From: Thomas Roessler <roessler@does-not-exist.org>
Date: Thu, 11 Aug 2005 21:46:25 +0000 (+0000)
Subject: automatic post-release commit for mutt-1.5.10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee7d8c9df962da6ca1b2f228541abcc3a8b61545;p=neomutt

automatic post-release commit for mutt-1.5.10
---

diff --git a/po/bg.po b/po/bg.po
index d57990945..e67c61577 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,31 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.5.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CP1251\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "Ïîòðåáèòåëñêî èìå íà %s: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Ïàðîëà çà %s@%s: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Èçõîä"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Èçòð."
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Âúçñò."
 
@@ -42,9 +42,9 @@ msgid "Select"
 msgstr "Èçáîð"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Ïîìîù"
 
@@ -97,175 +97,175 @@ msgstr "
 msgid "Alias added."
 msgstr "Ïñåâäîíèìúò å äîáàâåí."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Íÿìà øàáëîí ñ òîâà èìå. Æåëàåòå ëè äà ïðîäúëæèòå?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Çàïèñúò \"compose\" â mailcap èçèñêâà %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Ãðåøêà ïðè èçïúëíåíèåòî íà \"%s\"!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Ãðåøêà ïðè îòâàðÿíå íà ôàéëà çà ïðî÷èò íà çàãëàâíàòà èíôîðìàöèÿ."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Ãðåøêà ïðè îòâàðÿíå íà ôàéëà çà èçòðèâàíå íà çàãëàâíà èíôîðìàöèÿ."
 
-#: attach.c:183
+#: attach.c:184
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "Ãðåøêà ïðè îòâàðÿíå íà ôàéëà çà ïðî÷èò íà çàãëàâíàòà èíôîðìàöèÿ."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "Â mailcap ëèïñâà çàïèñ \"compose\" çà %s. Ñúçäàâàíå íà ïðàçåí ôàéë."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Çàïèñúò \"edit\" â mailcap èçèñêâà %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Â mailcap ëèïñâà çàïèñ \"edit\" çà %s"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr ""
 "Íå å íàìåðåíî ïîäõîäÿùî mailcap âïèñâàíå. Ïðèëîæåíèåòî å ïîêàçàíî êàòî òåêñò."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Íåäåôèíèðàí MIME òèï. Ïðèëîæåíèåòî íå ìîæå äà áúäå ïîêàçàíî."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Ôèëòúðúò íå ìîæå äà áúäå ñúçäàäåí"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Ãðåøêà ïðè ñúçäàâàíåòî íà ôèëòúð"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Ãðåøêà ïðè çàïèñ!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Íåâúçìîæíî îòïå÷àòâàíå!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Äèðåêòîðèÿ"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Ìàñêà"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s íå å äèðåêòîðèÿ."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Ïîùåíñêè êóòèè [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Àáîíèðàí [%s], Ôàéëîâà ìàñêà: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Äèðåêòîðèÿ [%s], Ôàéëîâà ìàñêà: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Íå ìîæå äà ïðèëàãàòå äèðåêòîðèÿ!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Íÿìà ôàéëîâå, îòãîâàðÿùè íà ìàñêàòà"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Ñàìî IMAP ïîùåíñêè êóòèè ìîãàò äà áúäàò ñúçäàâàíè"
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Ñàìî IMAP ïîùåíñêè êóòèè ìîãàò äà áúäàò ñúçäàâàíè"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Ñàìî IMAP ïîùåíñêè êóòèè ìîãàò äà áúäàò èçòðèâàíè"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Äåéñòâèòåëíî ëè æåëàåòå äà èçòðèåòå ïîùåíñêàòà êóòèÿ \"%s\"?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Ïîùåíñêàòà êóòèÿ å èçòðèòà."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "Ïîùåíñêàòà êóòèÿ íå å èçòðèòà."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Ñìÿíà íà äèðåêòîðèÿòà: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Ãðåøêà ïðè ÷åòåíå íà äèðåêòîðèÿòà."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Ôàéëîâà ìàñêà: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Îáðàòíî ïîäðåæäàíå ïî äàòà(d), àçáó÷åí ðåä(a), ðàçìåð(z) èëè áåç ïîäðåæäàíå"
 "(n)?"
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Ïîäðåæäàíå ïî äàòà(d), àçáó÷åí ðåä(a), ðàçìåð(z) èëè áåç ïîäðåæäàíå(n)?"
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "dazn"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Íîâî èìå çà ôàéëà: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Äèðåêòîðèÿòà íå ìîæå äà áúäå ïîêàçàíà"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Ãðåøêà ïðè ïîêàçâàíåòî íà ôàéëà"
 
@@ -332,7 +332,7 @@ msgstr "
 msgid "Verify PGP signature?"
 msgstr "Æåëàåòå ëè äà ïîòâúðäèòå èñòèííîñòòà íà PGP-ïîäïèñà?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Íåâúçìîæíî ñúçäàâàíåòî íà âðåìåíåí ôàéë!"
 
@@ -344,114 +344,114 @@ msgstr "
 msgid "Could not copy message"
 msgstr "Ïèñìîòî íå ìîæå äà áúäå êîïèðàíî."
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "S/MIME-ïîäïèñúò å ïîòâúðäåí óñïåøíî."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "Ïðèòåæàòåëÿò íà S/MIME ñåðòèôèêàòà íå ñúâïàäà ñ ïîäàòåëÿ íà ïèñìîòî."
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr ""
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "S/MIME-ïîäïèñúò ÍÅ å ïîòâúðäåí óñïåøíî."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "PGP-ïîäïèñúò å ïîòâúðäåí óñïåøíî."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "PGP-ïîäïèñúò ÍÅ å ïîòâúðäåí óñïåøíî."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Êîìàíäà: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Ïðåïðàùàíå íà ïèñìîòî êúì: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Ïðåïðàùàíå íà ìàðêèðàíèòå ïèñìà êúì: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Ãðåøêà ïðè ðàç÷èòàíå íà àäðåñúò!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "Ëîø IDN: '%s'"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Ïðåïðàùàíå íà ïèñìîòî êúì %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Ïðåïðàùàíå íà ïèñìîòî êúì %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "Ïèñìîòî íå å ïðåïðàòåíî."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "Ïèñìàòà íå ñà ïðåïðàòåíè."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Ïèñìîòî å ïðåïðàòåíî."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Ïèñìàòà ñà ïðåïðàòåíè."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "Ãðåøêà ïðè ñúçäàâàíåòî íà ôèëòúð"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Èçïðàùàíå êúì êîìàíäà (pipe): "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Íå å äåôèíèðàíà êîìàíäà çà îòïå÷àòâàíå"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Æåëàåòå ëè äà îòïå÷àòàòå ïèñìîòî?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Æåëàåòå ëè äà îòïå÷àòàòå ìàðêèðàíèòå ïèñìà?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Ïèñìîòî å îòïå÷àòàíî"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Ïèñìàòà ñà îòïå÷àòàíè"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "Ïèñìîòî íå å îòïå÷àòàíî"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Ïèñìàòà íå ñà îòïå÷àòàíè"
 
-#: commands.c:508
+#: commands.c:509
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -460,7 +460,7 @@ msgstr ""
 "Îáðàòíî ïîäðåæäàíå ïî: äàòà íà èçïðàùàíå(d)/îò(f)/äàòà íà ïîëó÷àâàíå(r)/òåìà"
 "(s)/ïîëó÷àòåë(o)/íèøêà(t)/áåç ïîäðåæäàíå(u)/ðàçìåð(z)/âàæíîñò(c)?: "
 
-#: commands.c:509
+#: commands.c:510
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
@@ -469,74 +469,74 @@ msgstr ""
 "Ïîäðåæäàíå ïî: äàòà íà èçïðàùàíå(d)/îò(f)/äàòà íà ïîëó÷àâàíå(r)/òåìà(s)/"
 "ïîëó÷àòåë(o)/íèøêà(t)/áåç ïîäðåæäàíå(u)/ðàçìåð(z)/âàæíîñò(c)?: "
 
-#: commands.c:510
+#: commands.c:511
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzc"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Øåë êîìàíäà: "
 
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Äåêîäèðàíå è çàïèñ íà%s â ïîùåíñêà êóòèÿ"
 
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Äåêîäèðàíå è êîïèðàíå íà%s â ïîùåíñêà êóòèÿ"
 
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Äåøèôðèðàíå è çàïèñ íà%s â ïîùåíñêà êóòèÿ"
 
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Äåøèôðèðàíå è çàïèñ íà%s â ïîùåíñêà êóòèÿ"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Çàïèñ íà%s â ïîùåíñêà êóòèÿ"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Êîïèðàíå íà%s â ïîùåíñêà êóòèÿ"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " ìàðêèðàí"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Ñúçäàâàíå íà êîïèå â %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Æåëàåòå ëè äà ãî êîíâåðòèðàòå äî %s ïðè èçïðàùàíå?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type å ïðîìåíåí íà %s."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Êîäîâàòà òàáëèöà å ïðîìåíåíà íà %s; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "íå å êîíâåðòèðàíî"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "êîíâåðòèðàíî"
 
@@ -629,105 +629,673 @@ msgstr "
 msgid "Attaching selected files..."
 msgstr "Ïðèëàãàíå íà èçáðàíèòå ôàéëîâå..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Ïðèëàãàíåòî íà %s å íåâúçìîæíî!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Îòâàðÿíå íà ïîùåíñêà êóòèÿ, îò êîÿòî äà áúäå ïðèëîæåíî ïèñìî"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Â òàçè êóòèÿ íÿìà ïèñìà."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Ìàðêèðàéòå ïèñìàòà, êîèòî èñêàòå äà ïðèëîæèòå!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Ïðèëàãàíåòî å íåâúçìîæíî!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "Ïðîìÿíàòà íà êîäèðàíåòî çàñÿãà ñàìî òåêñòîâèòå ïðèëîæåíèÿ."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "Òîâà ïðèëîæåíèå íÿìà äà áúäå ïðåêîäèðàíî."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "Òîâà ïðèëîæåíèå ùå áúäå ïðåêîäèðàíî."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Èçáðàíî å íåâàëèäíî êîäèðàíå."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Æåëàåòå ëè äà çàïàçèòå êîïèå îò òîâà ïèñìî?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Ïðåèìåíóâàíå â: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Ãðåøêà ïðè îòâàðÿíå íà %s: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Íîâ ôàéë: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Ïîëåòî Content-Type èìà ôîðìàòà áàçîâ-òèï/ïîäòèï"
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Íåïîçíàò Content-Type %s"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "Ãðåøêà ïðè ñúçäàâàíå íà ôàéëà %s"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "Ãðåøêà ïðè ñúçäàâàíå íà ïðèëîæåíèåòî"
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "Æåëàåòå ëè äà çàïèøåòå ÷åðíîâàòà?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "Çàïèñ íà ïèñìîòî â ïîùåíñêà êóòèÿ"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Çàïèñâàíå íà ïèñìîòî â %s ..."
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "Ïèñìîòî å çàïèñàíî."
 
-#: compose.c:1220
+#: compose.c:1225
 #, fuzzy
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "S/MIME-øèôðîâàíå âå÷å å èçáðàíî. Clear & continue? "
 
-#: compose.c:1246
+#: compose.c:1251
 #, fuzzy
 msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP-øèôðîâàíå âå÷å å èçáðàíî. Clear & continue? "
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+
+#: crypt-gpgme.c:993
+msgid "Warning: One of the keys has been revoked\n"
+msgstr ""
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Ñåðòèôèêàòúò íà ñúðâúðà å èçòåêúë"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL íå å íà ðàçïîëîæåíèå."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Ïðúñòîâ îòïå÷àòúê: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Ãðåøêà ïðè èçïðàùàíå íà ïèñìîòî."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Ãðåøêà â êîìàíäíèÿ ðåä: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Êðàé íà ïîäïèñàíèòå äàííè --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Ãðåøêà: íå ìîæå äà áúäå ñúçäàäåí âðåìåíåí ôàéë! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- ÍÀ×ÀËÎ ÍÀ PGP-ÏÈÑÌÎ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- ÍÀ×ÀËÎ ÍÀ ÁËÎÊ Ñ ÏÓÁËÈ×ÅÍ PGP-ÊËÞ× --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- ÍÀ×ÀËÎ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎ ÏÈÑÌÎ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- ÊÐÀÉ ÍÀ PGP-ÏÈÑÌÎÒÎ --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- ÊÐÀÉ ÍÀ ÁËÎÊÀ Ñ ÏÓÁËÈ×ÍÈß PGP-ÊËÞ× --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- ÊÐÀÉ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎÒÎ ÏÈÑÌÎ --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Ãðåøêà: íà÷àëîòî íà PGP-ïèñìîòî íå ìîæå äà áúäå íàìåðåíî! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Ãðåøêà: íåïðàâèëíî ïîñòðîåíî PGP/MIME ñúîáùåíèå! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Ãðåøêà: íå ìîæå äà áúäå ñúçäàäåí âðåìåíåí ôàéë! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Ñëåäíèòå äàííè ñà øèôðîâàíè ñ PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Ñëåäíèòå äàííè ñà øèôðîâàíè ñ PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- Êðàé íà øèôðîâàíèòå ñ PGP/MIME äàííè --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- Êðàé íà øèôðîâàíèòå ñ PGP/MIME äàííè --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr "[-- Ñëåäíèòå äàííè ñà ïîäïèñàíè ñúñ S/MIME --]\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr "[-- Ñëåäíèòå äàííè ñà øèôðîâàíè ñúñ S/MIME --]\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Êðàé íà ïîäïèñàíèòå ñúñ S/MIME äàííè --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Êðàé íà øèôðîâàíèòå ñúñ S/MIME äàííè --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Íåâàëèäåí   "
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Íåâàëèäåí ìåñåö: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Íåâàëèäåí ìåñåö: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Øèôðîâàíå"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Ñåðòèôèêàòúò å çàïèñàí"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Êëþ÷îâ èäåíòèôèêàòîð: 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "Àíóëèðàí   "
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Èçòåêúë   "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Ãðåøêà ïðè ñúçäàâàíå íà âðåìåíåí ôàéë"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Ñâúðçâàíå ñ %s..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Ãðåøêà ïðè ñâúðçâàíå ñúñ ñúðâúðà: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Êëþ÷îâ èäåíòèôèêàòîð: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "Íåóñïåøåí SSL: %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Âñè÷êè ïîäõîäÿùè êëþ÷îâå ñà îñòàðåëè, àíóëèðàíè èëè äåàêòèâèðàíè."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Èçõîä"
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Èçáîð "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Ïðîâåðêà íà êëþ÷  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP êëþ÷îâå, ñúâïàäàùè ñ \"%s\"."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP êëþ÷îâå, ñúâïàäàùè ñ \"%s\"."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "S/MIME ñåðòèôèêàòè, ñúâïàäàùè ñ \"%s\"."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP êëþ÷îâå, ñúâïàäàùè ñ \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr ""
+"Òîçè êëþ÷ íå ìîæå äà áúäå èçïîëçâàí, çàùîòî å îñòàðÿë, äåàêòèâèðàí èëè "
+"àíóëèðàí."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "Òîçè èäåíòèôèêàòîð å îñòàðÿë, äåàêòèâèðàí èëè àíóëèðàí."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "Òîçè èäåíòèôèêàòîð å ñ íåäåôèíèðàíà âàëèäíîñò."
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "Òîçè èäåíòèôèêàòîð íå íå å âàëèäåí."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "Òîçè èäåíòèôèêàòîð å ñ îãðàíè÷åíà âàëèäíîñò."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Äåéñòâèòåëíî ëè èñêàòå äà èçïîëçâàòå òîçè êëþ÷?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Òúðñåíå íà êëþ÷îâå, îòãîâàðÿùè íà \"%s\"..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "Æåëàåòå ëè èçïîëçâàòå êëþ÷îâèÿ èäåíòèôèêàòîð \"%s\" çà %s?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Âúâåäåòå êëþ÷îâ èäåíòèôèêàòîð çà %s: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr ""
+"PGP øèôðîâàíå(e), ïîäïèñ(s), ïîäïèñ êàòî(a), è äâåòå(b) èëè áåç òÿõ(f)?"
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "eswabf"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr ""
+"PGP øèôðîâàíå(e), ïîäïèñ(s), ïîäïèñ êàòî(a), è äâåòå(b) èëè áåç òÿõ(f)?"
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "eswabf"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Ïîäïèñ êàòî: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Ãðåøêà ïðè îòâàðÿíå íà ôàéëà çà ïðî÷èò íà çàãëàâíàòà èíôîðìàöèÿ."
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -743,29 +1311,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "Ïàðîëèòå ñà çàáðàâåíè."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Ñòàðòèðàíå íà PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Ïèñìîòî íå å èçïðàòåíî."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "S/MIME ïèñìà áåç óêàçàíèå çà ñúäúðæàíèåòî èì íå ñå ïîääúðæàò."
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "Îïèò çà èçâëè÷àíå íà PGP êëþ÷îâå...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Îïèò çà èçâëè÷àíå íà S/MIME ñåðòèôèêàòè...\n"
 
@@ -777,7 +1345,7 @@ msgstr ""
 "[-- Ãðåøêà: Ïðîòèâîðå÷èâà multipart/signed ñòðóêòóðà! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -786,7 +1354,7 @@ msgstr ""
 "[-- Ãðåøêà: Íåïîçíàò multipart/signed ïðîòîêîë %s! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -796,7 +1364,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -804,7 +1372,7 @@ msgstr ""
 "[-- Ñëåäíèòå äàííè ñà ïîäïèñàíè --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -812,7 +1380,7 @@ msgstr ""
 "[-- Ïðåäóïðåæäåíèå: íå ìîãàò äà áúäàò íàìåðåíè ïîäïèñè. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -820,227 +1388,257 @@ msgstr ""
 "\n"
 "[-- Êðàé íà ïîäïèñàíèòå äàííè --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Ñòàðòèðàíå íà PGP..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "yes"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "no"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Æåëàåòå ëè äà íàïóñíåòå mutt?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "íåïîçíàòà ãðåøêà"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Íàòèñíåòå íÿêîé êëàâèø..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " (èçïîëçâàéòå'?' çà èçáîð îò ñïèñúê): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Íÿìà îòâîðåíà ïîùåíñêà êóòèÿ."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Íÿìà ïèñìà."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "Òàçè ïîùåíñêà êóòèÿ å ñàìî çà ÷åòåíå."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Òàçè ôóíêöèÿ íå ìîæå äà ñå èçïúëíè ïðè ïðèëàãàíå íà ïèñìà."
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "Íÿìà âèäèìè ïèñìà."
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr ""
 "Ðåæèìúò íà çàùèòåíàòà îò çàïèñ ïîùåíñêà êóòèÿ íå ìîæå äà áúäå ïðîìåíåí!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Ïðîìåíèòå â òàçè ïîùåíñêà êóòèÿ ùå áúäàò çàïèñàíè ïðè íàïóñêàíåòî é."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Ïðîìåíèòå â òàçè ïîùåíñêà êóòèÿ íÿìà äà áúäàò çàïèñàíè."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Èçõîä"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Çàïèñ"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Íîâî"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Îòãîâîð"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Ãðóï. îòã."
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
 "Ïîùåíñêàòà êóòèÿ å ïðîìåíåíà îò äðóãà ïðîãðàìà. Ìàðêèðîâêèòå ìîæå äà ñà "
 "îñòàðåëè."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Íîâè ïèñìà â òàçè ïîùåíñêà êóòèÿ."
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "Ïîùåíñêàòà êóòèÿ å ïðîìåíåíà îò äðóãà ïðîãðàìà."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Íÿìà ìàðêèðàíè ïèñìà."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 msgid "Nothing to do."
 msgstr "Íÿìà êàêâî äà ñå ïðàâè."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Ñêîê êúì ïèñìî íîìåð: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "Àðãóìåíòúò òðÿáâà äà áúäå íîìåð íà ïèñìî."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Òîâà ïèñìî íå å âèäèìî."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Ãðåøåí íîìåð íà ïèñìî."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Èçòðèâàíå íà ïèñìà ïî øàáëîí: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "Íÿìà àêòèâåí îãðàíè÷èòåëåí øàáëîí."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Îãðàíè÷àâàíå: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Îãðàíè÷àâàíå äî ïèñìàòà, îòãîâàðÿùè íà: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Æåëàåòå ëè äà íàïóñíåòå mutt?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Ìàðêèðàíå íà ïèñìàòà, îòãîâàðÿùè íà: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Âúçñòàíîâÿâàíå íà ïèñìàòà, îòãîâàðÿùè íà: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Ïðåìàõâàíå íà ìàðêèðîâêàòà îò ïèñìàòà, îòãîâàðÿùè íà: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Îòâàðÿíå íà ïîùåíñêàòà êóòèÿ ñàìî çà ÷åòåíå"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Îòâàðÿíå íà ïîùåíñêà êóòèÿ"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s íå å ïîùåíñêà êóòèÿ."
 
-#: curs_main.c:1165
+#: curs_main.c:1176
 msgid "Exit Mutt without saving?"
 msgstr "Æåëàåòå ëè äà íàïóñíåòå Mutt áåç äà çàïèøåòå ïðîìåíèòå?"
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "Ïîêàçâàíåòî íà íèøêè íå å âêëþ÷åíî."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "çàïèñâà ïèñìîòî êàòî ÷åðíîâà çà ïî-êúñíî èçïðàùàíå"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Òîâà å ïîñëåäíîòî ïèñìî."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Íÿìà âúçñòàíîâåíè ïèñìà."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Òîâà å ïúðâîòî ïèñìî."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "Òúðñåíåòî å çàïî÷íàòî îòãîðå."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "Òúðñåíåòî å çàïî÷íàòî îòäîëó."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Íÿìà íîâè ïèñìà."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Íÿìà íåïðî÷åòåíè ïèñìà"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " â òîçè îãðàíè÷åí èçãëåä"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "Íå ìîæå äà áúäå ïðîìåíÿíà ìàðêèðîâêàòà 'important' íà POP ñúðâúð."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Íÿìà ïîâå÷å íèøêè."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Òîâà å ïúðâàòà íèøêà."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "Ïîêàçâàíåòî íà íèøêè íå å âêëþ÷åíî."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "Íèøêàòà ñúäúðæà íåïðî÷åòåíè ïèñìà."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "Ðåäàêòèðàíåòî íà ïèñìî íà POP ñúðâúð íå å âúçìîæíî."
 
@@ -1175,110 +1773,110 @@ msgstr "
 msgid "Clear flag"
 msgstr "Èçòðèâàíå íà ìàðêèðîâêà"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Ãðåøêà: Íåâúçìîæíî å ïîêàçâàíåòî íà êîÿòî è äà å îò àëòåðíàòèâíèòå ÷àñòè "
 "íà ïèñìîòî --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Ïðèëîæåíèå: #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Òèï: %s/%s, Êîäèðàíå: %s, Ðàçìåð: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Àâòîìàòè÷íî ïîêàçâàíå ïîñðåäñòâîì %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Àâòîìàòè÷íî ïîêàçâàíå ïîñðåäñòâîì: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Ãðåøêà ïðè ñòàðòèðàíå íà %s. --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Ãðåøêè îò %s --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Ãðåøêà: message/external-body íÿìà ïàðàìåòðè çà ìåòîä íà äîñòúï --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Òîâà %s/%s ïðèëîæåíèå "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(ðàçìåð %s áàéòà) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "áå èçòðèòî --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- íà %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- èìå: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Òîâà %s/%s ïðèëîæåíèå íå å âêëþ÷åíî â ïèñìîòî, --]\n"
 
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr "[-- à ôàéëúò, îïðåäåëåí çà ïðèêà÷âàíå âå÷å íå ñúùåñòâóâà. --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- à óêàçàíèÿò ìåòîä íà äîñòúï %s íå ñå ïîäúðæà. --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Ãðåøêà: multipart/signed áåç protocol ïàðàìåòúð."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Ãðåøêà: multipart/encrypted áåç protocol ïàðàìåòúð."
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Ãðåøêà ïðè îòâàðÿíå íà âðåìåííèÿ ôàéë!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s íå ñå ïîääúðæà"
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr " (èçïîëçâàéòå'%s' çà äà âèäèòå òàçè ÷àñò)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "('view-attachments' íÿìà êëàâèøíà êîìáèíàöèÿ!)"
 
@@ -1385,46 +1983,46 @@ msgstr "
 msgid "SASL authentication failed."
 msgstr "Íåóñïåøíà SASL èäåíòèôèêàöèÿ."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s íå å âàëèäíà IMAP ïúòåêà"
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Çàïèòâàíå çà namespaces..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Çàïèòâàíå çà ñïèñúêà îò ïîùåíñêè êóòèè..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "Íÿìà òàêàâà ïàïêà"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Ñúçäàâàíå íà ïîùåíñêà êóòèÿ: "
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "Ïîùåíñêàòà êóòèÿ òðÿáâà äà èìà èìå."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Ïîùåíñêàòà êóòèÿ å ñúçäàäåíà."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Ñúçäàâàíå íà ïîùåíñêà êóòèÿ: "
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "Íåóñïåøåí SSL: %s"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "Ïîùåíñêàòà êóòèÿ å ñúçäàäåíà."
@@ -1436,137 +2034,134 @@ msgstr "
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Íåïîïðàâèìà ãðåøêà. Ðàçëè÷åí áðîé íà ñúîáùåíèÿòà!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Çàòâàðÿíå íà âðúçêàòà êúì %s..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Òîçè IMAP-ñúðâúð å îñòàðÿë. Mutt íÿìà äà ðàáîòè ñ íåãî."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
-msgstr "Ñúðâúðúò èçïðàòè íåî÷àêâàí îòãîâîð: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
+msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "Æåëàåòå ëè äà óñòàíîâèòå ñèãóðíà âðúçêà ñ TLS?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "Íå ìîæå äà áúäå óñòàíîâåíà TSL âðúçêà"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Èçáèðàíå íà %s..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "Ãðåøêà ïðè îòâàðÿíå íà ïîùåíñêàòà êóòèÿ!"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Ãðåøêà ïðè äîáàâÿíåòî êúì IMAP ïîùåíñêèòå êóòèè íà òîçè ñúðâúð"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "Æåëàåòå ëè äà ñúçäàäåòå %s?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Ìàðêèðàíå íà %d ñúîáùåíèÿ çà èçòðèâàíå..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "Íåóñïåøíî ïðåìàõâàíå"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Çàïèñ íà ìàðêèðîâêèòå íà ïèñìîòî... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Ïðåìàõâàíå íà ñúîáùåíèÿòà îò ñúðâúðà..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbo: íåóñïåøåí EXPUNGE"
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "Íåóñïåøåí CLOSE"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "Íåâàëèäíî èìå íà ïîùåíñêàòà êóòèÿ"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Àáîíèðàíå çà %s..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Îòïèñâàíå îò %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr ""
 "Ãðåøêà ïðè ïîëó÷àâàíå íà çàãëàâíèòå ÷àñòè îò òàçè âåðñèÿ íà IMAP-ñúðâúðà."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Íåâúçìîæíî ñúçäàâàíåòî íà âðåìåíåí ôàéë %s"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Èçòåãëÿíå íà çàãëàâíèòå ÷àñòè... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Èçòåãëÿíå íà çàãëàâíèòå ÷àñòè... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Èçòåãëÿíå íà ïèñìî..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 "Íåâàëèäåí èíäåêñ íà ïèñìî. Îïèòàéòå äà îòâîðèòå îòíîâî ïîùåíñêàòà êóòèÿ."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Çàðåæäàíå íà ïèñìî íà ñúðâúðà ..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Êîïèðàíå íà %d ñúîáùåíèÿ â %s..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Êîïèðàíå íà %d-òî ñúîáùåíèå â %s..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Æåëàåòå ëè äà ïðîäúëæèòå?"
 
@@ -1575,124 +2170,124 @@ msgstr "
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:678
+#: init.c:644
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "ìàðêèðà ïèñìà, îòãîâàðÿùè íà øàáëîí"
 
-#: init.c:680
+#: init.c:646
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "ïðåìàõâà ìàðêèðîâêàòà îò ïèñìà, îòãîâàðÿùè íà øàáëîí"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias: íÿìà àäðåñ"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Ïðåäóïðåæäåíèå: Ëîø IDN '%s' â ïñåâäîíèìà '%s'.\n"
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "íåâàëèäíî çàãëàâíî ïîëå"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: íåïîçíàò ìåòîä çà ñîðòèðàíå"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): ãðåøêà â ðåãóëÿðíèÿ èçðàç: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: íåïîçíàòà ïðîìåíëèâà"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "òîçè ïðåôèêñ íå å âàëèäåí ñ \"reset\""
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "òàçè ñòîéíîñò íå å âàëèäíà ñ \"reset\""
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s å âêëþ÷åí"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s å èçêëþ÷åí"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: íåâàëèäåí òèï íà ïîùåíñêàòà êóòèÿ"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: íåâàëèäíà ñòîéíîñò"
 
-#: init.c:1589
+#: init.c:1555
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: Íåïîçíàò òèï."
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: íåïîçíàò òèï"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Ãðåøêà â %s, ðåä %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: ãðåøêè â %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: âìúêâàíåòî å ïðåêúñíàòî ïîðàäè òâúðäå ìíîãî ãðåøêè â %s"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: ãðåøêà ïðè %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: òâúðäå ìíîãî àðãóìåíòè"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: íåïîçíàòà êîìàíäà"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Ãðåøêà â êîìàíäíèÿ ðåä: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "ëè÷íàòà Âè äèðåêòîðèÿ íå ìîæå äà áúäå íàìåðåíà"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "ïîòðåáèòåëñêîòî Âè èìå íå ìîæå äà áúäå óñòàíîâåíî"
 
@@ -2153,400 +2748,409 @@ msgid "compose a new mail message"
 msgstr "ñúçäàâà íîâî ïèñìî"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "îòâàðÿ äðóãà ïîùåíñêà êóòèÿ"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "îòâàðÿ äðóãà ïîùåíñêà êóòèÿ ñàìî çà ÷åòåíå"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "îòñòðàíÿâà ìàðêèðîâêàòà çà ñòàòóñ îò ïèñìî"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "èçòðèâà ïèñìà, îòãîâàðÿùè íà øàáëîí"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "èçòåãëÿ ïðèíóäèòåëíî ïèñìà îò IMAP ñúðâúð"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "èçòåãëÿ ïèñìà îò POP ñúðâúð"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "ïðåìåñòâàíå êúì ïúðâîòî ïèñìî"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "ïðåìåñòâàíå êúì ïîñëåäíîòî ïèñìî"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "ïîêàçâà ñàìî ïèñìà, îòãîâàðÿùè íà øàáëîí"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Ïðåïðàùàíå íà ìàðêèðàíèòå ïèñìà êúì: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "ñêîê êúì ñëåäâàùîòî íîâî ïèñìî"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "ñêîê êúì ñëåäâàùîòî íîâî èëè íåïðî÷åòåíî ïèñìî"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "ñêîê êúì ñëåäâàùàòà ïîäíèøêà"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "ñêîê êúì ñëåäâàùàòà íèøêà"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "ïðåìåñòâàíå êúì ñëåäâàùîòî âúçñòàíîâåíî ïèñìî"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "ñêîê êúì ñëåäâàùîòî íåïðî÷åòåíî ïèñìî"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "ñêîê êúì ðîäèòåëñêîòî ïèñìî â íèøêàòà"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "ñêîê êúì ïðåäèøíàòà íèøêà"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "ñêîê êúì ïðåäèøíàòà ïîäíèøêà"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "ïðåìåñòâàíå êúì ïðåäèøíîòî âúçñòàíîâåíî ïèñìî"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "ñêîê êúì ïðåäèøíîòî íîâî ïèñìî"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "ñêîê êúì ïðåäèøíîòî íîâî èëè íåïðî÷åòåíî ïèñìî"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "ñêîê êúì ïðåäèøíîòî íåïðî÷åòåíî ïèñìî"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "ìàðêèðà òåêóùàòà íèøêà êàòî ïðî÷åòåíà"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "ìàðêèðà òåêóùàòà ïîäíèøêà êàòî ïðî÷åòåíà"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "ïîñòàâÿ ìàðêèðîâêàòà çà ñòàòóñ íà ïèñìî"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "çàïèñâà ïðîìåíèòå â ïîùåíñêàòà êóòèÿ"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "ìàðêèðà ïèñìà, îòãîâàðÿùè íà øàáëîí"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "âúçñòàíîâÿâà ïèñìà, îòãîâàðÿùè íà øàáëîí"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "ïðåìàõâà ìàðêèðîâêàòà îò ïèñìà, îòãîâàðÿùè íà øàáëîí"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "ïðåìåñòâàíå êúì ñðåäàòà íà ñòðàíèöàòà"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "ïðåìåñòâàíå êúì ñëåäâàùèÿ çàïèñ"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "ïðåâúðòà íàäîëó ñ åäèí ðåä"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "ïðåìåñòâàíå êúì ñëåäâàùàòà ñòðàíèöà"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "ñêîê êúì êðàÿ íà ïèñìîòî"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "ïîêàçâà/ñêðèâà öèòèðàí òåêñò"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "ïðåñêà÷à öèòèðàíèÿ òåêñò"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "ñêîê êúì íà÷àëîòî íà ïèñìîòî"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "èçïðàùà ïèñìî èëè ïðèëîæåíèå êúì êîìàíäà íà êîìàíäíèÿ èíòåðïðåòàòîð"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "ïðåìåñòâàíå êúì ïðåäèøíèÿ çàïèñ"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "ïðåâúðòàíå íàãîðå ñ åäèí ðåä"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "ïðåìåñòâàíå êúì ïðåäèøíàòà ñòðàíèöà"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "îòïå÷àòâà òåêóùîòî ïèñìî"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "èçïðàùà çàïèòâàíå êúì âúíøíà ïðîãðàìà çà àäðåñ"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "äîáàâÿ ðåçóëòàòèòå îò çàïèòâàíåòî êúì äîñåãàøíèòå"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "çàïèñâà ïðîìåíèòå â ïîùåíñêàòà êóòèÿ è íàïóñêà ïðîãðàìàòà"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "ðåäàêòèðà ÷åðíîâà"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "èçòðèâà è ïðåðèñóâà åêðàíà"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{âúòðåøíî}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "èçòðèâà òåêóùàòà ïîùåíñêà êóòèÿ (ñàìî IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "îòãîâîð íà ïèñìî"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "èçïîëçâà òåêóùîòî ïèñìî êàòî øàáëîí çà íîâî"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "çàïèñâà ïèñìî èëè ïðèëîæåíèå âúâ ôàéë"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "òúðñåíå íà ðåãóëÿðåí èçðàç"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "òúðñåíå íà ðåãóëÿðåí èçðàç â îáðàòíàòà ïîñîêà"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "òúðñè ñëåäâàùîòî ïîïàäåíèå"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "òúðñè ñëåäâàùîòî ïîïàäåíèå â îáðàòíàòà ïîñîêà"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "âêëþ÷âà/èçêëþ÷âà îöâåòÿâàíåòî ïðè òúðñåíå"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "èçïúëíÿâà êîìàíäà â êîìàíäíèÿ èíòåðïðåòàòîð"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "ïîäðåæäà ïèñìàòà"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "ïîäðåæäà ïèñìàòà â îáðàòåí ðåä"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "ìàðêèðà òåêóùèÿò çàïèñ"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "ïðèëàãà ñëåäâàùàòà ôóíêöèÿ âúðõó ìàðêèðàíèòå ïèñìà"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 msgid "apply next function ONLY to tagged messages"
 msgstr "ïðèëàãà ñëåäâàùàòà ôóíêöèÿ ÑÀÌÎ âúðõó ìàðêèðàíèòå ïèñìà"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "ìàðêèðà òåêóùàòà ïîäíèøêà"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "ìàðêèðà òåêóùàòà íèøêà"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "âêëþ÷âà/èçêëþ÷âà èíäèêàòîðà, äàëè ïèñìîòî å íîâî"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "âêëþ÷âà/èçêëþ÷âà ïðåçàïèñúò íà ïîùåíñêàòà êóòèÿ"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "ïðåâêëþ÷âà òúðñåíåòî ìåæäó ïîùåíñêè êóòèè èëè âñè÷êè ôàéëîâå"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "ïðåìåñòâàíå êúì íà÷àëîòî íà ñòðàíèöàòà"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "âúçñòàíîâÿâà òåêóùîòî ïèñìî"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "âúçñòàíîâÿâà âñè÷êè ïèñìà â íèøêàòà"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "âúçñòàíîâÿâà âñè÷êè ïèñìà â ïîäíèøêàòà"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "ïîêàçâà âåðñèÿòà íà mutt"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "ïîêàçâà ïðèëîæåíèå, èçïîëçâàéêè mailcap"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "ïîêàçâà MIME ïðèëîæåíèÿ"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "ïîêàçâà êîäà íà íàòèñíàò êëàâèø"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "ïîêàçâà àêòèâíèÿ îãðàíè÷èòåëåí øàáëîí"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "ñâèâà/ðàçòâàðÿ òåêóùàòà íèøêà"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "ñâèâà/ðàçòâàðÿ âñè÷êè íèøêè"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "ïðèëàãà PGP ïóáëè÷åí êëþ÷"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "ïîêàçâà PGP íàñòðîéêèòå"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "èçïðàùà PGP ïóáëè÷åí êëþ÷"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "ïîòâúðæäàâà PGP ïóáëè÷åí êëþ÷"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "ïîêàçâà ïîòðåáèòåëñêèÿ íîìåð êúì êëþ÷"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "ïðîâåðÿâà çà êëàñè÷åñêè pgp"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "îäîáðÿâà êîíñòðóèðàíàòà âåðèãà"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "äîáàâÿ remailer êúì âåðèãàòà"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "âìúêâà remailer âúâ âåðèãàòà"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "èçòðèâà remailer îò âåðèãàòà"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "èçáèðà ïðåäèøíèÿ åëåìåíò îò âåðèãàòà"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "èçáèðà ñëåäâàùèÿ åëåìåíò îò âåðèãàòà"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "èçïðàùà ïèñìîòî ïðåç mixmaster remailer âåðèãà"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "ñúçäàâà äåøèôðèðàíî êîïèå è èçòðèâà"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "ñúçäàâà äåøèôðèðàíî êîïèå"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "îòñòðàíÿâà ïàðîëèòå îò ïàìåòòà"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "èçâëè÷à ïîääúðæàíèòå ïóáëè÷íè êëþ÷îâå"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "ïîêàçâà S/MIME íàñòðîéêèòå"
 
-#: lib.c:64
+#: lib.c:126
 #, fuzzy
 msgid "Integer overflow -- can't allocate memory!"
 msgstr "Integer overflow -- çàäåëÿíåòî íà ïàìåò å íåâúçìîæíî!"
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Íåäîñòàòú÷íî ïàìåò!"
 
@@ -2571,12 +3175,13 @@ msgstr ""
 "ïðè îïðåäåëåíè óñëîâèÿ; íàïèøåòå `mutt -vv' çà ïîâå÷å ïîäðîáíîñòè.\n"
 
 #: main.c:61
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2623,25 +3228,71 @@ msgstr ""
 "Software\n"
 "    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
 
-#: main.c:99
+#: main.c:99
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"Ñòàðòèðàíå: mutt [ -nRyzZ ] [ -e <êîìàíäà> ] [ -F <ôàéë> ] [ -m <òèï> ] [ -f "
+"<ôàéë> ]\n"
+"       mutt [ -nR ] [ -e <êîìàíäà> ] [ -F <ôàéë> ] -Q <çàïèòâàíå> [ -Q "
+"<çàïèòâàíå> ] [...]\n"
+"       mutt [ -nR ] [ -e <êîìàíäà> ] [ -F <ôàéë> ] -A <ïñåâäîíèì> [ -A "
+"<ïñåâäîíèì> ] [...]\n"
+"       mutt [ -nx ] [ -e <êîìàíäà> ] [ -a <ôàéë> ] [ -F <ôàéë> ] [ -H "
+"<ôàéë> ] [ -i <ôàéë> ] [ -s <òåìà> ] [ -b <àäðåñ> ] [ -c <àäðåñ> ] <àäðåñ> "
+"[ ... ]\n"
+"       mutt [ -n ] [ -e <êîìàíäà> ] [ -F <ôàéë> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"Ïàðàìåòðè:\n"
+"  -A <ïñåâäîíèì>\tðàçãðúùà óêàçàíèÿ ïñåâäîíèì\n"
+"  -a <èìå íà ôàéë>\tïðèëàãà ôàéë êúì ïèñìîòî\n"
+"  -b <àäðåñ>\tèçïðàùà ñëÿïî êîïèå (BCC) êúì òîçè àäðåñ\n"
+"  -c <àäðåñ>\tèçïðàùà êîïèå (CC) êúì òîçè àäðåñ\n"
+"  -e <êîìàíäà>\têîìàíäà, êîÿòî äà áúäå èçïúëíåíà ñëåä èíèöèàëèçàöèÿ\n"
+"  -f <èìå íà ôàéë>\tïîùåíñêà êóòèÿ, êîÿòî äà áúäå çàðåäåíà\n"
+"  -F <èìå íà ôàéë>\tàëòåðíàòèâåí muttrc ôàéë\n"
+"  -H <èìå íà ôàéë>\tôàéë ñúñ çàãëàâíà èíôîðìàöèÿ\n"
+"  -i <èìå íà ôàéë>\tôàéë, êîéòî äà áúäå âêëþ÷åí â îòãîâîðà\n"
+"  -m <òèï>\tòèï íà ïîùåíñêàòà êóòèÿ ïî ïîäðàçáèðàíå\n"
+"  -n\t\tèãíîðèðà ñèñòåìíèÿ Muttrc\n"
+"  -p\t\tðåäàêòèðà ÷åðíîâà\n"
+"  -Q <variable>\tçàïèòâàíå çà êîíôèãóðàöèîííà ïðîìåíëèâà\n"
+"  -R\t\tîòâàðÿ ïîùåíñêàòà êóòèÿ ñàìî çà ÷åòåíå\n"
+"  -s <òåìà>\tòåìà íà ïèñìîòî (òðÿáâà äà å â êàâè÷êè, àêî ñúäúðæà èíòåðâàëè)\n"
+"  -v\t\tïîêàçâà âåðñèÿòà è äåôèíèöèèòå, èçïîëçâàíè ïðè êîìïèëàöèÿ\n"
+"  -x\t\tñèìóëèðà mailx èçïðàùàíå\n"
+"  -y\t\tèçáîð íà ôàéë îò ëèñòà `mailboxes'\n"
+"  -z\t\tíåçàáàâåí èçõîä îò ïðîãðàìàòà, àêî â ïîùåíñêàòà êóòèÿ íÿìà ïèñìà\n"
+"  -Z\t\tîòâàðÿíå íà ïúðâàòà ïîùåíñêà êóòèÿ ñ íîâè ïèñìà èëè íåçàáàâåí èçõîä "
+"îò ïðîãðàìàòà àêî íÿìà òàêàâà\n"
+"  -h\t\tïîêàçâà òîçè òåêñò"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
 #, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-"<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-"[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-"[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
-"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
-"\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2696,7 +3347,7 @@ msgstr ""
 "îò ïðîãðàìàòà àêî íÿìà òàêàâà\n"
 "  -h\t\tïîêàçâà òîçè òåêñò"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2704,47 +3355,47 @@ msgstr ""
 "\n"
 "Îïöèè ïðè êîìïèëàöèÿ:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Ãðåøêà ïðè èíèöèàëèçàöèÿ íà òåðìèíàëà."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Debugging íà íèâî %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "Îïöèÿòà DEBUG íå å å äåôèíèðàíà ïðè êîìïèëàöèÿ è å èãíîðèðàíà.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s íå ñúùåñòâóâà. Äà áúäå ëè ñúçäàäåí?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Ãðåøêà ïðè ñúçäàâàíå íà %s: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Íå ñà óêàçàíè ïîëó÷àòåëè.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: ãðåøêà ïðè ïðèëàãàíå íà ôàéëà.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Íÿìà ïîùåíñêà êóòèÿ ñ íîâè ïèñìà."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Íå ñà äåôèíèðàíè âõîäíè ïîùåíñêè êóòèè."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "Ïîùåíñêàòà êóòèÿ å ïðàçíà."
 
@@ -2761,12 +3412,12 @@ msgstr "
 msgid "Mailbox was corrupted!"
 msgstr "Ïîùåíñêàòà êóòèÿ å ïîâðåäåíà!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr ""
 "Íåïîïðàâèìà ãðåøêà! Ãðåøêà ïðè ïîâòîðíîòî îòâàðÿíå íà ïîùåíñêàòà êóòèÿ!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Ãðåøêà ïðè çàêëþ÷âàíå íà ïîùåíñêàòà êóòèÿ!"
 
@@ -2774,13 +3425,13 @@ msgstr "
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: ïîùåíñêàòà êóòèÿ å ïðîìåíåíà, íî íÿìà ïðîìåíåíè ïèñìà! (ìîëÿ, ñúîáùåòå "
 "çà òàçè ãðåøêà)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Çàïèñâàíå íà ïèñìàòà... %d (%d%%)"
@@ -2788,189 +3439,149 @@ msgstr "
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "Ñúõðàíÿâàíå íà ïðîìåíèòå..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Ãðåøêà ïðè çàïèñ! Ïîùåíñêàòà êóòèÿ å çàïèñàíà ÷àñòè÷íî â %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Ãðåøêà ïðè ïîâòîðíîòî îòâàðÿíå íà ïîùåíñêàòà êóòèÿ!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Ïîâòîðíî îòâàðÿíå íà ïîùåíñêàòà êóòèÿ..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Ñêîê êúì: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Íåâàëèäåí íîìåð íà èíäåêñ."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Íÿìà âïèñâàíèÿ."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Íå ìîæå äà ïðåâúðòàòå íàäîëó ïîâå÷å."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Íå ìîæå äà ïðåâúðòàòå íàãîðå ïîâå÷å."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Òîâà å ïîñëåäíàòà ñòðàíèöà."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Òîâà å ïúðâàòà ñòðàíèöà."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "Ïúðâèÿò çàïèñ å ïîêàçàí."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "Ïîñëåäíèÿò çàïèñ å ïîêàçàí."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Òîâà å ïîñëåäíèÿò çàïèñ."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Òîâà å ïúðâèÿò çàïèñ."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Òúðñåíå: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Îáðàòíî òúðñåíå: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Íå å äåôèíèðàí øàáëîí çà òúðñåíå."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Íÿìà ðåçóëòàòè îò òúðñåíåòî."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "Íÿìà ìàðêèðàíè çàïèñè."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "Çà òîâà ìåíþ íå å èìïëåìåíòèðàíî òúðñåíå."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "Ñêîêîâåòå íå ñà èìïëåìåíòèðàíè çà äèàëîçè."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Ìàðêèðàíåòî íå ñå ïîääúðæà."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Çàðåæäàíå íà %s... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 "maildir_commit_message(): ãðåøêà ïðè ïîñòàâÿíåòî íà ìàðêà çà âðåìå íà ôàéëà"
 
-#: muttlib.c:846
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr ""
-"Ôàéëúò å äèðåêòîðèÿ. Æåëàåòå ëè äà çàïèøåòå â íåÿ? [(y) äà, (n) íå, (a) "
-"âñè÷êè]"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr "yna"
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "Ôàéëúò å äèðåêòîðèÿ. Æåëàåòå ëè äà çàïèøåòå â íåÿ?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Ôàéë â òàçè äèðåêòîðèÿ: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Ôàéëúò ñúùåñòâóâà. Ïðåçàïèñ(o), äîáàâÿíå(a) èëè îòêàç(c)?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "oac"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Çàïèñ íà ïèñìî íà POP ñúðâúð íå å âúçìîæíî."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s íå å ïîùåíñêà êóòèÿ!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Æåëàåòå ëè äà äîáàâèòå ïèñìàòà êúì %s?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "Âðúçêàòà ñ %s å çàòâîðåíà"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL íå å íà ðàçïîëîæåíèå."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "Ãðåøêà ïðè èçïúëíåíèå íà êîìàíäàòà \"preconnect\""
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Ãðåøêà â êîìóíèêàöèÿòà ñ %s (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "Ëîø IDN \"%s\"."
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "Òúðñåíå íà %s..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Õîñòúò \"%s\" íå ìîæå äà áúäå íàìåðåí."
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Ñâúðçâàíå ñ %s..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Ãðåøêà ïðè ñâúðçâàíå ñ %s (%s)"
@@ -3002,7 +3613,8 @@ msgstr "
 msgid "SSL failed: %s"
 msgstr "Íåóñïåøåí SSL: %s"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Îò ñúðâúðà íå ìîæå äà áúäå ïîëó÷åí ñåðòèôèêàò"
 
@@ -3011,87 +3623,209 @@ msgstr "
 msgid "SSL connection using %s (%s)"
 msgstr "SSL âðúçêà, èçïîëçâàùà %s (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "íåèçâåñòíî"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[ãðåøêà ïðè ïðåñìÿòàíå]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[íåâàëèäíà äàòà]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "Ñåðòèôèêàòúò íà ñúðâúðà âñå îùå íå å âàëèäåí"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "Ñåðòèôèêàòúò íà ñúðâúðà å èçòåêúë"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Òîçè ñåðòèôèêàò ïðèíàäëåæè íà:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Òîçè ñåðòèôèêàò å èçäàäåí îò:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Òîçè ñåðòèôèêàò å âàëèäåí"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   îò %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "    äî %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Ïðúñòîâ îòïå÷àòúê: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "Ïðîâåðêà íà SSL ñåðòèôèêàò"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "îòõâúðëÿíå(r), åäíîêðàòíî ïðèåìàíå(o), ïðèåìàíå âèíàãè(a)"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "roa"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "îòõâúðëÿíå(r), åäíîêðàòíî ïðèåìàíå(o)"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "ro"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Èçõîä"
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Ïðåäóïðåæäåíèå: Ñåðòèôèêàòúò íå ìîæå äà áúäå çàïàçåí"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Ñåðòèôèêàòúò å çàïèñàí"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "SSL âðúçêà, èçïîëçâàùà %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Ñåðòèôèêàòúò å çàïèñàí"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Ãðåøêà ïðè èíèöèàëèçàöèÿ íà òåðìèíàëà."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Ïðúñòîâ îòïå÷àòúê: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Ïðúñòîâ îòïå÷àòúê: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Ñåðòèôèêàòúò íà ñúðâúðà âñå îùå íå å âàëèäåí"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Ñåðòèôèêàòúò íà ñúðâúðà å èçòåêúë"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Ñåðòèôèêàòúò íà ñúðâúðà å èçòåêúë"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "Ñåðòèôèêàòúò íà ñúðâúðà âñå îùå íå å âàëèäåí"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "Ïðîâåðêà íà SSL ñåðòèôèêàò"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Ñâúðçâàíå ñ %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Ãðåøêà â êîìóíèêàöèÿòà ñ %s (%s)"
+
+#: muttlib.c:910
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr ""
+"Ôàéëúò å äèðåêòîðèÿ. Æåëàåòå ëè äà çàïèøåòå â íåÿ? [(y) äà, (n) íå, (a) "
+"âñè÷êè]"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr "yna"
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "Ôàéëúò å äèðåêòîðèÿ. Æåëàåòå ëè äà çàïèøåòå â íåÿ?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Ôàéë â òàçè äèðåêòîðèÿ: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Ôàéëúò ñúùåñòâóâà. Ïðåçàïèñ(o), äîáàâÿíå(a) èëè îòêàç(c)?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "oac"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Çàïèñ íà ïèñìî íà POP ñúðâúð íå å âúçìîæíî."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Æåëàåòå ëè äà äîáàâèòå ïèñìàòà êúì %s?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s íå å ïîùåíñêà êóòèÿ!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3171,7 +3905,7 @@ msgstr "
 msgid "%d kept, %d moved, %d deleted."
 msgstr "çàïàçåíè: %d; ïðåìåñòåíè: %d; èçòðèòè: %d"
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "çàïàçåíè: %d; èçòðèòè: %d"
@@ -3190,15 +3924,15 @@ msgstr "
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Ïîùåíñêàòà êóòèÿ å ñàìî çà ÷åòåíå. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "Ïîùåíñêàòà êóòèÿ å îòáåëÿçàíà."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Íåâúçìîæåí çàïèñ íà ïèñìî"
 
-#: mx.c:1539
+#: mx.c:1544
 #, fuzzy
 msgid "Integer overflow -- can't allocate memory."
 msgstr "Integer overflow -- çàäåëÿíåòî íà ïàìåò å íåâúçìîæíî."
@@ -3207,48 +3941,48 @@ msgstr "Integer overflow -- 
 msgid "Not available in this menu."
 msgstr "Ôóíêöèÿòà íå å äîñòúïíà îò òîâà ìåíþ."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "Ïðåä. ñòð."
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "Ñëåäâ. ñòð."
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Ïðèëîæåíèÿ"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Ñëåäâàùî"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Òîâà å êðàÿò íà ïèñìîòî."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Òîâà å íà÷àëîòî íà ïèñìîòî."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Îáðàòíî òúðñåíå: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Òúðñåíå: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "Ïîìîùòà âå÷å å ïîêàçàíà."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "Íÿìà ïîâå÷å öèòèðàí òåêñò."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Íÿìà ïîâå÷å íåöèòèðàí òåêñò ñëåä öèòèðàíèÿ."
 
@@ -3315,27 +4049,27 @@ msgstr "
 msgid "error: unknown op %d (report this error)."
 msgstr "ãðåøêà: íåïîçíàò îïåðàòîð %d (ìîëÿ, ñúîáùåòå çà òàçè ãðåøêà)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Êîìïèëèðàíå íà øàáëîíà çà òúðñåíå..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Èçïúëíÿâàíå íà êîìàíäà âúðõó ïèñìàòà..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "Íÿìà ïèñìà, îòãîâàðÿùè íà òîçè êðèòåðèé."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "Òúðñåíåòî äîñòèãíà äî êðàÿ, áåç äà áúäå íàìåðåíî ñúâïàäåíèå"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "Òúðñåíåòî äîñòèãíà äî íà÷àëîòî, áåç äà áúäå íàìåðåíî ñúâïàäåíèå"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Òúðñåíåòî å ïðåêúñíàòî."
 
@@ -3347,11 +4081,11 @@ msgstr "
 msgid "PGP passphrase forgotten."
 msgstr "PGP ïàðîëàòà å çàáðàâåíà."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Ãðåøêà: íå ìîæå äà áúäå ñòàðòèðàí äúùåðåí PGP ïðîöåñ! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3359,51 +4093,22 @@ msgstr ""
 "[-- Êðàé íà PGP-ðåçóëòàòà --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- ÍÀ×ÀËÎ ÍÀ PGP-ÏÈÑÌÎ --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- ÍÀ×ÀËÎ ÍÀ ÁËÎÊ Ñ ÏÓÁËÈ×ÅÍ PGP-ÊËÞ× --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- ÍÀ×ÀËÎ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎ ÏÈÑÌÎ --]\n"
-"\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- ÊÐÀÉ ÍÀ PGP-ÏÈÑÌÎÒÎ --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- ÊÐÀÉ ÍÀ ÁËÎÊÀ Ñ ÏÓÁËÈ×ÍÈß PGP-ÊËÞ× --]\n"
-
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- ÊÐÀÉ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎÒÎ ÏÈÑÌÎ --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "Ïèñìîòî íå ìîæå äà áúäå êîïèðàíî."
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Ãðåøêà: íà÷àëîòî íà PGP-ïèñìîòî íå ìîæå äà áúäå íàìåðåíî! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "PGP-ïîäïèñúò å ïîòâúðäåí óñïåøíî."
 
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Âúòðåøíà ãðåøêà. Ìîëÿ, èíôîðìèðàéòå <roessler@does-not-exist.org>"
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3411,72 +4116,38 @@ msgstr ""
 "[-- Ãðåøêà: íå ìîæå äà áúäå ñòàðòèðàí äúùåðåí PGP ïðîöåñ! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Ãðåøêà: íåïðàâèëíî ïîñòðîåíî PGP/MIME ñúîáùåíèå! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Ãðåøêà: íå ìîæå äà áúäå ñúçäàäåí âðåìåíåí ôàéë! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- Ñëåäíèòå äàííè ñà øèôðîâàíè ñ PGP/MIME --]\n"
-"\n"
-
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Êðàé íà øèôðîâàíèòå ñ PGP/MIME äàííè --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "Íåóñïåøíî ðàçøèôðîâàíå."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "Íå ìîæå äà áúäå ñòàðòèðàí äúùåðåí PGP ïðîöåñ!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "Æåëàåòå ëè èçïîëçâàòå êëþ÷îâèÿ èäåíòèôèêàòîð \"%s\" çà %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Âúâåäåòå êëþ÷îâ èäåíòèôèêàòîð çà %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "PGP íå ìîæå äà áúäå ñòàðòèðàí"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr ""
 "PGP øèôðîâàíå(e), ïîäïèñ(s), ïîäïèñ êàòî(a), è äâåòå(b) èëè áåç òÿõ(f)?"
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1499
+#: pgp.c:1543
 #, fuzzy
 msgid "esabifc"
 msgstr "esabf"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Ïîäïèñ êàòî: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "Ïîëó÷àâàíå íà PGP êëþ÷..."
@@ -3485,16 +4156,6 @@ msgstr "
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Âñè÷êè ïîäõîäÿùè êëþ÷îâå ñà îñòàðåëè, àíóëèðàíè èëè äåàêòèâèðàíè."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Èçáîð "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Ïðîâåðêà íà êëþ÷  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3509,42 +4170,6 @@ msgstr "PGP 
 msgid "Can't open /dev/null"
 msgstr "Ãðåøêà ïðè îòâàðÿíå íà /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Ãðåøêà ïðè ñúçäàâàíå íà âðåìåíåí ôàéë"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Êëþ÷îâ èäåíòèôèêàòîð: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr ""
-"Òîçè êëþ÷ íå ìîæå äà áúäå èçïîëçâàí, çàùîòî å îñòàðÿë, äåàêòèâèðàí èëè "
-"àíóëèðàí."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "Òîçè èäåíòèôèêàòîð å îñòàðÿë, äåàêòèâèðàí èëè àíóëèðàí."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "Òîçè èäåíòèôèêàòîð å ñ íåäåôèíèðàíà âàëèäíîñò."
-
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "Òîçè èäåíòèôèêàòîð íå íå å âàëèäåí."
-
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "Òîçè èäåíòèôèêàòîð å ñ îãðàíè÷åíà âàëèäíîñò."
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Äåéñòâèòåëíî ëè èñêàòå äà èçïîëçâàòå òîçè êëþ÷?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Ìîëÿ, âúâåäåòå êëþ÷îâèÿ èäåíòèôèêàòîð: "
@@ -3558,11 +4183,6 @@ msgstr "
 msgid "PGP Key %s."
 msgstr "PGP êëþ÷ %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Òúðñåíå íà êëþ÷îâå, îòãîâàðÿùè íà \"%s\"..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3620,7 +4240,7 @@ msgstr "
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d îò %d ïèñìà ñà ïðî÷åòåíè]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "Ñúðâúðúò çàòâîðè âðúçêàòà!"
 
@@ -3650,15 +4270,15 @@ msgstr "
 msgid "Error connecting to server: %s"
 msgstr "Ãðåøêà ïðè ñâúðçâàíå ñúñ ñúðâúðà: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "Çàòâàðÿíå íà âðúçêàòà êúì POP ñúðâúð..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Ïîòâúðæäàâàíå èíäåêñèòå íà ïèñìàòà..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Âðúçêàòà ïðîïàäíà. Æåëàåòå ëè äà ñå âêëþ÷èòå îòíîâî êúì POP ñúðâúðà?"
 
@@ -4036,35 +4656,35 @@ msgstr "
 msgid "Sending in background."
 msgstr "Èçïðàùàíå íà çàäåí ôîí."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Íå å íàìåðåí \"boundary\" ïàðàìåòúð! [ìîëÿ, ñúîáùåòå çà òàçè ãðåøêà]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s âå÷å íå ñúùåñòâóâà!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s íå å îáèêíîâåí ôàéë."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "Ãðåøêà ïðè îòâàðÿíå íà %s"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Ãðåøêà %d (%s) ïðè èçïðàùàíå íà ïèñìîòî."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Èçïðàùàù ïðîöåñ:"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "Ëîø IDN %s äîêàòî ôîðìàòà çà ïîâòîðíî èçïðàùàíå áåøå ïîäãîòâÿíà."
@@ -4183,7 +4803,7 @@ msgstr "
 msgid "No output from OpenSSL..."
 msgstr "Íÿìà ðåçóëòàò îò äúùåðíèÿ OpenSSL ïðîöåñ..."
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4191,19 +4811,19 @@ msgstr ""
 "[-- Êðàé íà OpenSSL-ðåçóëòàòà --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Ãðåøêà: íå ìîæå äà áúäå ñòàðòèðàí äúùåðåí OpenSSL ïðîöåñ! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- Ñëåäíèòå äàííè ñà øèôðîâàíè ñúñ S/MIME --]\n"
 
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- Ñëåäíèòå äàííè ñà ïîäïèñàíè ñúñ S/MIME --]\n"
 
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4211,7 +4831,7 @@ msgstr ""
 "\n"
 "[-- Êðàé íà øèôðîâàíèòå ñúñ S/MIME äàííè --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4219,7 +4839,7 @@ msgstr ""
 "\n"
 "[-- Êðàé íà ïîäïèñàíèòå ñúñ S/MIME äàííè --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
@@ -4227,22 +4847,22 @@ msgstr ""
 "S/MIME øèôðîâàíå(e), ïîäïèñ(s), øèôðîâàíå ñ(w), ïîäïèñ êàòî(a), è äâåòå(b) "
 "èëè áåç òÿõ(f)?"
 
-#: smime.c:1936
+#: smime.c:1945
 #, fuzzy
 msgid "eswabfc"
 msgstr "eswabf"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, èëè îòêàç(f)? "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345f"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
@@ -4268,6 +4888,12 @@ msgstr "
 msgid "Parent message is not available."
 msgstr "Ðîäèòåëñêîòî ïèñìî íå å íàëè÷íî."
 
+#~ msgid "Unexpected response received from server: %s"
+#~ msgstr "Ñúðâúðúò èçïðàòè íåî÷àêâàí îòãîâîð: %s"
+
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Ãðåøêà ïðè äîáàâÿíåòî êúì IMAP ïîùåíñêèòå êóòèè íà òîçè ñúðâúð"
+
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr ""
 #~ "Æåëàåòå ëè äà ñúçäàäåòå òðàäèöèîííî PGP ïèñìî? (PGP ÷àñòòà å âìúêíàòà, à "
diff --git a/po/ca.po b/po/ca.po
index ebd953e22..319430c09 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutt 1.5.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2005-02-13 10:57+0100\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -20,28 +20,28 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "Nom d'usuari en «%s»: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Contrasenya per %s@%s: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Ix"
 
 # ivb (2001/12/08)
 # ivb  Menú superpoblat: mantenir _molt_ curt!
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Esbrr"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Recupera"
 
@@ -50,9 +50,9 @@ msgid "Select"
 msgstr "Selecciona"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Ajuda"
 
@@ -107,178 +107,178 @@ msgstr "S'ha afegit l'àlies."
 # ivb (2001/12/08)
 # ivb  ABREUJAT!
 # ivb  El nom de fitxer no concorda amb cap «nametemplate»; voleu continuar?
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "El nom de fitxer no concorda amb cap «nametemplate»; continuar?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Cal que l'entrada «compose» de «mailcap» continga «%%s»."
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Error en executar «%s»!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "No s'ha pogut obrir el fitxer per interpretar-ne les capçaleres."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "No s'ha pogut obrir el fitxer per eliminar-ne les capçaleres."
 
 # Es refereix a un fitxer temporal.  ivb
-#: attach.c:183
+#: attach.c:184
 msgid "Failure to rename file."
 msgstr "No s'ha pogut reanomenar un fitxer."
 
 # ivb (2001/12/08)
 # ivb  ABREUJAT!
 # ivb  No hi ha cap entrada «compose» de «%s» en «mailcap»: es crea un fitxer buit.
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "«%s» no té entrada «compose» en «mailcap»: cree fitxer buit."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Cal que l'entrada «edit» de «mailcap» continga «%%s»."
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "No hi ha cap entrada «edit» de «%s» en «mailcap»."
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "No hi ha cap entrada adequada en «mailcap». Es visualitza com a text."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "No s'ha definit el tipus MIME. No es pot veure el fitxer adjunt."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "No s'ha pogut crear el filtre."
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "No s'ha pogut crear el filtre."
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Error d'escriptura!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "No sé com imprimir això!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Canvia directori"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Màscara"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "«%s» no és un directori."
 
 # ivb (2001/12/07)
 # ivb  Es refereix a les definides en «mailboxes».
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Bústies d'entrada [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Subscrites [%s], màscara de fitxers: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Directori [%s], màscara de fitxers: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "No es pot adjuntar un directori!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "No hi ha cap fitxer que concorde amb la màscara de fitxers."
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Només es poden crear bústies IMAP."
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Només es poden crear bústies IMAP."
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Només es poden esborrar bústies IMAP."
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Voleu realment esborrar la bústia «%s»?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "S'ha esborrat la bústia."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "No s'ha esborrat la bústia."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Canvia al directori: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Error en llegir el directori."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Màscara de fitxers: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Ordena inversament per (d)ata, (a)lfabet, (m)ida, o (n)o ordenar? "
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Ordena per (d)ata, (a)lfabet, (m)ida, o (n)o ordenar? "
 
 # ivb (2004/03/20)
 # ivb  (d)ata, (a)lfabet, (m)ida, (n)o
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "damn"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Nom del nou fitxer: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "No es pot veure un directori."
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Error en intentar veure el fitxer."
 
@@ -354,7 +354,7 @@ msgstr "Els colors per defecte no estan suportats."
 msgid "Verify PGP signature?"
 msgstr "Voleu verificar la signatura PGP?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "No s'ha pogut crear un fitxer temporal!"
 
@@ -366,118 +366,118 @@ msgstr "No s'ha pogut crear el filtre de visualització."
 msgid "Could not copy message"
 msgstr "No s'ha pogut copiar el missatge."
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "S'ha pogut verificar amb èxit la signatura S/MIME."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "El propietari del certificat S/MIME no concorda amb el o la remitent."
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr "Avís: Part d'aquest missatge no ha estat signat."
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "NO s'ha pogut verificar la signatura S/MIME."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "S'ha pogut verificar amb èxit la signatura PGP."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "NO s'ha pogut verificar la signatura PGP."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Ordre: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Redirigeix el missatge a: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Redirigeix els missatges marcats a: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Error en interpretar l'adreça!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "L'IDN no és vàlid: «%s»"
 
 # ivb (2001/12/02)
 # ivb  El programa posa l'interrogant.
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Voleu redirigir el missatge a %s"
 
 # ivb (2001/12/02)
 # ivb  El programa posa l'interrogant.
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Voleu redirigir els missatges a %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "No s'ha redirigit el missatge."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "No s'han redirigit els missatges."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "S'ha redirigit el missatge."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "S'han redirigit els missatges."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "No s'ha pogut crear el procés filtre."
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Redirigeix a l'ordre: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "No s'ha definit cap ordre d'impressió."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Voleu imprimir el missatge?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Voleu imprimir els misatges marcats?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "S'ha imprés el missatge."
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "S'han imprés els missatges."
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "No s'ha pogut imprimir el missatge."
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "No s'han pogut imprimir els missatges."
 
-#: commands.c:508
+#: commands.c:509
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
@@ -485,7 +485,7 @@ msgstr ""
 "Dscnd (d)ata/(o)rig/(r)ebut/(t)ema/de(s)t/(f)il/(c)ap/(m)ida/(p)unts/sp(a)"
 "m?: "
 
-#: commands.c:509
+#: commands.c:510
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
@@ -495,73 +495,73 @@ msgstr ""
 
 # ivb (2004/08/16)
 # ivb  (d)ata/(o)rig/(r)ebut/(t)ema/de(s)t/(f)il/(c)ap/(m)ida/(p)unt/sp(a)m
-#: commands.c:510
+#: commands.c:511
 msgid "dfrsotuzcp"
 msgstr "dortsfcmpa"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Ordre per l'intèrpret: "
 
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Descodifica i desa%s en la bústia"
 
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Descodifica i còpia%s en la bústia"
 
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Desxifra i desa%s en la bústia"
 
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Desxifra i còpia%s en la bústia"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Desa%s en la bústia"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Còpia%s en la bústia"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " els marcats"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "S'està copiant en «%s»..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Voleu convertir en «%s» en enviar?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "S'ha canviat «Content-Type» a «%s»."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "S'ha canviat el joc de caràcters a «%s»; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "es farà conversió"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "no es farà conversió"
 
@@ -659,108 +659,695 @@ msgstr "L'IDN de «%s» no és vàlid: «%s»"
 msgid "Attaching selected files..."
 msgstr "S'estan adjuntant els fitxers seleccionats..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "No s'ha pogut adjuntar «%s»!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Bústia a obrir per adjuntar-ne missatges"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "La carpeta no conté missatges."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Marqueu els missatges que voleu adjuntar!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "No s'ha pogut adjuntar!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "La recodificació només afecta els fitxers adjunts de tipus text."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "No es convertirà el fitxer adjunt actual."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "Es convertirà el fitxer adjunt actual."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "La codificació no és vàlida."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Voleu guardar una còpia d'aquest missatge?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Reanomena a: "
 
 # ivb (2001/11/19)
 # ivb  Cuidadín: en «compose» la cadena és el nom de fitxer i en
 # ivb  «editmsg» i «sendlib» és la cadena d'error.
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Ha fallat stat() sobre «%s»: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Nou fitxer: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "«Content-Type» ha de tenir la forma «base/sub»."
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "El valor de «Content-Type» «%s» no és conegut."
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "No s'ha pogut crear el fitxer «%s»."
 
 # ivb (2001/11/20)
 # ivb  Curiosa forma d'emetre un error...
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "El que ocorre ací és que no s'ha pogut adjuntar un fitxer."
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "Voleu posposar aquest missatge?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "Escriu el missatge en la bústia"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "S'està escrivint el missatge en «%s»..."
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "S'ha escrit el missatge."
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "El missatge ja usa S/MIME. Voleu posar-lo en clar i continuar? "
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr "El missatge ja usa PGP. Voleu posar-lo en clar i continuar? "
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "Error en el patró en: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "Error en el patró en: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "Error en el patró en: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "Error en el patró en: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "Error en el patró en: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "Error en el patró en: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "Error en el patró en: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "Error en el patró en: %s"
+
+#: crypt-gpgme.c:993
+#, fuzzy
+msgid "Warning: One of the keys has been revoked\n"
+msgstr "Avís: Part d'aquest missatge no ha estat signat."
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "El certificat del servidor ha expirat."
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL no es troba disponible."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Empremta digital: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Error en enviar el missatge."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Error en la línia d'ordres: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Final de les dades signades. --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Error: No s'ha pogut crear un fitxer temporal! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- COMENÇA EL MISSATGE PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- COMENÇA EL BLOC DE CLAU PÚBLICA PGP --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- COMENÇA EL MISSATGE PGP SIGNAT --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- TERMINA EL MISSATGE PGP --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- TERMINA EL BLOC DE CLAU PÚBLICA PGP --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- TERMINA EL MISSATGE PGP SIGNAT --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Error: No s'ha trobat l'inici del missatge PGP! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Error: El missatge PGP/MIME és malmés! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Error: No s'ha pogut crear un fitxer temporal! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Les dades següents es troben xifrades amb PGP/MIME: --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Les dades següents es troben xifrades amb PGP/MIME: --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- Final de les dades xifrades amb PGP/MIME. --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- Final de les dades xifrades amb PGP/MIME. --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr "[-- Les dades següents es troben signades amb S/MIME: --]\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr "[-- Les dades següents es troben xifrades amb S/MIME: --]\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Final de les dades signades amb S/MIME. --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Final de les dades xifrades amb S/MIME. --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "No vàlid    "
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "El mes no és vàlid: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "El mes no és vàlid: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Xifra"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "S'ha desat el certificat."
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "ID de la clau: 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "Revocat     "
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Expirat     "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "No s'ha pogut crear un fitxer temporal."
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "S'està connectant amb «%s»..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Error en connectar amb el servidor: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "ID de la clau: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "La negociació d'SSL ha fallat: %s."
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr ""
+"Totes les claus concordants han expirat o estan revocades o inhabilitades."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Ix  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Selecciona  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Comprova clau  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "Claus PGP que concordem amb «%s»."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "Claus PGP que concordem amb «%s»."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "Certificats S/MIME que concorden amb «%s»."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "Claus PGP que concordem amb «%s»."
+
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr ""
+"No es pot usar aquesta clau: es troba expirada, inhabilitada o revocada."
+
+# ivb (2001/12/08)
+# ivb  ABREUJAT!
+# ivb  Aquest ID es troba expirat, inhabilitat o revocat.
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "ID expirat/inhabilitat/revocat."
+
+# ivb (2002/02/02)
+# ivb  ABREUJAT! (Hei!  Hui és 2/2/2!)
+# ivb  Aquest ID té una validesa indefinida.
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "L'ID té una validesa indefinida."
+
+# ivb (2001/12/08)
+# ivb  ABREUJAT!
+# ivb  Aquest ID no és vàlid.
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "L'ID no és vàlid."
+
+# ivb (2001/12/08)
+# ivb  ABREUJAT!
+# ivb  Aquest ID només és lleugerament vàlid.
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "L'ID és lleugerament vàlid."
+
+# ivb (2001/12/08)
+# ivb  Davant d'açò pot anar una de les quatre anteriors.
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s  Voleu realment usar la clau?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "S'estan cercant les claus que concorden amb «%s»..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "Voleu usar l'ID de clau «%s» per %s?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Entreu l'ID de clau per %s: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr "PGP: (x)ifra, (s)igna, si(g)na com a, (a)mbdós, %s, o en (c)lar? "
+
+# ivb (2003/03/26)
+# ivb  (x)ifra, (s)igna, xi(f)ra amb, si(g)na com a, (a)mbdós, o en (c)lar
+# La «f» i la «c» originals s'agafen en el mateix cas en el codi.  ivb
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "xsfgac"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr "PGP: (x)ifra, (s)igna, si(g)na com a, (a)mbdós, %s, o en (c)lar? "
+
+# ivb (2003/03/26)
+# ivb  (x)ifra, (s)igna, xi(f)ra amb, si(g)na com a, (a)mbdós, o en (c)lar
+# La «f» i la «c» originals s'agafen en el mateix cas en el codi.  ivb
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "xsfgac"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Signa com a: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "No s'ha pogut obrir el fitxer per interpretar-ne les capçaleres."
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -777,7 +1364,7 @@ msgid "Passphrase(s) forgotten."
 msgstr "S'han esborrat de la memòria la o les frases clau."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "S'està invocant PGP..."
 
@@ -785,25 +1372,25 @@ msgstr "S'està invocant PGP..."
 # ABREUJAT!  ivb
 # No s'ha pogut enviar el missatge en línia.  Voleu recórrer a usar PGP/MIME?
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 "No s'ha pogut enviar el missatge en línia.  Voleu recórrer a usar PGP/MIME?"
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "No s'ha enviat el missatge."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "No es suporten els misatges S/MIME sense pistes sobre el contingut."
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "S'està provant a extreure les claus PGP...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "S'està provant a extreure els certificats S/MIME...\n"
 
@@ -815,7 +1402,7 @@ msgstr ""
 "[-- Error: L'estructura «multipart/signed» no és consistent! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -825,7 +1412,7 @@ msgstr ""
 "[-- no és conegut! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -835,7 +1422,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -843,7 +1430,7 @@ msgstr ""
 "[-- Les dades següents es troben signades: --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -851,7 +1438,7 @@ msgstr ""
 "[-- Avís: No s'ha trobat cap signatura. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -859,236 +1446,266 @@ msgstr ""
 "\n"
 "[-- Final de les dades signades. --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "S'està invocant PGP..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "sí"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "no"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Voleu abandonar Mutt?"
 
 # ivb (2001/12/08)
 # ivb  Apareix amb més coses al darrere (curs_lib) o entre parèntesis
 # ivb  (mutt_socket) -> sense punt.
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "Error desconegut"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Premeu qualsevol tecla per continuar..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " («?» llista): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "No hi ha cap bústia oberta."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "No hi ha cap missatge."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "La bústia és de només lectura."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "No es permet aquesta funció en el mode d'adjuntar missatges."
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "No hi ha cap missatge visible."
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "No es pot establir si una bústia de només lectura pot ser modificada."
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "S'escriuran els canvis a la carpeta en abandonar-la."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "No s'escriuran els canvis a la carpeta."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Ix"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Desa"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Nou correu"
 
 # ivb (2001/12/08)
 # ivb  Menú superpoblat: mantenir _molt_ curt!
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Respon"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Grup"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
 "S'ha modificat la bústia des de fora. Els senyaladors poden ser incorrectes."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Hi ha correu nou en aquesta bústia."
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "S'ha modificat la bústia des de fora."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "No hi ha cap missatge marcat."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 msgid "Nothing to do."
 msgstr "No hi ha res a fer."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Salta al missatge: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "L'argument ha de ser un número de missatge."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Aqueix missatge no és visible."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "El número de missatge no és vàlid."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Esborra els missatges que concorden amb: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "No hi ha cap patró limitant en efecte."
 
 # ivb (2001/12/08)
 # ivb  Nooop!  Només mostra el límit actual.
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Límit: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Limita als missatges que concorden amb: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Voleu abandonar Mutt?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Marca els missatges que concorden amb: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Restaura els missatges que concorden amb: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Desmarca els missatges que concorden amb: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Obri en mode de només lectura la bústia"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Obri la bústia"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "«%s» no és una bústia."
 
-#: curs_main.c:1165
+#: curs_main.c:1176
 msgid "Exit Mutt without saving?"
 msgstr "Voleu abandonar Mutt sense desar els canvis?"
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "No s'ha habilitat l'ús de fils."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "desa aquest missatge per enviar-lo més endavant"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Vos trobeu sobre l'últim missatge."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "No hi ha cap missatge no esborrat."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Vos trobeu sobre el primer missatge."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "La recerca ha tornat al principi."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "La recerca ha tornat al final."
 
 # ivb (2001/12/08)
 # ivb  Ací no hi ha forma de posar el punt final de segur :(
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "No hi ha cap missatge nou"
 
 # ivb (2001/12/08)
 # ivb  Ací no hi ha forma de posar el punt final de segur :(
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "No hi ha cap missatge no llegit"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " en aquesta vista limitada."
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "No es pot canviar el senyalador «important» en un servidor POP."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "No hi ha més fils."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Vos trobeu en el primer fil."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "No s'ha habilitat l'ús de fils."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "El fil conté missatges no llegits."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "No es pot editar un missatge en un servidor POP."
 
@@ -1226,22 +1843,22 @@ msgstr "Quin senyalador voleu activar"
 msgid "Clear flag"
 msgstr "Quin senyalador voleu desactivar"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Error: No s'ha pogut mostrar cap part del «multipart/alternative»! --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Fitxer adjunt #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Tipus: %s/%s, Codificació: %s, Mida: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr ""
@@ -1251,96 +1868,96 @@ msgstr ""
 # ivb (2001/12/08)
 # ivb  ABREUJAT!
 # ivb  S'està invocant l'ordre de visualització automàtica: %s
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Ordre de visualització automàtica: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- No s'ha pogut executar «%s». --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr ""
 "[-- Errors de l'ordre de visualització automàtica --]\n"
 "[-- «%s» --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Error: La part «message/external-body» --]\n"
 "[-- no té paràmetre «access-type». --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr ""
 "[-- Aquest fitxer adjunt de tipus «%s/%s» --]\n"
 "[-- "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(amb mida %s octets) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "ha estat esborrat --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- amb data %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- nom: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Aquest fitxer adjunt de tipus «%s/%s» no s'inclou, --]\n"
 
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr "[-- i la font externa indicada ha expirat. --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 "[-- i el valor indicat d'«access-type» «%s» --]\n"
 "[-- no es suporta. --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Error: La part «multipart/signed» no té paràmetre «protocol»!"
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Error: La part «multipart/encrypted» no té paràmetre «protocol»!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "No s'ha pogut obrir el fitxer temporal!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- No es suporta «%s/%s». "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(useu «%s» per veure aquesta part)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(vinculeu «view-attachents» a una tecla!)"
 
@@ -1451,46 +2068,46 @@ msgstr "S'està autenticant (%s)..."
 msgid "SASL authentication failed."
 msgstr "L'autenticació SASL ha fallat."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "«%s» no és un camí IMAP vàlid."
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "S'estan obtenint els espais de noms..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "S'està obtenint la llista de carpetes..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "La carpeta no existeix."
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Crea la bústia: "
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "La bústia ha de tenir un nom."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "S'ha creat la bústia."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Crea la bústia: "
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "La negociació d'SSL ha fallat: %s."
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "S'ha creat la bústia."
@@ -1502,136 +2119,133 @@ msgstr "S'ha tancat la bústia."
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Error fatal. El recompte de missatges no es troba sincronitzat!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "S'està tancant la connexió amb «%s»..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Aquest servidor IMAP és antic. Mutt no pot funcionar amb ell."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
-msgstr "S'ha rebut una resposta inesperada del servidor: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
+msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "Voleu protegir la connexió usant TLS?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "No s'ha pogut negociar la connexió TLS."
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "S'està seleccionant la bústia «%s»..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "Error en obrir la bústia."
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Aquest servidor no permet afegir a les bústies IMAP."
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "Voleu crear «%s»?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "S'estan marcant %d missatges com a esborrats..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "No s'han pogut eliminar els missatges."
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "S'estan guardant els senyaladors d'estat dels missatges... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "S'estan eliminant missatges del servidor..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: Ha fallat «EXPUNGE»."
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "Ha fallat «CLOSE»."
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "El nom de la bústia no és vàlid."
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "S'està subscrivint a «%s»..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "S'està dessubscrivint de «%s»..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr ""
 "No s'han pogut recollir les capçaleres d'aquesta versió de servidor IMAP."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "No s'ha pogut crear el fitxer temporal «%s»."
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "S'està avaluant la memòria cau... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "S'estan recollint les capçaleres dels missatges... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "S'està recollint el missatge..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "L'índex del missatge no és correcte. Proveu de reobrir la bústia."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "S'està penjant el missatge..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "S'estan copiant %d missatges en «%s»..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "S'està copiant el missatge %d en «%s»..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Voleu continuar?"
 
@@ -1640,93 +2254,93 @@ msgstr "Voleu continuar?"
 msgid "Bad regexp: %s"
 msgstr "L'expressió regular no és vàlida: %s"
 
-#: init.c:678
+#: init.c:644
 msgid "spam: no matching pattern"
 msgstr "spam: No s'ha indicat el patró de concordança."
 
-#: init.c:680
+#: init.c:646
 msgid "nospam: no matching pattern"
 msgstr "spam: No s'ha indicat el patró de concordança."
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias: No s'ha indicat cap adreça."
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Avís: L'IDN «%s» de l'àlies «%s» no és vàlid.\n"
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "El camp de capçalera no és vàlid."
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: El mètode d'ordenació no és conegut."
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): Error en l'expressió regular: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: La variable no és coneguda."
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "El prefix usat en «reset» no és permés."
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "El valor usat en «reset» no és permés."
 
 # ivb (2001/11/24)
 # ivb  Es refereix a una variable lògica.
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "«%s» està activada."
 
 # ivb (2001/11/24)
 # ivb  Es refereix a una variable lògica.
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "«%s» no està activada."
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: El tipus de bústia no és vàlid."
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: El valor no és vàlid."
 
-#: init.c:1589
+#: init.c:1555
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: El tipus no és conegut."
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: El tipus no és conegut."
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Error en «%s», línia %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: Hi ha errors en «%s»."
@@ -1734,35 +2348,35 @@ msgstr "source: Hi ha errors en «%s»."
 # ivb (2001/12/08)
 # ivb  ABREUJAT!
 # ivb  source: S'avorta la lectura de «%s» perquè conté massa errors.
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: «%s» conté massa errors: s'avorta la lectura."
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: Error en «%s»."
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: Sobren arguments."
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: L'ordre no és coneguda."
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Error en la línia d'ordres: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "No s'ha pogut determinar el directori de l'usuari."
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "No s'ha pogut determinar el nom de l'usuari."
 
@@ -2227,407 +2841,416 @@ msgid "compose a new mail message"
 msgstr "redacta un nou missatge de correu"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "obri una carpeta diferent"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "obri una carpeta diferent en mode de només lectura"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "elimina un senyalador d'estat d'un missatge"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "esborra els missatges que concorden amb un patró"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "força l'obtenció del correu d'un servidor IMAP"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "obté el correu d'un servidor POP"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "va al primer missatge"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "va a l'últim missatge"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "mostra només els missatges que concorden amb un patró"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Redirigeix els missatges marcats a: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "salta al següent missatge nou"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "salta al següent missatge nou o no llegit"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "salta al subfil següent"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "salta al fil següent"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "va al següent missatge no esborrat"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "salta al següent missatge no llegit"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "salta al missatge pare del fil"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "salta al fil anterior"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "salta al subfil anterior"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "va a l'anterior missatge no llegit"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "salta a l'anterior missatge nou"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "salta a l'anterior missatge nou o no llegit"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "salta a l'anterior missatge no llegit"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "marca el fil actual com a llegit"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "marca el subfil actual com a llegit"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "estableix un senyalador d'estat d'un missatge"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "desa els canvis realitzats a la bústia"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "marca els missatges que concorden amb un patró"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "restaura els missatges que concorden amb un patró"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "desmarca els missatges que concorden amb un patró"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "va al centre de la pàgina"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "va a l'entrada següent"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "avança una línia"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "va a la pàgina següent"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "salta al final del missatge"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "oculta o mostra el text citat"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "avança fins al final del text citat"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "salta a l'inici del missatge"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "redirigeix un missatge o fitxer adjunt a una ordre de l'intèrpret"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "va a l'entrada anterior"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "endarrereix una línia"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "va a la pàgina anterior"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "imprimeix l'entrada actual"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "pregunta a un programa extern per una adreça"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "afig els resultats d'una consulta nova als resultats actuals"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "desa els canvis realitzats a la bústia i ix"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "recupera un missatge posposat"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "neteja i redibuixa la pantalla"
 
 # ivb (2001/11/26)
 # ivb  Es refereix a una funció -> femení.
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{interna}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "esborra la bústia actual (només en IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "respon a un missatge"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "usa el missatge actual com a plantilla per un de nou"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "guarda un missatge o fitxer adjunt en un fitxer"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "cerca una expressió regular"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "cerca cap enrere una expressió regular"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "cerca la concordança següent"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "cerca la concordança anterior"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "estableix si cal resaltar les concordances trobades"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "invoca una ordre en un subintèrpret"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "ordena els missatges"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "ordena inversament els missatges"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "marca l'entrada actual"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "aplica la funció següent als missatges marcats"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 msgid "apply next function ONLY to tagged messages"
 msgstr "aplica la funció següent NOMÉS als missatges marcats"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "marca el subfil actual"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "marca el fil actual"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "canvia el senyalador «nou» d'un missatge"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "estableix si s'escriuran els canvis a la bústia"
 
 # ivb (2001/12/07)
 # ivb  Es refereix a les definides en «mailboxes».
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr ""
 "estableix si es navegarà només per les bústies d'entrada o per tots els "
 "fitxers"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "va a l'inici de la pàgina"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "restaura l'entrada actual"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "restaura tots els missatges d'un fil"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "restaura tots els missatges d'un subfil"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "mostra el número de versió i la data de Mutt"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "mostra un fitxer adjunt usant l'entrada de «mailcap» si és necessari"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "mostra els fitxers adjunts MIME"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "mostra el codi d'una tecla premuda"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "mostra el patró limitant actiu"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "plega o desplega el fil actual"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "plega o desplega tots els fils"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "adjunta una clau pública PGP"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "mostra les opcions de PGP"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "envia una clau pública PGP"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "verifica una clau pública PGP"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "mostra l'identificador d'usuari d'una clau"
 
 # ivb (2001/12/02)
 # ivb  Es refereix al format del missatge.
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "comprova si s'ha usat el PGP clàssic"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "accepta la cadena construïda"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "afig un redistribuïdor a la cadena"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "inserta un redistribuïdor en la cadena"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "esborra un redistribuïdor de la cadena"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "selecciona l'element anterior de la cadena"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "selecciona l'element següent de la cadena"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "envia el missatge per una cadena de redistribuïdors Mixmaster"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "fa una còpia desxifrada del missatge i esborra aquest"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "fa una còpia desxifrada del missatge"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "esborra de la memòria la o les frases clau"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "extreu les claus públiques suportades"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "mostra les opcions d'S/MIME"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr "Desbordament enter -- no s'ha pogut reservar memòria."
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "No resta memòria!"
 
@@ -2654,12 +3277,13 @@ msgstr ""
 "condicions; useu «mutt -vv» per obtenir-ne més detalls.\n"
 
 #: main.c:61
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2710,6 +3334,7 @@ msgstr ""
 "    MA  02111, USA.\n"
 
 #: main.c:99
+#, fuzzy
 msgid ""
 "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
@@ -2717,6 +3342,7 @@ msgid ""
 "[...]\n"
 "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
 "       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
 "[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
@@ -2727,6 +3353,52 @@ msgid ""
 "  -a <file>\tattach a file to the message\n"
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"Forma d'ús: mutt [-nRyzZ] [-e ORDRE] [-F FITXER] [-m TIPUS] [-f FITXER]\n"
+"            mutt [-nR] [-e ORDRE] [-F FITXER] -Q VAR [-Q VAR] [...]\n"
+"            mutt [-nR] [-e ORDRE] [-F FITXER] -A ÀLIES [-A ÀLIES] [...]\n"
+"            mutt [-nx] [-e ORDRE] [-a FITXER] [-F FITXER] [-H FITXER]\n"
+"                 [-i FITXER] [-s ASSUMPTE] [-b ADREÇA] [-c ADREÇA] "
+"ADREÇA...\n"
+"            mutt [-n] [-e ORDRE] [-F FITXER] -p\n"
+"            mutt -v[v]\n"
+"\n"
+"Opcions:\n"
+"  -A ÀLIES             Expandeix l'ÀLIES indicat.\n"
+"  -a FITXER            Adjunta un FITXER al missatge.\n"
+"  -b ADREÇA            Indica una ADREÇA per la còpia cega (BCC).\n"
+"  -c ADREÇA            Indica una ADREÇA per la còpia (CC).\n"
+"  -e ORDRE             Indica una ORDRE a executar abans de la "
+"inicialització.\n"
+"  -f FITXER            Indica quina bústia llegir.\n"
+"  -F FITXER            Indica un FITXER «muttrc» alternatiu.\n"
+"  -H FITXER            Indica un FITXER esborrany d'on llegir la capçalera i "
+"el\n"
+"                       cos.\n"
+"  -i FITXER            Indica un FITXER que Mutt inclourà en el cos.\n"
+"  -m TIPUS             Indica un TIPUS de bústia per defecte.\n"
+"  -n                   Fa que Mutt no llija el fitxer «Muttrc» del sistema.\n"
+"  -p                   Recupera un missatge posposat.\n"
+"  -Q VARIABLE          Consulta el valor d'una VARIABLE de configuració.\n"
+"  -R                   Obri la bústia en mode de només lectura.\n"
+"  -s ASSUMPTE          Indica l'ASSUMPTE (entre cometes si porta espais).\n"
+"  -v                   Mostra la versió i les definicions de compiŀlació.\n"
+"  -x                   Simula el mode d'enviament de «mailx».\n"
+"  -y                   Selecciona una bústia de la vostra llista "
+"«mailboxes».\n"
+"  -z                   Ix immediatament si no hi ha missatges en la bústia.\n"
+"  -Z                   Obri la primera bústia amb missatges nous, i ix\n"
+"                       immediatament si no n'hi ha cap.\n"
+"  -h                   Mostra aquest missatge d'ajuda."
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
+#, fuzzy
+msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2782,7 +3454,7 @@ msgstr ""
 "                       immediatament si no n'hi ha cap.\n"
 "  -h                   Mostra aquest missatge d'ajuda."
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2790,49 +3462,49 @@ msgstr ""
 "\n"
 "Opcions de compiŀlació:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Error en inicialitzar el terminal."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "S'activa la depuració a nivell %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "No es va definir «DEBUG» en la compiŀlació. Es descarta l'opció.\n"
 
 # ivb (2001/11/27)
 # ivb  Es refereix al directori «Maildir» -> masculí.
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "«%s» no existeix. Voleu crear-lo?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "No s'ha pogut crear «%s»: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "No s'ha indicat cap destinatari.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: No s'ha pogut adjuntar el fitxer.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "No hi ha cap bústia amb correu nou."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "No s'ha definit cap bústia d'entrada."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "La bústia és buida."
 
@@ -2849,11 +3521,11 @@ msgstr "La bústia és corrupta!"
 msgid "Mailbox was corrupted!"
 msgstr "La bústia ha estat corrompuda!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Error fatal!  No s'ha pogut reobrir la bústia!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "No s'ha pogut blocar la bústia!"
 
@@ -2864,12 +3536,12 @@ msgstr "No s'ha pogut blocar la bústia!"
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: La bústia és modificada però els missatges no! (informeu de l'error)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "S'estan escrivint els missatges... %d (%d%%)"
@@ -2877,192 +3549,151 @@ msgstr "S'estan escrivint els missatges... %d (%d%%)"
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "S'estan realitzant els canvis..."
 
 # ivb (2001/12/08)
 # ivb  ABREUJAT!
 # ivb  L'escriptura ha fallat!  S'ha desat la bústia parcial en «%s».
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "L'escriptura fallà!  Es desa la bústia parcial en «%s»."
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "No s'ha pogut reobrir la bústia!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "S'està reobrint la bústia..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Salta a: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "El número d'índex no és vàlid."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "No hi ha cap entrada."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "No podeu baixar més."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "No podeu pujar més."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Vos trobeu en l'última pàgina."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Vos trobeu en la primera pàgina."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "La primera entrada ja és visible."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "L'última entrada ja és visible."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Vos trobeu en l'última entrada."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Vos trobeu en la primera entrada."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Cerca: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Cerca cap enrere: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "No s'ha indicat cap patró de recerca."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "No s'ha trobat."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "No hi ha cap entrada marcada."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "No es pot cercar en aquest menú."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "No es pot saltar en un diàleg."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "No es pot marcar."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "S'està llegint «%s»... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): No s'ha pogut canviar la data del fitxer."
 
-#: muttlib.c:846
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "El fitxer és un directori; voleu desar-hi a sota? [(s)í, (n)o, (t)ots]"
-
-# (s)í, (n)o, (t)ots  ivb
-#: muttlib.c:846
-msgid "yna"
-msgstr "snt"
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "El fitxer és un directori; voleu desar-hi a sota?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Fitxer a sota del directori: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "El fitxer ja existeix; (s)obreescriu, (a)fig o (c)anceŀla?"
-
-# ivb (2001/11/27)
-# ivb  (s)obreescriu, (a)fig, (c)anceŀla
-#: muttlib.c:880
-msgid "oac"
-msgstr "sac"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "No es poden desar missatges en bústies POP."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "«%s» no és una bústia!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Voleu afegir els missatges a «%s»?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "S'ha tancat la connexió amb «%s»."
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL no es troba disponible."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "L'ordre de preconnexió (preconnect) ha fallat."
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Error en parlar amb «%s» (%s)."
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "L'IDN no és vàlid: «%s»"
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "S'està cercant «%s»..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "No s'ha pogut trobar l'estació «%s»."
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "S'està connectant amb «%s»..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "No s'ha pogut connectar amb «%s» (%s)."
@@ -3094,7 +3725,8 @@ msgstr "Error d'E/S"
 msgid "SSL failed: %s"
 msgstr "La negociació d'SSL ha fallat: %s."
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "No s'ha pogut obtenir el certificat del servidor."
 
@@ -3106,93 +3738,216 @@ msgstr "La connexió SSL usa «%s» (%s)."
 # ivb (2001/12/02)
 # ivb  Es pot referir a nom, correu, organització, unitat organitzativa,
 # ivb  localitat, estat, país -> ni masculí ni femení, sinò tot el contrari.
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Desconegut/da"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[no s'ha pogut calcular]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[la data no és vàlida]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "El certificat del servidor encara no és vàlid."
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "El certificat del servidor ha expirat."
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Aquest certificat pertany a:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Aquest certificat ha estat lliurat per:"
 
 # ivb (2001/12/08)
 # ivb  A continuació ve el rang de validesa.
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Aquest certificat té validesa"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   des de %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     fins a %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Empremta digital: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "Comprovació del certificat SSL"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)ebutja, accepta (u)na sola volta, accepta (s)empre"
 
 # ivb (2001/11/27)
 # ivb  (r)ebutja, accepta (u)na sola volta, accepta (s)empre
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "rus"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)ebutja, accepta (u)na sola volta"
 
 # ivb (2001/11/27)
 # ivb  (r)ebutja, accepta (u)na sola volta
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "ru"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Ix  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Avís: No s'ha pogut desar el certificat."
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "S'ha desat el certificat."
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "La connexió SSL usa «%s» (%s)."
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "S'ha desat el certificat."
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Error en inicialitzar el terminal."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Empremta digital: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Empremta digital: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "El certificat del servidor encara no és vàlid."
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "El certificat del servidor ha expirat."
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "El certificat del servidor ha expirat."
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "El certificat del servidor encara no és vàlid."
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "Comprovació del certificat SSL"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "S'està connectant amb «%s»..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Error en parlar amb «%s» (%s)."
+
+#: muttlib.c:910
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "El fitxer és un directori; voleu desar-hi a sota? [(s)í, (n)o, (t)ots]"
+
+# (s)í, (n)o, (t)ots  ivb
+#: muttlib.c:910
+msgid "yna"
+msgstr "snt"
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "El fitxer és un directori; voleu desar-hi a sota?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Fitxer a sota del directori: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "El fitxer ja existeix; (s)obreescriu, (a)fig o (c)anceŀla?"
+
+# ivb (2001/11/27)
+# ivb  (s)obreescriu, (a)fig, (c)anceŀla
+#: muttlib.c:944
+msgid "oac"
+msgstr "sac"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "No es poden desar missatges en bústies POP."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Voleu afegir els missatges a «%s»?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "«%s» no és una bústia!"
+
 # ivb (2001/12/08)
 # ivb  ABREUJAT!
 # ivb  Hi ha massa forrellats; voleu eliminar-ne un de «%s»?
@@ -3277,7 +4032,7 @@ msgstr "No s'ha modificat la bústia."
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d mantinguts, %d moguts, %d esborrats."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d mantinguts, %d esborrats."
@@ -3302,15 +4057,15 @@ msgstr "Habiliteu l'escriptura amb «toggle-write»!"
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Bústia en estat de només lectura. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "S'ha establert un punt de control en la bústia."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "No s'ha pogut escriure el missatge."
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr "Desbordament enter -- no s'ha pogut reservar memòria."
 
@@ -3320,54 +4075,54 @@ msgstr "No es troba disponible en aquest menú."
 
 # ivb (2001/12/08)
 # ivb  Menú superpoblat: mantenir _molt_ curt!
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "RePàg"
 
 # ivb (2001/12/08)
 # ivb  Menú superpoblat: mantenir _molt_ curt!
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "AvPàg"
 
 # ivb (2001/12/08)
 # ivb  Menú superpoblat: mantenir _molt_ curt!
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "VeuAdjnt"
 
 # ivb (2001/12/08)
 # ivb  Menú superpoblat: mantenir _molt_ curt!
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Segnt"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "El final del missatge ja és visible."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "L'inici del missatge ja és visible."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Cerca cap enrere: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Cerca: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "Ja s'està mostrant l'ajuda."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "No hi ha més text citat."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "No hi ha més text sense citar després del text citat."
 
@@ -3434,27 +4189,27 @@ msgstr "El patró és buit."
 msgid "error: unknown op %d (report this error)."
 msgstr "error: L'operació %d és desconeguda. (informeu d'aquest error)"
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "S'està compiŀlant el patró de recerca..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "S'està executant l'ordre sobre els missatges concordants..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "No hi ha cap missatge que concorde amb el criteri."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "La recerca ha arribat al final sense trobar cap concordança."
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "La recerca ha arribat a l'inici sense trobar cap concordança."
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "S'ha interromput la recerca."
 
@@ -3466,11 +4221,11 @@ msgstr "Entreu la frase clau de PGP:"
 msgid "PGP passphrase forgotten."
 msgstr "S'ha esborrat de la memòria la frase clau de PGP."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Error: No s'ha pogut crear el subprocés PGP! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3478,51 +4233,22 @@ msgstr ""
 "[-- Final de l'eixida de PGP. --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- COMENÇA EL MISSATGE PGP --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- COMENÇA EL BLOC DE CLAU PÚBLICA PGP --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- COMENÇA EL MISSATGE PGP SIGNAT --]\n"
-"\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- TERMINA EL MISSATGE PGP --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- TERMINA EL BLOC DE CLAU PÚBLICA PGP --]\n"
-
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- TERMINA EL MISSATGE PGP SIGNAT --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "No s'ha pogut copiar el missatge."
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Error: No s'ha trobat l'inici del missatge PGP! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "S'ha pogut verificar amb èxit la signatura PGP."
 
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Error intern. Informeu <roessler@does-not-exist.org>."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3530,75 +4256,41 @@ msgstr ""
 "[-- Error: No s'ha pogut crear el subprocés PGP! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Error: El missatge PGP/MIME és malmés! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Error: No s'ha pogut crear un fitxer temporal! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- Les dades següents es troben xifrades amb PGP/MIME: --]\n"
-"\n"
-
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Final de les dades xifrades amb PGP/MIME. --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "El desxifratge ha fallat."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "No s'ha pogut obrir el subprocés PGP!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "Voleu usar l'ID de clau «%s» per %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Entreu l'ID de clau per %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "No s'ha pogut invocar PGP."
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "PGP: (x)ifra, (s)igna, si(g)na com a, (a)mbdós, %s, o en (c)lar? "
 
 # Ull!  La mateixa clau que «en línia».  ivb
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr "PGP/M(i)ME"
 
 # Ull!  La mateixa clau que «PGP/MIME».  ivb
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr "en lín(i)a"
 
 # ivb (2004/08/16)
 # ivb  (x)ifra, (s)igna, si(g)na com a, (a)mbdós, {PGP/M(i)ME|en lín(i)a}, o en (c)lar
 # La «f» i la «c» originals s'agafen en el mateix cas en el codi.  ivb
-#: pgp.c:1499
+#: pgp.c:1543
 msgid "esabifc"
 msgstr "xsgaic"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Signa com a: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "S'està recollint la clau PGP..."
@@ -3608,16 +4300,6 @@ msgid "All matching keys are expired, revoked, or disabled."
 msgstr ""
 "Totes les claus concordants han expirat o estan revocades o inhabilitades."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Selecciona  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Comprova clau  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3632,55 +4314,6 @@ msgstr "Claus PGP que concordem amb «%s»."
 msgid "Can't open /dev/null"
 msgstr "No s'ha pogut obrir «/dev/null»."
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "No s'ha pogut crear un fitxer temporal."
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "ID de la clau: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr ""
-"No es pot usar aquesta clau: es troba expirada, inhabilitada o revocada."
-
-# ivb (2001/12/08)
-# ivb  ABREUJAT!
-# ivb  Aquest ID es troba expirat, inhabilitat o revocat.
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "ID expirat/inhabilitat/revocat."
-
-# ivb (2002/02/02)
-# ivb  ABREUJAT! (Hei!  Hui és 2/2/2!)
-# ivb  Aquest ID té una validesa indefinida.
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "L'ID té una validesa indefinida."
-
-# ivb (2001/12/08)
-# ivb  ABREUJAT!
-# ivb  Aquest ID no és vàlid.
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "L'ID no és vàlid."
-
-# ivb (2001/12/08)
-# ivb  ABREUJAT!
-# ivb  Aquest ID només és lleugerament vàlid.
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "L'ID és lleugerament vàlid."
-
-# ivb (2001/12/08)
-# ivb  Davant d'açò pot anar una de les quatre anteriors.
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s  Voleu realment usar la clau?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Per favor, entreu l'ID de la clau: "
@@ -3694,11 +4327,6 @@ msgstr "S'està invocant «pgp»..."
 msgid "PGP Key %s."
 msgstr "Clau PGP %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "S'estan cercant les claus que concorden amb «%s»..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3759,7 +4387,7 @@ msgstr "Error en escriure en la bústia!"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [llegits %d de %d missatges]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "El servidor ha tancat la connexió!"
 
@@ -3789,18 +4417,18 @@ msgstr "No s'han pogut deixar els missatges en el servidor."
 msgid "Error connecting to server: %s"
 msgstr "Error en connectar amb el servidor: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "S'està tancant la connexió amb el servidor POP..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "S'estan verificant els índexs dels missatges..."
 
 # ivb (2001/12/08)
 # ivb  ABREUJAT!
 # ivb  S'ha perdut la connexió.  Voleu reconnectar amb el servidor POP?
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "S'ha perdut la connexió. Reconnectar amb el servidor POP?"
 
@@ -4190,21 +4818,21 @@ msgstr "S'ha enviat el missatge."
 msgid "Sending in background."
 msgstr "S'està enviant en segon pla."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "No s'ha trobat el paràmetre «boundary»! (informeu d'aquest error)"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "«%s» ja no existeix!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "«%s» no és un fitxer ordinari."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "No s'ha pogut obrir «%s»."
@@ -4212,16 +4840,16 @@ msgstr "No s'ha pogut obrir «%s»."
 # ivb (2001/12/08)
 # ivb  ABREUJAT!
 # ivb  Error en enviar el missatge, el procés fill ha exit amb codi %d (%s).
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Error en enviament, el fill isqué amb codi %d (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Eixida del procés de repartiment"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "L'IDN «%s» no és vàlid, en preparar «Resent-From»."
@@ -4340,7 +4968,7 @@ msgstr "No s'ha pogut obrir el subprocés OpenSSL!"
 msgid "No output from OpenSSL..."
 msgstr "OpenSSL no ha produit cap eixida..."
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4348,19 +4976,19 @@ msgstr ""
 "[-- Final de l'eixida d'OpenSSL. --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Error: No s'ha pogut crear el subprocés OpenSSL! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- Les dades següents es troben xifrades amb S/MIME: --]\n"
 
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- Les dades següents es troben signades amb S/MIME: --]\n"
 
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4368,7 +4996,7 @@ msgstr ""
 "\n"
 "[-- Final de les dades xifrades amb S/MIME. --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4376,7 +5004,7 @@ msgstr ""
 "\n"
 "[-- Final de les dades signades amb S/MIME. --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
@@ -4385,23 +5013,23 @@ msgstr ""
 # ivb (2003/03/26)
 # ivb  (x)ifra, (s)igna, xi(f)ra amb, si(g)na com a, (a)mbdós, o en (c)lar
 # La «f» i la «c» originals s'agafen en el mateix cas en el codi.  ivb
-#: smime.c:1936
+#: smime.c:1945
 msgid "eswabfc"
 msgstr "xsfgac"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 "1: DES, 2: DES triple, 3: RC2-40, 4: RC2-64, 5: RC2-128, o per (d)efecte? "
 
 # 1: DES, 2: DES triple, 3: RC2-40, 4: RC2-64, 5: RC2-128, o per (d)efecte  ivb
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345d"
 
 # Encara no s'ha signat.  ivb
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr "No es pot signar: no s'ha indicat cap clau.  Useu «signa com a»."
 
@@ -4424,3 +5052,9 @@ msgstr "El missatge pare no és visible en aquesta vista limitada."
 #: thread.c:1095
 msgid "Parent message is not available."
 msgstr "El missatge pare no es troba disponible."
+
+#~ msgid "Unexpected response received from server: %s"
+#~ msgstr "S'ha rebut una resposta inesperada del servidor: %s"
+
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Aquest servidor no permet afegir a les bústies IMAP."
diff --git a/po/cs.po b/po/cs.po
index 3f9f9d0dd..b8318bfc1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2004-08-21 20:20+0200\n"
 "Last-Translator: Dan Ohnesorg <dan@ohnesorg.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -16,30 +16,30 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "U¾ivatelské jméno na %s: "
 
 #
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Heslo pro %s@%s: "
 
 #
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Konec"
 
 #
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Smazat"
 
 #
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Obnovit"
 
@@ -50,9 +50,9 @@ msgstr "Volba"
 
 #
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Nápovìda"
 
@@ -114,206 +114,206 @@ msgid "Alias added."
 msgstr "Pøezdívka zavedena."
 
 #
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Shodu pro jmenný vzor nelze nalézt, pokraèovat?"
 
 #
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Polo¾ka mailcapu 'compose' vy¾aduje %s."
 
 #
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Chyba pøi bìhu programu \"%s\"!"
 
 #
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Soubor nutný pro zpracování hlavièek se nepodaøilo otevøít."
 
 #
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Soubor nutný pro odstranìní hlavièek se nepodaøilo otevøít."
 
 #
-#: attach.c:183
+#: attach.c:184
 msgid "Failure to rename file."
 msgstr "Soubor se nepodaøilo pøejmenovat."
 
 #
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "Pro %s neexistuje polo¾ka mailcapu 'compose', vytváøím prázdný soubor."
 
 #
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Polo¾ka mailcapu 'edit' vy¾aduje %s."
 
 #
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Pro %s neexistuje polo¾ka mailcapu 'edit'."
 
 #
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Odpovídající polo¾ka v mailcapu nebyla nalezena. Zobrazuji jako text."
 
 #
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME typ není definován, nelze zobrazit pøílohu."
 
 #
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Nelze vytvoøit filtr"
 
 #
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Filtr nelze vytvoøit"
 
 #
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Chyba pøi zápisu!"
 
 #
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Nevím, jak mám toto vytisknout!"
 
 #
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Zmìnit adresáø"
 
 #
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Maska"
 
 #
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s není adresáøem."
 
 #
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Schránky [%d]"
 
 #
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Pøihlá¹ená schránka [%s], Souborová maska: %s"
 
 #
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Adresáø [%s], Souborová maska: %s"
 
 #
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Adresáø nelze pøipojit!"
 
 #
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Souborové masce nevyhovuje ¾ádný soubor."
 
 #
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Vytváøení funguje pouze u IMAP schránek."
 
 #
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Vytváøení funguje pouze u IMAP schránek."
 
 #
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Mazání funguje pouze u IMAP schránek."
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Skuteènì chcete smazat schránku \"%s\"?"
 
 #
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Schránka byla smazána."
 
 #
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "Schránka nebyla smazána."
 
 #
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Nastavit pracovní adresáø na: "
 
 #
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Chyba pøi naèítání adresáøe."
 
 #
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Souborová maska: "
 
 #
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Obrácené øazení dle (d)ata, (p)ísmena, (v)elikosti èi (n)eøadit?"
 
 #
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Øadit dle (d)ata, (p)ísmena, (v)elikosti èi (n)eøadit?"
 
 #
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "dpvn"
 
 #
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Nové jméno souboru: "
 
 #
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Adresáø nelze zobrazit"
 
 #
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Chyba pøi zobrazování souboru"
 
@@ -395,7 +395,7 @@ msgid "Verify PGP signature?"
 msgstr "Ovìøit PGP podpis?"
 
 #
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Doèasný soubor nelze vytvoøit!"
 
@@ -409,134 +409,134 @@ msgstr "Nelze vytvo
 msgid "Could not copy message"
 msgstr "Nelze kopírovat zprávu."
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "S/MIME podpis byl úspì¹nì ovìøen."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "Vlastník S/MIME certifikátu není toto¾ný s odesílatelem zprávy."
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr "Pozor: Èást této zprávy nebyla podepsána."
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "S/MIME podpis NELZE ovìøit."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "PGP podpis byl úspì¹nì ovìøen."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "PGP podpis NELZE ovìøit."
 
 #
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Pøíkaz: "
 
 #
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Zaslat kopii zprávy na: "
 
 #
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Zaslat kopii oznaèených zpráv na: "
 
 #
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Chyba pøi zpracování adresy!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "Chybné IDN: '%s'"
 
 #
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Zaslat kopii zprávy na %s"
 
 #
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Zaslat kopii zpráv na %s"
 
 #
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "Kopie zprávy nebyla odeslána."
 
 #
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "Kopie zpráv nebyly odeslány."
 
 #
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Kopie zprávy byla odeslána."
 
 #
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Kopie zpráv byly odeslány."
 
 #
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "Filtrovací proces nelze vytvoøit"
 
 #
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Poslat rourou do pøíkazu: "
 
 #
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Není definován ¾ádný pøíkaz pro tisk."
 
 #
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Vytisknout zprávu?"
 
 #
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Vytisknout oznaèené zprávy?"
 
 #
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Zpráva byla vytisknuta"
 
 #
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Zprávy byly vytisknuty"
 
 #
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "Zprávu nelze vytisknout"
 
 #
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Zprávy nelze vytisknout"
 
 #
-#: commands.c:508
+#: commands.c:509
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
@@ -545,7 +545,7 @@ msgstr ""
 "sp(a)m?: "
 
 #
-#: commands.c:509
+#: commands.c:510
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
@@ -554,83 +554,83 @@ msgstr ""
 "m?: "
 
 #
-#: commands.c:510
+#: commands.c:511
 msgid "dfrsotuzcp"
 msgstr "dojvplnksa"
 
 #
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Pøíkaz pro shell: "
 
 #
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Dekódovat - ulo¾it %s do schránky"
 
 #
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Dekódovat - zkopírovat %s do schránky"
 
 #
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "De¹ifrovat - ulo¾it %s do schránky"
 
 #
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "De¹ifrovat - zkopírovat %s do schránky"
 
 #
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Ulo¾it %s do schránky"
 
 #
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Zkopírovat %s do schránky"
 
 #
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " oznaèené"
 
 #
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Kopíruji do %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Pøevést pøi odesílání na %s?"
 
 #
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Polo¾ka Content-Type zmìnìna na %s."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Znaková sada zmìnìna na %s; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "nepøevádím"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "pøevádím"
 
@@ -740,120 +740,744 @@ msgid "Attaching selected files..."
 msgstr "Pøipojuji zvolené soubory..."
 
 #
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "%s nelze pøipojit!"
 
 #
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Otevøít schránku, z ní¾ se pøipojí zpráva"
 
 #
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "V této slo¾ce nejsou ¾ádné zprávy."
 
 #
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Oznaète zprávy, které chcete pøipojit!"
 
 #
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Nelze pøipojit!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "Pøekódování se týká pouze textových pøíloh."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "Aktuální pøíloha nebude pøevedena."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "Aktuální pøíloha bude pøevedena."
 
 #
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Nesprávné kódování."
 
 #
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Ulo¾it kopii této zprávy?"
 
 #
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Pøejmenovat na: "
 
 #
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Chyba pøi volání funkce stat pro %s: %s"
 
 #
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Nový soubor: "
 
 #
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Polo¾ka 'Content-Type' je tvaru tøída/podtøída"
 
 #
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Hodnota %s polo¾ky 'Content-Type' je neznámá."
 
 #
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "Soubor %s nelze vytvoøit."
 
 #
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "Vytvoøení pøílohy se nezdaøilo."
 
 #
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "Odlo¾it tuto zprávu?"
 
 #
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "Ulo¾it zprávu do schránky"
 
 #
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Ukládám zprávu do %s ..."
 
 #
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "Zpráva ulo¾ena."
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "Je aktivní S/MIME, zru¹it jej a pokraèovat?"
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr "Je aktivní PGP, zru¹it jej a pokraèovat?"
 
+#
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "chyba ve vzoru na: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "chyba ve vzoru na: %s"
+
+#
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "chyba ve vzoru na: %s"
+
+#
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "chyba ve vzoru na: %s"
+
+#
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "chyba ve vzoru na: %s"
+
+#
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "chyba ve vzoru na: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "chyba ve vzoru na: %s"
+
+#
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "chyba ve vzoru na: %s"
+
+#: crypt-gpgme.c:993
+#, fuzzy
+msgid "Warning: One of the keys has been revoked\n"
+msgstr "Pozor: Èást této zprávy nebyla podepsána."
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Platnost certifikátu serveru vypr¹ela."
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL není dostupné"
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Otisk klíèe: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Chyba pøi zasílání zprávy."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Chyba %s na pøíkazovém øádku\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Konec podepsaných dat --]\n"
+
+#
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Chyba: doèasný soubor nelze vytvoøit! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- ZAÈÁTEK PGP ZPRÁVY --]\n"
+"\n"
+
+#
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[--ZAÈÁTEK VEØEJNÉHO KLÍÈE PGP --]\n"
+
+#
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- ZAÈÁTEK PODEPSANÉ PGP ZPRÁVY --]\n"
+"\n"
+
+#
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- KONEC PGP ZPRÁVY --]\n"
+
+#
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- KONEC VEØEJNÉHO KLÍÈE PGP --]\n"
+
+#
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- KONEC PODEPSANÉ PGP ZPRÁVY --]\n"
+
+#
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Chyba: nelze najít zaèátek PGP zprávy! --]\n"
+"\n"
+
+#
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Chyba: zpráva ve formátu PGP/MIME je poru¹ena! --]\n"
+"\n"
+
+#
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Chyba: doèasný soubor nelze vytvoøit! --]\n"
+
+#
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Následující data jsou za¹ifrována ve formátu PGP/MIME --]\n"
+"\n"
+
+#
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Následující data jsou za¹ifrována ve formátu PGP/MIME --]\n"
+"\n"
+
+#
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- Konec dat za¹ifrovaných ve formátu PGP/MIME --]\n"
+
+#
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- Konec dat za¹ifrovaných ve formátu PGP/MIME --]\n"
+
+#
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr "[-- Následují data podepsaná pomocí S/MIME --]\n"
+
+#
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr "[-- Následující data jsou za¹ifrována pomocí S/MIME --]\n"
+
+#
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Konec dat podepsaných pomocí S/MIME --]\n"
+
+#
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Konec dat za¹ifrovaných ve formátu S/MIME --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Není platný   "
+
+#
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Mìsíc %s není správný."
+
+#
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Mìsíc %s není správný."
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Za¹ifrovat"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Certifikát ulo¾en"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "ID klíèe: 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "Odvolaný   "
+
+#
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Platnost vypr¹ela   "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Doèasný soubor nelze vytvoøit."
+
+#
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Pøipojuji se k %s..."
+
+#
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Chyba pøi pøipojováno k serveru: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "ID klíèe: 0x%s"
+
+#
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "Chyba SSL: %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr ""
+"V¹em vyhovujícím klíèùm vypr¹ela platnost, byly zneplatnìny nebo zakázány."
+
+#
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Ukonèit  "
+
+#
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Zvolit "
+
+#
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Kontrolovat klíè  "
+
+#
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "klíèe PGP vyhovující \"%s\"."
+
+#
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "klíèe PGP vyhovující \"%s\"."
+
+#
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "S/MIME klíèe vyhovující \"%s\"."
+
+#
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "klíèe PGP vyhovující \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, fuzzy, c-format
+msgid "%s <%s>."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3594
+#, fuzzy, c-format
+msgid "%s \"%s\"."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Klíè nelze pou¾ít: vypr¹ela jeho platnost, nebo byl zakázán èi sta¾en."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "Tomuto ID vypr¹ela platnost, nebo bylo zakázáno èi sta¾eno."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "ID nemá definovanou dùvìryhodnost"
+
+#
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "Toto ID není dùvìryhodné."
+
+#
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "Dùvìryhodnost tohoto ID je pouze èásteèná."
+
+#
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Opravdu chcete tento klíè pou¾ít?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Hledám klíèe vyhovující \"%s\"..."
+
+#
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "Pou¾ít ID klíèe = \"%s\" pro %s?"
+
+#
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Zadejte ID klíèe pro %s: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr "PGP - ¹i(f)rovat, (p)odepsat, podepsat (j)ako, (o)bojí, %s, èi (n)ic?"
+
+#
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "fpmjon"
+
+#
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr "PGP - ¹i(f)rovat, (p)odepsat, podepsat (j)ako, (o)bojí, %s, èi (n)ic?"
+
+#
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "fpmjon"
+
+#
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Podepsat jako: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Soubor nutný pro zpracování hlavièek se nepodaøilo otevøít."
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -872,30 +1496,30 @@ msgstr "
 
 #
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Spou¹tím PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr "Nelze pou¾ít inline ¹ifrování, pou¾ít PGP/MIME?"
 
 #
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Zpráva nebyla odeslána."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "S/MIME zprávy, které neobsahují hints on content nejsou podporovány."
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "Zkou¹ím extrahovat PGP klíèe...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Zkou¹ím extrahovat S/MIME certifikáty...\n"
 
@@ -907,7 +1531,7 @@ msgstr ""
 "[-- Chyba: Chybná struktura zprávy typu multipart/signed! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -916,7 +1540,7 @@ msgstr ""
 "[-- Chyba: 'multipart/signed' protokol %s není znám! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -927,7 +1551,7 @@ msgstr ""
 
 #
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -935,7 +1559,7 @@ msgstr ""
 "[-- Následují podepsaná data --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -944,7 +1568,7 @@ msgstr ""
 "\n"
 
 #
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -952,278 +1576,310 @@ msgstr ""
 "\n"
 "[-- Konec podepsaných dat --]\n"
 
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
 #
-#: curs_lib.c:190
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Spou¹tím PGP..."
+
+#
+#: curs_lib.c:188
 msgid "yes"
 msgstr "ano"
 
 #
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "ne"
 
 #
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Ukonèit Mutt?"
 
 #
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "neznámá chyba"
 
 #
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Stisknìte libovolnou klávesu..."
 
 #
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " ('?' pro seznam): "
 
 #
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "®ádná schránka není otevøena."
 
 #
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Nejsou ¾ádné zprávy."
 
 #
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "Ze schránky je mo¾né pouze èíst."
 
 #
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "V re¾imu pøikládání zpráv není tato funkce povolena."
 
 #
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "®ádné viditelné zprávy"
 
 #
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Schránka je urèena pouze pro ètení, zápis nelze zapnout!"
 
 #
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Zmìny obsahu slo¾ky budou ulo¾eny po jejím uzavøení."
 
 #
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Zmìny obsahu slo¾ky nebudou ulo¾eny."
 
 #
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Konec"
 
 #
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Ulo¾it"
 
 #
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Psát"
 
 #
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Odepsat"
 
 #
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Skupinì"
 
 #
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Obsah schránky byl zmìnìn zvenèí. Atributy mohou být nesprávné."
 
 #
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "V této schránce je nová po¹ta."
 
 #
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "Obsah schránky byl zmìnìn zvenèí."
 
 #
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "®ádné zprávy nejsou oznaèeny."
 
 #
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 msgid "Nothing to do."
 msgstr "Není co dìlat"
 
 #
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Pøejít na zprávu: "
 
 #
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "Argumentem musí být èíslo zprávy."
 
 #
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Tato zpráva není viditelná."
 
 #
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Èíslo zprávy není správné."
 
 #
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Smazat zprávy shodující se s: "
 
 #
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "®ádné omezení není zavedeno."
 
 #
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Omezení: %s"
 
 #
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Omezit na zprávy shodující se s: "
 
 #
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Ukonèit Mutt?"
 
 #
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Oznaèit zprávy shodující se s: "
 
 #
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Obnovit zprávy shodující se s: "
 
 #
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Odznaèit zprávy shodující se s: "
 
 #
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Otevøít schránku pouze pro ètení"
 
 #
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Otevøít schránku"
 
 #
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s není schránkou."
 
 #
-#: curs_main.c:1165
+#: curs_main.c:1176
 msgid "Exit Mutt without saving?"
 msgstr "Ukonèit Mutt bez ulo¾ení zmìn?"
 
 #
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "Vlákna nejsou podporována."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "odlo¾it zprávu pro pozdìj¹í pou¾ití"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Jste na poslední zprávì."
 
 #
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Nejsou ¾ádné obnovené zprávy."
 
 #
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Jste na první zprávì."
 
 #
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "Hledání pokraèuje od zaèátku."
 
 #
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "Hledání pokraèuje od konce."
 
 #
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Nejsou ¾ádné nové zprávy"
 
 #
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Nejsou ¾ádné nepøeètené zprávy"
 
 #
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " v tomto omezeném zobrazení"
 
 #
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "U zpráv ulo¾ených na POP serveru nelze nastavit pøíznak 'Dùle¾ité'."
 
 #
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Nejsou dal¹í vlákna."
 
 #
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Jste na prvním vláknu."
 
 #
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "Vlákna nejsou podporována."
-
-#
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "Vlákno obsahuje nepøeètené zprávy."
 
 #
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "Na POP serveru nelze zprávy editovat."
 
@@ -1375,97 +2031,97 @@ msgid "Clear flag"
 msgstr "Vypnout pøíznak"
 
 #
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Chyba: ®ádnou z èástí 'Multipart/Alternative' nelze zobrazit! --]\n"
 
 #
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Pøíloha #%d"
 
 #
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Typ: %s/%s, Kódování: %s, Velikost: %s --]\n"
 
 #
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Zobrazuji automaticky pomocí %s --]\n"
 
 #
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Vyvolávám pøíkaz %s pro automatické zobrazování"
 
 #
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- %s nelze spustit --]\n"
 
 #
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Automaticky zobrazuji standardní chybový výstup %s --]\n"
 
 #
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Chyba: typ 'message/external-body' nemá parametr 'access-type' --]\n"
 
 #
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Tato pøíloha typu '%s/%s' "
 
 #
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(o velikosti v bajtech: %s) "
 
 #
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "byla smazána --]\n"
 
 #
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- %s --]\n"
 
 #
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- jméno: %s --]\n"
 
 #
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Tato pøíloha typu '%s/%s' není pøítomna, --]\n"
 
 #
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr "[-- a udaný externí zdroj ji¾ není platný --]\n"
 
 #
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
@@ -1473,34 +2129,34 @@ msgstr ""
 "[-- není podporována --]\n"
 
 #
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Chyba: typ 'multipart/signed' bez informace o protokolu"
 
 #
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Chyba: typ 'multipart/encrypted' bez informace o protokolu"
 
 #
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Doèasný soubor nelze otevøít!"
 
 #
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- typ '%s/%s' není podporován "
 
 #
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(pro zobrazení této èásti pou¾ijte '%s')"
 
 #
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(je tøeba svázat funkci 'view-attachments' s nìjakou klávesou!)"
 
@@ -1616,54 +2272,54 @@ msgstr "P
 msgid "SASL authentication failed."
 msgstr "SASL ovìøení se nezdaøilo."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s není platná IMAP cesta"
 
 #
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Stahuji jmenný prostor..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Stahuji seznam schránek..."
 
 #
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "Slo¾ka nenalezena"
 
 #
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Vytvoøit schránku: "
 
 #
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "Schránka musí mít jméno."
 
 #
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Schránka vytvoøena."
 
 #
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Vytvoøit schránku: "
 
 #
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "Chyba SSL: %s"
 
 #
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "Schránka vytvoøena."
@@ -1676,158 +2332,154 @@ msgstr "Schr
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Osudová chyba. Aktuální poèet zpráv nesouhlasí s pøedchozím údajem!"
 
 #
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Konèím spojení s %s..."
 
 #
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Tento IMAP server je zastaralý. Mutt s ním nebude fungovat."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
-msgstr "Neoèekávaná odpovìï od serveru: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
+msgstr ""
 
 #
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "Bezpeèné spojení pøes TLS?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "Nelze navázat TLS spojení"
 
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
 #
-#: imap/imap.c:590
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Volím %s..."
 
 #
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "Chyba pøi otevírání schránky"
 
 #
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Ke schránkám na tomto IMAP serveru nelze pøipojovat."
-
-#
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "Vytvoøit %s?"
 
 #
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Ma¾u zprávy (poèet: %d)..."
 
 #
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "Pøíkaz EXPUNGE se nezdaøil."
 
 #
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Ukládám pøíznaky stavu zprávy... [%d/%d]"
 
 #
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Odstraòuji zprávy ze serveru..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "pøi volání imap_sync_mailbox: EXPUNGE selhalo"
 
 #
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "Pøíkaz CLOSE se nezdaøil."
 
 #
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "Chybný název schránky"
 
 #
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Pøihla¹uji %s..."
 
 #
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Odhla¹uji %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Z IMAP serveru této verze hlavièky nelze stahovat."
 
 #
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Doèasný soubor %s nelze vytvoøit"
 
 #
-#: imap/message.c:134
+#: imap/message.c:128
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Stahuji hlavièky zpráv... [%d/%d]"
 
 #
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Stahuji hlavièky zpráv... [%d/%d]"
 
 #
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Stahuji zprávu..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "Index zpráv je chybný. Zkuste schránku znovu otevøít."
 
 #
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Posílám zprávu..."
 
 #
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Kopíruji zprávy (%d) do %s..."
 
 #
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Kopíruji zprávu %d do %s..."
 
 #
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Pokraèovat?"
 
@@ -1837,144 +2489,144 @@ msgid "Bad regexp: %s"
 msgstr "Chybný regulární výraz: %s"
 
 #
-#: init.c:678
+#: init.c:644
 msgid "spam: no matching pattern"
 msgstr "spam: vzoru nic nevyhovuje"
 
 #
-#: init.c:680
+#: init.c:646
 msgid "nospam: no matching pattern"
 msgstr "nospam: vzoru nic nevyhovuje"
 
 #
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "pøezdívka: ¾ádná adresa"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Pozor: Neplatné IDN '%s' v pøezdívce '%s'.\n"
 
 #
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "neplatná hlavièka"
 
 #
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "metoda %s pro øazení není známa"
 
 #
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): chybný regulární výraz %s\n"
 
 #
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "Promìnná %s není známa."
 
 #
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "Prefix není s 'reset' povolen."
 
 #
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "Hodnota není s 'reset' povolena."
 
 #
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s je nastaveno"
 
 #
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s není nastaveno"
 
 #
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s je nesprávný typ schránky."
 
 #
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "Hodnota %s je nesprávná."
 
 #
-#: init.c:1589
+#: init.c:1555
 #, c-format
 msgid "%s: Unknown type."
 msgstr "neznámý typ %s"
 
 #
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "neznámý typ %s"
 
 #
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Chyba v %s na øádku %d: %s"
 
 #
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: chyby v %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: ètení pøeru¹eno kvùli velikému mno¾ství chyb v %s"
 
 #
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: chyba na %s"
 
 #
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: pøíli¹ mnoho argumentù"
 
 #
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "Pøíkaz %s není znám."
 
 #
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Chyba %s na pøíkazovém øádku\n"
 
 #
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "domovský adresáø nelze urèit"
 
 #
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "u¾ivatelské jméno nelze urèit"
 
@@ -2532,490 +3184,500 @@ msgstr "spustit makro"
 msgid "compose a new mail message"
 msgstr "sestavit novou zprávu"
 
-#
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "otevøít jinou slo¾ku"
 
 #
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "otevøít jinou slo¾ku pouze pro ètení"
 
 #
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "odstranit zprávì pøíznak stavu"
 
 #
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "smazat zprávy shodující se se vzorem"
 
 #
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "vynutit sta¾ení po¹ty z IMAP serveru"
 
 #
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "stáhnout po¹tu z POP serveru"
 
 #
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "pøeskoèit na první zprávu"
 
 #
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "pøeskoèit na poslední zprávu"
 
 #
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "zobrazovat pouze zprávy shodující se se vzorem"
 
 #
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Zaslat kopii oznaèených zpráv na: "
+
+#
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "pøeskoèit na následující novou zprávu"
 
 #
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "pøeskoèit na následující novou nebo nepøeètenou zprávu"
 
 #
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "pøeskoèit na následující podvlákno"
 
 #
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "pøeskoèit na následující vlákno"
 
 #
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "pøeskoèit na následující obnovenou zprávu"
 
 #
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "pøeskoèit na následující nepøeètenou zprávu"
 
 #
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "pøeskoèit na pøedchozí zprávu ve vláknu"
 
 #
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "pøeskoèit na pøedchozí vlákno"
 
 #
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "pøeskoèit na pøedchozí podvlákno"
 
 #
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "pøeskoèit na pøedchozí obnovenou zprávu"
 
 #
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "pøeskoèit na pøedchozí novou zprávu"
 
 #
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "pøeskoèit na pøedchozí novou nebo nepøeètenou zprávu"
 
 #
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "pøeskoèit na pøedchozí nepøeètenou zprávu"
 
 #
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "oznaèit toto vlákno jako pøeètené"
 
 #
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "oznaèit toto podvlákno jako pøeètené"
 
 #
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "nastavit zprávì pøíznak stavu"
 
 #
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "ulo¾it zmìny do schránky"
 
 #
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "oznaèit zprávy shodující se se vzorem"
 
 #
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "obnovit zprávy shodující se se vzorem"
 
 #
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "odznaèit zprávy shodující se se vzorem"
 
 #
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "pøeskoèit do støedu stránky"
 
 #
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "pøeskoèit na dal¹í polo¾ku"
 
 #
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "rolovat o øádek dolù"
 
 #
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "pøeskoèit na dal¹í stránku"
 
 #
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "pøeskoèit na konec zprávy"
 
 #
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "pøepnout zobrazování citovaného textu"
 
 #
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "pøeskoèit za citovaný text"
 
 #
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "pøeskoèit na zaèátek zprávy"
 
 #
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "poslat zprávu/pøílohu rourou do pøíkazu shellu"
 
 #
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "pøeskoèit na pøedchozí polo¾ku"
 
 #
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "rolovat o øádek nahoru"
 
 #
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "pøeskoèit na pøedchozí stránku"
 
 #
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "vytisknout aktuální polo¾ku"
 
 #
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "dotázat se externího programu na adresy"
 
 #
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "pøidat výsledky nového dotazu k ji¾ existujícím"
 
 #
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "ulo¾it zmìny do schránky a skonèit"
 
 #
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "vrátit se k odlo¾ené zprávì"
 
 #
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "smazat a pøekreslit obrazovku"
 
 #
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "<vnitøní>"
 
 #
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "smazat aktuální schránku (pouze IMAP)"
 
 #
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "odepsat na zprávu"
 
 #
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "pou¾ít aktuální zprávu jako ¹ablonu pro novou"
 
 #
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "ulo¾it zprávu/pøílohu do souboru"
 
 #
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "vyhledat regulární výraz"
 
 #
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "vyhledat regulární výraz opaèným smìrem"
 
 #
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "vyhledat následující shodu"
 
 #
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "vyhledat následující shodu opaèným smìrem"
 
 #
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "pøepnout obarvování hledaných vzorù"
 
 #
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "spustit pøíkaz v podshellu"
 
 #
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "seøadit zprávy"
 
 #
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "seøadit zprávy v opaèném poøadí"
 
 #
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "oznaèit aktuální polo¾ku"
 
 #
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "prefix funkce, která má být pou¾ita pouze pro oznaèené zprávy"
 
 #
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 msgid "apply next function ONLY to tagged messages"
 msgstr "následující funkci pou¾ij POUZE pro oznaèené zprávy"
 
 #
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "oznaèit toto podvlákno"
 
 #
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "oznaèit toto vlákno"
 
 #
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "pøepnout zprávì pøíznak 'nová'"
 
 #
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "pøepnout, zda bude schránka pøepsána"
 
 #
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "pøepnout, zda procházet schránky nebo v¹echny soubory"
 
 #
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "pøeskoèit na zaèátek stránky"
 
 #
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "obnovit aktuální polo¾ku"
 
 #
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "obnovit v¹echny zprávy ve vláknu"
 
 #
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "obnovit v¹echny zprávy v podvláknu"
 
 #
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "Vypí¹e oznaèení verze a datum"
 
 #
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "pokud je to nezbytné, zobrazit pøílohy pomocí mailcapu"
 
 #
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "zobrazit MIME pøílohy"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "zobraz kód stisknuté klávesy"
 
 #
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "zobrazit aktivní omezující vzor"
 
 #
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "zavinout/rozvinout toto vlákno"
 
 #
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "zavinout/rozvinout v¹echna vlákna"
 
 #
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "pøipojit veøejný PGP klíè"
 
 #
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "zobrazit menu PGP"
 
 #
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "odeslat veøejný klíè PGP"
 
 #
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "ovìøit veøejný klíè PGP"
 
 #
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "zobrazit u¾ivatelské ID klíèe"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "hledat klasické pgp"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Akceptovat øetìz."
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "Pøipojit k øetìzu remailer"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "Vlo¾it do øetìzu remailer"
 
 #
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "Odstranit remailer z øetìzu"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "Vybrat pøedchozí èlánek øetìzu"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "Vybrat dal¹í èlánek øetìzu"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "odeslat zprávu pomocí øetìzu remailerù typu mixmaster"
 
 #
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "vytvoøit de¹ifrovanou kopii a smazat"
 
 #
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "vytvoøit de¹ifrovanou kopii"
 
 #
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "odstranit v¹echna hesla z pamìti"
 
 #
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "extrahovat v¹echny podporované veøejné klíèe"
 
 #
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "zobrazit menu S/MIME"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr "Integer overflow -- can't allocate memory!"
 
 #
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Pamì» vyèerpána!"
 
@@ -3047,12 +3709,13 @@ msgstr ""
 
 #
 #: main.c:61
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -3113,6 +3776,7 @@ msgid ""
 "[...]\n"
 "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
 "       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
 "[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
@@ -3123,6 +3787,53 @@ msgid ""
 "  -a <file>\tattach a file to the message\n"
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"Pou¾ití: mutt [ -nRyzZ ] [ -e <pøíkaz> ] [ -F <soubor> ] [ -m <typ> ] [ -f "
+"<soubor> ]\n"
+"       mutt [ -nR ] [ -e <pøíkaz> ] [ -F <soubor> ] -Q <dotaz> [ -Q "
+"<dotaz> ] [...]\n"
+"       mutt [ -nR ] [ -e <pøíkaz> ] [ -F <soubor> ] -A <alias> [ -A "
+"<alias> ] [...]\n"
+"       mutt [ -nx ] [ -e <pøíkaz> ] [ -a <soubor> ] [ -F <soubor> ] [ -H "
+"<soubor> ][ -i <soubor> ] [ -s <vìc> ] [ -b <adr> ] [ -c <adr> ]  <adr>  \n"
+"[ ... ]\n"
+"       mutt [ -n ] [ -e <pøíkaz> ] [ -F <soubor> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"pøepínaèe:\n"
+"  -A <alias>\texpanduje zadaný alias\n"
+"  -a <soubor>\tpøipojí soubor ke zprávì\n"
+"  -b <adresa>\tspecifikuje adresu pro utajenou kopii (BCC)\n"
+"  -c <adresa>\tspecifikuje adresu pro kopii (CC)\n"
+"  -e <pøíkaz>\tpøíkaz bude vykonán po inicializaci\n"
+"  -f <soubor>\tète z této schránky\n"
+"  -F <soubor>\talternativní soubor muttrc\n"
+"  -H <soubor>\tz tohoto souboru budou naèteny vzory hlavièek\n"
+"  -i <soubor>\ttento soubor Mutt vlo¾í do odpovìdi\n"
+"  -m <typ>\timplicitní typ schránky\n"
+"  -n\t\tMutt nebude èíst systémový soubor Muttrc\n"
+"  -p\t\tvrátí se k odlo¾ené zprávì\n"
+"  -Q <promìná>\tdotá¾e se na konfiguraèní promìnnou\n"
+"  -R\t\totevøe schránku pouze pro ètení\n"
+"  -s <vìc>\tspecifikuje vìc (pokud obsahuje mezery,\n"
+"              \ttak musí být v uvozovkách)\n"
+"  -v\t\tzobrazí oznaèení verze a parametry zadané pøi pøekladu\n"
+"  -x\t\tnapodobí odesílací re¾im programu mailx\n"
+"  -y\t\tzvolí schránku uvedenou v seznamu `mailboxes'\n"
+"  -z\t\tpokud ve schránce není po¹ta, pak okam¾itì skonèí\n"
+"  -Z\t\totevøe první slo¾ku s novou po¹tou; pokud není ¾ádná nová po¹ta,\n"
+"    \t\ttak okam¾itì skonèí\n"
+"  -h\t\tvypí¹e tuto nápovìdu"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#
+#: main.c:117
+#, fuzzy
+msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -3179,7 +3890,7 @@ msgstr ""
 "  -h\t\tvypí¹e tuto nápovìdu"
 
 #
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -3188,55 +3899,55 @@ msgstr ""
 "Pøelo¾eno s volbami:"
 
 #
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Chyba pøi inicializaci terminálu."
 
 #
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Úroveò ladìní je %d.\n"
 
 #
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "pøi pøekladu programu nebylo 'DEBUG' definováno. Ignoruji.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s neexistuje. Mám ho vytvoøit?"
 
 #
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "%s nelze vytvoøit: %s"
 
 #
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Nejsou specifikováni ¾ádní pøíjemci.\n"
 
 #
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "Soubor %s nelze pøipojit.\n"
 
 #
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "V ¾ádné schránce není nová po¹ta."
 
 #
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Není definována ¾ádná schránka pøijímající novou po¹tu."
 
 #
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "Schránka je prázdná."
 
@@ -3257,12 +3968,12 @@ msgid "Mailbox was corrupted!"
 msgstr "Schránka byla po¹kozena!"
 
 #
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Kritická chyba! Schránku nelze znovu otevøít!"
 
 #
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Schránku nelze zamknout!"
 
@@ -3271,13 +3982,13 @@ msgstr "Schr
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: mbox byl zmìnìn, ale nebyly zmìnìny ¾ádné zprávy! (ohlaste tuto chybu)"
 
 #
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Zapisuji zprávy... %d (%d%%)"
@@ -3286,219 +3997,178 @@ msgstr "Zapisuji zpr
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "Provádím zmìny..."
 
 #
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Ulo¾ení se nezdaøilo! Èást schránky byla ulo¾ena do %s"
 
 #
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Schránku nelze znovu otevøít!"
 
 #
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Otevírám schránku znovu..."
 
 #
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Pøeskoèit na: "
 
 #
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Nesprávné indexové èíslo."
 
 #
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "®ádné polo¾ky."
 
 #
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Dolù ji¾ rolovat nemù¾ete."
 
 #
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Nahoru ji¾ rolovat nemù¾ete."
 
 #
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Jste na poslední stránce."
 
 #
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Jste na první stránce."
 
 #
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "První polo¾ka je zobrazena."
 
 #
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "Poslední polo¾ka je zobrazena."
 
 #
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Jste na poslední polo¾ce."
 
 #
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Jste na první polo¾ce."
 
 #
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Vyhledat: "
 
 #
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Vyhledat obráceným smìrem: "
 
 #
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Není ¾ádný vzor k vyhledání."
 
 #
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Nenalezeno."
 
 #
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "®ádné polo¾ky nejsou oznaèeny."
 
 #
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "V tomto menu není hledání pøístupné."
 
 #
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "V dialozích není pøeskakování implementováno."
 
 #
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Oznaèování není podporováno."
 
 #
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Ètu %s... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 "pøi volání maildir_commit_message(): nemohu nastavit datum a èas u souboru"
 
-#: muttlib.c:846
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Soubor je adresáøem. Ulo¾it do nìj? [(a)no, (n)e, (v)¹echny]"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr "anv"
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "Soubor je adresáøem. Ulo¾it do nìj?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Zadejte jméno souboru: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Soubor ji¾ existuje: (p)øepsat, pø(i)pojit èi (z)ru¹it?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "piz"
-
-#
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Do POP schránek nelze ukládat zprávy."
-
-#
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s není schránkou!"
-
-#
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Pøipojit zprávy do %s?"
-
 #
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "Spojení s %s uzavøeno"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL není dostupné"
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "pøíkaz pøed spojením selhal"
 
 #
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Chyba pøi komunikaci s %s (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "Chybné IDN \"%s\"."
 
 #
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "Vyhledávám %s..."
 
 #
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Poèítaè \"%s\" nelze nalézt."
 
 #
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Pøipojuji se k %s..."
 
 #
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Spojení s %s nelze navázat (%s)."
@@ -3532,7 +4202,8 @@ msgid "SSL failed: %s"
 msgstr "Chyba SSL: %s"
 
 #
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Certifikát od serveru nelze získat"
 
@@ -3543,90 +4214,216 @@ msgid "SSL connection using %s (%s)"
 msgstr "SSL spojení pomocí %s (%s)"
 
 #
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Neznámý"
 
 #
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[nelze spoèítat]"
 
 #
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[chybné datum]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "Certifikát serveru není zatím platný."
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "Platnost certifikátu serveru vypr¹ela."
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Tento certifikát patøí:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Tento certifikát vydal:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Tento certifikát je platný."
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   od %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     pro %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Otisk klíèe: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "Kontrola SSL certifikátu"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(o)dmítnout, akceptovat pouze (t)eï, akceptovat (v)¾dy "
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "otv"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(o)dmítnout, akceptovat pouze (t)eï "
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "ot"
 
-#
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Ukonèit  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Varování: Certifikát nelze ulo¾it"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Certifikát ulo¾en"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "SSL spojení pomocí %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Certifikát ulo¾en"
+
+#
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Chyba pøi inicializaci terminálu."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Otisk klíèe: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Otisk klíèe: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Certifikát serveru není zatím platný."
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Platnost certifikátu serveru vypr¹ela."
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Platnost certifikátu serveru vypr¹ela."
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "Certifikát serveru není zatím platný."
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "Kontrola SSL certifikátu"
+
+#
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Pøipojuji se k %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Chyba pøi komunikaci s %s (%s)"
+
+#: muttlib.c:910
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "Soubor je adresáøem. Ulo¾it do nìj? [(a)no, (n)e, (v)¹echny]"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr "anv"
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "Soubor je adresáøem. Ulo¾it do nìj?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Zadejte jméno souboru: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Soubor ji¾ existuje: (p)øepsat, pø(i)pojit èi (z)ru¹it?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "piz"
+
+#
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Do POP schránek nelze ukládat zprávy."
+
+#
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Pøipojit zprávy do %s?"
+
+#
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s není schránkou!"
+
 #
 #: mx.c:120
 #, c-format
@@ -3721,7 +4518,7 @@ msgid "%d kept, %d moved, %d deleted."
 msgstr "ponecháno: %d, pøesunuto: %d, smazáno: %d"
 
 #
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "ponecháno: %d, smazáno: %d"
@@ -3744,16 +4541,16 @@ msgid "Mailbox is marked unwritable. %s"
 msgstr "Schránka má vypnut zápis. %s"
 
 #
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "Do schránky byla vlo¾ena kontrolní znaèka."
 
 #
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Zprávu nelze ulo¾it"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr "Integer overflow -- can't allocate memory."
 
@@ -3763,58 +4560,58 @@ msgid "Not available in this menu."
 msgstr "V tomto menu není tato funkce dostupná."
 
 #
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "Pøstr"
 
 #
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "Dlstr"
 
 #
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Pøílohy"
 
 #
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Dal¹í"
 
 #
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Konec zprávy je zobrazen."
 
 #
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Zaèátek zprávy je zobrazen."
 
 #
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Hledat opaèným smìrem: "
 
 #
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Hledat: "
 
 #
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "Nápovìda je právì zobrazena."
 
 #
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "®ádný dal¹í citovaný text."
 
 #
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Za citovaným textem ji¾ nenásleduje ¾ádný bì¾ný text."
 
@@ -3895,32 +4692,32 @@ msgid "error: unknown op %d (report this error)."
 msgstr "chyba: neznámý operand %d (ohlaste tuto chybu)."
 
 #
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Pøekládám vzor k vyhledání..."
 
 #
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Spou¹tím pøíkaz pro shodující se zprávy... "
 
 #
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "®ádná ze zpráv nesplòuje daná kritéria."
 
 #
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "Pøi vyhledávání bylo dosa¾eno konce bez nalezení shody."
 
 #
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "Pøi vyhledávání bylo dosa¾eno zaèátku bez nalezení shody."
 
 #
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Hledání bylo pøeru¹eno."
 
@@ -3935,12 +4732,12 @@ msgid "PGP passphrase forgotten."
 msgstr "PGP heslo zapomenuto"
 
 #
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Chyba: nelze spustit PGP proces! --]\n"
 
 #
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3949,59 +4746,24 @@ msgstr ""
 "\n"
 
 #
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- ZAÈÁTEK PGP ZPRÁVY --]\n"
-"\n"
-
-#
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[--ZAÈÁTEK VEØEJNÉHO KLÍÈE PGP --]\n"
-
-#
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- ZAÈÁTEK PODEPSANÉ PGP ZPRÁVY --]\n"
-"\n"
-
-#
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- KONEC PGP ZPRÁVY --]\n"
-
-#
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- KONEC VEØEJNÉHO KLÍÈE PGP --]\n"
-
-#
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- KONEC PODEPSANÉ PGP ZPRÁVY --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "Nelze kopírovat zprávu."
 
-#
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Chyba: nelze najít zaèátek PGP zprávy! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "PGP podpis byl úspì¹nì ovìøen."
 
 #
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Vnitøní chyba. Informujte <roessler@does-not-exist.org>."
 
 #
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -4010,79 +4772,39 @@ msgstr ""
 "\n"
 
 #
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Chyba: zpráva ve formátu PGP/MIME je poru¹ena! --]\n"
-"\n"
-
-#
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Chyba: doèasný soubor nelze vytvoøit! --]\n"
-
-#
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- Následující data jsou za¹ifrována ve formátu PGP/MIME --]\n"
-"\n"
-
-#
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Konec dat za¹ifrovaných ve formátu PGP/MIME --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "De¹ifrování se nezdaøilo."
 
 #
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "PGP proces nelze spustit!"
 
-#
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "Pou¾ít ID klíèe = \"%s\" pro %s?"
-
-#
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Zadejte ID klíèe pro %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "PGP nelze spustit."
 
 #
-#: pgp.c:1496
+#: pgp.c:1540
 #, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "PGP - ¹i(f)rovat, (p)odepsat, podepsat (j)ako, (o)bojí, %s, èi (n)ic?"
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr "PGP/M(i)ME"
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr "(i)nline"
 
 #
-#: pgp.c:1499
+#: pgp.c:1543
 msgid "esabifc"
 msgstr "fpjoin"
 
-#
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Podepsat jako: "
-
 #
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
@@ -4093,18 +4815,6 @@ msgid "All matching keys are expired, revoked, or disabled."
 msgstr ""
 "V¹em vyhovujícím klíèùm vypr¹ela platnost, byly zneplatnìny nebo zakázány."
 
-#
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Zvolit "
-
-#
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Kontrolovat klíè  "
-
 #
 #: pgpkey.c:532
 #, c-format
@@ -4122,45 +4832,6 @@ msgstr "kl
 msgid "Can't open /dev/null"
 msgstr "Nelze otevøít /dev/null"
 
-#
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Doèasný soubor nelze vytvoøit."
-
-#
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "ID klíèe: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Klíè nelze pou¾ít: vypr¹ela jeho platnost, nebo byl zakázán èi sta¾en."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "Tomuto ID vypr¹ela platnost, nebo bylo zakázáno èi sta¾eno."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "ID nemá definovanou dùvìryhodnost"
-
-#
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "Toto ID není dùvìryhodné."
-
-#
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "Dùvìryhodnost tohoto ID je pouze èásteèná."
-
-#
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Opravdu chcete tento klíè pou¾ít?"
-
 #
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
@@ -4177,11 +4848,6 @@ msgstr "Spou
 msgid "PGP Key %s."
 msgstr "Klíè PGP %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Hledám klíèe vyhovující \"%s\"..."
-
 #
 #: pop.c:90 pop_lib.c:201
 #, c-format
@@ -4252,7 +4918,7 @@ msgid "%s [%d of %d messages read]"
 msgstr "%s [poèet pøeètených zpráv: %d/%d]"
 
 #
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "Server uzavøel spojení!"
 
@@ -4286,17 +4952,17 @@ msgid "Error connecting to server: %s"
 msgstr "Chyba pøi pøipojováno k serveru: %s"
 
 #
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "Konèím spojení s POP serverem..."
 
 #
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Ukládám indexy zpráv..."
 
 #
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Spojení ztraceno. Navázat znovu spojení s POP serverem."
 
@@ -4740,39 +5406,39 @@ msgid "Sending in background."
 msgstr "Zasílám na pozadí."
 
 #
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Nebyl nalezen 'boundary' parametr! [ohlaste tuto chybu]"
 
 #
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s ji¾ neexistuje!"
 
 #
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s není øádným souborem."
 
 #
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "%s nelze otevøít"
 
 #
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Chyba pøi zasílání zprávy, potomek ukonèen %d (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Výstup doruèovacího programu"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "Chybné IDN %s pøi generování resent-from."
@@ -4905,7 +5571,7 @@ msgid "No output from OpenSSL..."
 msgstr "OpenSSL nevygenerovalo ¾ádný výstup..."
 
 #
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4914,22 +5580,22 @@ msgstr ""
 "\n"
 
 #
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Chyba: nelze spustit OpenSSL podproces! --]\n"
 
 #
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- Následující data jsou za¹ifrována pomocí S/MIME --]\n"
 
 #
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- Následují data podepsaná pomocí S/MIME --]\n"
 
 #
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4938,7 +5604,7 @@ msgstr ""
 "[-- Konec dat za¹ifrovaných ve formátu S/MIME --]\n"
 
 #
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4947,7 +5613,7 @@ msgstr ""
 "[-- Konec dat podepsaných pomocí S/MIME --]\n"
 
 #
-#: smime.c:1935
+#: smime.c:1944
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
@@ -4955,20 +5621,20 @@ msgstr ""
 "bojí, èi (n)ic?"
 
 #
-#: smime.c:1936
+#: smime.c:1945
 msgid "eswabfc"
 msgstr "fpmjon"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, nebo (n)ic? "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345n"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr "Nemohu najít klíè odesílatele, pou¾ijte funkci podepsat jako."
 
@@ -4997,6 +5663,13 @@ msgstr "Rodi
 msgid "Parent message is not available."
 msgstr "Rodièovská zpráva není dostupná."
 
+#~ msgid "Unexpected response received from server: %s"
+#~ msgstr "Neoèekávaná odpovìï od serveru: %s"
+
+#
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Ke schránkám na tomto IMAP serveru nelze pøipojovat."
+
 #~ msgid "unspecified protocol error"
 #~ msgstr "nespecifikovaná chyba v protokolu"
 
@@ -5044,9 +5717,6 @@ msgstr "Rodi
 #~ msgid "Copy"
 #~ msgstr "Kopírovat"
 
-#~ msgid "%s [%s]\n"
-#~ msgstr "%s [%s]\n"
-
 #
 #~ msgid ""
 #~ "\n"
diff --git a/po/da.po b/po/da.po
index d76193d19..83cc53b08 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.5.8i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2005-03-13 17:22+0100\n"
 "Last-Translator: Morten Bo Johansen <mojo@mbjnet.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -13,26 +13,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "Brugernavn på %s: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Adgangskode for %s@%s: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Tilbage"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Slet"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Behold"
 
@@ -41,9 +41,9 @@ msgid "Select"
 msgstr "Vælg"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Hjælp"
 
@@ -95,169 +95,169 @@ msgstr "Gem i fil: "
 msgid "Alias added."
 msgstr "Adresse tilføjet."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Kan ikke matche navneskabelon, fortsæt?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Brug af \"compose\" i mailcap-fil kræver %%s."
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Fejl ved kørsel af \"%s\"!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Kan ikke åbne fil for at analysere brevhovedet."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Kan ikke åbne fil for at fjerne brevhovedet."
 
-#: attach.c:183
+#: attach.c:184
 msgid "Failure to rename file."
 msgstr "Omdøbning af fil slog fejl."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "Ingen \"compose\"-regel for %s i mailcap-fil, opretter en tom fil."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Brug af \"edit\" i mailcap-fil kræver %%s."
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Ingen \"edit\"-regel for %s i mailcap-fil."
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Ingen passende mailcap-regler fundet. Viser som tekst."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME-typen er ikke defineret. Kan ikke vise bilag."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Kan ikke oprette filter."
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Kan ikke oprette filter"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Skrivefejl!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Jeg ved ikke hvordan man udskriver dette!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Skift filkatalog"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Maske"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s er ikke et filkatalog."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Indbakker [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Abonnementer [%s], filmaske: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Filkatalog [%s], filmaske: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Kan ikke vedlægge et filkatalog!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Ingen filer passer til filmasken."
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Oprettelse er kun understøttet for IMAP-brevbakker"
 
-#: browser.c:880
+#: browser.c:881
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Omdøbning er kun understøttet for IMAP-brevbakker"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Sletning er kun understøttet for IMAP-brevbakker"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Virkelig slette brevbakke \"%s\"?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Brevbakke slettet."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "Brevbakke ikke slettet."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Skift til filkatalog: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Fejl ved indlæsning af filkatalog."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Filmaske: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Omvendt sortering efter (d)ato, (a)lfabetisk, (s)tr. eller (i)ngen? "
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Sortering efter (d)ato, (a)lfabetisk, (s)tr. eller (i)ngen? "
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "dasi"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Nyt filnavn: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Filkataloger kan ikke vises."
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Fejl ved visning af fil."
 
@@ -324,7 +324,7 @@ msgstr "standard-farver er ikke underst
 msgid "Verify PGP signature?"
 msgstr "Kontrollér PGP-underskrift?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Kunne ikke oprette midlertidig fil!"
 
@@ -336,114 +336,114 @@ msgstr "Kan ikke oprette fremvisningsfilter."
 msgid "Could not copy message"
 msgstr "Kunne ikke kopiere brevet."
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "S/MIME-underskrift er i orden."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "Der er ikke sammenfald mellem ejer af S/MIME-certifikat og afsender"
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr "Advarsel: En del af dette brev er ikke underskrevet."
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "S/MIME-underskrift er IKKE i orden."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "PGP-underskrift er i orden."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "PGP-underskrift er IKKE i orden."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Kommando: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Gensend brev til: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Gensend udvalgte breve til: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Ugyldig adresse!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "Forkert IDN: '%s'"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Gensend brev til %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Gensend breve til %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "Brevet er ikke gensendt."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "Brevene er ikke gensendt."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Brevet er gensendt."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Brevene er gensendt."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "Kan ikke oprette filterproces"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Overfør til kommando: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Ingen udskrivningskommando er defineret"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Udskriv brev?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Udskriv udvalgte breve?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Brevet er udskrevet"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Brevene er udskrevet"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "Brevet kunne ikke udskrives"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Brevene kunne ikke udskrives"
 
-#: commands.c:508
+#: commands.c:509
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
@@ -451,7 +451,7 @@ msgstr ""
 "Omv-sort. (d)ato/(f)ra/(a)nk./(e)mne/t(i)l/(t)råd/(u)sort/(s)tr./s(c)ore/s(p)"
 "am?: "
 
-#: commands.c:509
+#: commands.c:510
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
@@ -459,73 +459,73 @@ msgstr ""
 "Sortér (d)ato/(f)ra/(a)nk./(e)mne/t(i)l/(t)råd/(u)sort/(s)tr./s(c)ore/s(p)"
 "am?:"
 
-#: commands.c:510
+#: commands.c:511
 msgid "dfrsotuzcp"
 msgstr "dfaeituscp"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Skalkommando: "
 
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Afkod-gem%s i brevbakke"
 
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Afkod-kopiér%s til brevbakke"
 
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Dekryptér-gem%s i brevbakke"
 
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Dekryptér-kopiér%s til brevbakke"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Gem%s i brevbakke"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Kopiér%s til brevbakke"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " udvalgte"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Kopierer til %s ..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Omdan til %s ved afsendelse?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "\"Content-Type\" ændret til %s."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Tegnsæt ændret til %s; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "omdanner ikke"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "omdanner"
 
@@ -617,102 +617,667 @@ msgstr "Forkert IDN i \"%s\": '%s'"
 msgid "Attaching selected files..."
 msgstr "Vedlægger valgte filer ..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Kan ikke vedlægge %s!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Åbn brevbakken med brevet som skal vedlægges"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Ingen breve i den brevbakke."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Udvælg de breve som du vil vedlægge!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Kan ikke vedlægge!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "Omkodning berører kun tekstdele"
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "Den aktuelle del vil ikke blive konverteret"
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "Den aktuelle del vil blive konverteret"
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Ugyldig indkodning."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Gem en kopi af dette brev?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Omdøb til: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Kan ikke finde filen %s: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Ny fil: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "\"Content-Type\" er på formen grundtype/undertype."
 
-#: compose.c:1057
+#: compose.c:1060
+#, c-format
+msgid "Unknown Content-Type %s"
+msgstr "Ukendt \"Content-Type\" %s."
+
+#: compose.c:1073
+#, c-format
+msgid "Can't create file %s"
+msgstr "Kan ikke oprette filen %s."
+
+#: compose.c:1081
+msgid "What we have here is a failure to make an attachment"
+msgstr "Det er ikke muligt at lave et bilag."
+
+#: compose.c:1142
+msgid "Postpone this message?"
+msgstr "Udsæt afsendelse af dette brev?"
+
+#: compose.c:1201
+msgid "Write message to mailbox"
+msgstr "Skriv brevet til brevbakke"
+
+#: compose.c:1204
+#, c-format
+msgid "Writing message to %s ..."
+msgstr "Skriver brevet til %s ..."
+
+#: compose.c:1213
+msgid "Message written."
+msgstr "Brevet skrevet."
+
+#: compose.c:1225
+msgid "S/MIME already selected. Clear & continue ? "
+msgstr "S/MIME allerede valgt. Ryd og fortsæt ? "
+
+#: compose.c:1251
+msgid "PGP already selected. Clear & continue ? "
+msgstr "PGP allerede valgt. Ryd og fortsæt ? "
+
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "fejl i mønster ved: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "fejl i mønster ved: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "fejl i mønster ved: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "fejl i mønster ved: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "fejl i mønster ved: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "fejl i mønster ved: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "fejl i mønster ved: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "fejl i mønster ved: %s"
+
+#: crypt-gpgme.c:993
+#, fuzzy
+msgid "Warning: One of the keys has been revoked\n"
+msgstr "Advarsel: En del af dette brev er ikke underskrevet."
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Server-certifikat er udløbet"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL er ikke tilgængelig."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Fingeraftryk: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Fejl ved afsendelse af brev."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Fejl i kommandolinje: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Slut på underskrevne data --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Fejl: Kunne ikke oprette en midlertidig fil! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- END PGP MESSAGE --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- END PGP PUBLIC KEY BLOCK --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- END PGP SIGNED MESSAGE --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Fejl: kunne ikke finde begyndelse på PGP-meddelelsen! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Fejl: forkert udformet PGP/MIME-meddelelse! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Fejl: Kunne ikke oprette en midlertidig fil! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Følgende data er PGP/MIME-krypteret --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Følgende data er PGP/MIME-krypteret --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- Slut på PGP/MIME-krypteret data --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- Slut på PGP/MIME-krypteret data --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr "[-- Følgende data er S/MIME-underskrevet --]\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr "[-- Følgende data er S/MIME-krypteret --]\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Slut på S/MIME-underskrevne data --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Slut på S/MIME-krypteret data --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Ugyldigt   "
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Ugyldig måned: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Ugyldig måned: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Kryptér"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Certifikat gemt"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Nøgle-id: 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "Tilbagekaldt   "
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Udløbet   "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Kan ikke oprette midlertidig fil"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Forbinder til %s ..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Fejl under forbindelse til server: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Nøgle-id: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "Omdøbning slog fejl: %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Alle matchende nøgler er sat ud af kraft, udløbet eller tilbagekaldt."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Afslut "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Udvælg  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Undersøg nøgle  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP-nøgler som matcher \"%s\"."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP-nøgler som matcher \"%s\"."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "S/MIME-certifikater som matcher \"%s\"."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP-nøgler som matcher \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Denne nøgle kan ikke bruges: udløbet/sat ud af kraft/tilbagekaldt."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "Id er udløbet/ugyldig/ophævet."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "Ægthed af id er ubestemt."
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "Id er ikke bevist ægte."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "Id er kun bevist marginalt ægte."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Vil du virkelig anvende nøglen?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
 #, c-format
-msgid "Unknown Content-Type %s"
-msgstr "Ukendt \"Content-Type\" %s."
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Leder efter nøgler, der matcher \"%s\"..."
 
-#: compose.c:1070
+#: crypt-gpgme.c:4002 pgp.c:1149
 #, c-format
-msgid "Can't create file %s"
-msgstr "Kan ikke oprette filen %s."
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "Anvend nøgle-id = \"%s\" for %s?"
 
-#: compose.c:1078
-msgid "What we have here is a failure to make an attachment"
-msgstr "Det er ikke muligt at lave et bilag."
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Anfør nøgle-id for %s: "
 
-#: compose.c:1139
-msgid "Postpone this message?"
-msgstr "Udsæt afsendelse af dette brev?"
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
 
-#: compose.c:1196
-msgid "Write message to mailbox"
-msgstr "Skriv brevet til brevbakke"
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr "PGP (k)ryptér, (u)nderskriv, underskriv (s)om, (b)egge, %s, in(g)en "
 
-#: compose.c:1199
-#, c-format
-msgid "Writing message to %s ..."
-msgstr "Skriver brevet til %s ..."
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "kumsbg"
 
-#: compose.c:1208
-msgid "Message written."
-msgstr "Brevet skrevet."
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr "PGP (k)ryptér, (u)nderskriv, underskriv (s)om, (b)egge, %s, in(g)en "
 
-#: compose.c:1220
-msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME allerede valgt. Ryd og fortsæt ? "
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "kumsbg"
 
-#: compose.c:1246
-msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP allerede valgt. Ryd og fortsæt ? "
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Underskriv som: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Kan ikke åbne fil for at analysere brevhovedet."
 
 #: crypt.c:69
 #, c-format
@@ -729,29 +1294,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "Har glemt løsen(er)."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Starter PGP ..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr "Brevet kan ikke sendes integreret. Brug PGP/MIME i stedet?"
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Brev ikke sendt."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "S/MIME-breve uden antydning om indhold er ikke understøttet."
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "Forsøger at udtrække PGP-nøgler ...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Forsøger at udtrække S/MIME-certifikater ...\n"
 
@@ -763,7 +1328,7 @@ msgstr ""
 "[-- Fejl: Inkonsistent \"multipart/signed\" struktur! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -772,7 +1337,7 @@ msgstr ""
 "[-- Fejl: Ukendt \"multipart/signed\" protokol %s! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -780,7 +1345,7 @@ msgid ""
 msgstr "[-- Advarsel: %s/%s underskrifter kan ikke kontrolleres. --]\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -788,13 +1353,13 @@ msgstr ""
 "[-- Følgende data er underskrevet --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr "[-- Advarsel: Kan ikke finde nogen underskrifter. --]\n"
 
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -802,224 +1367,254 @@ msgstr ""
 "\n"
 "[-- Slut på underskrevne data --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Starter PGP ..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "ja"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "nej"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Afslut Mutt øjeblikkeligt?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Tryk på en tast for at fortsætte ..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " ('?' for en liste): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Ingen brevbakke er åben."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Der er ingen breve."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "Brevbakken er skrivebeskyttet."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Funktionen er ikke tilladt ved vedlægning af bilag."
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "Ingen synlige breve."
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Kan ikke skrive til en skrivebeskyttet brevbakke!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Ændringer i brevbakken vil blive skrevet til disk, når den forlades."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Ændringer i brevbakken vil ikke blive skrevet til disk."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Afslut"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Gem"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Send"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Svar"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Gruppe"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Brevbakke ændret udefra. Status-indikatorer kan være forkerte."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Ny(e) brev(e) i denne brevbakke."
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "Brevbakke ændret udefra."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Ingen breve er udvalgt."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 msgid "Nothing to do."
 msgstr "Intet at gøre."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Hop til brev: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "Parameter skal være nummeret på et brev."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Brevet er ikke synligt."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Ugyldigt brevnummer."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Slet breve efter mønster: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "Intet afgrænsningsmønster er i brug."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Afgrænsning: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Afgræns til breve efter mønster: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Afslut Mutt?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Udvælg breve efter mønster: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Behold breve efter mønster: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Fjern valg efter mønster: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Åbn brevbakke i skrivebeskyttet tilstand"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Åbn brevbakke"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s er ikke en brevbakke."
 
-#: curs_main.c:1165
+#: curs_main.c:1176
 msgid "Exit Mutt without saving?"
 msgstr "Afslut Mutt uden at gemme?"
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "Trådning er ikke i brug."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "gem dette brev til senere forsendelse"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Du er ved sidste brev."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Alle breve har slette-markering."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Du er ved første brev."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "Søgning fortsat fra top."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "Søgning fortsat fra bund."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Ingen nye breve"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Ingen ulæste breve"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " i dette afgrænsede billede"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "Kan ikke ændre 'vigtig'-markering for breve på POP-server."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Ikke flere tråde."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Du er ved den første tråd."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "Trådning er ikke i brug."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "Tråden indeholder ulæste breve."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "Kan ikke redigere brev på POP-server."
 
@@ -1152,109 +1747,109 @@ msgstr "S
 msgid "Clear flag"
 msgstr "Fjern statusindikator"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Fejl: Kunne ikke vise nogen del af \"Multipart/Alternative\"! --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Brevdel #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Type: %s/%s, indkodning: %s, størrelse: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Autovisning ved brug af %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Starter autovisning kommando: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Kan ikke køre %s --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Fejl fra autovisning af %s --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Fejl: \"message/external-body\" har ingen \"access-type\"-parameter --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Denne %s/%s-del "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(på %s bytes) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "er blevet slettet --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- den %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- navn %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Denne %s/%s-del er ikke medtaget, --]\n"
 
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr "[-- og den angivne eksterne kilde findes ikke mere. --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- og den angivne \"access-type\" %s er ikke understøttet --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Fejl: \"multipart/signed\" har ingen \"protocol\"-parameter."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Fejl: \"multipart/encrypted\" har ingen \"protocol\"-parameter!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Kan ikke åbne midlertidig fil!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s er ikke understøttet "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(brug '%s' for vise denne brevdel)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "('view-attachments' må tildeles en tast!)"
 
@@ -1361,46 +1956,46 @@ msgstr "Godkender (%s) ..."
 msgid "SASL authentication failed."
 msgstr "SASL-godkendelse slog fejl."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s er en ugyldig IMAP-sti"
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Henter navnerum ..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Henter liste over brevbakker ..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "Brevbakken findes ikke"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Opret brevbakke: "
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "Brevbakken skal have et navn."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Brevbakke oprettet."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Omdøb brevbakke %s to: "
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, c-format
 msgid "Rename failed: %s"
 msgstr "Omdøbning slog fejl: %s"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 msgid "Mailbox renamed."
 msgstr "Brevbakke omdøbt."
 
@@ -1411,135 +2006,132 @@ msgstr "Brevbakke lukket"
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Kritisk fejl. Antal breve er ikke som forventet!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Lukker forbindelsen til %s ..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Forældet IMAP-server. Mutt kan ikke bruge den."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
-msgstr "Modtog uventet svar fra server: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
+msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "Sikker forbindelse med TLS?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "Kunne ikke opnå TLS-forbindelse"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Vælger %s ..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "Fejl ved åbning af brevbakke"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Kunne ikke føje til IMAP-brevbakker på denne server."
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "Opret %s?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Markerer %d breve slettet ..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "Sletning slog fejl"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Gemmer brevstatus-indikatorer ... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Sletter breve på server ..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE slog fejl"
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "CLOSE slog fejl"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "Ugyldigt navn på brevbakke"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Abonnerer på %s ..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Afmelder abonnement på %s ..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Kan ikke hente brevhoveder fra denne version IMAP-server."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Kunne ikke oprette midlertidig fil %s"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Evaluerer cache ... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Henter brevhoveder ... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Henter brev ..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "Brevindekset er forkert. Prøv at genåbne brevbakken."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Uploader brev ..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Kopierer %d breve til %s ..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Kopierer brev %d til %s ..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Fortsæt?"
 
@@ -1548,122 +2140,122 @@ msgstr "Forts
 msgid "Bad regexp: %s"
 msgstr "Fejl i regulært udtryk: %s"
 
-#: init.c:678
+#: init.c:644
 msgid "spam: no matching pattern"
 msgstr "spam: intet mønster matcher"
 
-#: init.c:680
+#: init.c:646
 msgid "nospam: no matching pattern"
 msgstr "nospam: intet mønster matcher"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias: Ingen adresse"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Advarsel: Forkert IDN '%s' i alias '%s'.\n"
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "ugyldig linje i brevhoved"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: ukendt sorteringsmetode"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): Fejl i regulært udtryk: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: ukendt variabel."
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "præfiks er ikke tilladt med reset"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "værdi er ikke tilladt med reset"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s er sat."
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s er ikke sat."
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: ugyldig type brevbakke"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: Ugyldig værdi"
 
-#: init.c:1589
+#: init.c:1555
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: Ukendt type"
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: ukendt type"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Fejl i %s, linje %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: Fejl i %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: læsning afbrudt pga. for mange fejl i %s"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: Fejl ved %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: For mange parametre"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: Ukendt kommando"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Fejl i kommandolinje: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "Kan ikke bestemme hjemmekatalog."
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "kan ikke bestemme brugernavn."
 
@@ -2121,398 +2713,407 @@ msgid "compose a new mail message"
 msgstr "skriv et nyt brev"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "åbn en anden brevbakke"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "åbn en anden brevbakke som skrivebeskyttet"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "fjern statusindikator fra brev"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "slet breve efter mønster"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "hent post fra IMAP-server nu"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "hent post fra POP-server"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "gå til det første brev"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "gå til det sidste brev"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "vis kun breve, der matcher et mønster"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Gensend udvalgte breve til: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "hop til det næste nye brev"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "hop til næste nye eller ulæste brev"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "hop til næste deltråd"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "hop til næste tråd"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "hop til næste ikke-slettede brev"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "hop til næste ulæste brev"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "hop til forrige brev i tråden"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "hop til forrige tråd"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "hop til forrige deltråd"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "hop til forrige ikke-slettede brev"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "hop til forrige nye brev"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "hop til forrige nye eller ulæste brev"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "hop til forrige ulæste brev"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "markér den aktuelle tråd som læst"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "markér den aktuelle deltråd som læst"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "sæt en status-indikator på et brev"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "gem ændringer i brevbakke"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "udvælg breve efter et mønster"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "fjern slet-markering efter mønster"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "fjern valg efter mønster"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "gå til midten af siden"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "gå til næste listning"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "flyt en linje ned"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "gå til næste side"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "gå til bunden af brevet"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "vælg om citeret tekst skal vises"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "gå forbi citeret tekst"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "gå til toppen af brevet"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "overfør brev/brevdel til en skalkommando"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "gå til forrige listning"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "flyt en linje op"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "gå til den forrige side"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "udskriv den aktuelle listning"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "send adresse-forespørgsel til hjælpeprogram"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "føj nye resultater af forespørgsel til de aktuelle resultater"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "gem ændringer i brevbakke og afslut"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "genindlæs et tilbageholdt brev"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "ryd og opfrisk skærmen"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{intern}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 msgid "rename the current mailbox (IMAP only)"
 msgstr "omdøb den aktuelle brevbakke (kun IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "svar på et brev"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "brug det aktuelle brev som forlæg for et nyt"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "gem brev/brevdel i en fil"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "søg efter et regulært udtryk"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "søg baglæns efter et regulært udtryk"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "søg efter næste resultat"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "søg efter næste resultat i modsat retning"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "vælg om fundne søgningsmønstre skal farves"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "kør en kommando i en under-skal"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "sortér breve"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "sortér breve i omvendt rækkefølge"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "udvælg den aktuelle listning"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "anvend næste funktion på de udvalgte breve"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 msgid "apply next function ONLY to tagged messages"
 msgstr "anvend næste funktion KUN på udvalgte breve"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "markér den aktuelle deltråd"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "markér den aktuelle tråd"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "sæt/fjern et brevs \"ny\"-indikator"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "slå genskrivning af brevbakke til/fra"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "skift mellem visning af brevbakker eller alle filer"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "gå til toppen af siden"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "fjern slet-markering fra den aktuelle listning"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "fjern slet-markering fra alle breve i tråd"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "fjern slet-markering fra alle breve i deltråd"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "vis Mutts versionsnummer og dato"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "vis brevdel, om nødvendigt ved brug af mailcap"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "vis MIME-dele"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "vis tastekoden for et tastetryk"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "vis det aktive afgrænsningsmønster"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "sammen-/udfold den aktuelle tråd"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "sammen-/udfold alle tråde"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "vedlæg en offentlig PGP-nøgle (public key)"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "vis tilvalg for PGP"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "send en offentlig PGP-nøgle"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "Kontrollér en offentlig PGP-nøgle"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "vis nøglens bruger-id"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "Tjek for klassisk pgp"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Brug den opbyggede kæde"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "Føj en genposter til kæden"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "indsæt en genposter i kæden"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "Slet en genposter fra kæden"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "Vælg kædens forrige led"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "Vælg kædens næste led"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "send brevet gennem en mixmaster-genposterkæde"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "opret dekrypteret kopi og slet"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "opret dekrypteret kopi"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "fjern løsen(er) fra hukommelse"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "udtræk understøttede offentlige nøgler"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "vis tilvalg for S/MIME"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr "Heltals-overløb, kan ikke tildele hukommelse!"
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Ikke mere hukommelse!"
 
@@ -2537,12 +3138,13 @@ msgstr ""
 "under visse betingelser; tast `mutt -vv` for detaljer.\n"
 
 #: main.c:61
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2589,6 +3191,7 @@ msgstr ""
 "    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
 
 #: main.c:99
+#, fuzzy
 msgid ""
 "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
@@ -2596,6 +3199,7 @@ msgid ""
 "[...]\n"
 "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
 "       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
 "[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
@@ -2606,6 +3210,49 @@ msgid ""
 "  -a <file>\tattach a file to the message\n"
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"anvendelse: mutt [ -nRyzZ ] [ -e <kmd> ] [ -F <fil> ] [ -m <type> ] [ -f "
+"<fil> ]\n"
+"       mutt [ -nR ] [ -e <kmd> ] [ -F <fil> ] -Q <spørg> [ -Q <spørg> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <kmd> ] [ -F <fil> ] -A <alias> [ -A <alias> ] "
+"\"[...]\n"
+"       mutt [ -nx ] [ -e <kmd> ] [ -a <fil> ] [ -F <fil> ] [ -H <fil> ] [ -i "
+"<fil> ] [ -s <emne> ] [ -b <adr> ] [ -c <adr> ] <adr> [ ... ]\n"
+"       mutt [ -n ] [ -e <kmd> ] [ -F <fil> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"tilvalg:\n"
+"  -A <alias>\tudfold alias\n"
+"  -a <fil>\tvedlæg fil ved brevet\n"
+"  -b <adresse>\tanfør en blind carbon-copy (BCC)-adresse\n"
+"  -c <adresse>\tanfør en carbon-copy (CC)-adresse\n"
+"  -e <kommando>\tanfør en Mutt-kommando til udførelse efter opstart\n"
+"  -f <fil>\tanfør hvilken brevbakke der skal indlæses\n"
+"  -F <fil>\tanfør en alternativ muttrc-fil\n"
+"  -H <fil>\tanfør en kladdefil hvorfra brevhovedet skal indlæses\n"
+"  -i <fil>\tanfør en fil som Mutt skal medtage i svaret\n"
+"  -m <type>\tanfør standardtype af brevbakke\n"
+"  -n\t\tgør at Mutt ikke læser systemets Muttrc\n"
+"  -p\t\tgenindlæs et tilbageholdt brev\n"
+"  -Q <variable>\tspørg på værdi for en opsætningsvariabel\n"
+"  -R\t\tåbn en brevbakke i skrivebeskyttet tilstand\n"
+"  -s <emne>\tanfør et emne (sættes i citationstegn, hvis der er blanktegn)\n"
+"  -v\t\tvis version og oversættelsesparametre\n"
+"  -x\t\tefterlign mailx' afsendelsesmåde\n"
+"  -y\t\tvælg en indbakke\n"
+"  -z\t\tafslut øjeblikkeligt, hvis brevbakken er tom\n"
+"  -Z\t\tåbn første brevbakke med nye breve, afslut straks hvis tom\n"
+"  -h\t\tdenne hjælpeskærm"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
+#, fuzzy
+msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2658,7 +3305,7 @@ msgstr ""
 "  -Z\t\tåbn første brevbakke med nye breve, afslut straks hvis tom\n"
 "  -h\t\tdenne hjælpeskærm"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2666,47 +3313,47 @@ msgstr ""
 "\n"
 "Tilvalg ved oversættelsen:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Kan ikke klargøre terminal."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Afluser på niveau %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG blev ikke defineret ved oversættelsen. Ignoreret.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s findes ikke. Opret?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Kan ikke oprette %s: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Ingen angivelse af modtagere.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: kan ikke vedlægge fil.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Ingen brevbakke med nye breve."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Ingen indbakker er defineret"
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "Brevbakken er tom."
 
@@ -2723,11 +3370,11 @@ msgstr "Brevbakken er 
 msgid "Mailbox was corrupted!"
 msgstr "Brevbakken blev ødelagt!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Kritisk fejl! Kunne ikke genåbne brevbakke!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Kan ikke låse brevbakke!"
 
@@ -2735,11 +3382,11 @@ msgstr "Kan ikke l
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "sync: mbox ændret, men ingen ændrede breve! (rapportér denne bug)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Skriver breve ... %d (%d%%)"
@@ -2747,186 +3394,148 @@ msgstr "Skriver breve ... %d (%d%%)"
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "Udfører ændringer ..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Kunne ikke skrive! Gemte en del af brevbakken i %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Kunne ikke genåbne brevbakke!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Genåbner brevbakke ..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Hop til: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Ugyldigt indeksnummer."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Ingen listninger"
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Du kan ikke komme længere ned."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Du kan ikke komme længere op."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Du er på den sidste side."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Du er på den første side."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "Første listning vises."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "Sidste listning vises."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Du er på sidste listning."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Du er på første listning."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Søg efter: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Søg baglæns efter: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Intet søgemønster."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Ikke fundet."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "Der er ingen udvalgte listninger."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "Søgning kan ikke bruges i denne menu."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "Man kan ikke springe rundt i dialogerne"
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Udvælgelse er ikke understøttet."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Læser %s ... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): kan ikke sætte tidsstempel på fil"
 
-#: muttlib.c:846
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Filen er et filkatalog, gem i det? [(j)a, (n)ej, (a)lle]"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr "jna"
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "Filen er et filkatalog, gem i det?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Fil i dette filkatalog: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Filen eksisterer , (o)verskriv, (t)ilføj, (a)nnulér?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "ota"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Kan ikke gemme brev i POP-brevbakke."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s er ingen brevbakke"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Føj breve til %s?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "Forbindelse til %s er lukket."
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL er ikke tilgængelig."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "\"preconnect\"-kommando slog fejl"
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Kommunikationsfejl med server %s (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "Forkert IDN \"%s\"."
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "Opsøger %s ..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Kunne ikke finde værten \"%s\""
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Forbinder til %s ..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Kunne ikke forbinde til %s (%s)."
@@ -2958,7 +3567,8 @@ msgstr "I/O-fejl"
 msgid "SSL failed: %s"
 msgstr "SSL slog fejl: %s"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Ude af stand til at hente certifikat fra server"
 
@@ -2967,87 +3577,207 @@ msgstr "Ude af stand til at hente certifikat fra server"
 msgid "SSL connection using %s (%s)"
 msgstr "SSL-forbindelse bruger %s (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[kan ikke beregne]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[ugyldig dato]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "Server-certifikat er endnu ikke gyldigt"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "Server-certifikat er udløbet"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Dette certifikat tilhører:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Dette certifikat er udstedt af:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Dette certifikat er gyldigt"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   fra %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     til %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Fingeraftryk: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "Tjek af SSL-certifikat"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(a)fvis, (g)odkend denne gang, (v)arig godkendelse"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "agv"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(a)fvis, (g)odkend denne gang"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "ag"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Afslut "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Advarsel: Kunne ikke gemme certifikat"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Certifikat gemt"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "SSL-forbindelse bruger %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Certifikat gemt"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Kan ikke klargøre terminal."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Fingeraftryk: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Fingeraftryk: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Server-certifikat er endnu ikke gyldigt"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Server-certifikat er udløbet"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Server-certifikat er udløbet"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "Server-certifikat er endnu ikke gyldigt"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "Tjek af SSL-certifikat"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Forbinder til %s ..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Kommunikationsfejl med server %s (%s)"
+
+#: muttlib.c:910
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "Filen er et filkatalog, gem i det? [(j)a, (n)ej, (a)lle]"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr "jna"
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "Filen er et filkatalog, gem i det?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Fil i dette filkatalog: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Filen eksisterer , (o)verskriv, (t)ilføj, (a)nnulér?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "ota"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Kan ikke gemme brev i POP-brevbakke."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Føj breve til %s?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s er ingen brevbakke"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3125,7 +3855,7 @@ msgstr "Brevbakken er u
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d beholdt, %d flyttet, %d slettet."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d beholdt, %d slettet."
@@ -3144,15 +3874,15 @@ msgstr "Brug 'toggle-write' for at muligg
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Brevbakken er skrivebeskyttet. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "Brevbakke opdateret."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Kan ikke skrive brev"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr "Heltals-overløb, kan ikke tildele hukommelse!"
 
@@ -3160,48 +3890,48 @@ msgstr "Heltals-overl
 msgid "Not available in this menu."
 msgstr "Funktion er ikke tilgængelig i denne menu."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "Side op"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "Side ned"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Vis brevdel"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Næste"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Bunden af brevet vises."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Toppen af brevet vises."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Søg baglæns: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Søg: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "Hjælpeskærm vises nu."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "Ikke mere citeret tekst."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Ikke mere uciteret tekst efter citeret tekst."
 
@@ -3268,27 +3998,27 @@ msgstr "tomt m
 msgid "error: unknown op %d (report this error)."
 msgstr "fejl: ukendt op %d (rapportér denne fejl)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Klargør søgemønster ..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Udfører kommando på matchende breve ..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "Ingen breve opfylder kriterierne."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "Søgning er nået til bunden uden resultat."
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "Søgning nåede toppen uden resultat."
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Søgning afbrudt."
 
@@ -3300,11 +4030,11 @@ msgstr "Anf
 msgid "PGP passphrase forgotten."
 msgstr "Har glemt PGP-løsen."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Fejl: kan ikke skabe en PGP-delproces! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3312,51 +4042,22 @@ msgstr ""
 "[-- Slut på PGP-uddata --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- END PGP MESSAGE --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- END PGP PUBLIC KEY BLOCK --]\n"
-
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- END PGP SIGNED MESSAGE --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "Kunne ikke kopiere brevet."
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Fejl: kunne ikke finde begyndelse på PGP-meddelelsen! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "PGP-underskrift er i orden."
 
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Intern fejl. Rapportér dette til <roessler@does-not-exist.org>."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3364,71 +4065,37 @@ msgstr ""
 "[-- Fejl: Kunne ikke skabe en PGP-delproces! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Fejl: forkert udformet PGP/MIME-meddelelse! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Fejl: Kunne ikke oprette en midlertidig fil! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- Følgende data er PGP/MIME-krypteret --]\n"
-"\n"
-
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Slut på PGP/MIME-krypteret data --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "Dekryptering slog fejl."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "Kan ikke åbne PGP-delproces!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "Anvend nøgle-id = \"%s\" for %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Anfør nøgle-id for %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "Kan ikke starte PGP"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "PGP (k)ryptér, (u)nderskriv, underskriv (s)om, (b)egge, %s, in(g)en "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr "PGP/M(i)ME"
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr "in(t)egreret"
 
 # TJEK
-#: pgp.c:1499
+#: pgp.c:1543
 msgid "esabifc"
 msgstr "kusbitg"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Underskriv som: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "Henter PGP-nøgle ..."
@@ -3437,16 +4104,6 @@ msgstr "Henter PGP-n
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Alle matchende nøgler er sat ud af kraft, udløbet eller tilbagekaldt."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Udvælg  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Undersøg nøgle  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3461,40 +4118,6 @@ msgstr "PGP-n
 msgid "Can't open /dev/null"
 msgstr "Kan ikke åbne /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Kan ikke oprette midlertidig fil"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Nøgle-id: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Denne nøgle kan ikke bruges: udløbet/sat ud af kraft/tilbagekaldt."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "Id er udløbet/ugyldig/ophævet."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "Ægthed af id er ubestemt."
-
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "Id er ikke bevist ægte."
-
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "Id er kun bevist marginalt ægte."
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Vil du virkelig anvende nøglen?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Anfør venligst nøgle-id: "
@@ -3508,11 +4131,6 @@ msgstr "Starter pgp ..."
 msgid "PGP Key %s."
 msgstr "PGP-nøgle %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Leder efter nøgler, der matcher \"%s\"..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3570,7 +4188,7 @@ msgstr "Fejl ved skrivning til brevbakke!"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d af %d breve læst]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "Serveren afbrød forbindelsen!"
 
@@ -3600,15 +4218,15 @@ msgstr "Kunne ikke efterlade breve p
 msgid "Error connecting to server: %s"
 msgstr "Fejl under forbindelse til server: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "Lukker forbindelsen til POP-server ..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Efterkontrollerer brevfortegnelser ..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Mistede forbindelsen. Opret ny forbindelse til POP-server?"
 
@@ -3978,35 +4596,35 @@ msgstr "Brev sendt."
 msgid "Sending in background."
 msgstr "Sender i baggrunden."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Fandt ingen \"boundary\"-parameter! [rapportér denne fejl]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s eksisterer ikke mere!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s er ikke en almindelig fil."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "Kunne ikke åbne %s."
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Fejl %d under afsendelse af brev (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Uddata fra leveringsprocessen"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "Forkert IDN %s under forberedelse af af \"Resent-From\"-felt."
@@ -4123,7 +4741,7 @@ msgstr "Kan ikke 
 msgid "No output from OpenSSL..."
 msgstr "Ingen uddata fra OpenSSL ..."
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4131,19 +4749,19 @@ msgstr ""
 "[-- Slut på OpenSSL-uddata --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Fejl: kan ikke skabe en OpenSSL-delproces! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- Følgende data er S/MIME-krypteret --]\n"
 
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- Følgende data er S/MIME-underskrevet --]\n"
 
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4151,7 +4769,7 @@ msgstr ""
 "\n"
 "[-- Slut på S/MIME-krypteret data --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4159,27 +4777,27 @@ msgstr ""
 "\n"
 "[-- Slut på S/MIME-underskrevne data --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
 "S/MIME (k)ryptér, (u).skriv, kryptér (m)ed, u.skriv (s)om, (b)egge, in(g)en "
 
-#: smime.c:1936
+#: smime.c:1945
 msgid "eswabfc"
 msgstr "kumsbg"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, eller (a)fbryd? "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345a"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr "Kan ikke underskrive: Ingen nøgle er angivet. Brug \"underskriv som\"."
 
@@ -4202,3 +4820,9 @@ msgstr "Forrige brev i tr
 #: thread.c:1095
 msgid "Parent message is not available."
 msgstr "Forrige brev i tråden er ikke tilgængeligt."
+
+#~ msgid "Unexpected response received from server: %s"
+#~ msgstr "Modtog uventet svar fra server: %s"
+
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Kunne ikke føje til IMAP-brevbakker på denne server."
diff --git a/po/de.po b/po/de.po
index 47817eb73..cfdc5697c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.5.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2005-03-20 14:03+0100\n"
 "Last-Translator: Roland Rosenfeld <roland@spinnaker.de>\n"
 "Language-Team: German <mutt-po@mutt.org>\n"
@@ -10,26 +10,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "Username bei %s: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Paßwort für %s@%s: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Verlassen"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Lösch."
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Behalten"
 
@@ -38,9 +38,9 @@ msgid "Select"
 msgstr "Auswählen"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Hilfe"
 
@@ -93,171 +93,171 @@ msgstr "Speichern in Datei: "
 msgid "Alias added."
 msgstr "Adresse eingetragen."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Namensschema kann nicht erfüllt werden, fortfahren?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "\"compose\"-Eintrag in der Mailcap-Datei erfordert %%s."
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Fehler beim Ausführen von \"%s\"!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu untersuchen."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu entfernen."
 
-#: attach.c:183
+#: attach.c:184
 msgid "Failure to rename file."
 msgstr "Fehler beim Umbenennen der Datei."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr ""
 "Kein \"compose\"-Eintrag für %s in der Mailcap-Datei, erzeuge leere Datei."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "\"edit\"-Eintrag in Mailcap erfordert %%s."
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Kein \"edit\"-Eintrag für %s in Mailcap."
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Es gibt keinen passenden Mailcap-Eintrag. Anzeige als Text."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Undefinierter MIME-Typ. Kann Anhang nicht anzeigen."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Kann Filter nicht erzeugen."
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Kann Filter nicht erzeugen"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Schreibfehler!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Ich weiß nicht, wie man dies druckt!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Verzeichnis"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Maske"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ist kein Verzeichnis."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Mailbox-Dateien [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Abonniert [%s], Dateimaske: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Verzeichnis [%s], Dateimaske: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Verzeichnisse können nicht angehängt werden!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Es gibt keine zur Maske passenden Dateien"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Es können nur IMAP Mailboxen erzeugt werden"
 
-#: browser.c:880
+#: browser.c:881
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Es können nur IMAP Mailboxen umbenannt werden"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Es können nur IMAP Mailboxen gelöscht werden"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Mailbox \"%s\" wirklich löschen?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Mailbox gelöscht."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "Mailbox nicht gelöscht."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Verzeichnis wechseln nach: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Fehler beim Einlesen des Verzeichnisses."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Dateimaske: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Sortiere umgekehrt nach (D)atum, (a)lphabetisch, (G)röße, oder (n)icht? "
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Sortiere nach (D)atum, (a)lphabetisch, (G)röße oder (n)icht?"
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "dagn"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Neuer Dateiname: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Verzeichnisse können nicht angezeigt werden."
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Fehler bei der Anzeige einer Datei"
 
@@ -324,7 +324,7 @@ msgstr "Standard-Farben werden nicht unterst
 msgid "Verify PGP signature?"
 msgstr "PGP-Signatur überprüfen?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Konnte keine Temporärdatei erzeugen!"
 
@@ -336,114 +336,114 @@ msgstr "Kann Filter zum Anzeigen nicht erzeugen."
 msgid "Could not copy message"
 msgstr "Konnte Nachricht nicht kopieren."
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "S/MIME Unterschrift erfolgreich überprüft."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "S/MIME Zertifikat-Inhaber stimmt nicht mit Absender überein."
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr "Warnung: Ein Teil dieser Nachricht wurde nicht signiert."
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "S/MIME Unterschrift konnte NICHT überprüft werden."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "PGP Unterschrift erfolgreich überprüft."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "PGP Unterschrift konnte NICHT überprüft werden."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Kommando: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Nachricht weiterleiten an: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Markierte Nachrichten weiterleiten an: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Unverständliche Adresse!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "Ungültige IDN: '%s'"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Nachricht an %s weiterleiten"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Nachrichten an %s weiterleiten"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "Nachricht nicht weitergeleitet."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "Nachrichten nicht weitergeleitet."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Nachricht weitergeleitet."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Nachrichten weitergeleitet."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "Kann Filterprozeß nicht erzeugen"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "In Kommando einspeisen: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Kein Druck-Kommando definiert."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Nachricht drucken?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Ausgewählte Nachrichten drucken?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Nachricht gedruckt"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Nachrichten gedruckt"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "Nachricht konnte nicht gedruckt werden"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Nachrichten konnten nicht gedruckt werden"
 
-#: commands.c:508
+#: commands.c:509
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
@@ -451,7 +451,7 @@ msgstr ""
 "Umgekehrt (D)at/(A)bs/Ei(n)g/(B)etr/(E)mpf/(F)aden/(u)nsrt/(G)röße/Be(w)/S(p)"
 "am?: "
 
-#: commands.c:509
+#: commands.c:510
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
@@ -459,73 +459,73 @@ msgstr ""
 "Sortieren (D)at/(A)bs/Ei(n)g/(B)etr/(E)mpf/(F)aden/(u)nsrt/(G)röße/Be(w)ert/S"
 "(p)am?: "
 
-#: commands.c:510
+#: commands.c:511
 msgid "dfrsotuzcp"
 msgstr "danbefugwp"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Shell-Kommando: "
 
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Speichere%s dekodiert in Mailbox"
 
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Kopiere%s dekodiert in Mailbox"
 
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Speichere%s entschlüsselt in Mailbox"
 
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Kopiere%s entschlüsselt in Mailbox"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Speichere%s in Mailbox"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Kopiere%s in Mailbox"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " ausgewählte"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Kopiere nach %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Konvertiere beim Senden nach %s?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type in %s abgeändert."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Zeichensatz in %s abgeändert; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "nicht konvertiert"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "konvertiert"
 
@@ -617,102 +617,669 @@ msgstr "Ung
 msgid "Attaching selected files..."
 msgstr "Hänge ausgewählte Dateien an..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Kann %s nicht anhängen!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Mailbox, aus der angehängt werden soll"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Keine Nachrichten in diesem Ordner."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Bitte markieren Sie die Nachrichten, die Sie anhängen wollen!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Kann nicht anhängen!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "Ändern der Kodierung betrifft nur Textanhänge."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "Der aktuelle Anhang wird nicht konvertiert werden."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "Der aktuelle Anhang wird konvertiert werden."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Ungültige Kodierung."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Soll eine Kopie dieser Nachricht gespeichert werden?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Umbenennen in: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Kann Verzeichniseintrag für Datei %s nicht lesen: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Neue Datei: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type ist von der Form Basis/Untertyp."
 
-#: compose.c:1057
+#: compose.c:1060
+#, c-format
+msgid "Unknown Content-Type %s"
+msgstr "Unbekannter Content-Type %s."
+
+#: compose.c:1073
+#, c-format
+msgid "Can't create file %s"
+msgstr "Kann Datei %s nicht anlegen."
+
+#: compose.c:1081
+msgid "What we have here is a failure to make an attachment"
+msgstr "Anhang kann nicht erzeugt werden."
+
+#: compose.c:1142
+msgid "Postpone this message?"
+msgstr "Nachricht zurückstellen?"
+
+#: compose.c:1201
+msgid "Write message to mailbox"
+msgstr "Schreibe Nachricht in Mailbox"
+
+#: compose.c:1204
+#, c-format
+msgid "Writing message to %s ..."
+msgstr "Schreibe Nachricht nach %s ..."
+
+#: compose.c:1213
+msgid "Message written."
+msgstr "Nachricht geschrieben."
+
+#: compose.c:1225
+msgid "S/MIME already selected. Clear & continue ? "
+msgstr "S/MIME bereits ausgewählt. Löschen und weiter?"
+
+#: compose.c:1251
+msgid "PGP already selected. Clear & continue ? "
+msgstr "PGP bereits ausgewählt. Löschen und weiter?"
+
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "Fehler in Muster bei: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "Fehler in Muster bei: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "Fehler in Muster bei: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "Fehler in Muster bei: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "Fehler in Muster bei: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "Fehler in Muster bei: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "Fehler in Muster bei: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "Fehler in Muster bei: %s"
+
+#: crypt-gpgme.c:993
+#, fuzzy
+msgid "Warning: One of the keys has been revoked\n"
+msgstr "Warnung: Ein Teil dieser Nachricht wurde nicht signiert."
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Zertifikat des Servers ist abgelaufen"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL ist nicht verfügbar."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Fingerabdruck: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Fehler beim Versand der Nachricht."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Fehler in Kommandozeile: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Ende der signierten Daten --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Fehler: Konnte Temporärdatei nicht anlegen! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- END PGP MESSAGE --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- END PGP PUBLIC KEY BLOCK --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- END PGP SIGNED MESSAGE --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Fehler: Konnte Anfang der PGP-Nachricht nicht finden! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Fehler: Fehlerhafte PGP/MIME-Nachricht! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Fehler: Konnte Temporärdatei nicht anlegen! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Die folgenden Daten sind PGP/MIME-verschlüsselt --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Die folgenden Daten sind PGP/MIME-verschlüsselt --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- Ende der PGP/MIME-verschlüsselten Daten --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- Ende der PGP/MIME-verschlüsselten Daten --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr "[-- Die folgenden Daten sind S/MIME signiert --]\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr "[-- Die folgenden Daten sind S/MIME-verschlüsselt --]\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Ende der S/MIME signierten Daten --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Ende der S/MIME-verschlüsselten Daten --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Ungültig  "
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Ungültiger Monat: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Ungültiger Monat: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Verschlüsseln"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Zertifikat gespeichert"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Schlüssel ID: 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "Zurückgez."
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Veraltet  "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Kann temporäre Datei nicht erzeugen"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Verbinde zu %s..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Fehler beim Verbinden mit dem Server: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Schlüssel ID: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "Umbenennung fehlgeschlagen: %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr ""
+"Alles passenden Schlüssel sind veraltet, zurückgezogen oder deaktiviert."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Ende  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Auswahl  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Schlüssel prüfen  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP-Schlüssel, die zu \"%s\" passen."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP-Schlüssel, die zu \"%s\" passen."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "S/MIME Zertifikate, die zu \"%s\" passen."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP-Schlüssel, die zu \"%s\" passen."
+
+#: crypt-gpgme.c:3592
+#, fuzzy, c-format
+msgid "%s <%s>."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3594
+#, fuzzy, c-format
+msgid "%s \"%s\"."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr ""
+"Dieser Schlüssel ist nicht verwendbar: veraltet/deaktiviert/zurückgezogen."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "Diese ID ist veraltet/deaktiviert/zurückgezogen."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "Die Gültigkeit dieser ID ist undefiniert."
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "Diese ID ist ungültig."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "Diese Gültigkeit dieser ID ist begrenzt."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Wollen Sie den Schlüssel wirklich benutzen?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Suche nach Schlüsseln, die auf \"%s\" passen..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
 #, c-format
-msgid "Unknown Content-Type %s"
-msgstr "Unbekannter Content-Type %s."
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "Benutze KeyID = \"%s\" für %s?"
 
-#: compose.c:1070
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
 #, c-format
-msgid "Can't create file %s"
-msgstr "Kann Datei %s nicht anlegen."
+msgid "Enter keyID for %s: "
+msgstr "KeyID für %s: "
 
-#: compose.c:1078
-msgid "What we have here is a failure to make an attachment"
-msgstr "Anhang kann nicht erzeugt werden."
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
 
-#: compose.c:1139
-msgid "Postpone this message?"
-msgstr "Nachricht zurückstellen?"
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, %s, (k)ein PGP? "
 
-#: compose.c:1196
-msgid "Write message to mailbox"
-msgstr "Schreibe Nachricht in Mailbox"
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "vsmabkc"
 
-#: compose.c:1199
-#, c-format
-msgid "Writing message to %s ..."
-msgstr "Schreibe Nachricht nach %s ..."
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, %s, (k)ein PGP? "
 
-#: compose.c:1208
-msgid "Message written."
-msgstr "Nachricht geschrieben."
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "vsmabkc"
 
-#: compose.c:1220
-msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME bereits ausgewählt. Löschen und weiter?"
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Signiere als: "
 
-#: compose.c:1246
-msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP bereits ausgewählt. Löschen und weiter?"
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu untersuchen."
 
 #: crypt.c:69
 #, c-format
@@ -729,30 +1296,30 @@ msgid "Passphrase(s) forgotten."
 msgstr "Mantra(s) vergessen."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Rufe PGP auf..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr "Nachricht kann nicht inline verschickt werden. PGP/MIME verwenden?"
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Nachricht nicht verschickt."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 "S/MIME Nachrichten ohne Hinweis auf den Inhalt werden nicht unterstützt."
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "Versuche PGP Keys zu extrahieren...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Versuche S/MIME Zertifikate zu extrahieren...\n"
 
@@ -764,7 +1331,7 @@ msgstr ""
 "[-- Fehler: Inkonsistente multipart/signed Struktur! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -773,7 +1340,7 @@ msgstr ""
 "[-- Fehler: Unbekanntes multipart/signed Protokoll %s! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -783,7 +1350,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -791,7 +1358,7 @@ msgstr ""
 "[-- Die folgenden Daten sind signiert --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -799,7 +1366,7 @@ msgstr ""
 "[-- Warnung: Kann keine Unterschriften finden. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -807,224 +1374,254 @@ msgstr ""
 "\n"
 "[-- Ende der signierten Daten --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Rufe PGP auf..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "ja"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "nein"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Mutt verlassen?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "unbekannter Fehler"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Bitte drücken Sie eine Taste..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " (für eine Liste '?' eingeben): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Keine Mailbox ist geöffnet."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Es sind keine Nachrichten vorhanden."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "Mailbox kann nur gelesen, nicht geschrieben werden."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Funktion steht beim Anhängen von Nachrichten nicht zur Verfügung."
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "Keine sichtbaren Nachrichten."
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Kann Mailbox im Nur-Lese-Modus nicht schreibbar machen!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Änderungen an dieser Mailbox werden beim Verlassen geschrieben."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Änderungen an dieser Mailbox werden nicht geschrieben."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Ende"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Speichern"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Senden"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Antw."
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Antw.alle"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Mailbox wurde verändert. Markierungen können veraltet sein."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Neue Nachrichten in dieser Mailbox."
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "Mailbox wurde von außen verändert."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Keine markierten Nachrichten."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 msgid "Nothing to do."
 msgstr "Nichts zu erledigen."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Springe zu Nachricht: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "Argument muß eine Nachrichtennummer sein."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Diese Nachricht ist nicht sichtbar."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Ungültige Nachrichtennummer."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Lösche Nachrichten nach Muster: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "Zur Zeit ist kein Muster aktiv."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Begrenze: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Begrenze auf Nachrichten nach Muster: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Mutt beenden?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Markiere Nachrichten nach Muster: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Entferne Löschmarkierung nach Muster: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Entferne Markierung nach Muster: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Öffne Mailbox im nur-Lesen-Modus"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Öffne Mailbox"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s ist keine Mailbox."
 
-#: curs_main.c:1165
+#: curs_main.c:1176
 msgid "Exit Mutt without saving?"
 msgstr "Mutt verlassen, ohne Änderungen zu speichern?"
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "Darstellung von Diskussionsfäden ist nicht eingeschaltet."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "Stelle Nachricht zum späteren Versand zurück"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Sie sind bereits auf der letzten Nachricht."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Alle Nachrichten gelöscht."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Sie sind bereits auf der ersten Nachricht."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "Suche von vorne begonnen."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "Suche von hinten begonnen."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Keine neuen Nachrichten"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Keine ungelesenen Nachrichten"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " in dieser begrenzten Ansicht."
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "Kann 'Wichtig'-Markierung auf dem POP-Server nicht ändern."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Keine weiteren Diskussionsfäden."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Sie haben bereits den ersten Diskussionsfaden ausgewählt."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "Darstellung von Diskussionsfäden ist nicht eingeschaltet."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "Diskussionsfaden enthält ungelesene Nachrichten."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "Kann Nachricht auf dem POP-Server nicht ändern."
 
@@ -1158,76 +1755,76 @@ msgstr "Setze Indikator"
 msgid "Clear flag"
 msgstr "Entferne Indikator"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Fehler: Konnte keinen der multipart/alternative-Teile anzeigen! --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Anhang #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Typ: %s/%s, Kodierung: %s, Größe: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Automatische Anzeige mittels %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Automatische Anzeige mittels: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Kann %s nicht ausführen. --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Fehlerausgabe von %s --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Fehler: message/external-body hat keinen access-type Parameter --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Dieser %s/%s-Anhang "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(Größe %s Byte) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "wurde gelöscht --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- am %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- Name: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Dieser %s/%s-Anhang ist nicht in der Nachricht enthalten, --]\n"
 
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
@@ -1235,34 +1832,34 @@ msgstr ""
 "[-- und die zugehörige externe Quelle --]\n"
 "[-- existiert nicht mehr. --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- und die angegebene Zugangsmethode %s wird nicht unterstützt --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Fehler: multipart/signed ohne \"protocol\"-Parameter."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Fehler: multipart/encrypted ohne \"protocol\"-Parameter!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Konnte temporäre Datei nicht öffnen!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s wird nicht unterstützt "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(benutzen Sie '%s', um diesen Teil anzuzeigen)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(Tastaturbindung für 'view-attachments' benötigt!)"
 
@@ -1369,46 +1966,46 @@ msgstr "Authentifiziere (%s)..."
 msgid "SASL authentication failed."
 msgstr "SASL Authentifizierung fehlgeschlagen."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s ist ein ungültiger IMAP Pfad"
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Hole Namensräume..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Hole Liste der Ordner..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "Ordner existiert nicht"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Erzeuge Mailbox: "
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "Mailbox muß einen Namen haben."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Mailbox erzeugt."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Benenne Mailbox %s um in: "
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, c-format
 msgid "Rename failed: %s"
 msgstr "Umbenennung fehlgeschlagen: %s"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 msgid "Mailbox renamed."
 msgstr "Mailbox umbenannt."
 
@@ -1419,137 +2016,134 @@ msgstr "Mailbox geschlossen"
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Kritischer Fehler.  Nachrichtenzähler weicht ab!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Beende Verbindung zu %s..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Dieser IMAP-Server ist veraltet und wird nicht von Mutt unterstützt."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
-msgstr "Unerwartete Antwort vom Server empfangen: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
+msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "Sichere Verbindung mittels TLS?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "Konnte keine TLS-Verbindung realisieren"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Wähle %s aus..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "Fehler beim Öffnen der Mailbox"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Kann auf diesem IMAP-Server zu Mailboxen nichts hinzufügen."
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "%s erstellen?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Markiere %d Nachrichten zum Löschen..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "Löschen fehlgeschlagen"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Speichere Nachrichten-Status-Indikatoren... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Lösche Nachrichten auf dem Server..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE fehlgeschlagen"
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "CLOSE fehlgeschlagen"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "Unzulässiger Mailbox Name"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Abonniere %s..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Beende Abonnement von %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr ""
 "Kann von dieser Version des IMAP-Servers keine Nachrichtenköpfe erhalten."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Konnte Temporärdatei %s nicht erzeugen"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Werte Cache aus... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Hole Nachrichten-Köpfe... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Hole Nachricht..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 "Der Nachrichtenindex ist fehlerhaft. Versuche die Mailbox neu zu öffnen."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Lade Nachrichten auf den Server..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Kopiere %d Nachrichten nach %s..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Kopiere Nachricht %d nach %s..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Weiter?"
 
@@ -1558,122 +2152,122 @@ msgstr "Weiter?"
 msgid "Bad regexp: %s"
 msgstr "Fehlerhafte regexp: %s"
 
-#: init.c:678
+#: init.c:644
 msgid "spam: no matching pattern"
 msgstr "Spam: kein passendes Muster"
 
-#: init.c:680
+#: init.c:646
 msgid "nospam: no matching pattern"
 msgstr "nospam: kein passendes Muster"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias: Keine Adresse"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Warnung: Ungültige IDN '%s' in Alias '%s'.\n"
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "my_hdr: Ungültiges Kopf-Feld"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: Unbekannte Sortiermethode"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): Fehler in regulärem Ausdruck: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: Unbekannte Variable."
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "Präfix ist bei \"reset\" nicht zulässig."
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "Wertzuweisung ist bei \"reset\" nicht zulässig."
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s ist gesetzt."
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s ist nicht gesetzt."
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: Ungültiger Mailbox-Typ"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: Ungültiger Wert"
 
-#: init.c:1589
+#: init.c:1555
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: Unbekannter Typ."
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: Unbekannter Typ"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Fehler in %s, Zeile %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: Fehler in %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: Lesevorgang abgebrochen, zu viele Fehler in %s"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: Fehler bei %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: Zu viele Argumente"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: Unbekanntes Kommando"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Fehler in Kommandozeile: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "Kann Home-Verzeichnis nicht bestimmen."
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "Kann Nutzernamen nicht bestimmen."
 
@@ -2131,398 +2725,407 @@ msgid "compose a new mail message"
 msgstr "Erzeuge neue Nachricht"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "Öffne eine andere Mailbox"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "Öffne eine andere Mailbox im Nur-Lesen-Modus"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "Entferne einen Status-Indikator"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "Lösche Nachrichten nach Muster"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "Hole Nachrichten vom IMAP-Server"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "Hole Nachrichten vom POP-Server"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "Springe zu erster Nachricht"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "Springe zu letzter Nachricht"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "Wähle anzuzeigende Nachrichten mit Muster aus"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Markierte Nachrichten weiterleiten an: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "Springe zur nächsten neuen Nachricht"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "Springe zur nächsten neuen oder ungelesenen Nachricht"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "Springe zum nächsten Diskussionsfadenteil"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "Springe zum nächsten Diskussionsfaden"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "Springe zur nächsten ungelöschten Nachricht"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "Springe zur nächsten ungelesenen Nachricht"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "Springe zur Bezugsnachricht im Diskussionsfaden"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "Springe zum vorigen Diskussionsfaden"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "Springe zum vorigen Diskussionsfadenteil"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "Springe zur vorigen ungelöschten Nachricht"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "Springe zur vorigen neuen Nachricht"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "Springe zur vorigen neuen oder ungelesenen Nachricht"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "Springe zur vorigen ungelesenen Nachricht"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "Markiere den aktuellen Diskussionsfaden als gelesen"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "Markiere den aktuellen Diskussionsfadenteil als gelesen"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "Setze Statusindikator einer Nachricht"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "Speichere Änderungen in Mailbox"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "Markiere Nachrichten nach Muster"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "entferne Löschmarkierung nach Muster"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "Entferne Markierung nach Muster"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "Gehe zur Seitenmitte"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "Gehe zum nächsten Eintrag"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "Gehe eine Zeile nach unten"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "Gehe zur nächsten Seite"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "Springe zum Ende der Nachricht"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "Schalte Anzeige von zitiertem Text ein/aus"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "Übergehe zitierten Text"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "Springe zum Nachrichtenanfang"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "Bearbeite (pipe) Nachricht/Anhang mit Shell-Kommando"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "Gehe zum vorigen Eintrag"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "Gehe eine Zeile nach oben"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "Gehe zur vorigen Seite"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "Drucke aktuellen Eintrag"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "Externe Adressenabfrage"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "Hänge neue Abfrageergebnisse an"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "Speichere Änderungen in Mailbox und beende das Programm"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "Bearbeite eine zurückgestellte Nachricht"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "Erzeuge Bildschirmanzeige neu"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{intern}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 msgid "rename the current mailbox (IMAP only)"
 msgstr "benenne die aktuelle Mailbox um (nur für IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "Beantworte Nachricht"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "Verwende aktuelle Nachricht als Vorlage für neue Nachricht"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "Speichere Nachricht/Anhang in Datei"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "Suche nach regulärem Ausdruck"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "Suche rückwärts nach regulärem Ausdruck"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "Suche nächsten Treffer"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "Suche nächsten Treffer in umgekehrter Richtung"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "Schalte Suchtreffer-Hervorhebung ein/aus"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "Rufe Kommando in Shell auf"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "Sortiere Nachrichten"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "Sortiere Nachrichten in umgekehrter Reihenfolge"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "Markiere aktuellen Eintrag"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "Wende nächste Funktion auf markierte Nachrichten an"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 msgid "apply next function ONLY to tagged messages"
 msgstr "Wende nächste Funktion NUR auf markierte Nachrichten an"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "Markiere aktuellen Diskussionsfadenteil"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "Markiere aktuellen Diskussionsfaden"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "Setze/entferne den \"neu\"-Indikator einer Nachricht"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "Schalte Sichern von Änderungen ein/aus"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "Schalte zwischen Mailboxen und allen Dateien um"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "Springe zum Anfang der Seite"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "Entferne Löschmarkierung vom aktuellen Eintrag"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "Entferne Löschmarkierung von allen Nachrichten im Diskussionsfaden"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "Entferne Löschmarkierung von allen Nachrichten im Diskussionsfadenteil"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "Zeige Versionsnummer an"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "Zeige Anhang, wenn nötig via Mailcap"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "Zeige MIME-Anhänge"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "Zeige Tastatur-Code einer Taste"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "Zeige derzeit aktives Begrenzungsmuster"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "Kollabiere/expandiere aktuellen Diskussionsfaden"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "Kollabiere/expandiere alle Diskussionsfäden"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "Hänge öffentlichen PGP-Schlüssel an"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "Zeige PGP-Optionen"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "Verschicke öffentlichen PGP-Schlüssel"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "Prüfe öffentlichen PGP-Schlüssel"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "Zeige Nutzer-ID zu Schlüssel an"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "Suche nach klassischem PGP"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Akzeptiere die erstellte Kette"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "Hänge einen Remailer an die Kette an"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "Füge einen Remailer in die Kette ein"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "Lösche einen Remailer aus der Kette"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "Wähle das vorhergehende Element der Kette aus"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "Wähle das nächste Element der Kette aus"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "Verschicke die Nachricht über eine Mixmaster Remailer Kette"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "Erzeuge dechiffrierte Kopie und lösche"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "Erzeuge dechiffrierte Kopie"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "Entferne Mantra(s) aus Speicher"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "Extrahiere unterstützte öffentliche Schlüssel"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "Zeige S/MIME Optionen"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr "Integer Überlauf -- Kann keinen Speicher belegen!"
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Kein Speicher verfügbar!"
 
@@ -2549,12 +3152,13 @@ msgstr ""
 "`mutt -vv' für weitere Details.\n"
 
 #: main.c:61
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2604,6 +3208,7 @@ msgstr ""
 "02111, USA.\n"
 
 #: main.c:99
+#, fuzzy
 msgid ""
 "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
@@ -2611,6 +3216,7 @@ msgid ""
 "[...]\n"
 "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
 "       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
 "[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
@@ -2621,6 +3227,49 @@ msgid ""
 "  -a <file>\tattach a file to the message\n"
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\tExpandiere den angegebenen Alias\n"
+"  -a <file>\tHängt Datei an die Message an\n"
+"  -b <address>\tEmpfänger einer unsichtbaren Kopie (Bcc:)\n"
+"  -c <address>\tEmpfänger einer Kopie (Cc:)\n"
+"  -e <command>\tMutt-Kommando, nach der Initialisierung ausführen\n"
+"  -f <file>\tMailbox, die eingelesen werden soll\n"
+"  -F <file>\tAlternatives muttrc File.\n"
+"  -H <file>\tFile, aus dem Header und Body der Mail gelesen werden sollen\n"
+"  -i <file>\tFile, das in den Body der Message eingebunden werden soll\n"
+"  -m <type>\tDefault-Mailbox Typ\n"
+"  -n\t\tDas Muttrc des Systems ignorieren\n"
+"  -p\t\tEine zurückgestellte Nachricht zurückholen\n"
+"  -Q <variable>\tFrage die Variable aus der Konfiguration ab\n"
+"  -R\t\tMailbox nur zum Lesen öffnen\n"
+"  -s <subj>\tSubject der Mail (Leerzeichen in Anführungsstrichen)\n"
+"  -v\t\tVersion und Einstellungen beim Compilieren anzeigen\n"
+"  -x\t\tSimuliert mailx beim Verschicken von Mails\n"
+"  -y\t\tStarte Mutt mit einer Mailbox aus der `mailboxes' Liste\n"
+"  -z\t\tNur starten, wenn neue Nachrichten in der Mailbox liegen\n"
+"  -Z\t\tÖffne erste Mailbox mit neuen Nachrichten oder beenden\n"
+"  -h\t\tDiese Hilfe"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
+#, fuzzy
+msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2673,7 +3322,7 @@ msgstr ""
 "  -Z\t\tÖffne erste Mailbox mit neuen Nachrichten oder beenden\n"
 "  -h\t\tDiese Hilfe"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2681,47 +3330,47 @@ msgstr ""
 "\n"
 "Einstellungen bei der Compilierung:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Kann Terminal nicht initialisieren."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Debugging auf Ebene %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG war beim Kompilieren nicht definiert.  Ignoriert.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s existiert nicht. Neu anlegen?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Kann %s nicht anlegen: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Keine Empfänger angegeben.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: Kann Datei nicht anhängen.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Keine Mailbox mit neuen Nachrichten."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Keine Eingangs-Mailboxen definiert."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "Mailbox ist leer."
 
@@ -2738,11 +3387,11 @@ msgstr "Mailbox fehlerhaft!"
 msgid "Mailbox was corrupted!"
 msgstr "Mailbox wurde zerstört!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!"
 
@@ -2750,12 +3399,12 @@ msgstr "Kann Mailbox nicht f
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: Mailbox verändert, aber Nachrichten unverändert! (bitte Bug melden)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Schreibe Nachrichten... %d (%d%%)"
@@ -2763,186 +3412,148 @@ msgstr "Schreibe Nachrichten... %d (%d%%)"
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "Speichere Änderungen..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Konnte nicht schreiben! Speichere Teil-Mailbox in %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Konnte Mailbox nicht erneut öffnen!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Öffne Mailbox erneut..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Springe zu: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Ungültige Indexnummer."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Keine Einträge"
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Sie können nicht weiter nach unten gehen."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Sie können nicht weiter nach oben gehen."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Sie sind auf der letzten Seite."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Sie sind auf der ersten Seite."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "Der erste Eintrag wird angezeigt."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "Der letzte Eintrag wird angezeigt."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Sie sind auf dem letzten Eintrag."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Sie sind auf dem ersten Eintrag"
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Suche nach: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Suche rückwärts nach: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Kein Suchmuster."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Nicht gefunden."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "Keine markierten Einträge."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "In diesem Menü kann nicht gesucht werden."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "Springen in Dialogen ist nicht möglich."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Markieren wird nicht unterstützt."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Lese %s... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): kann Zeitstempel der Datei nicht setzen"
 
-#: muttlib.c:846
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Datei ist ein Verzeichnis, darin abspeichern? [(j)a, (n)ein, (a)lle]"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr "jna"
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "Datei ist ein Verzeichnis, darin abspeichern?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Datei in diesem Verzeichnis: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Datei existiert, (u)eberschreiben, (a)nhängen, a(b)brechen?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "uab"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Kann Nachricht nicht in POP Mailbox schreiben."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s ist keine Mailbox!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Nachricht an %s anhängen?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "Verbindung zu %s beendet"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL ist nicht verfügbar."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "\"Preconnect\" Kommando fehlgeschlagen."
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Fehler bei Verbindung mit %s (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "Ungültige IDN \"%s\"."
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "Schlage %s nach..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Kann Host \"%s\" nicht finden"
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Verbinde zu %s..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Kann keine Verbindung zu %s aufbauen (%s)."
@@ -2974,7 +3585,8 @@ msgstr "Ein-/Ausgabe Fehler"
 msgid "SSL failed: %s"
 msgstr "SSL fehlgeschlagen: %s"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Kann kein Zertifikat vom Server erhalten"
 
@@ -2983,87 +3595,207 @@ msgstr "Kann kein Zertifikat vom Server erhalten"
 msgid "SSL connection using %s (%s)"
 msgstr "SSL Verbindung unter Verwendung von %s (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "unbekannt"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[kann nicht berechnet werden]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[ungültiges Datum]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "Zertifikat des Servers ist noch nicht gültig"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "Zertifikat des Servers ist abgelaufen"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Dieses Zertifikat gehört zu:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Dieses Zertifikat wurde ausgegeben von:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Dieses Zertifikat ist gültig"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "    von %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     an %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Fingerabdruck: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "SSL Zertifikat Überprüfung"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(z)urückweisen, (e)inmal akzeptieren, (i)mmer akzeptieren"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "zei"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(z)urückweisen, (e)inmal akzeptieren"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "ze"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Ende  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Warnung: Konnte Zertifikat nicht speichern"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Zertifikat gespeichert"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "SSL Verbindung unter Verwendung von %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Zertifikat gespeichert"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Kann Terminal nicht initialisieren."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Fingerabdruck: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Fingerabdruck: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Zertifikat des Servers ist noch nicht gültig"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Zertifikat des Servers ist abgelaufen"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Zertifikat des Servers ist abgelaufen"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "Zertifikat des Servers ist noch nicht gültig"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "SSL Zertifikat Überprüfung"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Verbinde zu %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Fehler bei Verbindung mit %s (%s)"
+
+#: muttlib.c:910
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "Datei ist ein Verzeichnis, darin abspeichern? [(j)a, (n)ein, (a)lle]"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr "jna"
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "Datei ist ein Verzeichnis, darin abspeichern?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Datei in diesem Verzeichnis: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Datei existiert, (u)eberschreiben, (a)nhängen, a(b)brechen?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "uab"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Kann Nachricht nicht in POP Mailbox schreiben."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Nachricht an %s anhängen?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s ist keine Mailbox!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3141,7 +3873,7 @@ msgstr "Mailbox unver
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d behalten, %d verschoben, %d gelöscht."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d behalten, %d gelöscht."
@@ -3160,15 +3892,15 @@ msgstr "Benutzen Sie 'toggle-write', um Schreib-Modus zu reaktivieren"
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Mailbox ist als unschreibbar markiert. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "Checkpoint in der Mailbox gesetzt."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Kann Nachricht nicht schreiben"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr "Integer Überlauf -- kann keinen Speicher belegen."
 
@@ -3176,48 +3908,48 @@ msgstr "Integer 
 msgid "Not available in this menu."
 msgstr "Funktion ist in diesem Menü nicht verfügbar."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "S.zurück"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "S.vor"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Anhänge betr."
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Nächste Nachr."
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Das Ende der Nachricht wird angezeigt."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Der Beginn der Nachricht wird angezeigt."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Suche rückwärts: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Suche: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "Hilfe wird bereits angezeigt."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "Kein weiterer zitierter Text."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Kein weiterer eigener Text nach zitiertem Text."
 
@@ -3284,27 +4016,27 @@ msgstr "Leeres Muster"
 msgid "error: unknown op %d (report this error)."
 msgstr "Fehler: Unbekannter Muster-Operator %d (Bitte Bug melden)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Compiliere Suchmuster..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Führe Kommando aus..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "Keine Nachrichten haben Kriterium erfüllt."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "Suche hat Ende erreicht, ohne Treffer zu erzielen."
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "Suche hat Anfang erreicht, ohne Treffer zu erzielen."
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Suche unterbrochen."
 
@@ -3316,11 +4048,11 @@ msgstr "PGP-Mantra eingeben:"
 msgid "PGP passphrase forgotten."
 msgstr "PGP-Mantra vergessen."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Fehler: Kann keinen PGP-Prozeß erzeugen! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3328,51 +4060,22 @@ msgstr ""
 "[-- Ende der PGP-Ausgabe --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- END PGP MESSAGE --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- END PGP PUBLIC KEY BLOCK --]\n"
-
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- END PGP SIGNED MESSAGE --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "Konnte Nachricht nicht kopieren."
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Fehler: Konnte Anfang der PGP-Nachricht nicht finden! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "PGP Unterschrift erfolgreich überprüft."
 
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Interner Fehler. Bitte <roessler@does-not-exist.org> informieren."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3380,70 +4083,36 @@ msgstr ""
 "[-- Fehler: Konnte PGP-Subprozeß nicht erzeugen! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Fehler: Fehlerhafte PGP/MIME-Nachricht! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Fehler: Konnte Temporärdatei nicht anlegen! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- Die folgenden Daten sind PGP/MIME-verschlüsselt --]\n"
-"\n"
-
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Ende der PGP/MIME-verschlüsselten Daten --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "Entschlüsselung gescheitert."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "Kann PGP-Subprozeß nicht erzeugen!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "Benutze KeyID = \"%s\" für %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "KeyID für %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "Kann PGP nicht aufrufen"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, %s, (k)ein PGP? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr "PGP/M(i)ME"
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr "(i)nline"
 
-#: pgp.c:1499
+#: pgp.c:1543
 msgid "esabifc"
 msgstr "vsabikc"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Signiere als: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "Hole PGP Schlüssel..."
@@ -3453,16 +4122,6 @@ msgid "All matching keys are expired, revoked, or disabled."
 msgstr ""
 "Alles passenden Schlüssel sind veraltet, zurückgezogen oder deaktiviert."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Auswahl  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Schlüssel prüfen  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3477,41 +4136,6 @@ msgstr "PGP-Schl
 msgid "Can't open /dev/null"
 msgstr "Kann /dev/null nicht öffnen"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Kann temporäre Datei nicht erzeugen"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Schlüssel ID: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr ""
-"Dieser Schlüssel ist nicht verwendbar: veraltet/deaktiviert/zurückgezogen."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "Diese ID ist veraltet/deaktiviert/zurückgezogen."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "Die Gültigkeit dieser ID ist undefiniert."
-
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "Diese ID ist ungültig."
-
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "Diese Gültigkeit dieser ID ist begrenzt."
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Wollen Sie den Schlüssel wirklich benutzen?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Bitte Schlüsselidentifikation eingeben: "
@@ -3525,11 +4149,6 @@ msgstr "Rufe PGP auf..."
 msgid "PGP Key %s."
 msgstr "PGP Schlüssel %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Suche nach Schlüsseln, die auf \"%s\" passen..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3587,7 +4206,7 @@ msgstr "Fehler beim Versuch, die Mailbox zu schreiben!"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d von %d Nachrichten gelesen]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "Server hat Verbindung beendet!"
 
@@ -3617,15 +4236,15 @@ msgstr "Kann Nachrichten nicht auf dem Server belassen."
 msgid "Error connecting to server: %s"
 msgstr "Fehler beim Verbinden mit dem Server: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "Beende Verbindung zum POP-Server..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Überprüfe Nachrichten-Indexe..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Verbindung unterbrochen. Verbindung zum POP-Server wiederherstellen?"
 
@@ -3999,35 +4618,35 @@ msgstr "Nachricht verschickt."
 msgid "Sending in background."
 msgstr "Verschicke im Hintergrund."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Kein boundary-Parameter gefunden! (bitte Bug melden)"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s existiert nicht mehr!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s ist keine normale Datei."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "Konnte %s nicht öffnen."
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Fehler %d beim Versand der Nachricht (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Ausgabe des Auslieferungs-Prozesses"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "Ungültige IDN %s bei der Vorbereitung von Resent-From."
@@ -4142,7 +4761,7 @@ msgstr "Kann OpenSSL-Unterproze
 msgid "No output from OpenSSL..."
 msgstr "Keine Ausgabe von OpenSSL..."
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4150,19 +4769,19 @@ msgstr ""
 "[-- Ende der OpenSSL-Ausgabe --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Fehler: Kann keinen OpenSSL-Unterprozeß erzeugen! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- Die folgenden Daten sind S/MIME-verschlüsselt --]\n"
 
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- Die folgenden Daten sind S/MIME signiert --]\n"
 
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4170,7 +4789,7 @@ msgstr ""
 "\n"
 "[-- Ende der S/MIME-verschlüsselten Daten --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4178,27 +4797,27 @@ msgstr ""
 "\n"
 "[-- Ende der S/MIME signierten Daten --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
 "S/MIME (v)erschl., (s)ign., verschl. (m)it, sign. (a)ls, (b)eides, (k)eins? "
 
-#: smime.c:1936
+#: smime.c:1945
 msgid "eswabfc"
 msgstr "vsmabkc"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, oder (k)ein S/MIME? "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345k"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 "Kann nicht signieren: Kein Schlüssel angegeben. Verwenden Sie \"sign. als\"."
@@ -4223,6 +4842,12 @@ msgstr "Bezugsnachricht ist in dieser begrenzten Sicht nicht sichtbar."
 msgid "Parent message is not available."
 msgstr "Bezugsnachricht ist nicht verfügbar."
 
+#~ msgid "Unexpected response received from server: %s"
+#~ msgstr "Unerwartete Antwort vom Server empfangen: %s"
+
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Kann auf diesem IMAP-Server zu Mailboxen nichts hinzufügen."
+
 #~ msgid "unspecified protocol error"
 #~ msgstr "Nicht spezifizierter Protokollfehler"
 
@@ -4280,9 +4905,6 @@ msgstr "Bezugsnachricht ist nicht verf
 #~ "[-- enthalten und die angegebene externe Quelle existiert nicht mehr. "
 #~ "--]\n"
 
-#~ msgid "%s [%s]\n"
-#~ msgstr "%s [%s]\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "[-- End of PGP output --]\n"
diff --git a/po/el.po b/po/el.po
index d73963f45..9c9fc2e27 100644
--- a/po/el.po
+++ b/po/el.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt-1.5.7i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2005-02-01 00:01GMT+2\n"
 "Last-Translator: Dokianakis Fanis <madf@hellug.gr>\n"
 "Language-Team: Greek <EL@li.org>\n"
@@ -21,30 +21,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "¼íïìá ÷ñÞóôç óôï %s: "
 
 #
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Óõíèçìáôéêü ãéá ôï %s@%s: "
 
 #
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "¸îïäïò"
 
 #
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "ÄéáãñáöÞ"
 
 #
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "ÅðáíáöïñÜ"
 
@@ -55,9 +55,9 @@ msgstr "
 
 #
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "ÂïÞèåéá"
 
@@ -119,211 +119,211 @@ msgid "Alias added."
 msgstr "Ôï øåõäþíõìï ðñïóôÝèçêå."
 
 #
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Áäõíáìßá ôáéñéÜóìáôïò ôïõ nametemplate, óõíÝ÷åéá;"
 
 #
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Ç êáôá÷þñçóç óôïé÷åßùí ôïõ mailcap ÷ñåéÜæåôáé ôï %%s"
 
 #
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "ÓöÜëìá êáôÜ ôçí åêôÝëåóç ôïõ \"%s\"!"
 
 #
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Áðïôõ÷ßá êáôÜ ôï Üíïéãìá áñ÷åßïõ ãéá ôçí áíÜëõóç ôùí åðéêåöáëßäùí."
 
 #
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Áðïôõ÷ßá êáôÜ ôï Üíïéãìá áñ÷åßïõ ãéá ôçí áðïãýìíùóç ôùí åðéêåöáëßäùí"
 
 #
-#: attach.c:183
+#: attach.c:184
 msgid "Failure to rename file."
 msgstr "Áðïôõ÷ßá ìåôïíïìáóßáò áñ÷åßïõ."
 
 #
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "Êáììßá êáôá÷þñçóç mailcap ãéá ôï %s, äçìéïõñãßá êåíïý áñ÷åßïõ."
 
 #
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Ç êáôá÷þñçóç mailcap Edit ÷ñåéÜæåôáé ôï %%s"
 
 #
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Äåí õðÜñ÷åé êáôá÷þñçóç mailcap ãéá åðåîåñãáóßá êåéìÝíïõ ãéá ôï %s"
 
 #
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Äåí âñÝèçêå üìïéá êáôá÷þñçóç Mailcap. Áðåéêüíéóç ùò êåßìåíï."
 
 #
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Ï ôýðïò MIME äåí Ý÷åé ïñéóôåß. Áäõíáìßá åìöÜíéóçò ðñïóáñôÞóåùò."
 
 #
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Áäõíáìßá äçìéïõñãßáò ößëôñïõ"
 
 #
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Áäõíáìßá äçìéïõñãßáò ößëôñïõ"
 
 #
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "ÓöÜëìá åããñáöÞò!"
 
 #
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Äåí ãíùñßæù ðþò íá ôï ôõðþóù áõôü!"
 
 #
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "ÁëëáãÞ êáôáëüãïõ"
 
 #
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "ÌÜóêá"
 
 #
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "Ôï %s äåí åßíáé êáôÜëïãïò."
 
 #
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Ãñáììáôïêéâþôéá [%d]"
 
 #
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "ÅããåãñáììÝíá [%s], ÌÜóêá áñ÷åßïõ: %s"
 
 #
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "ÊáôÜëïãïò [%s], ÌÜóêá áñ÷åßïõ: %s"
 
 #
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Áäõíáìßá ðñïóÜñôçóçò åíüò êáôÜëïãïõ"
 
 #
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "ÊáíÝíá áñ÷åßï äåí ôáéñéÜæåé ìå ôç ìÜóêá áñ÷åßïõ"
 
 #
 # recvattach.c:1065
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Ç äçìéïõñãßá õðïóôçñßæåôáé ìüíï ãéá ôá ãñáììáôïêéâþôéá IMAP"
 
 #
 # recvattach.c:1065
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Ç äçìéïõñãßá õðïóôçñßæåôáé ìüíï ãéá ôá ãñáììáôïêéâþôéá IMAP"
 
 #
 # recvattach.c:1065
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Ç äéáãñáöÞ õðïóôçñßæåôáé ìüíï ãéá ôá ãñáììáôïêéâþôéá IMAP"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "ÄéáãñáöÞ ôïõ ãñáììáôïêéâùôßïõ \"%s\";"
 
 #
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Ôï ãñáììáôïêéâþôéï äéáãñÜöçêå."
 
 #
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "Ôï ãñáììáôïêéâþôéï äåí äéáãñÜöçêå."
 
 #
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "ÁëëáãÞ êáôáëüãïõ óå:"
 
 #
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "ÓöÜëìá êáôÜ ôç äéåñåýíçóç ôïõ êáôáëüãïõ."
 
 #
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "ÌÜóêá áñ÷åßïõ: "
 
 #
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "ÁíÜóôñïöç ôáîéíüìçóç êáôÜ (d)çìåñïìçíßá, (a)áëöáâçôéêÜ, (z)ìÝãåèïò Þ (n)"
 "Üêõñï;"
 
 #
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Ôáîéíüìçóç êáôÜ (d)çìåñïìçíßá, (a)áëöáâçôéêÜ, (z)ìÝãåèïò Þ (n)Üêõñï;"
 
 #
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "dazn"
 
 #
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "ÍÝï üíïìá áñ÷åßïõ: "
 
 #
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Áäõíáìßá áíÜãíùóçò åíüò êáôÜëïãïõ"
 
 #
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "ÓöÜëìá êáôÜ ôçí åìöÜíéóç áñ÷åßïõ"
 
@@ -406,7 +406,7 @@ msgid "Verify PGP signature?"
 msgstr "Åðéâåâáßùóç ôçò PGP øçöéáêÞò õðïãñáöÞò;"
 
 #
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý áñ÷åßïõ!"
 
@@ -420,134 +420,134 @@ msgstr "
 msgid "Could not copy message"
 msgstr "Áäõíáìßá áíôéãñáöÞò ôïõ ìçíýìáôïò."
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "Ç õðïãñáöÞ S/MIME åðáëçèåýôçêå åðéôõ÷þò."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "Ï éäéïêôÞôçò ôïõ ðéóôïðïéçôéêïý S/MIME äåí ôáéñéÜæåé ìå ôïí áðïóôïëÝá."
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr "Ðñïåéäïðïßçóç: ÔìÞìá áõôïý ôïõ ìçíýìáôïò äåí åßíáé õðïãåãñáììÝíï."
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "Ç õðïãñáöÞ S/MIME ÄÅÍ åðáëçèåýôçêå."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "Ç õðïãñáöÞ PGP åðáëçèåýôçêå åðéôõ÷þò."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "Ç õðïãñáöÞ PGP ÄÅÍ åðáëçèåýôçêå."
 
 #
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "ÅíôïëÞ: "
 
 #
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Äéáâßâáóç ìçíýìáôïò óôïí: "
 
 #
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Äéáâßâáóç óçìåéùìÝíùí ìçíõìÜôùí óôïí: "
 
 #
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "ÓöÜëìá êáôÜ ôçí áíÜëõóç ôçò äéåýèõíóçò!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "ËáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN: '%s'"
 
 #
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Äéáâßâáóç ìçíýìáôïò óôïí %s"
 
 #
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Äéáâßâáóç ìçíõìÜôùí óôïí %s"
 
 #
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "Ôï ìÞíõìá äåí äéáâéâÜóôçêå."
 
 #
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "Ôá ìçíýìáôá äåí äéáâéâÜóôçêáí."
 
 #
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Ôï ìÞíõìá äéáâéâÜóôçêå."
 
 #
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Ôá ìçíýìáôá äéáâéâÜóôçêáí."
 
 #
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "Áäõíáìßá äçìéïõñãßáò äéåñãáóßáò ößëôñïõ"
 
 #
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Äéï÷Ýôåõóç óôçí åíôïëÞ: "
 
 #
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Äåí Ý÷åé ïñéóôåß åíôïëÞ åêôõðþóåùò."
 
 #
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Åêôýðùóç ìçíýìáôïò;"
 
 #
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Åêôýðùóç ôùí óçìåéùìÝíùí ìçíõìÜôùí;"
 
 #
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Ôï ìÞíõìá åêôõðþèçêå"
 
 #
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Ôá ìçíýìáôá åêôõðþèçêáí"
 
 #
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "Áäõíáìßá åêôýðùóçò ìçíýìáôïò"
 
 #
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Áäõíáìßá åêôýðùóçò ìçíõìÜôùí"
 
 #
-#: commands.c:508
+#: commands.c:509
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
@@ -556,7 +556,7 @@ msgstr ""
 "(p)am;: "
 
 #
-#: commands.c:509
+#: commands.c:510
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
@@ -565,83 +565,83 @@ msgstr ""
 "am;: "
 
 #
-#: commands.c:510
+#: commands.c:511
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzcp"
 
 #
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "ÅíôïëÞ öëïéïý: "
 
 #
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Áðïêùäéêïðïßçóç-áðïèÞêåõóç%s óôï ãñáììáôïêéâþôéï"
 
 #
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Áðïêùäéêïðïßçóç-áíôéãñáöÞ%s óôï ãñáììáôïêéâþôéï"
 
 #
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "ÁðïêñõðôïãñÜöçóç-áðïèÞêåõóç%s óôï ãñáììáôïêéâþôéï"
 
 #
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "ÁðïêñõðôïãñÜöçóç-áíôéãñáöÞ%s óôï ãñáììáôïêéâþôéï"
 
 #
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "ÁðïèÞêåõóç%s óôï ãñáììáôïêéâþôéï"
 
 #
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "ÁíôéãñáöÞ%s óôï ãñáììáôïêéâþôéï"
 
 #
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " óçìåéùìÝíï"
 
 #
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "ÁíôéãñáöÞ óôï %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "ÌåôáôñïðÞ óå %s êáôÜ ôç ìåôáöïñÜ;"
 
 #
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Ôï Content-Type Üëëáîå óå %s."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Ôï óåô ÷áñáêôÞñùí Üëëáîå óå %s; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "ü÷é ìåôáôñïðÞ"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "ìåôáôñïðÞ"
 
@@ -694,181 +694,833 @@ msgid "Clear"
 msgstr "ÁðåíåñãïðïéçìÝíï"
 
 #
-#: compose.c:145
-msgid " (inline)"
-msgstr "(åóùôåñéêü êåßìåíï)"
+#: compose.c:145
+msgid " (inline)"
+msgstr "(åóùôåñéêü êåßìåíï)"
+
+#: compose.c:147
+msgid " (PGP/MIME)"
+msgstr " (PGP/MIME)"
+
+#
+#: compose.c:155 compose.c:159
+msgid " sign as: "
+msgstr " õðïãñáöÞ ùò: "
+
+#
+# compose.c:116
+#: compose.c:155 compose.c:159
+msgid "<default>"
+msgstr "<åî'ïñéóìïý>"
+
+#
+# compose.c:105
+#: compose.c:167
+msgid "Encrypt with: "
+msgstr "ÊñõðôïãñÜöçóç ìå: "
+
+#
+#: compose.c:221
+#, c-format
+msgid "%s [#%d] no longer exists!"
+msgstr "Ôï %s [#%d] äåí õðÜñ÷åé ðéá!"
+
+#
+#: compose.c:229
+#, c-format
+msgid "%s [#%d] modified. Update encoding?"
+msgstr "Ôï %s [#%d] ìåôáâëÞèçêå. ÅíçìÝñùóç ôçò êùäéêïðïßçóçò;"
+
+#
+#: compose.c:272
+msgid "-- Attachments"
+msgstr "-- ÐñïóáñôÞóåéò"
+
+#: compose.c:302
+#, c-format
+msgid "Warning: '%s' is a bad IDN."
+msgstr "Ðñïåéäïðïßçóç: '%s' åßíáé ëáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN."
+
+#
+#: compose.c:325
+msgid "You may not delete the only attachment."
+msgstr "Äåí ìðïñåßôå íá äéáãñÜøåôå ôç ìïíáäéêÞ ðñïóÜñôçóç."
+
+#: compose.c:601 send.c:1486
+#, c-format
+msgid "Bad IDN in \"%s\": '%s'"
+msgstr "ËáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN óôï \"%s\": '%s'"
+
+#: compose.c:684
+msgid "Attaching selected files..."
+msgstr "ÐñïóÜñôçóç åðéëåãìÝíùí áñ÷åßùí..."
+
+#
+#: compose.c:696
+#, c-format
+msgid "Unable to attach %s!"
+msgstr "Áäõíáìßá ðñïóÜñôçóçò ôïõ %s!"
+
+#
+#: compose.c:715
+msgid "Open mailbox to attach message from"
+msgstr "¶íïéãìá ãñáììáôïêéâùôßïõ ãéá ôçí ðñïóÜñôçóç ìçíýìáôïò áðü"
+
+#
+#: compose.c:753
+msgid "No messages in that folder."
+msgstr "Äåí õðÜñ÷ïõí ìçíýìáôá óå áõôü ôï öÜêåëï."
+
+#
+#: compose.c:762
+msgid "Tag the messages you want to attach!"
+msgstr "Óçìåéþóôå ôá ìçíýìáôá ðïõ èÝëåôå íá ðñïóáñôÞóåôå!"
+
+#
+#: compose.c:794
+msgid "Unable to attach!"
+msgstr "Áäõíáìßá ðñïóÜñôçóçò!"
+
+#: compose.c:845
+msgid "Recoding only affects text attachments."
+msgstr "Ç åðáíáêùäéêïðïßçóç åðçñåÜæåé ìüíï ôçò ðñïóáñôÞóåéò êåéìÝíïõ."
+
+#: compose.c:850
+msgid "The current attachment won't be converted."
+msgstr "Ç ôñÝ÷ïõóá ðñïóÜñôçóç äåí èá ìåôáôñáðåß."
+
+#: compose.c:852
+msgid "The current attachment will be converted."
+msgstr "Ç ôñÝ÷ïõóá ðñïóÜñôçóç èá ìåôáôñáðåß."
+
+#
+#: compose.c:927
+msgid "Invalid encoding."
+msgstr "Ìç Ýãêõñç êùäéêïðïßçóç."
+
+#
+#: compose.c:953
+msgid "Save a copy of this message?"
+msgstr "ÁðïèÞêåõóç áíôéãñÜöïõ ôïõ ìçíýìáôïò;"
+
+#
+#: compose.c:1009
+msgid "Rename to: "
+msgstr "Ìåôïíïìáóßá óå: "
+
+#
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
+#, c-format
+msgid "Can't stat %s: %s"
+msgstr "Áäõíáìßá ëÞøçò ôçò êáôÜóôáóçò ôïõ %s: %s"
+
+#
+#: compose.c:1041
+msgid "New file: "
+msgstr "ÍÝï áñ÷åßï: "
+
+#
+#: compose.c:1054
+msgid "Content-Type is of the form base/sub"
+msgstr "Ôï Content-Type åßíáé ôçò ìïñöÞò base/sub"
+
+#
+#: compose.c:1060
+#, c-format
+msgid "Unknown Content-Type %s"
+msgstr "¶ãíùóôï Content-Type %s"
+
+#
+#: compose.c:1073
+#, c-format
+msgid "Can't create file %s"
+msgstr "Áäõíáìßá äçìéïõñãßáò áñ÷åßïõ %s"
+
+#
+#: compose.c:1081
+msgid "What we have here is a failure to make an attachment"
+msgstr "Áðïôõ÷ßá êáôÜ ôçí äçìéïõñãßá ðñïóÜñôçóçò"
+
+#
+#: compose.c:1142
+msgid "Postpone this message?"
+msgstr "Íá áíáâëçèåß ç ôá÷õäñüìçóç áõôïý ôïõ ìçíýìáôïò;"
+
+#
+#: compose.c:1201
+msgid "Write message to mailbox"
+msgstr "ÅããñáöÞ ôïõò ìçíýìáôïò óôï ãñáììáôïêéâþôéï"
+
+#
+#: compose.c:1204
+#, c-format
+msgid "Writing message to %s ..."
+msgstr "ÅããñáöÞ ìçíýìáôïò óôï %s ..."
+
+#
+#: compose.c:1213
+msgid "Message written."
+msgstr "Ôï ìÞíõìá ãñÜöôçêå."
+
+#: compose.c:1225
+msgid "S/MIME already selected. Clear & continue ? "
+msgstr "Ôï S/MIME åß÷å Þäç åðéëåãåß. Êáèáñéóìüò Þ óõíÝ÷åéá ; "
+
+#: compose.c:1251
+msgid "PGP already selected. Clear & continue ? "
+msgstr "Ôï PGP åß÷å Þäç åðéëåãåß. Êáèáñéóìüò Þ óõíÝ÷åéá ; "
+
+#
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+
+#
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+
+#
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+
+#
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+
+#
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+
+#
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+
+#: crypt-gpgme.c:993
+#, fuzzy
+msgid "Warning: One of the keys has been revoked\n"
+msgstr "Ðñïåéäïðïßçóç: ÔìÞìá áõôïý ôïõ ìçíýìáôïò äåí åßíáé õðïãåãñáììÝíï."
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Ôï ðéóôïðïéçôéêü ôïõ äéáêïìéóôÞ Ýëçîå"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "Ôï SSL äåí åßíáé äéáèÝóéìï."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Áðïôýðùìá: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "ÓöÜëìá êáôÜ ôçí áðïóôïëÞ ôïõ ìçíýìáôïò."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "ËÜèïò óôç ãñáììÞ åíôïëþí: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#
+# pgp.c:682
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- ÔÝëïò õðïãåãñáììÝíùí äåäïìÝíùí --]\n"
+
+#
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- ÓöÜëìá: áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý áñ÷åßïõ! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#
+# pgp.c:353
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- ÅÍÁÑÎÇ ÌÇÍÕÌÁÔÏÓ PGP --]\n"
+"\n"
+
+#
+# pgp.c:355
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- ÅÍÁÑÎÇ ÏÌÁÄÁÓ ÄÇÌÏÓÉÙÍ ÊËÅÉÄÉÙÍ PGP --]\n"
+
+#
+# pgp.c:357
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- ÅÍÁÑÎÇ ÕÐÏÃÅÃÑÁÌÌÅÍÏÕ PGP ÌÇÍÕÌÁÔÏÓ --]\n"
+"\n"
+
+#
+# pgp.c:459
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- ÔÅËÏÓ ÌÇÍÕÌÁÔÏÓ PGP --]\n"
+
+#
+# pgp.c:461
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- ÔÅËÏÓ ÏÌÁÄÁÓ ÄÇÌÏÓÉÙÍ ÊËÅÉÄÉÙÍ PGP --]\n"
+
+#
+# pgp.c:463
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- ÔÅËÏÓ ÕÐÏÃÅÃÑÁÌÌÅÍÏÕ PGP ÌÇÍÕÌÁÔÏÓ --]\n"
+
+#
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- ÓöÜëìá: äå ìðüñåóå íá âñåèåß ç áñ÷Þ ôïõ ìçíýìáôïò PGP! --]\n"
+"\n"
+
+#
+# pgp.c:958
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- ÓöÜëìá: êáêïöôéáãìÝíï ìÞíõìá PGP/MIME! --]\n"
+"\n"
+
+#
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- ÓöÜëìá: áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý áñ÷åßïõ! --]\n"
+
+#
+# pgp.c:980
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Ôá åðüìåíá äåäïìÝíá åßíáé êñõðôïãñáöçìÝíá ìÝóù PGP/MIME --]\n"
+"\n"
+
+#
+# pgp.c:980
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Ôá åðüìåíá äåäïìÝíá åßíáé êñõðôïãñáöçìÝíá ìÝóù PGP/MIME --]\n"
+"\n"
+
+#
+# pgp.c:988
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- ÔÝëïò äåäïìÝíùí êñõðôïãñáöçìÝíùí ìÝóù PGP/MIME --]\n"
+
+#
+# pgp.c:988
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- ÔÝëïò äåäïìÝíùí êñõðôïãñáöçìÝíùí ìÝóù PGP/MIME --]\n"
+
+#
+# pgp.c:676
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr "[-- Ôá åðüìåíá äåäïìÝíá åßíáé õðïãåãñáììÝíá ìå S/MIME --]\n"
+
+#
+# pgp.c:980
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr "[-- Ôá åðüìåíá äåäïìÝíá åßíáé êñõðôïãñáöçìÝíá ìÝóù S/MIME --]\n"
+
+#
+# pgp.c:682
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- ÔÝëïò äåäïìÝíùí õðïãåãñáììÝíùí ìå S/MIME --]\n"
+
+#
+# pgp.c:988
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- ÔÝëïò äåäïìÝíùí êñõðôïãñáöçìÝíùí ìÝóù S/MIME --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Ìç Ýãêõñï   "
+
+#
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Ìç Ýãêõñïò ìÞíáò: %s"
+
+#
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Ìç Ýãêõñïò ìÞíáò: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#
+# compose.c:105
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "ÊñõðôïãñÜöçóç"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Ôï ðéóôïðïéçôéêü áðïèçêåýôçêå"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#
+# pgpkey.c:236
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "ID êëåéäéïý: 0x%s"
 
-#: compose.c:147
-msgid " (PGP/MIME)"
-msgstr " (PGP/MIME)"
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "ÁíáêëÞèçêå   "
 
 #
-#: compose.c:155 compose.c:159
-msgid " sign as: "
-msgstr " õðïãñáöÞ ùò: "
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "¸ëçîå   "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
 
 #
-# compose.c:116
-#: compose.c:155 compose.c:159
-msgid "<default>"
-msgstr "<åî'ïñéóìïý>"
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý áñ÷åßïõ"
 
 #
-# compose.c:105
-#: compose.c:167
-msgid "Encrypt with: "
-msgstr "ÊñõðôïãñÜöçóç ìå: "
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Óýíäåóç óôï %s..."
 
 #
-#: compose.c:221
-#, c-format
-msgid "%s [#%d] no longer exists!"
-msgstr "Ôï %s [#%d] äåí õðÜñ÷åé ðéá!"
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "ÓöÜëìá êáôá ôç óýíäåóç óôï äéáêïìéóôÞ: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
 
 #
-#: compose.c:229
+# pgpkey.c:236
+#: crypt-gpgme.c:3248 pgpkey.c:580
 #, c-format
-msgid "%s [#%d] modified. Update encoding?"
-msgstr "Ôï %s [#%d] ìåôáâëÞèçêå. ÅíçìÝñùóç ôçò êùäéêïðïßçóçò;"
+msgid "Key ID: 0x%s"
+msgstr "ID êëåéäéïý: 0x%s"
 
 #
-#: compose.c:272
-msgid "-- Attachments"
-msgstr "-- ÐñïóáñôÞóåéò"
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "SSL áðÝôõ÷å: %s"
 
-#: compose.c:302
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
 #, c-format
-msgid "Warning: '%s' is a bad IDN."
-msgstr "Ðñïåéäïðïßçóç: '%s' åßíáé ëáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN."
-
-#
-#: compose.c:325
-msgid "You may not delete the only attachment."
-msgstr "Äåí ìðïñåßôå íá äéáãñÜøåôå ôç ìïíáäéêÞ ðñïóÜñôçóç."
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
 
-#: compose.c:601 send.c:1486
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
 #, c-format
-msgid "Bad IDN in \"%s\": '%s'"
-msgstr "ËáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN óôï \"%s\": '%s'"
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
 
-#: compose.c:684
-msgid "Attaching selected files..."
-msgstr "ÐñïóÜñôçóç åðéëåãìÝíùí áñ÷åßùí..."
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "¼ëá ôá êëåéäéÜ ðïõ ôáéñéÜæïõí åßíáé ëçãìÝíá, áêõñùìÝíá Þ áíåíåñãÜ."
 
 #
-#: compose.c:695
-#, c-format
-msgid "Unable to attach %s!"
-msgstr "Áäõíáìßá ðñïóÜñôçóçò ôïõ %s!"
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "¸îïäïò "
 
 #
-#: compose.c:714
-msgid "Open mailbox to attach message from"
-msgstr "¶íïéãìá ãñáììáôïêéâùôßïõ ãéá ôçí ðñïóÜñôçóç ìçíýìáôïò áðü"
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "ÄéáëÝîôå "
 
 #
-#: compose.c:752
-msgid "No messages in that folder."
-msgstr "Äåí õðÜñ÷ïõí ìçíýìáôá óå áõôü ôï öÜêåëï."
+# pgpkey.c:178
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "ÅëÝãîôå êëåéäß "
 
 #
-#: compose.c:761
-msgid "Tag the messages you want to attach!"
-msgstr "Óçìåéþóôå ôá ìçíýìáôá ðïõ èÝëåôå íá ðñïóáñôÞóåôå!"
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "¼ìïéá PGP êëåéäéÜ \"%s\"."
 
 #
-#: compose.c:793
-msgid "Unable to attach!"
-msgstr "Áäõíáìßá ðñïóÜñôçóçò!"
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "¼ìïéá PGP êëåéäéÜ \"%s\"."
 
-#: compose.c:842
-msgid "Recoding only affects text attachments."
-msgstr "Ç åðáíáêùäéêïðïßçóç åðçñåÜæåé ìüíï ôçò ðñïóáñôÞóåéò êåéìÝíïõ."
+#
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "¼ìïéá ðéóôïðïéçôéêÜ S/MIME \"%s\"."
 
-#: compose.c:847
-msgid "The current attachment won't be converted."
-msgstr "Ç ôñÝ÷ïõóá ðñïóÜñôçóç äåí èá ìåôáôñáðåß."
+#
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "¼ìïéá PGP êëåéäéÜ \"%s\"."
 
-#: compose.c:849
-msgid "The current attachment will be converted."
-msgstr "Ç ôñÝ÷ïõóá ðñïóÜñôçóç èá ìåôáôñáðåß."
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
 
-#
-#: compose.c:924
-msgid "Invalid encoding."
-msgstr "Ìç Ýãêõñç êùäéêïðïßçóç."
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
 
-#
-#: compose.c:950
-msgid "Save a copy of this message?"
-msgstr "ÁðïèÞêåõóç áíôéãñÜöïõ ôïõ ìçíýìáôïò;"
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr ""
+"Áõôü ôï êëåéäß äåí ìðïñåß íá ÷ñçóéìïðïéçèåß ëçãìÝíï/á÷ñçóôåõìÝíï/Üêõñï."
 
-#
-#: compose.c:1006
-msgid "Rename to: "
-msgstr "Ìåôïíïìáóßá óå: "
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "Ôï ID åßíáé ëçãìÝíï/á÷ñçóôåõìÝíï/Üêõñï."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "Ôï ID Ý÷åé ìç ïñéóìÝíç åãêõñüôçôá."
 
 #
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
-#, c-format
-msgid "Can't stat %s: %s"
-msgstr "Áäõíáìßá ëÞøçò ôçò êáôÜóôáóçò ôïõ %s: %s"
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "Ôï ID äåí åßíáé Ýãêõñï."
 
 #
-#: compose.c:1038
-msgid "New file: "
-msgstr "ÍÝï áñ÷åßï: "
+# pgpkey.c:259
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "Ôï ID åßíáé ìüíï ìåñéêþò Ýãêõñï."
 
 #
-#: compose.c:1051
-msgid "Content-Type is of the form base/sub"
-msgstr "Ôï Content-Type åßíáé ôçò ìïñöÞò base/sub"
+# pgpkey.c:262
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s ÈÝëåôå óßãïõñá íá ÷ñçóéìïðïéÞóåôå ôï êëåéäß;"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Åýñåóç üìïéùí êëåéäéþí ìå \"%s\"..."
 
 #
-#: compose.c:1057
+# pgp.c:1194
+#: crypt-gpgme.c:4002 pgp.c:1149
 #, c-format
-msgid "Unknown Content-Type %s"
-msgstr "¶ãíùóôï Content-Type %s"
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "Íá ÷ñçóéìïðïéçèåß keyID = \"%s\" ãéá ôï %s;"
 
 #
-#: compose.c:1070
+# pgp.c:1200
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
 #, c-format
-msgid "Can't create file %s"
-msgstr "Áäõíáìßá äçìéïõñãßáò áñ÷åßïõ %s"
+msgid "Enter keyID for %s: "
+msgstr "ÅéóÜãåôå keyID ãéá ôï %s: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
 
 #
-#: compose.c:1078
-msgid "What we have here is a failure to make an attachment"
-msgstr "Áðïôõ÷ßá êáôÜ ôçí äçìéïõñãßá ðñïóÜñôçóçò"
+# compose.c:132
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr "PGP (e)êëåßä, (s)õðïãñ, õðïãñ.ó(a)í, (b)êë+õð, %s, Þ (c)ôßðïôá; "
 
 #
-#: compose.c:1139
-msgid "Postpone this message?"
-msgstr "Íá áíáâëçèåß ç ôá÷õäñüìçóç áõôïý ôïõ ìçíýìáôïò;"
+# compose.c:133
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "eswabfc"
 
 #
-#: compose.c:1196
-msgid "Write message to mailbox"
-msgstr "ÅããñáöÞ ôïõò ìçíýìáôïò óôï ãñáììáôïêéâþôéï"
+# compose.c:132
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr "PGP (e)êëåßä, (s)õðïãñ, õðïãñ.ó(a)í, (b)êë+õð, %s, Þ (c)ôßðïôá; "
 
 #
-#: compose.c:1199
-#, c-format
-msgid "Writing message to %s ..."
-msgstr "ÅããñáöÞ ìçíýìáôïò óôï %s ..."
+# compose.c:133
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "eswabfc"
 
 #
-#: compose.c:1208
-msgid "Message written."
-msgstr "Ôï ìÞíõìá ãñÜöôçêå."
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "ÕðïãñáöÞ ùò: "
 
-#: compose.c:1220
-msgid "S/MIME already selected. Clear & continue ? "
-msgstr "Ôï S/MIME åß÷å Þäç åðéëåãåß. Êáèáñéóìüò Þ óõíÝ÷åéá ; "
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
 
-#: compose.c:1246
-msgid "PGP already selected. Clear & continue ? "
-msgstr "Ôï PGP åß÷å Þäç åðéëåãåß. Êáèáñéóìüò Þ óõíÝ÷åéá ; "
+#
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Áðïôõ÷ßá êáôÜ ôï Üíïéãìá áñ÷åßïõ ãéá ôçí áíÜëõóç ôùí åðéêåöáëßäùí."
 
 #: crypt.c:69
 #, c-format
@@ -891,12 +1543,12 @@ msgstr "
 #
 # commands.c:87 commands.c:95 pgp.c:1373 pgpkey.c:220
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "ÊëÞóç ôïõ PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 "Ôï ìÞíõìá äåí ìðïñåß íá óôáëåß ùò åóùôåñéêü êåßìåíï. Íá ÷ñçóéìïðïéçèåß PGP/"
@@ -904,19 +1556,19 @@ msgstr ""
 
 #
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Ôï ãñÜììá äåí åóôÜëç."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "Äåí õðïóôçñßæïíôáé ìçíýìáôá S/MIME ÷ùñßò ðëçñïöïñßåò óôçí åðéêåöáëßäá."
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "ÐñïóðÜèåéá åîáãùãÞò êëåéäéþí PGP...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "ÐñïóðÜèåéá åîáãùãÞò ðéóôïðïéçôéêþí S/MIME...\n"
 
@@ -930,7 +1582,7 @@ msgstr ""
 
 #
 # handler.c:1378
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -939,7 +1591,7 @@ msgstr ""
 "[-- ÓöÜëìá: ¶ãíùóôï ðïëõìåñÝò/õðïãåãñáììÝíï ðñùôüêïëëï %s! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -951,7 +1603,7 @@ msgstr ""
 #
 # pgp.c:676
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -959,7 +1611,7 @@ msgstr ""
 "[-- Ôá åðüìåíá äåäïìÝíá åßíáé õðïãåãñáììÝíá --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -969,7 +1621,7 @@ msgstr ""
 
 #
 # pgp.c:682
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -977,280 +1629,313 @@ msgstr ""
 "\n"
 "[-- ÔÝëïò õðïãåãñáììÝíùí äåäïìÝíùí --]\n"
 
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#
+# commands.c:87 commands.c:95 pgp.c:1373 pgpkey.c:220
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "ÊëÞóç ôïõ PGP..."
+
 #
-#: curs_lib.c:190
+#: curs_lib.c:188
 msgid "yes"
 msgstr "y(íáé)"
 
 #
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "n(ü÷é)"
 
 #
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "¸îïäïò áðü ôï Mutt;"
 
 #
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "Üãíùóôï óöÜëìá"
 
 #
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "ÐáôÞóôå Ýíá ðëÞêôñï ãéá íá óõíå÷ßóåôå..."
 
 #
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr "('?' ãéá ëßóôá): "
 
 #
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Äåí õðÜñ÷ïõí áíïé÷ôÜ ãñáììáôïêéâþôéá."
 
 #
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Äåí õðÜñ÷ïõí ìçíýìáôá."
 
 #
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "Ôï ãñáììáôïêéâþôéï åßíáé ìüíï ãéá áíÜãíùóç."
 
 #
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Ç ëåéôïõñãßá áðáãïñåýåôáé óôçí êáôÜóôáóç ðñïóÜñôçóç-ìçíýìáôïò."
 
 #
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "Äåí õðÜñ÷ïõí ïñáôÜ ìçíýìáôá."
 
 #
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr ""
 "Áäõíáìßá áëëáãÞò óå êáôÜóôáóç åããñáöÞò óå ãñáììáôïêéâþôéï ìüíï ãéá áíÜãíùóç!"
 
 #
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Ïé áëëáãÝò óôï öÜêåëï èá ãñáöïýí êáôÜ ôç Ýîïäï áðü ôï öÜêåëï."
 
 #
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Ïé áëëáãÝò óôï öÜêåëï äåí èá ãñáöïýí."
 
 #
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "¸îïäïò"
 
 #
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "ÁðïèÞê"
 
 #
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Ôá÷õäñ"
 
 #
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "ÁðÜíô"
 
 #
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "ÏìÜäá"
 
 #
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
 "Ôï ãñáììáôïêéâþôéï ôñïðïðïéÞèçêå åîùôåñéêÜ. Ïé óçìáßåò ìðïñåß íá åßíáé ëÜèïò"
 
 #
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "ÍÝá áëëçëïãñáößá óå áõôü ôï ãñáììáôïêéâþôéï."
 
 #
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "Ôï ãñáììáôïêéâþôéï ôñïðïðïéÞèçêå åîùôåñéêÜ."
 
 #
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Äåí õðÜñ÷ïõí óçìåéùìÝíá ìçíýìáôá."
 
 #
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 msgid "Nothing to do."
 msgstr "Êáììßá åíÝñãåéá."
 
 #
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "ÌåôÜâáóç óôï ìÞíõìá: "
 
 #
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "Ç ðáñÜìåôñïò ðñÝðåé íá åßíáé áñéèìüò ìçíýìáôïò."
 
 #
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Áõôü ôï ìÞíõìá äåí åßíáé ïñáôü."
 
 #
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Ìç Ýãêõñïò áñéèìüò ìçíýìáôïò."
 
 #
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "ÄéáãñáöÞ ðáñüìïéùí ìçíõìÜôùí: "
 
 #
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "ÊáíÝíá õðüäåéãìá ïñßùí óå ëåéôïõñãßá."
 
 #
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "¼ñéï: %s"
 
 #
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Ðåñéïñéóìüò óôá ðáñüìïéá ìçíýìáôá: "
 
 #
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "¸îïäïò áðü ôï Mutt;"
 
 #
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Óçìåéþóôå ìçíýìáôá ðïõ ôáéñéÜæïõí óå: "
 
 #
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "ÅðáíáöïñÜ ôá ìçíýìáôá ðïõ ôáéñéÜæïõí óå: "
 
 #
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Áöáßñåóç ôçò óçìåßùóçò óôá ìçíýìáôá ðïõ ôáéñéÜæïõí óå: "
 
 #
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Áíïßîôå ôï ãñáììáôïêéâþôéï óå êáôÜóôáóç ìüíï ãéá åããñáöÞ"
 
 #
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Áíïßîôå ôï ãñáììáôïêéâþôéï"
 
 #
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "Ôï %s äåí åßíáé ãñáììáôïêéâþôéï."
 
 #
-#: curs_main.c:1165
+#: curs_main.c:1176
 msgid "Exit Mutt without saving?"
 msgstr "¸îïäïò áðü ôï Mutt ÷ùñßò áðïèÞêåõóç;"
 
 #
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "Ç ÷ñÞóç óõæçôÞóåùí äåí Ý÷åé åíåñãïðïéçèåß."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "áðïèÞêåõóç áõôïý ôïõ ìçíýìáôïò ãéá ìåôÝðåéôá áðïóôïëÞ"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Åßóôå óôï ôåëåõôáßï ìÞíõìá."
 
 #
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Äåí õðÜñ÷ïõí áðïêáôáóôçìÝíá ìçíýìáôá."
 
 #
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Åßóôå óôï ðñþôï ìÞíõìá."
 
 #
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "ÁíáæÞôçóç óõíå÷ßóôçêå áðü ôçí êïñõöÞ."
 
 #
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "ÁíáæÞôçóç óõíå÷ßóôçêå óôç âÜóç."
 
 #
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Äåí õðÜñ÷ïõí íÝá ìçíýìáôá"
 
 #
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Äåí õðÜñ÷ïõí ìç áíáãíùóìÝíá ìçíýìáôá"
 
 #
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr "óå áõôÞ ôçí ðåñéïñéóìÝíç üøç"
 
 #
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "Áäõíáìßá áëëáãÞò ôçò óçìáßáò 'important' óôï äéáêïìéóôÞ POP."
 
 #
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Äåí õðÜñ÷ïõí Üëëåò óõæçôÞóåéò."
 
 #
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Åßóôå óôçí ðñþôç óõæÞôçóç."
 
 #
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "Ç ÷ñÞóç óõæçôÞóåùí äåí Ý÷åé åíåñãïðïéçèåß."
-
-#
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "Ç óõæÞôçóç ðåñéÝ÷åé ìç áíáãíùóìÝíá ìçíýìáôá."
 
 #
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "Áäõíáìßá åðåîåñãáóßáò ìçíýìáôïò óôï äéáêïìéóôÞ POP."
 
@@ -1403,91 +2088,91 @@ msgid "Clear flag"
 msgstr "Êáèáñßóôå óçìáßá"
 
 #
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- ÓöÜëìá: Áäõíáìßá áðåéêüíéóçò óå üëá ôá ìÝñç ôïõ Multipart/Alternative! "
 "--]\n"
 
 #
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- ÐñïóÜñôçóç #%d"
 
 #
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Ôýðïò: %s/%s, Êùäéêïðïßçóç: %s, ÌÝãåèïò: %s --]\n"
 
 #
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Autoview ÷ñçóéìïðïéþíôáò ôï %s --]\n"
 
 #
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "ÊëÞóç ôçò åíôïëÞò autoview: %s"
 
 #
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Áäõíáìßá åêôÝëåóçò óôéò %s --]\n"
 
 #
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Autoview êáíïíéêÞ Ýîïäïò ôïõ %s --]\n"
 
 #
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- ÓöÜëìá: ôï ìÞíõìá/åîùôåñéêü-óþìá äåí Ý÷åé ðáñÜìåôñï access-type --]\n"
 
 #
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- ÁõôÞ ç %s/%s ðñïóÜñôçóç "
 
 #
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(ìÝãåèïò %s bytes) "
 
 #
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "Ý÷åé äéáãñáöåß --]\n"
 
 #
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- óôéò %s --]\n"
 
 #
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- üíïìá: %s --]\n"
 
 #
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- ÁõôÞ ç %s/%s ðñïóÜñôçóç äåí ðåñéëáìâÜíåôå, --]\n"
 
 #
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
@@ -1496,41 +2181,41 @@ msgstr ""
 "[-- ëÞîåé. --]\n"
 
 #
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- êáé ôï åíäåäåéãìÝíï access-type %s äåí õðïóôçñßæåôáé --]\n"
 
 #
 # handler.c:1378
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "ÓöÜëìá: ôï ðïëõìåñÝò/õðïãåãñáììÝíï äåí Ý÷åé ðñùôüêïëëï"
 
 #
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "ÓöÜëìá: ôï ðïëõìåñÝò/êñõðôïãñáöçìÝíï äåí Ý÷åé ðáñÜìåôñï ðñùôïêüëëïõ!"
 
 #
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Áäõíáìßá áíïßãìáôïò ðñïóùñéíïý áñ÷åßïõ!"
 
 #
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- Ôï %s/%s äåí õðïóôçñßæåôáé "
 
 #
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(÷ñçóéìïðïéÞóôå ôï '%s' ãéá íá äåßôå áõôü ôï ìÝñïò)"
 
 #
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(áðáéôåßôáé ôï 'view-attachments' íá åßíáé óõíäåäåìÝíï ìå ðëÞêôñï!"
 
@@ -1646,54 +2331,54 @@ msgstr "
 msgid "SASL authentication failed."
 msgstr "Áõèåíôéêïðïßçóç SASL áðÝôõ÷å."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s åßíáé ìç Ýãêõñç äéáäñïìÞ IMAP"
 
 #
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "ËÞøç namespaces..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "ËÞøç ëßóôáò öáêÝëùí..."
 
 #
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "Äåí õðÜñ÷åé ôÝôïéïò öÜêåëïò"
 
 #
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Äçìéïõñãßá ãñáììáôïêéâùôßïõ: "
 
 #
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "Ôï ãñáììáôïêéâþôéï ðñÝðåé íá Ý÷åé üíïìá."
 
 #
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Ôï ãñáììáôïêéâþôéï äçìéïõñãÞèçêå."
 
 #
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Äçìéïõñãßá ãñáììáôïêéâùôßïõ: "
 
 #
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "SSL áðÝôõ÷å: %s"
 
 #
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "Ôï ãñáììáôïêéâþôéï äçìéïõñãÞèçêå."
@@ -1707,159 +2392,155 @@ msgstr "
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Ìïéñáßï óöÜëìá. Ï áñéèìüò ôùí ìçíõìÜôùí äåí åßíáé óå óõìöùíßá!"
 
 #
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Êëåßóéìï óýíäåóçò óôï óôï %s..."
 
 #
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr ""
 "Áõôüò ï åîõðçñåôçôÞò IMAP åßíáé áñ÷áßïò. Ôï Mutt äåí åßíáé óõìâáôü ìå áõôüí."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
-msgstr "ÅëÞöèç áðñïóäüêçôç áðÜíôçóç áðü ôï äéáêïìéóôÞ: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
+msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "ÁóöáëÞò óýíäåóç ìå TLS;"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "Áäõíáìßá äéáðñáãìÜôåõóçò óýíäåóçò TLS"
 
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
 #
-#: imap/imap.c:590
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "ÅðéëïãÞ %s..."
 
 #
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "ÓöÜëìá êáôÜ  ôï Üíïéãìá ôïõ ãñáììáôïêéâùôßïõ"
 
 #
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Áäõíáìßá óôçí ðñïóèÞêç óôá ãñáìì/ôéá IMAP óå áõôüí ôïí åîõðçñåôçôÞ"
-
-#
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "Äçìéïõñãßá ôïõ %s;"
 
 #
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Óçìåßùóç %d äéáãñáöÝíôùí ìçíõìÜôùí..."
 
 #
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "ÄéáãñáöÞ áðÝôõ÷å"
 
 #
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "ÁðïèÞêåõóç óçìáéþí êáôÜóôáóçò ìçíýìáôïò... [%d/%d]"
 
 #
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "ÄéáãñáöÞ ìçíõìÜôùí áðü ôïí åîõðçñåôçôÞ..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE áðÝôõ÷å"
 
 #
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "CLOSE áðÝôõ÷å"
 
 #
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "Êáêü üíïìá ãñáììáôïêéâùôßïõ"
 
 #
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "ÅããñáöÞ óôï %s..."
 
 #
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "ÄéáãñáöÞ óôï %s..."
 
 #
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Áäõíáìßá ëÞøçò åðéêåöáëßäùí áðü áõôÞ ôçí Ýêäïóç ôïõ åîõðçñåôçôÞ IMAP."
 
 #
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý áñ÷åßïõ %s"
 
 #
-#: imap/message.c:134
+#: imap/message.c:128
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "¸ëåã÷ïò ðñïóùñéíÞò ìíÞìçò... [%d/%d]"
 
 #
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "ËÞøç åðéêåöáëßäùí áðü ôá ìçíýìáôá... [%d/%d]"
 
 #
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "ËÞøç ìçíýìáôïò..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "Ï äåßêôçò ôïõ ìçíýìáôïò åßíáé Üêõñïò. Îáíáíïßîôå ôï ãñáììáôïêéâþôéï."
 
 #
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "ÁíÝâáóìá ìçíýìáôïò ..."
 
 #
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "ÁíôéãñáöÞ %d ìçíõìÜôùí óôï %s..."
 
 #
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "ÁíôéãñáöÞ ìçíýìáôïò %d óôï %s ..."
 
 #
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "ÓõíÝ÷åéá;"
 
@@ -1869,145 +2550,145 @@ msgid "Bad regexp: %s"
 msgstr "ëáíèáóìÝíç êáíïíéêÞ Ýêöñáóç: %s"
 
 #
-#: init.c:678
+#: init.c:644
 msgid "spam: no matching pattern"
 msgstr "spam: äåí õðÜñ÷åé ìïíôÝëï ðïõ íá ôáéñéÜæåé"
 
 #
-#: init.c:680
+#: init.c:646
 msgid "nospam: no matching pattern"
 msgstr "nospam: äåí õðÜñ÷åé ìïíôÝëï ðïõ íá ôáéñéÜæåé"
 
 #
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "øåõäþíõìï: êáììßá äéåýèõíóç"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 "Ðñïåéäïðïßçóç: ËáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN '%s' óôï øåõäþíõìï '%s'.\n"
 
 #
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "ìç Ýãêõñï ðåäßï åðéêåöáëßäáò"
 
 #
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: Üãíùóôç ìÝèïäïò ôáîéíüìçóçò"
 
 #
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): ëÜèïò óôï regexp: %s\n"
 
 #
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: Üãíùóôç ìåôáâëçôÞ"
 
 #
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "ôï ðñüèåìá åßíáé Üêõñï ìå ôçí åðáíáöïñÜ"
 
 #
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "ç ôéìÞ åßíáé Üêõñç ìå ôçí åðáíáöïñÜ"
 
 #
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "Ôï %s Ý÷åé ôåèåß"
 
 #
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "Ôï %s äåí Ý÷åé ôåèåß"
 
 #
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: ìç Ýãêõñïò ôýðïò ãñáììáôïêéâùôßïõ"
 
 #
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: ìç Ýãêõñç ôéìÞ"
 
 #
-#: init.c:1589
+#: init.c:1555
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: Üãíùóôïò ôýðïò."
 
 #
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: Üãíùóôïò ôýðïò"
 
 #
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "ÓöÜëìá óôï %s, ãñáììÞ %d: %s"
 
 #
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: ëÜèç óôï %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "ðçãÞ: áðüññéøç áíÜãíùóçò ëüãù ðïëëþí óöáëìÜôùí óôï %s"
 
 #
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: ëÜèïò óôï %s"
 
 #
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: ðÜñá ðïëëÜ ïñßóìáôá"
 
 #
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: Üãíùóôç åíôïëÞ"
 
 #
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "ËÜèïò óôç ãñáììÞ åíôïëþí: %s\n"
 
 #
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "áäõíáìßá óôïí åíôïðéóìü ôïõ êáôáëüãïõ ÷ñÞóôç (home directory)"
 
 #
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "áäõíáìßá óôïí åíôïðéóìü ôïõ ïíüìáôïò ÷ñÞóôç"
 
@@ -2565,499 +3246,509 @@ msgstr "
 msgid "compose a new mail message"
 msgstr "óýíèåóç åíüò íÝïõ ìçíýìáôïò"
 
-#
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "Üíïéãìá åíüò äéáöïñåôéêïý öáêÝëïõ"
 
 #
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "Üíïéãìá åíüò äéáöïñåôéêïý öáêÝëïõ óå êáôÜóôáóç ìüíï-áíÜãíùóçò"
 
 #
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "êáèáñéóìüò ôçò óçìáßáò êáôÜóôáóçò áðü ôï ìÞíõìá"
 
 #
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "äéáãñáöÞ ôùí ìçíõìÜôùí ðïõ ôáéñéÜæïõí óå Ýíá ìïíôÝëï/ìïñöÞ"
 
 #
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "åîáíáãêáóìÝíç ðáñáëáâÞ áëëçëïãñáößáò áðü ôï åîõðçñåôçôÞ IMAP"
 
 #
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "ðáñáëáâÞ áëëçëïãñáößáò áðü ôï åîõðçñåôçôÞ POP"
 
 #
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "ìåôáêßíçóç óôï ðñþôï ìÞíõìá"
 
 #
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "ìåôáêßíçóç óôï ôåëåõôáßï ìÞíõìá"
 
 #
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "åìöÜíéóç ìüíï ôùí ìçíõìÜôùí ðïõ ôáéñéÜæïõí óå Ýíá ìïíôÝëï/ìïñöÞ"
 
 #
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Äéáâßâáóç óçìåéùìÝíùí ìçíõìÜôùí óôïí: "
+
+#
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "ìåôÜâáóç óôï åðüìåíï íÝï ìÞíõìá"
 
 #
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "ìåôÜâáóç óôï åðüìåíï íÝï Þ ìç áíáãíùóìÝíï ìÞíõìá"
 
 #
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "ìåôÜâáóç óôï åðüìåíï èÝìá ôçò äåõôåñåýïõóáò óõæÞôçóçò"
 
 #
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "ìåôÜâáóç óôçí åðüìåíç óõæÞôçóç"
 
 #
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "ìåôáêßíçóç óôï åðüìåíï áðïêáôáóôçìÝíï ìÞíõìá"
 
 #
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "ìåôÜâáóç óôï åðüìåíï ìç áíáãíùóìÝíï ìÞíõìá"
 
 #
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "ìåôÜâáóç óôï ôñÝ÷ïí ìÞíõìá ôçò óõæÞôçóçò"
 
 #
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "ìåôÜâáóç óôçí ðñïçãïýìåíç óõæÞôçóç"
 
 #
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "ìåôÜâáóç óôçí ðñïçãïýìåíç äåõôåñåýïõóá óõæÞôçóç"
 
 #
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "ìåôáêßíçóç óôï ðñïçãïýìåíï áðïêáôáóôçìÝíï ìÞíõìá"
 
 #
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "ìåôÜâáóç óôï ðñïçãïýìåíï íÝï ìÞíõìá"
 
 #
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "ìåôÜâáóç óôï ðñïçãïýìåíï íÝï Þ ìç áíáãíùóìÝíï ìÞíõìá"
 
 #
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "ìåôÜâáóç óôï ðñïçãïýìåíï ìç áíáãíùóìÝíï ìÞíõìá"
 
 #
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "óçìåßùóç ôçò ôñÝ÷ïõóáò óõæÞôçóçò ùò áíáãíùóìÝíç"
 
 #
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "óçìåßùóç ôçò ôñÝ÷ïõóáò õðïóõæÞôçóçò ùò áíáãíùóìÝíç"
 
 #
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "ïñéóìüò ôçò óçìáßáò êáôÜóôáóçò óå Ýíá ìÞíõìá"
 
 #
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "áðïèÞêåõóç ôùí áëëáãþí óôï ãñáììáôïêéâþôéï"
 
 #
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "óçìåßùóç ôùí ìçíõìÜôùí ðïõ ôáéñéÜæïõí ìå ìéá ìïñöÞ/ìïíôÝëï"
 
 #
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr ""
 "áðïêáôÜóôáóç (undelete) ôùí ìçíõìÜôùí ðïõ ôáéñéÜæïõí ìå ìßá ìïñöÞ/ìïíôÝëï"
 
 #
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr ""
 "áöáßñåóç ôçò óçìåßùóçò áðü ôá ìçíýìáôá ðïõ ôáéñéÜæïõí ìå ìßá ìïñöÞ/ìïíôÝëï"
 
 #
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "ìåôáêßíçóç óôï ìÝóï ôçò óåëßäáò"
 
 #
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "ìåôáêßíçóç óôçí åðüìåíç êáôá÷þñçóç"
 
 #
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "ìåôáêßíçóç ìéá ãñáììÞ ðñïò ôá êÜôù"
 
 #
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "ìåôáêßíçóç óôçí åðüìåíç óåëßäá"
 
 #
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "ìåôÜâáóç óôç âÜóç ôïõ ìçíýìáôïò"
 
 #
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "åðéëïãÞ ôçò åìöÜíéóçò ôïõ quoted êåéìÝíïõ"
 
 #
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "ðñïóðÝñáóç ðÝñá áðü ôï quoted êåßìåíï"
 
 #
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "ìåôÜâáóç óôçí áñ÷Þ ôïõ ìçíýìáôïò"
 
 #
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "äéï÷Ýôåõóç ôïõ ìçíýìáôïò/ðñïóÜñôçóçò óå ìéá åíôïëÞ öëïéïý"
 
 #
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "ìåôáêßíçóç óôçí ðñïçãïýìåíç êáôá÷þñçóç"
 
 #
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "ìåôáêßíçóç ìéá ãñáììÞ ðñïò ôá ðÜíù"
 
 #
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "ìåôáêßíçóç óôçí ðñïçãïýìåíç óåëßäá"
 
 #
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "åêôýðùóç ôçò ôñÝ÷ïõóáò êáôá÷þñçóçò"
 
 #
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "åñþôçóç åíüò åîùôåñéêïý ðñïãñÜììáôïò ãéá äéåõèýíóåéò"
 
 #
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "ðñüóèåóç ôùí íÝùí áðïôåëåóìÜôùí ôçò åñþôçóçò óôá ôñÝ÷ïíôá"
 
 #
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "áðïèÞêåõóç ôùí áëëáãþí óôï ãñáììáôïêéâþôéï êáé åãêáôÜëåéøç"
 
 #
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "åðáíÜêëçóç åíüò áíáâëçèÝíôïò ìçíýìáôïò"
 
 #
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "êáèáñéóìüò êáé áíáíÝùóç ôçò ïèüíçò"
 
 #
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{åóùôåñéêü}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "åããñáöÞ óôï ôñÝ÷ïí ãñáììáôïêéâþôéï (IMAP ìüíï)"
 
 #
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "áðÜíôçóç óå Ýíá ìÞíõìá"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "÷ñçóéìïðïßçóç ôïõ ôñÝ÷ïíôïò ìçíýìáôïò ùò ó÷åäßïõ ãéá Ýíá íÝï"
 
 #
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "áðïèÞêåõóç ìçíýìáôïò/ðñïóÜñôçóçò óå Ýíá áñ÷åßï"
 
 #
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "áíáæÞôçóç ìéáò êáíïíéêÞò Ýêöñáóçò"
 
 #
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "áíáæÞôçóç ìéáò êáíïíéêÞò Ýêöñáóçò ðñïò ôá ðßóù"
 
 #
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "áíáæÞôçóç ãéá åðüìåíï ôáßñéáóìá"
 
 #
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "áíáæÞôçóç ôïõ åðüìåíïõ ôáéñéÜóìáôïò ðñïò ôçí áíôßèåôç êáôåýèõíóç"
 
 #
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "åðéëïãÞ ôïõ ÷ñùìáôéóìïý ôùí áðïôåëåóìÜôùí áíáæÞôçóçò"
 
 #
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "êëÞóç ìéáò åíôïëÞò óå Ýíá äåõôåñåýùí öëïéü"
 
 #
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "ôáîéíüìçóç ôùí ìçíõìÜôùí"
 
 #
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "ôáîéíüìçóç ôùí ìçíõìÜôùí óå áíÜóôñïöç óåéñÜ"
 
 #
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "óçìåßùóç ôçò ôñÝ÷ïõóáò êáôá÷þñçóçò"
 
 #
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "åöáñìïãÞ ôçò åðüìåíçò ëåéôïõñãßáò óôá óçìåéùìÝíá ìçíýìáôá"
 
 #
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 msgid "apply next function ONLY to tagged messages"
 msgstr "åöáñìïãÞ ôçò åðüìåíçò ëåéôïõñãßáò ÌÏÍÏ óôá óçìåéùìÝíá ìçíýìáôá"
 
 #
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "óçìåßùóç ôçò ôñÝ÷ïõóáò äåõôåñåýïõóáò óõæÞôçóçò"
 
 #
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "óçìåßùóç ôçò ôñÝ÷ïõóáò óõæÞôçóçò"
 
 #
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "åðéëïãÞ ôçò 'íÝáò' óçìáßáò ìçíýìáôïò"
 
 #
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "åðéëïãÞ åÜí ôï ãñáììáôïêéâþôéï èá îáíáãñáöåß"
 
 #
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "åðéëïãÞ ãéá ðåñéÞãçóç óôá ãñáììáôïêéâþôéá Þ óå üëá ôá áñ÷åßá"
 
 #
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "ìåôáêßíçóç óôçí áñ÷Þ ôçò óåëßäáò"
 
 #
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "áðïêáôÜóôáóç ôçò ôñÝ÷ïõóáò êáôá÷þñçóçò"
 
 #
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "áðïêáôÜóôáóç üëùí ôùí ìçíõìÜôùí óôç óõæÞôçóç"
 
 #
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "áðïêáôÜóôáóç üëùí ôùí ìçíõìÜôùí óôç äåõôåñåýïõóá óõæÞôçóç"
 
 #
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "åìöÜíéóç ôïõ áñéèìïý Ýêäïóçò ôïõ Mutt êáé ôçí çìåñïìçíßá"
 
 #
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr ""
 "åìöÜíéóç ðñïóÜñôçóçò ÷ñçóéìïðïéþíôáò åÜí ÷ñåéÜæåôáé ôçí êáôá÷þñçóç mailcap"
 
 #
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "åìöÜíéóç ôùí ðñïóáñôÞóåùí MIME"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "åìöÜíéóç êùäéêïý ðëçêôñïëïãßïõ ãéá ðáôçèÝí ðëÞêôñï"
 
 #
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "åìöÜíéóç ôçò åíåñãÞò ìïñöÞò ôùí ïñßùí"
 
 #
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "ìÜæåìá/Üðëùìá ôçò ôñÝ÷ïõóáò óõæÞôçóçò"
 
 #
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "ìÜæåìá/Üðëùìá üëùí ôùí óõæçôÞóåùí"
 
 #
 # keymap_defs.h:158
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "ðñïóÜñôçóç ôïõ äçìüóéïõ êëåéäéïý PGP"
 
 #
 # keymap_defs.h:159
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "åìöÜíéóç ôùí åðéëïãþí PGP"
 
 #
 # keymap_defs.h:162
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "ôá÷õäñüìçóç äçìüóéïõ êëåéäéïý PGP"
 
 #
 # keymap_defs.h:163
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "åðéâåâáßùóç åíüò äçìüóéïõ êëåéäéïý PGP"
 
 #
 # keymap_defs.h:164
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "åìöÜíéóç ôïõ éäéïêôÞôç ôïõ êëåéäéïý"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "Ýëåã÷ïò ãéá ôï êëáóóéêü pgp"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Áðïäï÷Þ ôçò êáôáóêåõáóìÝíçò áëõóßäáò"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "ÐñïóÜñôçóç åíüò åðáíáðïóôïëÝá óôçí áëõóßäá"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "ÐñïóèÞêç åíüò åðáíáðïóôïëÝá óôçí áëõóßäá"
 
 #
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "ÄéáãñáöÞ åíüò åðáíáðïóôïëÝá áðü ôçí áëõóßäá"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "ÅðéëïãÞ ôïõ ðñïçãïýìåíïõ óôïé÷åßïõ ôçò áëõóßäáò"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "ÅðéëïãÞ ôïõ åðüìåíïõ óôïé÷åßïõ ôçò áëõóßäáò"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "áðïóôïëÞ ôïõ ìçíýìáôïò ìÝóù ìéáò áëõóßäáò åðáíáðïóôïëÝùí Mixmaster"
 
 #
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "äçìéïõñãßá áðïêñõðôïãñáöçìÝíïõ áíôéãñÜöïõ êáé äéáãñáöÞ"
 
 #
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "äçìéïõñãßá áðïêñõðôïãñáöçìÝíïõ áíôéãñÜöïõ"
 
 #
 # keymap_defs.h:161
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "åîáöÜíéóç ôçò öñÜóçò(-åùí) êëåéäß áðü ôç ìíÞìç"
 
 #
 # keymap_defs.h:160
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "åîáãùãÞ ôùí äçìüóéùí êëåéäéþí ðïõ õðïóôçñßæïíôáé"
 
 #
 # keymap_defs.h:159
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "åìöÜíéóç ôùí åðéëïãþí S/MIME"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr "Õðåñ÷åßëéóç áêåñáßïõ -- áäõíáìßá åê÷þñçóçò ìíÞìçò!"
 
 #
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Ç ìíÞìç åîáíôëÞèçêå!"
 
@@ -3088,12 +3779,13 @@ msgstr ""
 
 #
 #: main.c:61
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -3152,6 +3844,7 @@ msgid ""
 "[...]\n"
 "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
 "       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
 "[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
@@ -3162,6 +3855,52 @@ msgid ""
 "  -a <file>\tattach a file to the message\n"
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"÷ñÞóç: mutt [ -nRyzZ ] [ -e <åíôïëÞ> ] [ -F <áñ÷åßï> ] [ -m <ôýðïò> ] [ -f "
+"<áñ÷åßï>]\n"
+"       mutt [ -nR ] [ -e <åíôïëÞ> ] [ -F <áñ÷åßï> ] -Q <åñþôçóç>[ -Q "
+"<åñþôçóç> ] [...]\n"
+"       mutt [ -nx ] [ -e <åíôïëÞ> ] [ -a <áñ÷åßï> ] [ -F <áñ÷åßï> ] [ -H "
+"<áñ÷åßï> ] [ -i <áñ÷åßï> ] [ -s <èÝìá> ] [ -b <äéåõè> ] [ -c <äéåõè> ] "
+"<äéåõè> [ ... ]\n"
+"       mutt [ -n ] [ -e <åíôïëÞ> ] [ -F <áñ÷åßï> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"åðéëïãÝò:\n"
+"  -A <alias>\táðåéêüíéóç ôïõ óõãêåêñéìÝíïõ øåõäþíõìïõ\n"
+"  -a <áñ÷åßï>\tðñïóáñôÞóôå Ýíá áñ÷åßï óå áõôü ôï ìÞíõìá\n"
+"  -b <äéåõè>\têáèïñßóôå ìéá äéåýèõíóç ôõöëïý-ðéóôïý-áíôéãñÜöïõ (BCC)\n"
+"  -c <äéåõè>\têáèïñßóôå ìéá äéåýèõíóç ðéóôïý-áíôéãñÜöïõ (CC)\n"
+"  -e <åíôïëÞ>\têáèïñßóôå ìéá åíôïëÞ ãéá íá åêôåëåóôåß ìåôÜ ôçí åêêßíçóç\n"
+"  -f <áñ÷åßï>\têáèïñßóôå ðïéï ãñáììáôïêéâþôéï íá áíáãíùóôåß\n"
+"  -F <áñ÷åßï>\têáèïñßóôå Ýíá åíáëëáêôéêü áñ÷åßï muttrc\n"
+"  -H <áñ÷åßï>\têáèïñßóôå Ýíá ðñïó÷Ýäéï áðü ôï ïðïßï èá äéáâáóôåß ç "
+"åðéêåöáëßäá\n"
+"  -i <áñ÷åßï>\têáèïñßóôå Ýíá áñ÷åßï ðïõ ôï Mutt èá óõìðåñéëáìâÜíåé êáôÜ "
+"ôçí \n"
+"áðÜíôçóç\n"
+"  -m <ôýðïò>\têáèïñßóôå Ýíá ôýðï ðñïêáèïñéóìÝíïõ ãñáììáôïêéâùôßïõ\n"
+"  -n\t\têÜíåôå ôï Mutt íá ìçí äéáâÜóåé ôï Muttrc ôïõ óõóôÞìáôïò\n"
+"  -p\t\tåðáíáöÝñåôå Ýíá áíáâëçèÝí ìÞíõìá\n"
+"  -Q <ìåôáâëçôÞ>\tåñþôçóç(åìöÜíéóç ôéìÞò) ìéáò ìåôáâëçôÞò ôùí ñõèìßóåùí\n"
+"  -R\t\táíïßîôå ôï ãñáììáôïêéâþôéï óå êáôÜóôáóç ìüíï-áíÜãíùóçò\n"
+"  -s <èÝìá>\têáèïñßóôå Ýíá èÝìá (óå åéóáãùãéêÜ åÜí Ý÷åé êåíÜ)\n"
+"  -v\t\täåßîôå ôçí Ýêäïóç êáé ôïõò ïñéóìïýò êáôÜ ôç ìåôáãëþôôéóç\n"
+"  -x\t\tåîïìïéþóôå ôçí êáôÜóôáóç áðïóôïëÞò mailx\n"
+"  -y\t\täéáëÝîôå Ýíá ãñáììáôïêéâþôéï áðü ôçí ëßóôá `ãñáììáôïêéâùôßùí'\n"
+"  -z\t\tåãêáôÜëåéøç áìÝóùò åÜí äåí õðÜñ÷ïõí ìçíýìáôá óôï ãñáììáôïêéâþôéï\n"
+"  -Z\t\táíïßîôå ôïí ðñþôï öÜêåëï ìå íÝï ìÞíõìá, âãåßôå åÜí äåí õðÜñ÷ïõí\n"
+"  -h\t\táõôü ôï ìÞíõìá âïÞèåéáò"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#
+#: main.c:117
+#, fuzzy
+msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -3217,7 +3956,7 @@ msgstr ""
 "  -h\t\táõôü ôï ìÞíõìá âïÞèåéáò"
 
 #
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -3226,55 +3965,55 @@ msgstr ""
 "ÐáñÜìåôñïé ìåôáãëþôôéóçò:"
 
 #
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "ËÜèïò êáôÜ ôçí áñ÷éêïðïßçóç ôïõ ôåñìáôéêïý."
 
 #
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "ÁðïóöáëìÜôùóç óôï åðßðåäï %d.\n"
 
 #
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "Ôï DEBUG äåí ïñßóôçêå êáôÜ ôçí äéÜñêåéá ôïõ compile. ÁãíïÞèçêå.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "Ôï %s äåí õðÜñ÷åé. Äçìéïõñãßá;"
 
 #
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Áäõíáìßá äçìéïõñãßáò ôïõ %s: %s."
 
 #
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Äåí Ý÷ïõí ïñéóôåß ðáñáëÞðôåò.\n"
 
 #
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: áäõíáìßá ðñïóÜñôçóçò ôïõ áñ÷åßïõ.\n"
 
 #
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Äåí õðÜñ÷åé íÝá áëëçëïãñáößá óå êáíÝíá ãñáììáôïêéâþôéï."
 
 #
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Äåí Ý÷åé ïñéóôåß ãñáììáôïêéâþôéï åéóåñ÷ïìÝíùí."
 
 #
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "Ôï ãñáììáôïêéâþôéï åßíáé Üäåéï."
 
@@ -3295,12 +4034,12 @@ msgid "Mailbox was corrupted!"
 msgstr "Ôï ãñáììáôïêéâþôéï åß÷å áëëïéùèåß!"
 
 #
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Ìïéñáßï ëÜèïò! Áäõíáìßá åðáíáðñüóâáóçò ôïõ ãñáììáôïêéâùôßïõ!"
 
 #
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Áäõíáìßá êëåéäþìáôïò ôïõ ãñáììáôïêéâùôßïõ!"
 
@@ -3309,14 +4048,14 @@ msgstr "
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: ôï mbox Ý÷åé ôñïðïðïéçèåß, äåí õðÜñ÷ïõí ôñïðïðïéçìÝíá ìçíýìáôá!\n"
 "(áíáöÝñáôå áõôü ôï óöÜëìá)"
 
 #
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "ÅããñáöÞ ìçíõìÜôùí... %d (%d%%)"
@@ -3325,173 +4064,131 @@ msgstr "
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "ÅöáñìïãÞ ôùí áëëáãþí..."
 
 #
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Ç åããñáöÞ áðÝôõ÷å! ÌÝñïò ôïõ ãñáììáôïêéâùôßïõ áðïèçêåýôçêå óôï %s"
 
 #
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Áäõíáìßá åðáíáðñüóâáóçò ôïõ ãñáììáôïêéâùôßïõ!"
 
 #
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Åðáíáðñüóâáóç óôï ãñáììáôïêéâþôéï..."
 
 #
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Ìåôáêßíçóç óôï: "
 
 #
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Ìç Ýãêõñïò áñéèìüò äåßêôç"
 
 #
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Êáììßá êáôá÷þñçóç"
 
 #
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Äåí ìðïñåßôå íá ìåôáêéíçèåßôå ðáñáêÜôù."
 
 #
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Äåí ìðïñåßôå íá ìåôáêéíçèåßôå ðáñáðÜíù."
 
 #
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Åßóôå óôçí ôåëåõôáßá óåëßäá."
 
 #
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Åßóôå óôçí ðñþôç óåëßäá."
 
 #
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "Ç ðñþôç êáôá÷þñçóç åìöáíßæåôáé."
 
 #
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "Ç ôåëåõôáßá êáôá÷þñçóç åìöáíßæåôáé."
 
 #
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Åßóôå óôçí ôåëåõôáßá êáôá÷þñçóç."
 
 #
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Åßóôå óôçí ðñþôç êáôá÷þñçóç."
 
 #
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "ÁíáæÞôçóç ãéá: "
 
 #
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "ÁíÜóôñïöç áíáæÞôçóç ãéá: "
 
 #
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "ÊáíÝíá ó÷Ýäéï áíáæÞôçóçò."
 
 #
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Äå âñÝèçêå."
 
 #
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "Êáììßá óçìåéùìÝíç åßóïäïò."
 
 #
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
-msgstr "Äåí Ý÷åé åöáñìïóôåß áíáæÞôçóç ãéá áõôü ôï ìåíïý."
-
-#
-#: menu.c:1005
-msgid "Jumping is not implemented for dialogs."
-msgstr "Äåí Ý÷åé åöáñìïóôåß ìåôáêßíçóç ãéá ôïõò äéáëüãïõò."
-
-#
-#: menu.c:1046
-msgid "Tagging is not supported."
-msgstr "Óçìåéþóåéò äåí õðïóôçñßæïíôáé."
-
-#
-#: mh.c:663 mh.c:900
-#, c-format
-msgid "Reading %s... %d"
-msgstr "ÁíÜãíùóç %s... %d"
-
-#: mh.c:1151
-msgid "maildir_commit_message(): unable to set time on file"
-msgstr "maildir_commit_message(): áäõíáìßá ïñéóìïý ÷ñüíïõ óôï áñ÷åßï"
-
-#: muttlib.c:846
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr ""
-"Ôï áñ÷åßï åßíáé öÜêåëïò, áðïèÞêåõóç õðü áõôïý; [(y)íáé, (n)ü÷é, (a)üëá]"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr "yna"
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "Ôï áñ÷åßï åßíáé öÜêåëïò, áðïèÞêåõóç õðü áõôïý;"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Áñ÷åßï õðü öÜêåëï:"
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Ôï áñ÷åßï õðÜñ÷åé, (o)äéáãñáöÞ ôïõ õðÜñ÷ïíôïò, (a)ðñüóèåóç, (c)Üêõñï;"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "oac"
+msgstr "Äåí Ý÷åé åöáñìïóôåß áíáæÞôçóç ãéá áõôü ôï ìåíïý."
 
 #
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Áäõíáìßá åããñáöÞò ôïõ ìçíýìáôïò óôï POP ãñáììáôïêéâþôéï."
+#: menu.c:1014
+msgid "Jumping is not implemented for dialogs."
+msgstr "Äåí Ý÷åé åöáñìïóôåß ìåôáêßíçóç ãéá ôïõò äéáëüãïõò."
 
 #
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "Ôï %s äåí åßíáé ãñáììáôïêéâþôéï!"
+#: menu.c:1055
+msgid "Tagging is not supported."
+msgstr "Óçìåéþóåéò äåí õðïóôçñßæïíôáé."
 
 #
-#: muttlib.c:1214
+#: mh.c:667 mh.c:923
 #, c-format
-msgid "Append messages to %s?"
-msgstr "Ðñüóèåóç ìçíõìÜôùí óôï %s;"
+msgid "Reading %s... %d"
+msgstr "ÁíÜãíùóç %s... %d"
+
+#: mh.c:1203
+msgid "maildir_commit_message(): unable to set time on file"
+msgstr "maildir_commit_message(): áäõíáìßá ïñéóìïý ÷ñüíïõ óôï áñ÷åßï"
 
 #
 #: mutt_socket.c:91 mutt_socket.c:147
@@ -3499,45 +4196,45 @@ msgstr "
 msgid "Connection to %s closed"
 msgstr "¸êëåéóå ç óýíäåóç óôï %s"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "Ôï SSL äåí åßíáé äéáèÝóéìï."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "Áðïôõ÷ßá åíôïëÞò ðñïóýíäåóçò"
 
 #
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "ÓöÜëìá óôç óõíïìéëßá ìå ôï %s (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "ËáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN \"%s\"."
 
 #
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "ÁíáæÞôçóç ôïõ %s..."
 
 #
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Áäõíáìßá åýñåóçò ôïõ äéáêïìéóôÞ \"%s\""
 
 #
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Óýíäåóç óôï %s..."
 
 #
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Áäõíáìßá óýíäåóçò óôï %s (%s)."
@@ -3571,7 +4268,8 @@ msgid "SSL failed: %s"
 msgstr "SSL áðÝôõ÷å: %s"
 
 #
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Áäõíáìßá óôç ëÞøç ðéóôïðïéçôéêïý áðü ôï ôáßñé"
 
@@ -3582,90 +4280,217 @@ msgid "SSL connection using %s (%s)"
 msgstr "Óýíäåóç SSL ÷ñçóéìïðïéþíôáò ôï %s (%s)"
 
 #
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "¶ãíùóôï"
 
 #
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[áäõíáìßá õðïëïãéóìïý]"
 
 #
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[ìç Ýãêõñç çìåñïìçíßá]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "Ç ðéóôïðïßçóç ôïõ äéáêïìéóôÞ äåí åßíáé áêüìá Ýãêõñç"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "Ôï ðéóôïðïéçôéêü ôïõ äéáêïìéóôÞ Ýëçîå"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Áõôü ôï ðéóôïðïéçôéêü áíÞêåé óôï:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Áõôü ôï ðéóôïðïéçôéêü åêäüèçêå áðü ôï:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Áõôü ôï ðéóôïðïéçôéêü åßíáé Ýãêõñï"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   áðü  %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "    ðñïò %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Áðïôýðùìá: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "¸ëåã÷ïò Ðéóôïðïéçôéêïý SSL"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)áðüññéøç, (o)áðïäï÷Þ ìéá öïñÜ, (a)áðïäï÷Þ ðÜíôá"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "roa"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)áðüññéøç, (o)áðïäï÷Þ ìéá öïñÜ"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "ro"
 
-#
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "¸îïäïò "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Ðñïåéäïðïßçóç: Áäõíáìßá áðïèÞêåõóçò ðéóôïðïéçôéêïý"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Ôï ðéóôïðïéçôéêü áðïèçêåýôçêå"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "Óýíäåóç SSL ÷ñçóéìïðïéþíôáò ôï %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Ôï ðéóôïðïéçôéêü áðïèçêåýôçêå"
+
+#
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "ËÜèïò êáôÜ ôçí áñ÷éêïðïßçóç ôïõ ôåñìáôéêïý."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Áðïôýðùìá: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Áðïôýðùìá: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Ç ðéóôïðïßçóç ôïõ äéáêïìéóôÞ äåí åßíáé áêüìá Ýãêõñç"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Ôï ðéóôïðïéçôéêü ôïõ äéáêïìéóôÞ Ýëçîå"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Ôï ðéóôïðïéçôéêü ôïõ äéáêïìéóôÞ Ýëçîå"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "Ç ðéóôïðïßçóç ôïõ äéáêïìéóôÞ äåí åßíáé áêüìá Ýãêõñç"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "¸ëåã÷ïò Ðéóôïðïéçôéêïý SSL"
+
+#
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Óýíäåóç óôï %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "ÓöÜëìá óôç óõíïìéëßá ìå ôï %s (%s)"
+
+#: muttlib.c:910
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr ""
+"Ôï áñ÷åßï åßíáé öÜêåëïò, áðïèÞêåõóç õðü áõôïý; [(y)íáé, (n)ü÷é, (a)üëá]"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr "yna"
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "Ôï áñ÷åßï åßíáé öÜêåëïò, áðïèÞêåõóç õðü áõôïý;"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Áñ÷åßï õðü öÜêåëï:"
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Ôï áñ÷åßï õðÜñ÷åé, (o)äéáãñáöÞ ôïõ õðÜñ÷ïíôïò, (a)ðñüóèåóç, (c)Üêõñï;"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "oac"
+
+#
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Áäõíáìßá åããñáöÞò ôïõ ìçíýìáôïò óôï POP ãñáììáôïêéâþôéï."
+
+#
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Ðñüóèåóç ìçíõìÜôùí óôï %s;"
+
+#
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "Ôï %s äåí åßíáé ãñáììáôïêéâþôéï!"
+
 #
 #: mx.c:120
 #, c-format
@@ -3760,7 +4585,7 @@ msgid "%d kept, %d moved, %d deleted."
 msgstr "%d êñáôÞèçêáí, %d ìåôáêéíÞèçêáí, %d äéáãñÜöçêáí."
 
 #
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d êñáôÞèçêáí, %d äéáãñÜöçêáí."
@@ -3783,16 +4608,16 @@ msgid "Mailbox is marked unwritable. %s"
 msgstr "Ôï ãñáììáôïêéâþôéï åßíáé óçìåéùìÝíï ìç åããñÜøéìï. %s"
 
 #
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "Ôï ãñáììáôïêéâþôéï óçìåéþèçêå."
 
 #
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Áäõíáìßá åããñáöÞò ôïõ ìçíýìáôïò"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr "Õðåñ÷åßëéóç áêåñáßïõ -- áäõíáìßá åê÷þñçóçò ìíÞìçò."
 
@@ -3802,58 +4627,58 @@ msgid "Not available in this menu."
 msgstr "Äåí åßíáé äéáèÝóéìï óå áõôü ôï ìåíïý."
 
 #
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "ÐñïçãÓåë"
 
 #
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "ÅðüìÓåë"
 
 #
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "¼øçÐñïóÜñô"
 
 #
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Åðüìåíï"
 
 #
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Åìöáíßæåôáé ç âÜóç ôïõ ìçíýìáôïò."
 
 #
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Åìöáíßæåôáé ç áñ÷Þ ôïõ ìçíýìáôïò."
 
 #
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "ÁíÜóôñïöç áíáæÞôçóç: "
 
 #
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "ÁíáæÞôçóç:"
 
 #
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "Ç âïÞèåéá Þäç åìöáíßæåôáé."
 
 #
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "¼÷é Üëëï êáèïñéóìÝíï êåßìåíï."
 
 #
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "¼÷é Üëëï ìç êáèïñéóìÝíï êåßìåíï ìåôÜ áðü êáèïñéóìÝíï."
 
@@ -3934,32 +4759,32 @@ msgid "error: unknown op %d (report this error)."
 msgstr "ëÜèïò: Üãíùóôç äéåñãáóßá %d (áíÝöåñå áõôü ôï óöÜëìá)."
 
 #
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Óýíôáîç ìïíôÝëïõ áíáæÞôçóçò..."
 
 #
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "ÅêôÝëåóç åíôïëÞò óôá ðáñüìïéá ìçíýìáôá..."
 
 #
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "ÊáíÝíá ìÞíõìá äåí ôáéñéÜæåé óôá êñéôÞñéá."
 
 #
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "Ç áíáæÞôçóç Ýöèáóå óôï ôÝëïò ÷ùñßò íá âñåé üìïéï"
 
 #
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "Ç áíáæÞôçóç Ýöèáóå óôçí áñ÷Þ ÷ùñßò íá âñåé üìïéï"
 
 #
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Ç áíáæÞôçóç äéáêüðçêå."
 
@@ -3976,13 +4801,13 @@ msgid "PGP passphrase forgotten."
 msgstr "Ç öñÜóç-êëåéäß PGP Ý÷åé îå÷áóôåß."
 
 #
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- ÓöÜëìá: áäõíáìßá óôç äçìéïõñãßá õðïäéåñãáóßáò PGP! --]\n"
 
 #
 # pgp.c:669 pgp.c:894
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3991,67 +4816,26 @@ msgstr ""
 "\n"
 
 #
-# pgp.c:353
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- ÅÍÁÑÎÇ ÌÇÍÕÌÁÔÏÓ PGP --]\n"
-"\n"
-
-#
-# pgp.c:355
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- ÅÍÁÑÎÇ ÏÌÁÄÁÓ ÄÇÌÏÓÉÙÍ ÊËÅÉÄÉÙÍ PGP --]\n"
-
-#
-# pgp.c:357
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- ÅÍÁÑÎÇ ÕÐÏÃÅÃÑÁÌÌÅÍÏÕ PGP ÌÇÍÕÌÁÔÏÓ --]\n"
-"\n"
-
-#
-# pgp.c:459
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- ÔÅËÏÓ ÌÇÍÕÌÁÔÏÓ PGP --]\n"
-
-#
-# pgp.c:461
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- ÔÅËÏÓ ÏÌÁÄÁÓ ÄÇÌÏÓÉÙÍ ÊËÅÉÄÉÙÍ PGP --]\n"
-
-#
-# pgp.c:463
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- ÔÅËÏÓ ÕÐÏÃÅÃÑÁÌÌÅÍÏÕ PGP ÌÇÍÕÌÁÔÏÓ --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "Áäõíáìßá áíôéãñáöÞò ôïõ ìçíýìáôïò."
 
-#
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- ÓöÜëìá: äå ìðüñåóå íá âñåèåß ç áñ÷Þ ôïõ ìçíýìáôïò PGP! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "Ç õðïãñáöÞ PGP åðáëçèåýôçêå åðéôõ÷þò."
 
 #
 # pgp.c:801
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Åóùôåñéêü óöÜëìá. ÐëçñïöïñÞóôå <roessler@does-not-exist.org>."
 
 #
 # pgp.c:865
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -4060,87 +4844,42 @@ msgstr ""
 "\n"
 
 #
-# pgp.c:958
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- ÓöÜëìá: êáêïöôéáãìÝíï ìÞíõìá PGP/MIME! --]\n"
-"\n"
-
-#
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- ÓöÜëìá: áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý áñ÷åßïõ! --]\n"
-
-#
-# pgp.c:980
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- Ôá åðüìåíá äåäïìÝíá åßíáé êñõðôïãñáöçìÝíá ìÝóù PGP/MIME --]\n"
-"\n"
-
-#
-# pgp.c:988
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- ÔÝëïò äåäïìÝíùí êñõðôïãñáöçìÝíùí ìÝóù PGP/MIME --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "Ç áðïêñõðôïãñÜöçóç áðÝôõ÷å."
 
 #
 # pgp.c:1070
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "Áäõíáìßá áíïßãìáôïò õðïäéåñãáóßáò PGP!"
 
-#
-# pgp.c:1194
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "Íá ÷ñçóéìïðïéçèåß keyID = \"%s\" ãéá ôï %s;"
-
-#
-# pgp.c:1200
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "ÅéóÜãåôå keyID ãéá ôï %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "Áäõíáìßá êëÞóçò ôïõ PGP"
 
 #
 # compose.c:132
-#: pgp.c:1496
+#: pgp.c:1540
 #, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "PGP (e)êëåßä, (s)õðïãñ, õðïãñ.ó(a)í, (b)êë+õð, %s, Þ (c)ôßðïôá; "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr "PGP/M(i)ME"
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr "(i)åóùôåñéêü êåßìåíï"
 
 #
 # compose.c:133
-#: pgp.c:1499
+#: pgp.c:1543
 msgid "esabifc"
 msgstr "esabifc"
 
-#
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "ÕðïãñáöÞ ùò: "
-
 #
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
@@ -4150,19 +4889,6 @@ msgstr "
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "¼ëá ôá êëåéäéÜ ðïõ ôáéñéÜæïõí åßíáé ëçãìÝíá, áêõñùìÝíá Þ áíåíåñãÜ."
 
-#
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "ÄéáëÝîôå "
-
-#
-# pgpkey.c:178
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "ÅëÝãîôå êëåéäß "
-
 #
 #: pgpkey.c:532
 #, c-format
@@ -4181,49 +4907,6 @@ msgstr "
 msgid "Can't open /dev/null"
 msgstr "Áäõíáìßá áíïßãìáôïò /dev/null"
 
-#
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý áñ÷åßïõ"
-
-#
-# pgpkey.c:236
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "ID êëåéäéïý: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr ""
-"Áõôü ôï êëåéäß äåí ìðïñåß íá ÷ñçóéìïðïéçèåß ëçãìÝíï/á÷ñçóôåõìÝíï/Üêõñï."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "Ôï ID åßíáé ëçãìÝíï/á÷ñçóôåõìÝíï/Üêõñï."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "Ôï ID Ý÷åé ìç ïñéóìÝíç åãêõñüôçôá."
-
-#
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "Ôï ID äåí åßíáé Ýãêõñï."
-
-#
-# pgpkey.c:259
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "Ôï ID åßíáé ìüíï ìåñéêþò Ýãêõñï."
-
-#
-# pgpkey.c:262
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s ÈÝëåôå óßãïõñá íá ÷ñçóéìïðïéÞóåôå ôï êëåéäß;"
-
 #
 # pgpkey.c:369
 #: pgpkey.c:724
@@ -4243,11 +4926,6 @@ msgstr "
 msgid "PGP Key %s."
 msgstr "Êëåéäß PGP %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Åýñåóç üìïéùí êëåéäéþí ìå \"%s\"..."
-
 #
 #: pop.c:90 pop_lib.c:201
 #, c-format
@@ -4318,7 +4996,7 @@ msgid "%s [%d of %d messages read]"
 msgstr "%s [%d áðü %d ìçíýìáôá äéáâÜóôçêáí]"
 
 #
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "Ç óýíäåóç ìå ôïí åîõðçñåôçôÞ Ýêëåéóå!"
 
@@ -4352,17 +5030,17 @@ msgid "Error connecting to server: %s"
 msgstr "ÓöÜëìá êáôá ôç óýíäåóç óôï äéáêïìéóôÞ: %s"
 
 #
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "Êëåßóéìï óýíäåóçò óôïí åîõðçñåôçôÞ IMAP..."
 
 #
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Åðéâåâáßùóç ôùí åõñåôçñßùí ìçíõìÜôùí..."
 
 #
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Áðþëåéá óýíäåóçò. Åðáíáóýíäåóç óôï äéáêïìéóôÞ POP;"
 
@@ -4817,40 +5495,40 @@ msgid "Sending in background."
 msgstr "ÁðïóôïëÞ óôï ðáñáóêÞíéï."
 
 #
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Äå âñÝèçêå ðáñÜìåôñïò ïñéïèÝôçóçò! [áíáöÝñáôå áõôü ôï óöÜëìá]"
 
 #
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "Ôï %s äåí õðÜñ÷åé ðéá!"
 
 #
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "Ôï %s äåí åßíáé êáíïíéêü áñ÷åßï."
 
 #
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "Áäõíáìßá áíïßãìáôïò ôïõ %s"
 
 #
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "ÓöÜëìá êáôÜ ôçí áðïóôïëÞ ìçíýìáôïò, ôåñìáôéóìüò èõãáôñéêÞò ìå %d (%s)."
 
 #
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "¸îïäïò ôçò äéåñãáóßáò áðïóôïëÞò"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
@@ -4991,7 +5669,7 @@ msgstr "
 
 #
 # pgp.c:669 pgp.c:894
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -5000,25 +5678,25 @@ msgstr ""
 "\n"
 
 #
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- ÓöÜëìá: áäõíáìßá äçìéïõñãßáò õðïäéåñãáóßáò OpenSSL! --]\n"
 
 #
 # pgp.c:980
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- Ôá åðüìåíá äåäïìÝíá åßíáé êñõðôïãñáöçìÝíá ìÝóù S/MIME --]\n"
 
 #
 # pgp.c:676
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- Ôá åðüìåíá äåäïìÝíá åßíáé õðïãåãñáììÝíá ìå S/MIME --]\n"
 
 #
 # pgp.c:988
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -5028,7 +5706,7 @@ msgstr ""
 
 #
 # pgp.c:682
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -5038,7 +5716,7 @@ msgstr ""
 
 #
 # compose.c:132
-#: smime.c:1935
+#: smime.c:1944
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
@@ -5046,20 +5724,20 @@ msgstr ""
 
 #
 # compose.c:133
-#: smime.c:1936
+#: smime.c:1945
 msgid "eswabfc"
 msgstr "eswabfc"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, Þ (f)Üêõñï; "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345f"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr "Áäõíáìßá õðïãñáöÞò. Äåí Ý÷åé ïñéóôåß êëåéäß. ×ñçóéìïðïéÞóôå Õðïãñ.óáí"
 
@@ -5089,6 +5767,13 @@ msgstr "
 msgid "Parent message is not available."
 msgstr "Ôï ôñÝ÷ïí ìÞíõìá äåí åßíáé äéáèÝóéìï."
 
+#~ msgid "Unexpected response received from server: %s"
+#~ msgstr "ÅëÞöèç áðñïóäüêçôç áðÜíôçóç áðü ôï äéáêïìéóôÞ: %s"
+
+#
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Áäõíáìßá óôçí ðñïóèÞêç óôá ãñáìì/ôéá IMAP óå áõôüí ôïí åîõðçñåôçôÞ"
+
 #
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "Äçìéïõñãßá åíüò åóùôåñéêïý ìçíýìáôïò PGP;"
diff --git a/po/eo.po b/po/eo.po
index 260ceaab1..18f172317 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.5.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2003-11-12 22:03+0000\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: eo <eo@li.org>\n"
@@ -13,26 +13,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "Uzantonomo æe %s: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Pasvorto por %s@%s: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Fino"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Forviþi"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Malforviþi"
 
@@ -41,9 +41,9 @@ msgid "Select"
 msgstr "Elekto"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Helpo"
 
@@ -95,36 +95,36 @@ msgstr "Skribi al dosiero: "
 msgid "Alias added."
 msgstr "Adreso aldonita."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Nomþamblono ne estas plenumebla. Æu daýrigi?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "\"compose\" en Mailcap-dosiero postulas %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Eraro dum ruligo de \"%s\"!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Malsukceso malferi dosieron por analizi æapa¼ojn."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Malsukceso malferi dosieron por forigi æapa¼ojn."
 
-#: attach.c:183
+#: attach.c:184
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "Malsukceso malferi dosieron por analizi æapa¼ojn."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr ""
@@ -132,136 +132,136 @@ msgstr ""
 "kreita."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "\"edit\" en Mailcap-dosiero postulas %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "En la Mailcap-dosiero mankas \"edit\" por %s"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Neniu Mailcap-regulo kongruas. Traktas kiel tekston."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME-speco ne difinita. Ne povas vidigi parton."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Ne povas krei filtrilon."
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Ne povas krei filtrilon"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Skriberaro!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Mi ne scias presi tion!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Listo"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Masko"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ne estas dosierujo."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Poþtfakoj [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Abonita [%s], Dosieromasko: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Dosierujo [%s], Dosieromasko: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Ne povas aldoni dosierujon!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Neniu dosiero kongruas kun la dosieromasko"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Kreado funkcias nur æe IMAP-poþtfakoj"
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Kreado funkcias nur æe IMAP-poþtfakoj"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Forviþado funkcias nur æe IMAP-poþtfakoj"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Æu vere forviþi la poþtfakon \"%s\"?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Poþtfako forviþita."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "Poþtfako ne forviþita."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Iri al la dosierujo: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Eraro dum legado de dosierujo."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Dosieromasko: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Inversa ordigo laý (d)ato, (a)lfabete, (g)rando, aý (n)e ordigu? "
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Ordigo laý (d)ato, (a)lfabete, (g)rando, aý (n)e ordigu? "
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "dagn"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Nova dosieronomo: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Ne povas rigardi dosierujon"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Eraro dum vidigo de dosiero"
 
@@ -328,7 +328,7 @@ msgstr "implicitaj koloroj ne funkcias"
 msgid "Verify PGP signature?"
 msgstr "Æu kontroli PGP-subskribon?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Ne povis krei dumtempan dosieron!"
 
@@ -340,114 +340,114 @@ msgstr "Ne povas krei vidig-filtrilon"
 msgid "Could not copy message"
 msgstr "Ne povis kopii mesaøon"
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "S/MIME-subskribo estis sukcese kontrolita."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "Posedanto de S/MIME-atestilo ne kongruas kun sendinto."
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr ""
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "S/MIME-subskribo NE povis esti kontrolita."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "PGP-subskribo estis sukcese kontrolita."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "PGP-subskribo NE povis esti kontrolita."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Komando: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Redirekti mesaøon al: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Redirekti markitajn mesaøojn al: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Eraro dum analizo de adreso!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "Malbona IDN: '%s'"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Redirekti mesaøon al %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Redirekti mesaøojn al %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "Mesaøo ne redirektita."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "Mesaøoj ne redirektitaj."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Mesaøo redirektita."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Mesaøoj redirektitaj."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "Ne povas krei filtrilprocezon"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Filtri per komando: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Neniu pres-komando estas difinita."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Æu presi mesaøon?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Æu presi markitajn mesaøojn?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Mesaøo presita"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Mesaøoj presitaj"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "Ne eblis presi mesaøon"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Ne eblis presi mesaøojn"
 
-#: commands.c:508
+#: commands.c:509
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -456,7 +456,7 @@ msgstr ""
 "Inversa ordigo laý (d)ato/d(e)/(r)ecv/(t)emo/(a)l/(f)adeno/(n)esortite/(g)"
 "rando/(p)oentoj?: "
 
-#: commands.c:509
+#: commands.c:510
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
@@ -465,74 +465,74 @@ msgstr ""
 "Ordigo laý (d)ato/d(e)/(r)ecv/(t)emo/(a)l/(f)adeno/(n)esortite/(g)rando/(p)"
 "oentoj?: "
 
-#: commands.c:510
+#: commands.c:511
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dertafngp"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Þelkomando: "
 
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Malkodita skribi%s al poþtfako"
 
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Malkodita kopii%s al poþtfako"
 
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Malæifrita skribi%s al poþtfako"
 
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Malæifrita kopii%s al poþtfako"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Skribi%s al poþtfako"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Kopii%s al poþtfako"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " markitajn"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Kopias al %s ..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Æu konverti al %s æe sendado?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type þanøita al %s."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Signaro þanøita al %s; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "ne konvertas"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "konvertas"
 
@@ -625,103 +625,670 @@ msgstr "Malbona IDN en \"%s\": '%s'"
 msgid "Attaching selected files..."
 msgstr "Aldonas la elektitajn dosierojn ..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Ne povas aldoni %s!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Malfermu poþtfakon por aldoni mesaøon el øi"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Ne estas mesaøoj en tiu poþtfako."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Marku la mesaøojn, kiujn vi volas aldoni!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Ne povas aldoni!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "Rekodado efikas nur al tekstaj partoj."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "Æi tiu parto ne estos konvertita."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "Æi tiu parto estos konvertita."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Nevalida kodado."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Æu skribi kopion de æi tiu mesaøo?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Renomi al: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Ne povas ekzameni la dosieron %s: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Nova dosiero: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type havas la formon bazo/subspeco"
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Nekonata Content-Type %s"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "Ne povas krei dosieron %s"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "Oni malsukcesis krei kunsenda¼on"
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "Æu prokrasti æi tiun mesaøon?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "Skribi mesaøon al poþtfako"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Skribas mesaøon al %s ..."
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "Mesaøo skribita."
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "S/MIME jam elektita. Æu nuligi kaj daýrigi? "
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP jam elektita. Æu nuligi kaj daýrigi? "
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "eraro en þablono æe: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "eraro en þablono æe: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "eraro en þablono æe: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "eraro en þablono æe: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "eraro en þablono æe: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "eraro en þablono æe: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "eraro en þablono æe: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "eraro en þablono æe: %s"
+
+#: crypt-gpgme.c:993
+msgid "Warning: One of the keys has been revoked\n"
+msgstr ""
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Atestilo de servilo estas eksvalidiøinta"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL ne estas disponata."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Fingrospuro: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Eraro dum sendado de mesaøo."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Eraro en komandlinio: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Fino de subskribitaj datenoj --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Eraro: ne povas krei dumtempan dosieron! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr "[-- KOMENCO DE PGP-MESAØO --]\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- KOMENCO DE PUBLIKA PGP-ÞLOSILO --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- KOMENCO DE PGP-SUBSKRIBITA MESAØO --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- FINO DE PGP-MESAØO --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- FINO DE PUBLIKA PGP-ÞLOSILO --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- FINO DE PGP-SUBSKRIBITA MESAØO --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Eraro: ne povas trovi komencon de PGP-mesaøo! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Eraro: misformita PGP/MIME-mesaøo! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Eraro: ne povas krei dumtempan dosieron! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- La sekvaj datenoj estas PGP/MIME-æifritaj --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- La sekvaj datenoj estas PGP/MIME-æifritaj --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- Fino de PGP/MIME-æifritaj datenoj --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- Fino de PGP/MIME-æifritaj datenoj --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr "[-- La sekvaj datenoj estas S/MIME-subskribitaj --]\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr "[-- La sekvaj datenoj estas S/MIME-æifritaj --]\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Fino de S/MIME-subskribitaj datenoj. --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Fino de S/MIME-æifritaj datenoj. --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Nevalida      "
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Nevalida monato: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Nevalida monato: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Æifri"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Atestilo skribita"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Key ID: 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "Revokite      "
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Eksvalidiøinte"
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Ne povas krei dumtempan dosieron"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Konektiøas al %s ..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Eraro dum konektiøo al servilo: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Key ID: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "SSL malsukcesis: %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr ""
+"Æiuj kongruaj þlosiloj estas eksvalidiøintaj, revokitaj, aý malþaltitaj."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Eliri  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Elekti  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Kontroli þlosilon  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP-þlosiloj, kiuj kongruas kun \"%s\"."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP-þlosiloj, kiuj kongruas kun \"%s\"."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "S/MIME-atestiloj, kiuj kongruas kun \"%s\"."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP-þlosiloj, kiuj kongruas kun \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, fuzzy, c-format
+msgid "%s <%s>."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3594
+#, fuzzy, c-format
+msgid "%s \"%s\"."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Æi tiu þlosilo ne estas uzebla: eksvalidiøinta/malþaltita/revokita."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "ID estas eksvalidiøinta/malþaltita/revokita."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "ID havas nedifinitan validecon."
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "ID ne estas valida."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "ID estas nur iomete valida."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Æu vi vere volas uzi la þlosilon?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Seræas þlosilojn, kiuj kongruas kun \"%s\" ..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "Æu uzi keyID = \"%s\" por %s?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Donu keyID por %s: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr ""
+"PGP æ(i)fri, (s)ubskribi, subskribi (k)iel, (a)mbaý, \"i(n)line\", aý (f)"
+"orgesi? "
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "ispkaf"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr ""
+"PGP æ(i)fri, (s)ubskribi, subskribi (k)iel, (a)mbaý, \"i(n)line\", aý (f)"
+"orgesi? "
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "ispkaf"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Subskribi kiel: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Malsukceso malferi dosieron por analizi æapa¼ojn."
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -737,29 +1304,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "Pasfrazo(j) forgesita(j)."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Alvokas PGP ..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Mesaøo ne sendita."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "S/MIME-mesaøoj sen informoj pri enhavo ne funkcias."
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "Provas eltiri PGP-þlosilojn ...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Provas eltiri S/MIME-atestilojn ...\n"
 
@@ -771,7 +1338,7 @@ msgstr ""
 "[-- Eraro: maløusta strukturo de multipart/signed! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -780,7 +1347,7 @@ msgstr ""
 "[-- Eraro: nekonata multipart/signed-protokolo %s! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -790,7 +1357,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -798,7 +1365,7 @@ msgstr ""
 "[-- La sekvaj datenoj estas subskribitaj --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -806,7 +1373,7 @@ msgstr ""
 "[-- Averto: ne povas trovi subskribon. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -814,224 +1381,254 @@ msgstr ""
 "\n"
 "[-- Fino de subskribitaj datenoj --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Alvokas PGP ..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "jes"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "ne"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Æu eliri el Mutt?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "nekonata eraro"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Premu klavon por daýrigi ..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " ('?' por listo): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Neniu poþtfako estas malfermita."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Ne estas mesaøoj."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "Poþtfako estas nurlega."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Funkcio nepermesata dum elektado de aldonoj."
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "Mankas videblaj mesaøoj"
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Ne povas þanøi skribostaton æe nurlega poþtfako!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Þanøoj al poþtfako estos skribitaj æe eliro."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Þanøoj al poþtfako ne estos skribitaj."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Fini"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Skribi"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Nova mesaøo"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Respondi"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Respondi al grupo"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Poþtfako estis modifita de ekstere. Flagoj povas esti maløustaj."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Nova mesaøo en æi tiu poþtfako"
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "Poþtfako estis modifita de ekstere."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Mankas markitaj mesaøoj."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 msgid "Nothing to do."
 msgstr "Nenio farenda."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Salti al mesaøo: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "Argumento devas esti mesaønumero."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Tiu mesaøo ne estas videbla."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Nevalida mesaønumero."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Forviþi mesaøojn laý la þablono: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "Nenia þablono estas aktiva."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Þablono: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Limigi al mesaøoj laý la þablono: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Æu eliri el Mutt?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Marki mesaøojn laý la þablono: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Malforviþi mesaøojn laý la þablono: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Malmarki mesaøojn laý la þablono: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Malfermi poþtfakon nurlege"
 
-#: curs_main.c:1055
-msgid "Open mailbox"
-msgstr "Malfermi poþtfakon"
+#: curs_main.c:1065
+msgid "Open mailbox"
+msgstr "Malfermi poþtfakon"
+
+#: curs_main.c:1081 mx.c:512 mx.c:658
+#, c-format
+msgid "%s is not a mailbox."
+msgstr "%s ne estas poþtfako."
+
+#: curs_main.c:1176
+msgid "Exit Mutt without saving?"
+msgstr "Eliri el Mutt sen skribi?"
+
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "Fadenoj ne estas þaltitaj."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
-#, c-format
-msgid "%s is not a mailbox."
-msgstr "%s ne estas poþtfako."
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "skribi æi tiun mesaøon por sendi øin poste"
 
-#: curs_main.c:1165
-msgid "Exit Mutt without saving?"
-msgstr "Eliri el Mutt sen skribi?"
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Vi estas æe la lasta mesaøo."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Mankas neforviþitaj mesaøoj."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Vi estas æe la unua mesaøo."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "Seræo rekomencis æe la komenco."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "Seræo rekomencis æe la fino."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Mankas novaj mesaøoj"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Mankas nelegitaj mesaøoj"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " en æi tiu limigita rigardo"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "Ne povas þanøi la flagon 'important' æe POP-servilo."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Ne restas fadenoj."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Vi estas æe la unua fadeno."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "Fadenoj ne estas þaltitaj."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "Fadeno enhavas nelegitajn mesaøojn."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "Ne eblas redakti mesaøon en POP-servilo."
 
@@ -1164,107 +1761,107 @@ msgstr "
 msgid "Clear flag"
 msgstr "Malþalti flagon"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- Eraro: Neniu parto de Multipart/Alternative estis montrebla! --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Parto #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Speco: %s/%s, Kodado: %s, Grando: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Aýtomata vidigo per %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Alvokas aýtomatan vidigon per: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Ne povas ruli %s. --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Erareligo de %s --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr "[-- Eraro: parto message/external ne havas parametro access-type --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Æi tiu %s/%s-parto "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(grando %s bitokoj) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "estas forviþita --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- je %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- nomo: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Æi tiu %s/%s-parto ne estas inkluzivita, --]\n"
 
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr "[-- kaj la indikita ekstera fonto eksvalidiøis. --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- kaj Mutt ne kapablas je la indikita alirmaniero %s. --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Eraro: multipart/signed ne havas parametron protocol!"
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Eraro: multipart/encrypted ne havas parametron protocol!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Ne povas malfermi dumtempan dosieron!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s ne estas konata "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(uzu '%s' por vidigi æi tiun parton)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(bezonas klavodifinon por 'view-attachments'!)"
 
@@ -1371,46 +1968,46 @@ msgstr "Rajti
 msgid "SASL authentication failed."
 msgstr "SASL-rajtiøo malsukcesis."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s ne estas valida IMAP-vojo"
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Prenas nomspacojn ..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Prenas liston de poþtfakoj ..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "Poþtfako ne ekzistas"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Krei poþtfakon: "
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "Poþtfako devas havi nomon."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Poþtfako kreita."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Krei poþtfakon: "
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "SSL malsukcesis: %s"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "Poþtfako kreita."
@@ -1422,135 +2019,132 @@ msgstr "Po
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Fatala eraro. Mesaøonombro ne kongruas!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Fermas la konekton al %s ..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Æi tiu IMAP-servilo estas antikva. Mutt ne funkcias kun øi."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
-msgstr "Neatendita respondo ricevita de servilo: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
+msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "Æu sekura konekto per TLS?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "Ne povis negoci TLS-konekton"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Elektas %s ..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "Eraro dum malfermado de poþtfako"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Ne povas aldoni al IMAP-poþtfako æe æi tiu servilo"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "Æu krei %s?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Markas %d mesaøojn kiel forviþitajn ..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "Forviþo malsukcesis"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Skribas mesaøoflagojn ... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Forviþas mesaøojn de la servilo ..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE malsukcesis"
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "CLOSE malsukcesis"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "Malbona nomo por poþtfako"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Abonas %s ..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Malabonas %s ..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Ne povas preni æapojn de æi tiu versio de IMAP-servilo."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Ne povis krei dumtempan dosieron %s"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Prenas mesaøoæapojn ... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Prenas mesaøoæapojn ... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Prenas mesaøon ..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "La mesaøindekso estas maløusta. Provu remalfermi la poþtfakon."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Alþutas mesaøon ..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Kopias %d mesaøojn al %s ..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Kopias mesaøon %d al %s ..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Æu daýrigi?"
 
@@ -1559,124 +2153,124 @@ msgstr "
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:678
+#: init.c:644
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "marki mesaøojn laý þablono"
 
-#: init.c:680
+#: init.c:646
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "malmarki mesaøojn laý þablono"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "adresaro: mankas adreso"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Averto: Malbona IDN '%s' en adreso '%s'.\n"
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "nevalida æaplinio"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: nekonata ordigmaniero"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): eraro en regula esprimo: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: nekonata variablo"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "reset: prefikso ne permesata"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "reset: valoro ne permesata"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s estas þaltita"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s estas malþaltita"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: nevalida poþtfakospeco"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: nevalida valoro"
 
-#: init.c:1589
+#: init.c:1555
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: Nekonata speco."
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: nekonata speco"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Eraro en %s, linio %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: eraroj en %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: legado æesis pro tro da eraroj en %s"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: eraro æe %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: tro da argumentoj"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: nekonata komando"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Eraro en komandlinio: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "ne povas eltrovi la hejmdosierujon"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "ne povas eltrovi la uzantonomo"
 
@@ -2134,399 +2728,408 @@ msgid "compose a new mail message"
 msgstr "verki novan mesaøon"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "malfermi alian poþtfakon"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "malfermi alian poþtfakon nurlege"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "malþalti flagon æe mesaøo"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "forviþi mesaøojn laý þablono"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "devigi prenadon de mesaøoj de IMAP-servilo"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "elþuti mesaøojn de POP-servilo"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "iri al la unua mesaøo"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "iri al la lasta mesaøo"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "montri nur la mesaøojn, kiuj kongruas kun þablono"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Redirekti markitajn mesaøojn al: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "salti al la unua nova mesaøo"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "salti al la sekva nova aý nelegita mesaøo"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "salti al la sekva subfadeno"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "salti al la sekva fadeno"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "salti al la sekva neforviþita mesaøo"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "salti al la sekva nelegita mesaøo"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "salti al patra mesaøo en fadeno"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "salti al la antaýa fadeno"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "salti al la antaýa subfadeno"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "salti al la antaýa neforviþita mesaøo"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "salti al la antaýa nova mesaøo"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "salti al la antaýa nova aý nelegita mesaøo"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "salti al la antaýa nelegita mesaøo"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "marki la aktualan fadenon kiel legitan"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "marki la aktualan subfadenon kiel legitan"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "þalti flagon æe mesaøo"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "skribi þanøojn al poþtfako"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "marki mesaøojn laý þablono"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "malforviþi mesaøojn laý þablono"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "malmarki mesaøojn laý þablono"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "iri al la mezo de la paøo"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "iri al la sekva registro"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "rulumi malsupren unu linion"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "iri al la sekva paøo"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "salti al la fino de la mesaøo"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "þalti aý malþalti montradon de citita teksto"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "supersalti cititan tekston"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "salti al la komenco de mesaøo"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "trakti mesaøon/parton per þelkomando"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "iri al la antaýa registro"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "rulumi supren unu linion"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "iri al la antaýa paøo"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "presi la aktualan registron"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "demandi eksteran programon pri adresoj"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "aldoni novajn demandrezultojn al jamaj rezultoj"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "skribi þanøojn al poþtfako kaj eliri"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "revoki prokrastitan mesaøon"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "rekrei la enhavon de la ekrano"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{interna}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "forviþi æi tiun poþtfakon (nur IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "respondi al mesaøo"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "uzi æi tiun mesaøon kiel modelon por nova mesaøo"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "skribi mesaøon/parton al dosiero"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "seræi pri regula esprimo"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "seræi malantaýen per regula esprimo"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "seræi pri la sekva trafo"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "seræi pri la sekva trafo en la mala direkto"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "þalti aý malþalti alikolorigon de seræþablono"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "alvoki komandon en subþelo"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "ordigi mesaøojn"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "ordigi mesaøojn en inversa ordo"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "marki la aktualan registron"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "apliki la sekvan komandon al æiuj markitaj mesaøoj"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 msgid "apply next function ONLY to tagged messages"
 msgstr "apliki la sekvan funkcion NUR al markitaj mesaøoj"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "marki la aktualan subfadenon"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "marki la aktualan fadenon"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "þanøi la flagon 'nova' de mesaøo"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "(mal)þalti, æu la poþtfako estos reskribita"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "(mal)þali, æu vidi poþtfakojn aý æiujn dosierojn"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "iri al la supro de la paøo"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "malforviþi la aktualan registron"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "malforviþi æiujn mesaøojn en fadeno"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "malforviþi æiujn mesaøojn en subfadeno"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "montri la version kaj daton de Mutt"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "vidigi parton, per mailcap, se necese"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "montri MIME-partojn"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "montri la klavokodon por klavopremo"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "montri la aktivan limigþablonon"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "(mal)kolapsigi la aktualan fadenon"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "(mal)kolapsigi æiujn fadenojn"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "aldoni publikan PGP-þlosilon"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "montri PGP-funkciojn"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "sendi publikan PGP-þlosilon"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "kontroli publikan PGP-þlosilon"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "vidi la uzant-identigilon de la þlosilo"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "kontroli pri klasika PGP"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Akcepti la konstruitan æenon"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "Aldoni plusendilon al la æeno"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "Enþovi plusendilon en la æenon"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "Forviþi plusendilon el la æeno"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "Elekti la antaýan elementon de la æeno"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "Elekti la sekvan elementon de la æeno"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "Sendi la mesaøon tra mixmaster-plusendiloæeno"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "fari malæifritan kopion kaj forviþi"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "fari malæifritan kopion"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "forviþi pasfrazo(j)n el memoro"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "eltiri publikajn þlosilojn"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "montri S/MIME-funkciojn"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr "Entjera troo - ne povas asigni memoron!"
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Mankas memoro!"
 
@@ -2551,12 +3154,13 @@ msgstr ""
 "sub difinitaj kondiæoj; tajpu 'mutt -v' por detaloj.\n"
 
 #: main.c:61
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2602,25 +3206,67 @@ msgstr ""
 "    GNU kun æi tiu programo; se ne, skribu al Free Software Foundation,\n"
 "    Inc., 59 Temple Place - Suite 330, Boston, MA  02111, Usono.\n"
 
-#: main.c:99
+#: main.c:99
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"uzado: mutt [ -nRyzZ ] [ -e <kom> ] [ -F <dos> ] [ -m <speco> ] [ -f "
+"<dos> ]\n"
+"       mutt [ -nR ] [ -e <kom> ] [ -F <dos> ] -Q <var> [ -Q <var> ] [...]\n"
+"       mutt [ -nR ] [ -e <kom> ] [ -F <dos> ] -A <nom> [ -A <nom> ] [...]\n"
+"       mutt [ -nx ] [ -e <kom> ] [ -a <dos> ] [ -F <dos> ] [ -H <dos> ] [ -i "
+"<dos> ] [ -s <temo> ] [ -b <adr> ] [ -c <adr> ] <adr> [ ... ]\n"
+"       mutt [ -n ] [ -e <kom> ] [ -F <dos> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"opcioj:\n"
+"  -A <nomo>     traduki la nomon per la adresaro\n"
+"  -a <dosiero>\taldoni dosieron al la mesaøo\n"
+"  -b <adreso>\tspecifi adreson por blinda kopio (BCC)\n"
+"  -c <adreso>\tspecifi adreson por kopio (CC)\n"
+"  -e <komando>\tspecifi komandon por ruligi post la starto\n"
+"  -f <dosiero>\tspecifi la poþtfakon por malfermi\n"
+"  -F <dosiero>\tspecifi alian dosieron muttrc\n"
+"  -H <dosiero>\tspecifi malnetan dosieron por legi la æapon\n"
+"  -i <dosiero>\tspecifi dosieron, kiun Mutt inkluzivu en la respondo\n"
+"  -m <speco>\tspecifi implicitan specon de poþtfakoj\n"
+"  -n\t\tindikas al Mutt ne legi la sisteman dosieron Muttrc\n"
+"  -p\t\trevoki prokrastitan mesaøon\n"
+"  -Q <variablo> pridemandi la valoron de agordo-variablo\n"
+"  -R\t\tmalfermi poþtfakon nurlege\n"
+"  -s <temo>\tspecifi temlinion (en citiloj, se øi enhavas spacetojn)\n"
+"  -v\t\tmontri version kaj parametrojn de la traduka¼o\n"
+"  -x\t\timiti la sendreøimon de mailx\n"
+"  -y\t\telekti poþtfakon specifitan en via listo 'mailboxes'\n"
+"  -z\t\teliri tuj, se ne estas mesaøoj en la poþtfako\n"
+"  -Z\t\tmalfermi la unuan poþtfakon kun nova mesaøo; eliri tuj, se mankas\n"
+"  -h\t\tdoni æi tiun helpmesaøon"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
 #, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-"<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-"[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-"[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
-"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
-"\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2671,7 +3317,7 @@ msgstr ""
 "  -Z\t\tmalfermi la unuan poþtfakon kun nova mesaøo; eliri tuj, se mankas\n"
 "  -h\t\tdoni æi tiun helpmesaøon"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2679,47 +3325,47 @@ msgstr ""
 "\n"
 "Parametroj de la traduka¼o:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Eraro dum startigo de la terminalo."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Sencimigo æe la nivelo %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG ne estis difinita por la tradukado. Ignoras.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s ne ekzistas. Æu krei øin?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Ne povas krei %s: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Nenia ricevonto specifita.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: ne povas aldoni dosieron.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Mankas poþtfako kun nova poþto."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Neniu enir-poþtfako estas difinita."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "Poþtfako estas malplena."
 
@@ -2736,11 +3382,11 @@ msgstr "Po
 msgid "Mailbox was corrupted!"
 msgstr "Poþtfako fuþiøis!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Fatala eraro! Ne povis remalfermi poþtfakon!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Ne povis þlosi poþtfakon!"
 
@@ -2748,12 +3394,12 @@ msgstr "Ne povis 
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: mbox modifita, sed mankas modifitaj mesaøoj! (Raportu æi tiun cimon.)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Skribas mesaøojn ... %d (%d%%)"
@@ -2761,186 +3407,148 @@ msgstr "Skribas mesa
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "Skribas þanøojn ..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Skribo malsukcesis! Skribis partan poþtfakon al %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Ne povis remalfermi poþtfakon!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Remalfermas poþtfakon ..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Salti al: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Nevalida indeksnumero."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Neniaj registroj."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Vi ne povas rulumi pli malsupren."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Vi ne povas rulumi pli supren."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Vi estas æe la lasta paøo."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Vi estas æe la unua paøo."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "Unua registro estas montrita."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "Lasta registro estas montrita."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Vi estas æe la lasta registro."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Vi estas æe la lasta registro."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Seræi pri: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Inversa seræo pri: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Mankas seræþablono."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Ne trovita."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "Mankas markitaj registroj."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "Seræo ne eblas por æi tiu menuo."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "Saltado ne funkcias æe dialogoj."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Markado ne funkcias."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Legas %s ... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): ne povas þanøi tempon de dosiero"
 
-#: muttlib.c:846
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Dosiero estas dosierujo; æu skribi sub øi? [(j)es, (n)e, æ(i)uj]"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr "jni"
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "Tio estas dosierujo; æu skribi dosieron en øi?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Dosiero en dosierujo: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Dosiero ekzistas; æu (s)urskribi, (a)ldoni, aý (n)uligi?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "san"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Ne eblas skribi mesaøon al POP-poþtfako."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s ne estas poþtfako!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Æu aldoni mesaøojn al %s?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "Konekto al %s fermita"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL ne estas disponata."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "Antaýkonekta komando malsukcesis."
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Eraro dum komunikado kun %s (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "Malbona IDN \"%s\"."
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "Seræas pri %s ..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Ne povis trovi la servilon \"%s\""
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Konektiøas al %s ..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Ne povis konektiøi al %s (%s)."
@@ -2972,7 +3580,8 @@ msgstr "eraro 
 msgid "SSL failed: %s"
 msgstr "SSL malsukcesis: %s"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Ne povas akiri SSL-atestilon"
 
@@ -2981,87 +3590,207 @@ msgstr "Ne povas akiri SSL-atestilon"
 msgid "SSL connection using %s (%s)"
 msgstr "SSL-konekto per %s (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Nekonata"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[ne povas kalkuli]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[nevalida dato]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "Atestilo de servilo ankoraý ne validas"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "Atestilo de servilo estas eksvalidiøinta"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Æi tiu atestilo apartenas al:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Æi tiu atestilo estis eldonita de:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Æi tiu atestilo estis valida"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "     de %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     al %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Fingrospuro: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "Kontrolo de SSL-atestilo"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(m)alakcepti, akcepti (u)nufoje, (a)kcepti æiam"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "mua"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(m)alakcepti, akcepti (u)nufoje"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "mu"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Eliri  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Averto: Ne povis skribi atestilon"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Atestilo skribita"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "SSL-konekto per %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Atestilo skribita"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Eraro dum startigo de la terminalo."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Fingrospuro: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Fingrospuro: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Atestilo de servilo ankoraý ne validas"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Atestilo de servilo estas eksvalidiøinta"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Atestilo de servilo estas eksvalidiøinta"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "Atestilo de servilo ankoraý ne validas"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "Kontrolo de SSL-atestilo"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Konektiøas al %s ..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Eraro dum komunikado kun %s (%s)"
+
+#: muttlib.c:910
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "Dosiero estas dosierujo; æu skribi sub øi? [(j)es, (n)e, æ(i)uj]"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr "jni"
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "Tio estas dosierujo; æu skribi dosieron en øi?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Dosiero en dosierujo: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Dosiero ekzistas; æu (s)urskribi, (a)ldoni, aý (n)uligi?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "san"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Ne eblas skribi mesaøon al POP-poþtfako."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Æu aldoni mesaøojn al %s?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s ne estas poþtfako!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3139,7 +3868,7 @@ msgstr "Po
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d retenite, %d movite, %d forviþite."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d retenite, %d forviþite."
@@ -3158,15 +3887,15 @@ msgstr "Uzu 'toggle-write' por reebligi skribon!"
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Poþtfako estas markita kiel neskribebla. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "Poþtfako sinkronigita."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Ne povas skribi mesaøon"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr "Entjera troo - ne povas asigni memoron."
 
@@ -3174,48 +3903,48 @@ msgstr "Entjera troo - ne povas asigni memoron."
 msgid "Not available in this menu."
 msgstr "Ne disponata en æi tiu menuo."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "AntPø"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "SekvPø"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Vidi Partojn"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Sekva"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Fino de mesaøo estas montrita."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Vi estas æe la komenco de la mesaøo"
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Inversa seræo: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Seræo: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "Helpo estas nun montrata."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "Ne plu da citita teksto."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Ne plu da necitita teksto post citita teksto."
 
@@ -3282,27 +4011,27 @@ msgstr "malplena 
 msgid "error: unknown op %d (report this error)."
 msgstr "eraro: nekonata funkcio %d (raportu æi tiun cimon)"
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Tradukas seræþablonon ..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Ruligas komandon pri trafataj mesaøoj ..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "Mankas mesaøoj, kiuj plenumas la kondiæojn"
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "Seræo atingis la finon sen trovi trafon"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "Seræo atingis la komencon sen trovi trafon"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Seræo interrompita."
 
@@ -3314,11 +4043,11 @@ msgstr "Donu PGP-pasfrazon:"
 msgid "PGP passphrase forgotten."
 msgstr "PGP-pasfrazo forgesita."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Eraro: ne povas krei PGP-subprocezon! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3326,49 +4055,22 @@ msgstr ""
 "[-- Fino de PGP-eligo --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr "[-- KOMENCO DE PGP-MESAØO --]\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- KOMENCO DE PUBLIKA PGP-ÞLOSILO --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- KOMENCO DE PGP-SUBSKRIBITA MESAØO --]\n"
-"\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- FINO DE PGP-MESAØO --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- FINO DE PUBLIKA PGP-ÞLOSILO --]\n"
-
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- FINO DE PGP-SUBSKRIBITA MESAØO --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "Ne povis kopii mesaøon"
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Eraro: ne povas trovi komencon de PGP-mesaøo! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "PGP-subskribo estis sukcese kontrolita."
 
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Interna eraro. Informu al <roessler@does-not-exist.org>."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3376,73 +4078,39 @@ msgstr ""
 "[-- Eraro: ne povas krei PGP-subprocezon! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Eraro: misformita PGP/MIME-mesaøo! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Eraro: ne povas krei dumtempan dosieron! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- La sekvaj datenoj estas PGP/MIME-æifritaj --]\n"
-"\n"
-
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Fino de PGP/MIME-æifritaj datenoj --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "Malæifro malsukcesis."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "Ne povas malfermi PGP-subprocezon!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "Æu uzi keyID = \"%s\" por %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Donu keyID por %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "Ne povas alvoki PGP"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr ""
 "PGP æ(i)fri, (s)ubskribi, subskribi (k)iel, (a)mbaý, \"i(n)line\", aý (f)"
 "orgesi? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1499
+#: pgp.c:1543
 #, fuzzy
 msgid "esabifc"
 msgstr "iskanf"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Subskribi kiel: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "Prenas PGP-þlosilon ..."
@@ -3452,16 +4120,6 @@ msgid "All matching keys are expired, revoked, or disabled."
 msgstr ""
 "Æiuj kongruaj þlosiloj estas eksvalidiøintaj, revokitaj, aý malþaltitaj."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Elekti  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Kontroli þlosilon  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3476,40 +4134,6 @@ msgstr "PGP-
 msgid "Can't open /dev/null"
 msgstr "Ne povas malfermi /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Ne povas krei dumtempan dosieron"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Key ID: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Æi tiu þlosilo ne estas uzebla: eksvalidiøinta/malþaltita/revokita."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "ID estas eksvalidiøinta/malþaltita/revokita."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "ID havas nedifinitan validecon."
-
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "ID ne estas valida."
-
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "ID estas nur iomete valida."
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Æu vi vere volas uzi la þlosilon?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Bonvolu doni la þlosilidentigilon: "
@@ -3523,11 +4147,6 @@ msgstr "Alvokas PGP ..."
 msgid "PGP Key %s."
 msgstr "PGP-þlosilo %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Seræas þlosilojn, kiuj kongruas kun \"%s\" ..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3585,7 +4204,7 @@ msgstr "Eraro dum skribado de po
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d el %d mesaøoj legitaj]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "Servilo fermis la konekton!"
 
@@ -3615,15 +4234,15 @@ msgstr "Ne povas lasi mesa
 msgid "Error connecting to server: %s"
 msgstr "Eraro dum konektiøo al servilo: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "Fermas la konekton al POP-servilo ..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Kontrolas mesaøindeksojn ..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Konekto perdita. Æu rekonekti al POP-servilo?"
 
@@ -3994,35 +4613,35 @@ msgstr "Mesa
 msgid "Sending in background."
 msgstr "Sendas en fono."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Nenia limparametro trovita! (Raportu æi tiun cimon.)"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s ne plu ekzistas!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s ne estas normala dosiero."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "Ne povas malfermi %s"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Eraro dum sendado de mesaøo; ido finis per %d (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Eligo de la liverprocezo"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "Malbona IDN %s dum kreado de resent-from."
@@ -4138,7 +4757,7 @@ msgstr "Ne povas malfermi OpenSSL-subprocezon!"
 msgid "No output from OpenSSL..."
 msgstr "Nenia eliro de OpenSSL."
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4146,19 +4765,19 @@ msgstr ""
 "[-- Fino de OpenSSL-eligo --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Eraro: ne povas krei OpenSSL-subprocezon! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- La sekvaj datenoj estas S/MIME-æifritaj --]\n"
 
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- La sekvaj datenoj estas S/MIME-subskribitaj --]\n"
 
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4166,7 +4785,7 @@ msgstr ""
 "\n"
 "[-- Fino de S/MIME-æifritaj datenoj. --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4174,7 +4793,7 @@ msgstr ""
 "\n"
 "[-- Fino de S/MIME-subskribitaj datenoj. --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
@@ -4182,22 +4801,22 @@ msgstr ""
 "S/MIME æ(i)fri, (s)ubskribi, subskribi (p)er, subskribi (k)iel, (a)mbaý, aý "
 "(f)orgesi? "
 
-#: smime.c:1936
+#: smime.c:1945
 #, fuzzy
 msgid "eswabfc"
 msgstr "ispkaf"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, aý (f)orgesi? "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345f"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
@@ -4221,6 +4840,12 @@ msgstr "Patra mesa
 msgid "Parent message is not available."
 msgstr "Patra mesaøo ne estas havebla."
 
+#~ msgid "Unexpected response received from server: %s"
+#~ msgstr "Neatendita respondo ricevita de servilo: %s"
+
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Ne povas aldoni al IMAP-poþtfako æe æi tiu servilo"
+
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "Æu krei tradician (\"inline\") PGP-mesaøon?"
 
@@ -4283,9 +4908,6 @@ msgstr "Patra mesa
 #~ "[-- kaj la indikita ekstera fonto estas --]\n"
 #~ "[-- eksvalidiøinta. --]\n"
 
-#~ msgid "%s [%s]\n"
-#~ msgstr "%s [%s]\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "[-- End of PGP output --]\n"
diff --git a/po/es.po b/po/es.po
index d2f12a7b8..47319b977 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutt 1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2001-06-08 19:44+02:00\n"
 "Last-Translator: Boris Wesslowski <Boris@Wesslowski.com>\n"
 "Language-Team: -\n"
@@ -12,26 +12,26 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "Nombre de usuario en %s: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Contraseña para %s@%s: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Salir"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Sup."
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Recuperar"
 
@@ -40,9 +40,9 @@ msgid "Select"
 msgstr "Seleccionar"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Ayuda"
 
@@ -94,174 +94,174 @@ msgstr "Guardar en archivo: "
 msgid "Alias added."
 msgstr "Dirección añadida."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "No se pudo encontrar el nombre, ¿continuar?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "La entrada \"compose\" en el archivo Mailcap requiere %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "¡Error al ejecutar \"%s\"!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Error al abrir el archivo para leer las cabeceras."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Error al abrir el archivo para quitar las cabeceras."
 
-#: attach.c:183
+#: attach.c:184
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "Error al abrir el archivo para leer las cabeceras."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr ""
 "Falta la entrada \"compose\" de mailcap para %s, creando archivo vacío."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "La entrada \"edit\" en el archivo Mailcap requiere %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Falta la entrada \"edit\" para %s en el archivo Mailcap"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr ""
 "No hay una entrada correspondiente en el archivo mailcap. Viendo como texto."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Tipo MIME no definido.  No se puede mostrar el archivo adjunto."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "No se pudo crear el filtro"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "No se pudo crear filtro"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "¡Error de escritura!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "¡No sé cómo se imprime eso!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Directorio"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Patrón"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s no es un directorio."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Buzones [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Suscrito [%s], patrón de archivos: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Directorio [%s], patrón de archivos: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "¡No se puede adjuntar un directorio!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Ningún archivo coincide con el patrón"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Crear sólo está soportado para buzones IMAP"
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Crear sólo está soportado para buzones IMAP"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Suprimir sólo está soportado para buzones IMAP"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "¿Realmente quiere suprimir el buzón \"%s\"?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "El buzón fue suprimido."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "El buzón no fue suprimido."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Cambiar directorio a:"
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Error leyendo directorio."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Patrón de archivos: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "¿Órden inverso por (f)echa, (t)amaño, (a)lfabéticamente o (s)in órden? "
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "¿Ordenar por (f)echa, (t)amaño, (a)lfabéticamente o (s)in órden? "
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "fats"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Nombre del nuevo archivo: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "No se puede mostrar el directorio"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Error al tratar de mostrar el archivo"
 
@@ -329,7 +329,7 @@ msgstr "No hay soporte para colores est
 msgid "Verify PGP signature?"
 msgstr "¿Verificar firma PGP?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "¡No se pudo crear el archivo temporal!"
 
@@ -341,118 +341,118 @@ msgstr "No se pudo crear el filtro de muestra"
 msgid "Could not copy message"
 msgstr "No se pudo copiar el mensaje"
 
-#: commands.c:186
+#: commands.c:187
 #, fuzzy
 msgid "S/MIME signature successfully verified."
 msgstr "Firma PGP verificada con éxito."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr ""
 
-#: commands.c:193
+#: commands.c:194
 #, fuzzy
 msgid "S/MIME signature could NOT be verified."
 msgstr "Firma PGP NO pudo ser verificada."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "Firma PGP verificada con éxito."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "Firma PGP NO pudo ser verificada."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Comando: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Rebotar mensaje a: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Rebotar mensajes marcados a: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "¡Dirección errónea!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Rebotar mensaje a %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Rebotar mensajes a %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Message not bounced."
 msgstr "Mensaje rebotado."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Messages not bounced."
 msgstr "Mensajes rebotados."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Mensaje rebotado."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Mensajes rebotados."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "No se pudo crear el proceso del filtro"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Redirigir el mensaje al comando:"
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "No ha sido definida la órden de impresión."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "¿Impimir mensaje?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "¿Imprimir mensajes marcados?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Mensaje impreso"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Mensajes impresos"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "El mensaje no pudo ser imprimido"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Los mensajes no pudieron ser imprimidos"
 
-#: commands.c:508
+#: commands.c:509
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -460,7 +460,7 @@ msgid ""
 msgstr ""
 "Órden-rev fech(a)/d(e)/(r)ece/a(s)nto/(p)ara/(h)ilo/(n)ada/ta(m)añ/punta(j): "
 
-#: commands.c:509
+#: commands.c:510
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
@@ -468,74 +468,74 @@ msgid ""
 msgstr ""
 "Órden fech(a)/d(e)/(r)ecep/a(s)unto/(p)ara/(h)ilo/(n)ada/ta(m)año/punta(j)e: "
 
-#: commands.c:510
+#: commands.c:511
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "aersphnmj"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Comando de shell: "
 
-#: commands.c:709
+#: commands.c:716
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "%s%s en buzón"
 
-#: commands.c:710
+#: commands.c:717
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "%s%s en buzón"
 
-#: commands.c:711
+#: commands.c:718
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "%s%s en buzón"
 
-#: commands.c:712
+#: commands.c:719
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "%s%s en buzón"
 
-#: commands.c:713
+#: commands.c:720
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
 msgstr "%s%s en buzón"
 
-#: commands.c:713
+#: commands.c:720
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
 msgstr "%s%s en buzón"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " marcado"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Copiando a %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "¿Convertir a %s al mandar?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type cambiado a %s."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "El mapa de caracteres fue cambiado a %s; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "dejando sin convertir"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "convirtiendo"
 
@@ -629,103 +629,686 @@ msgstr ""
 msgid "Attaching selected files..."
 msgstr "Adjuntando archivos seleccionados..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "¡Imposible adjuntar %s!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Abrir buzón para adjuntar mensaje de"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "No hay mensajes en esa carpeta."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Marque el mensaje que quiere adjuntar."
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "¡Imposible adjuntar!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "Recodificado sólo afecta archivos adjuntos de tipo texto."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "El archivo adjunto actual no será convertido."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "El archivo adjunto actual será convertido."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "La codificación no es válida."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "¿Guardar una copia de este mensaje?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Renombrar a: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "No se pudo encontrar en disco: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Archivo nuevo: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type es de la forma base/subtipo"
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Content-Type %s desconocido"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "No se pudo creal el archivo %s"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "Lo que tenemos aquí es un fallo al producir el archivo a adjuntar"
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "¿Posponer el mensaje?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "Guardar mensaje en el buzón"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Escribiendo mensaje en %s ..."
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "Mensaje escrito."
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "error en patrón en: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "error en patrón en: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "error en patrón en: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "error en patrón en: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "error en patrón en: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "error en patrón en: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "error en patrón en: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "error en patrón en: %s"
+
+#: crypt-gpgme.c:993
+msgid "Warning: One of the keys has been revoked\n"
+msgstr ""
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Certificado del servidor ha expirado"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL no está disponible."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Huella: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Error al enviar el mensaje."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Error en línea de comando: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Fin de datos firmados --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- ¡Error: no se pudo cear archivo temporal! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PRINCIPIO DEL MENSAJE PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PRINCIPIO DEL BLOQUE DE CLAVES PÚBLICAS PGP --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PRINCIPIO DEL MENSAJE FIRMADO CON PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+#, fuzzy
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- FIN DEL MENSAJE PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- FIN DEL BLOQUE DE CLAVES PÚBLICAS PGP --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+#, fuzzy
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- FIN DEL MENSAJE FIRMADO CON PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- ¡Error: no se encontró el principio del mensaje PGP! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- ¡Error: mensaje PGP/MIME mal formado! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- ¡Error: no se pudo cear archivo temporal! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Lo siguiente está cifrado con PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Lo siguiente está cifrado con PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Fin de datos cifrados con PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+#, fuzzy
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Fin de datos cifrados con PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr ""
+"[-- Los siguientes datos están firmados --]\n"
+"\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Lo siguiente está cifrado con PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Fin de datos firmados --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Fin de datos cifrados con PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Mes inválido: %s"
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Mes inválido: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Mes inválido: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Cifrar"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "El certificado fue guardado"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Key ID: 0x%s"
+
+#: crypt-gpgme.c:3099
+msgid "[Revoked]"
+msgstr ""
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Salir  "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "No se pudo crear archivo temporal"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Conectando a %s..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Error al conectar al servidor: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Key ID: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "CLOSE falló"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Todas las llaves que coinciden están marcadas expiradas/revocadas."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Salir  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Seleccionar  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Verificar clave  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "Claves PGP que coinciden con \"%s\"."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "Claves PGP que coinciden con \"%s\"."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "Claves PGP que coinciden con \"%s\"."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "Claves PGP que coinciden con \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, fuzzy, c-format
+msgid "%s <%s>."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3594
+#, fuzzy, c-format
+msgid "%s \"%s\"."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Esta clave no se puede usar: expirada/desactivada/revocada."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+#, fuzzy
+msgid "ID is expired/disabled/revoked."
+msgstr "Esta clave está expirada/desactivada/revocada"
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr ""
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+#, fuzzy
+msgid "ID is not valid."
+msgstr "Esta ID no es de confianza."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+#, fuzzy
+msgid "ID is only marginally valid."
+msgstr "Esta ID es marginalmente de confianza."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s ¿Realmente quiere utilizar la llave?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Buscando claves que coincidan con \"%s\"..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "¿Usar keyID = \"%s\" para %s?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Entre keyID para %s: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr "¿co(d)ificar, f(i)rmar (c)omo, amb(o)s, inc(l)uido, o ca(n)celar? "
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "dicon"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr "¿co(d)ificar, f(i)rmar (c)omo, amb(o)s, inc(l)uido, o ca(n)celar? "
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "dicon"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Firmar como: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Error al abrir el archivo para leer las cabeceras."
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -742,29 +1325,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "Contraseña PGP olvidada."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Invocando PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Mensaje no enviado."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
@@ -776,7 +1359,7 @@ msgstr ""
 "[-- Error: ¡Estructura multipart/signed inconsistente! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -785,7 +1368,7 @@ msgstr ""
 "[-- Error: ¡Protocolo multipart/signed %s desconocido! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -795,7 +1378,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
@@ -804,7 +1387,7 @@ msgstr ""
 "[-- Los siguientes datos están firmados --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -812,7 +1395,7 @@ msgstr ""
 "[-- Advertencia: No se pudieron encontrar firmas. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 #, fuzzy
 msgid ""
 "\n"
@@ -821,226 +1404,256 @@ msgstr ""
 "\n"
 "[-- Fin de datos firmados --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Invocando PGP..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "sí"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "no"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "¿Salir de Mutt?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Presione una tecla para continuar..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " ('?' para lista): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Ningún buzón está abierto."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "No hay mensajes."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "El buzón es de sólo lectura."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Función no permitida en el modo de adjuntar mensaje."
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "No hay mensajes visibles."
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "¡No se puede cambiar a escritura un buzón de sólo lectura!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Los cambios al buzón seran escritos al salir del mismo."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Los cambios al buzón no serán escritos."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Salir"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Guardar"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Nuevo"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Responder"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Grupo"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Buzón fue modificado.  Los indicadores pueden estar mal."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Correo nuevo en este buzón."
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "Buzón fue modificado externamente."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "No hay mensajes marcados."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 #, fuzzy
 msgid "Nothing to do."
 msgstr "Conectando a %s..."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Saltar a mensaje: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "Argumento tiene que ser un número de mensaje."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Ese mensaje no es visible."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Número de mensaje erróneo."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Suprimir mensajes que coincidan con: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "No hay patrón limitante activo."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Límite: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Limitar a mensajes que coincidan con: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "¿Salir de Mutt?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Marcar mensajes que coincidan con: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "No suprimir mensajes que coincidan con: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Desmarcar mensajes que coincidan con: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Abrir buzón en modo de sólo lectura"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Abrir buzón"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
-#, c-format
-msgid "%s is not a mailbox."
-msgstr "%s no es un buzón."
+#: curs_main.c:1081 mx.c:512 mx.c:658
+#, c-format
+msgid "%s is not a mailbox."
+msgstr "%s no es un buzón."
+
+#: curs_main.c:1176
+msgid "Exit Mutt without saving?"
+msgstr "¿Salir de Mutt sin guardar?"
+
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "La muestra por hilos no está activada."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "guardar este mensaje para enviarlo después"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
 
-#: curs_main.c:1165
-msgid "Exit Mutt without saving?"
-msgstr "¿Salir de Mutt sin guardar?"
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Está en el último mensaje."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "No hay mensajes sin suprimir."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Está en el primer mensaje."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "La búsqueda volvió a empezar desde arriba."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "La búsqueda volvió a empezar desde abajo."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "No hay mensajes nuevos"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "No hay mensajes sin leer"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " en esta vista limitada"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 #, fuzzy
 msgid "Can't change 'important' flag on POP server."
 msgstr "No se pueden editar mensajes en el servidor POP."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "No hay mas hilos."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Ya está en el primer hilo."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "La muestra por hilos no está activada."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "El hilo contiene mensajes sin leer."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "No se pueden editar mensajes en el servidor POP."
 
@@ -1173,76 +1786,76 @@ msgstr "Poner indicador"
 msgid "Clear flag"
 msgstr "Quitar indicador"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- ¡Error: no se pudo mostrar ninguna parte de multipart/alternative! --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Archivo adjunto #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Tipo: %s/%s, codificación: %s, tamaño: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Automuestra usando %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Invocando comando de automuestra: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- No se puede ejecutar %s. --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Error al ejecutar %s --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Error: Contenido message/external no tiene parámetro acces-type --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Este archivo adjunto %s/%s "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(tamaño %s bytes) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "ha sido suprimido --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- el %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- nombre: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, fuzzy, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Este archivo adjunto %s/%s "
 
-#: handler.c:1696
+#: handler.c:1712
 #, fuzzy
 msgid ""
 "[-- and the indicated external source has --]\n"
@@ -1251,36 +1864,36 @@ msgstr ""
 "[-- Este archivo adjunto %s/%s no está incluido --]\n"
 "[-- y la fuente externa indicada ha expirado. --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 "[-- Este archivo adjunto %s/%s no está incluido --]\n"
 "[-- y el tipo de acceso indicado %s no está soportado --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Error: multipart/signed no tiene protocolo."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Error: ¡multipart/encrypted no tiene parámetro de protocolo!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "¡Imposible abrir archivo temporal!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s no está soportado "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(use '%s' para ver esta parte)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(necesita 'view-attachments' enlazado a una tecla)"
 
@@ -1387,47 +2000,47 @@ msgstr "Verificando autentidad (APOP)..."
 msgid "SASL authentication failed."
 msgstr "Verificación de autentidad SASL falló."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr ""
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Consiguiendo espacio de nombres..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Consiguiendo lista de carpetas..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 #, fuzzy
 msgid "No such folder"
 msgstr "%s: color desconocido"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Crear buzón: "
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "El buzón tiene que tener un nombre."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Buzón creado."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Crear buzón: "
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "CLOSE falló"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "Buzón creado."
@@ -1439,139 +2052,136 @@ msgstr "Buz
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "¡Error fatal!  La cuenta de mensajes no está sincronizada."
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Cerrando conexión a %s..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Este servidor IMAP es ancestral. Mutt no puede trabajar con el."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "¿Asegurar conexión con TLS?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "No se pudo negociar una conexión TLS"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Seleccionando %s..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 #, fuzzy
 msgid "Error opening mailbox"
 msgstr "¡Error al escribir el buzón!"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "No es posible agregar a buzones IMAP en este servidor."
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "¿Crear %s?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Marcando %d mensajes como suprimidos..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 #, fuzzy
 msgid "Expunge failed"
 msgstr "CLOSE falló"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Guardando indicadores de estado de mensajes... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Eliminando mensajes del servidor..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "CLOSE falló"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 #, fuzzy
 msgid "Bad mailbox name"
 msgstr "Crear buzón: "
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Suscribiendo a %s..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Desuscribiendo de %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr ""
 "No se pueden recoger cabeceras de mensajes de esta versión de servidor IMAP."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, fuzzy, c-format
 msgid "Could not create temporary file %s"
 msgstr "¡No se pudo crear el archivo temporal!"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Consiguiendo cabeceras de mensajes... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Consiguiendo cabeceras de mensajes... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Consiguiendo mensaje..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "El índice de mensajes es incorrecto. Intente reabrir el buzón."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Subiendo mensaje ..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Copiando %d mensajes a %s..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Copiando mensaje %d a %s..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "¿Continuar?"
 
@@ -1580,124 +2190,124 @@ msgstr "
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:678
+#: init.c:644
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "marcar mensajes que coincidan con un patrón"
 
-#: init.c:680
+#: init.c:646
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "quitar marca de los mensajes que coincidan con un patrón"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias: sin dirección"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "encabezado erróneo"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: órden desconocido"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): error en expresión regular: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: variable desconocida"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "prefijo es ilegal con reset"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "valor es ilegal con reset"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s está activada"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s no está activada"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: tipo de buzón inválido"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: valor inválido"
 
-#: init.c:1589
+#: init.c:1555
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s: tipo desconocido"
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: tipo desconocido"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Error en %s, renglón %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: errores en %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: lectura fue cancelada por demasiados errores en %s"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: errores en %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: demasiados parámetros"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: comando desconocido"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Error en línea de comando: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "imposible determinar el directorio del usuario"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "imposible determinar nombre del usuario"
 
@@ -2159,405 +2769,414 @@ msgid "compose a new mail message"
 msgstr "escribir un mensaje nuevo"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "abrir otro buzón"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "abrir otro buzón en modo de sólo lectura"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "quitarle un indicador a un mensaje"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "suprimir mensajes que coincidan con un patrón"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "forzar el obtener correo de un servidor IMAP"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "obtener correo de un servidor POP"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "ir al primer mensaje"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "ir al último mensaje"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "mostrar sólo mensajes que coincidan con un patrón"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Rebotar mensajes marcados a: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "saltar al próximo mensaje nuevo"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 #, fuzzy
 msgid "jump to the next new or unread message"
 msgstr "saltar al próximo mensaje sin leer"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "saltar al próximo subhilo"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "saltar al próximo hilo"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "ir al próximo mensaje no borrado"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "saltar al próximo mensaje sin leer"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "saltar al mensaje anterior en el hilo"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "saltar al hilo anterior"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "saltar al subhilo anterior"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "ir al mensaje no borrado anterior"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "saltar al mensaje nuevo anterior"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 #, fuzzy
 msgid "jump to the previous new or unread message"
 msgstr "saltar al mensaje sin leer anterior"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "saltar al mensaje sin leer anterior"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "marcar el hilo actual como leído"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "marcar el subhilo actual como leído"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "ponerle un indicador a un mensaje"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "guardar cabios al buzón"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "marcar mensajes que coincidan con un patrón"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "restaurar mensajes que coincidan con un patrón"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "quitar marca de los mensajes que coincidan con un patrón"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "ir al centro de la página"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "ir a la próxima entrada"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "bajar un renglón"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "ir a la próxima página"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "saltar al final del mensaje"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "cambiar muestra del texto citado"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "saltar atrás del texto citado"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "saltar al principio del mensaje"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "filtrar mensaje/archivo adjunto via un comando de shell"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "ir a la entrada anterior"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "subir un renglón"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "ir a la página anterior"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "imprimir la entrada actual"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "Obtener direcciones de un programa externo"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "agregar nuevos resultados de la búsqueda a anteriores"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "guardar cambios al buzón y salir"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "reeditar mensaje pospuesto"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "refrescar la pantalla"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{interno}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "suprimir el buzón actual (sólo IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "responder a un mensaje"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "usar el mensaje actual como base para uno nuevo"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "guardar mensaje/archivo adjunto en un archivo"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "buscar con una expresión regular"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "buscar con una expresión regular hacia atrás"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "buscar próxima coincidencia"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "buscar próxima coincidencia en dirección opuesta"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "cambiar coloración de patrón de búsqueda"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "invocar comando en un subshell"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "ordenar mensajes"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "ordenar mensajes en órden inverso"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "marcar la entrada actual"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "aplicar la próxima función a los mensajes marcados"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 #, fuzzy
 msgid "apply next function ONLY to tagged messages"
 msgstr "aplicar la próxima función a los mensajes marcados"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "marcar el subhilo actual"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "marcar el hilo actual"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "cambiar el indicador de 'nuevo' de un mensaje"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "cambiar si los cambios del buzón serán guardados"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "cambiar entre ver buzones o todos los archivos al navegar"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "ir al principio de la página"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "restaurar la entrada actual"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "restaurar todos los mensajes del hilo"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "restaurar todos los mensajes del subhilo"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "mostrar el número de versión y fecha de Mutt"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "mostrar archivo adjunto usando entrada mailcap si es necesario"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "mostrar archivos adjuntos tipo MIME"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr ""
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "mostrar patrón de limitación activo"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "colapsar/expander hilo actual"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "colapsar/expander todos los hilos"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "adjuntar clave PGP pública"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "mostrar opciones PGP"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "enviar clave PGP pública"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "verificar clave PGP pública"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "mostrar la identificación del usuario de la clave"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "verificar presencia de un pgp clásico"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Aceptar la cadena construida"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "Agregar un remailer a la cadena"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "Poner un remailer en la cadena"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "Suprimir un remailer de la cadena"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "Seleccionar el elemento anterior en la cadena"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "Seleccionar el siguiente elemento en la cadena"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "enviar el mensaje a través de una cadena de remailers mixmaster"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "crear copia descifrada y suprimir "
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "crear copia descifrada"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 #, fuzzy
 msgid "wipe passphrase(s) from memory"
 msgstr "borrar contraseña PGP de la memoria"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 #, fuzzy
 msgid "extract supported public keys"
 msgstr "extraer claves PGP públicas"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 #, fuzzy
 msgid "show S/MIME options"
 msgstr "mostrar opciones PGP"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr ""
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "¡Sin memoria!"
 
@@ -2586,11 +3205,11 @@ msgstr ""
 #: main.c:61
 #, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2639,25 +3258,63 @@ msgstr ""
 "    along with this program; if not, write to the Free Software\n"
 "    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
 
-#: main.c:99
+#: main.c:99
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"uso: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <arch> ] [ -m <tipo> ] [ -f <arch> ]\n"
+"     mutt [ -nx ] [ -e <cmd> ] [ -a <arch> ] [ -F <arch> ] [ -H <arch> ] [ -"
+"i <arch> ] [ -s <asunto> ] [ -b <dir> ] [ -c <dir> ] <dir> [ ... ]\n"
+"     mutt [ -n ] [ -e <cmd> ] [ -F <archivo> ] -p\n"
+"     mutt -v[v]\n"
+"\n"
+"opciones:\n"
+"  -a <archivo>\tañadir un archivo al mensaje\n"
+"  -b <dirección>\tespecifica una dirección para enviar copia ciega (BCC)\n"
+"  -c <dirección>\tespecifica una dirección para enviar copia (CC)\n"
+"  -e <comando>\tespecifica un comando a ser ejecutado al empezar\n"
+"  -f <archivo>\tespecifica un buzón a leer\n"
+"  -F <archivo>\tespecifica un archivo muttrc alterno\n"
+"  -H <archivo>\tespecifica un archivo para obtener una cabecera\n"
+"  -i <archivo>\tespecifica un archivo a incluir en la respuesta\n"
+"  -m <tipo>\tespecifica un tipo de buzón\n"
+"  -n\t\tproduce que Mutt no lea el archivo Muttrc del sistema\n"
+"  -p\t\tcontinuar un mensaje pospuesto\n"
+"  -R\t\tabrir un buzón en modo de solo-lectura\n"
+"  -s <asunto>\tespecifica el asunto (necesita comillas si contiene "
+"espacios)\n"
+"  -v\t\tmuestra versión y opciones definidas al compilar\n"
+"  -x\t\tsimula el modo de envío mailx\n"
+"  -y\t\tselecciona un buzón especificado en su lista `mailboxes'\n"
+"  -z\t\tsalir inmediatamente si no hay mensajes en el buzón\n"
+"  -Z\t\tabrir la primera carpeta con mensajes nuevos, salir si no hay\n"
+"  -h\t\teste mensaje de ayuda"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
 #, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-"<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-"[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-"[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
-"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
-"\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2704,7 +3361,7 @@ msgstr ""
 "  -Z\t\tabrir la primera carpeta con mensajes nuevos, salir si no hay\n"
 "  -h\t\teste mensaje de ayuda"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2712,47 +3369,47 @@ msgstr ""
 "\n"
 "Opciones especificadas al compilar:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Error al inicializar la terminal."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Modo debug a nivel %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG no fue definido al compilar.  Ignorado.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s no existe. ¿Crearlo?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "No se pudo crear %s: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "No hay destinatario.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: imposible adjuntar archivo.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Ningún buzón con correo nuevo."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Ningún buzón de entrada fue definido."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "El buzón está vacío."
 
@@ -2769,11 +3426,11 @@ msgstr "
 msgid "Mailbox was corrupted!"
 msgstr "¡El buzón fue corrupto!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "¡Error fatal! ¡No se pudo reabrir el buzón!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "¡Imposible bloquear buzón!"
 
@@ -2781,12 +3438,12 @@ msgstr "
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: buzón modificado, ¡pero sin mensajes modificados! (reporte este fallo)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Guardando mensajes... %d (%d%%)"
@@ -2794,188 +3451,149 @@ msgstr "Guardando mensajes... %d (%d%%)"
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 #, fuzzy
 msgid "Committing changes..."
 msgstr "Compilando patrón de búsqueda..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "¡La escritura falló! Buzón parcial fue guardado en %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "¡Imposible reabrir buzón!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Reabriendo buzón..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Saltar a: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Número de índice inválido."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "No hay entradas."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Ya no puede bajar más."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Ya no puede subir más."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Está en la última página."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Está en la primera página."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "La primera entrada está siendo mostrada."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "La última entrada está siendo mostrada."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Está en la última entrada."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Está en la primera entrada."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Buscar por: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Buscar en sentido opuesto: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Nada que buscar."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "No fue encontrado."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "No hay entradas marcadas."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "No puede buscar en este menú."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "Saltar no está implementado para diálogos."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Marcar no está soportado."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Leyendo %s... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
-#: muttlib.c:846
-#, fuzzy
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Archivo es un directorio, ¿guardar en él?"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr ""
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "Archivo es un directorio, ¿guardar en él?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Archivo bajo directorio: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "El archivo existe, ¿(s)obreescribir, (a)gregar o (c)ancelar?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "sac"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "No se puede guardar un mensaje en un buzón POP."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "¡%s no es un buzón!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "¿Agregar mensajes a %s?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "Conexión a %s cerrada"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL no está disponible."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "La órden anterior a la conexión falló."
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Error al hablar con %s (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "Buscando %s..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "No se encontró la dirección del servidor %s"
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Conectando a %s..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "No se pudo conectar a %s (%s)."
@@ -3007,7 +3625,8 @@ msgstr ""
 msgid "SSL failed: %s"
 msgstr "CLOSE falló"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Imposible recoger el certificado de la contraparte"
 
@@ -3016,87 +3635,208 @@ msgstr "Imposible recoger el certificado de la contraparte"
 msgid "SSL connection using %s (%s)"
 msgstr "Conectando por SSL con %s (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[imposible calcular]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[fecha inválida]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "Certificado del servidor todavía no es válido"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "Certificado del servidor ha expirado"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Este certificado pertenece a:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Este certificado fue producido por:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Este certificado es válido"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   de %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     a %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Huella: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "Prueba del certificado SSL"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)echazar, aceptar (u)na vez, (a)ceptar siempre"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "rua"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)echazar, aceptar (u)na vez"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "ru"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Salir  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Advertencia: no se pudo guardar el certificado"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "El certificado fue guardado"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "Conectando por SSL con %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "El certificado fue guardado"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Error al inicializar la terminal."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Huella: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Huella: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Certificado del servidor todavía no es válido"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Certificado del servidor ha expirado"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Certificado del servidor ha expirado"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "Certificado del servidor todavía no es válido"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "Prueba del certificado SSL"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Conectando a %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Error al hablar con %s (%s)"
+
+#: muttlib.c:910
+#, fuzzy
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "Archivo es un directorio, ¿guardar en él?"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr ""
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "Archivo es un directorio, ¿guardar en él?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Archivo bajo directorio: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "El archivo existe, ¿(s)obreescribir, (a)gregar o (c)ancelar?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "sac"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "No se puede guardar un mensaje en un buzón POP."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "¿Agregar mensajes a %s?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "¡%s no es un buzón!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3174,7 +3914,7 @@ msgstr "Buz
 msgid "%d kept, %d moved, %d deleted."
 msgstr "quedan %d, %d movidos, %d suprimidos."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "quedan %d, %d suprimidos."
@@ -3193,15 +3933,15 @@ msgstr "
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Buzón está marcado inescribible. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "El buzón fue marcado."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "No se pudo escribir el mensaje"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
@@ -3209,48 +3949,48 @@ msgstr ""
 msgid "Not available in this menu."
 msgstr "No disponible en este menú."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "PágAnt"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "PróxPág"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Adjuntos"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Sig."
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "El final del mensaje está siendo mostrado."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "El principio del mensaje está siendo mostrado."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Buscar hacia atrás: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Buscar: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "La ayuda está siendo mostrada."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "No hay mas texto citado."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "No hay mas texto sin citar bajo el texto citado."
 
@@ -3318,27 +4058,27 @@ msgstr "patr
 msgid "error: unknown op %d (report this error)."
 msgstr "error: op %d desconocida (reporte este error)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Compilando patrón de búsqueda..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Ejecutando comando en mensajes que coinciden..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "Ningún mensaje responde al criterio dado."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "La búsqueda llegó al final sin encontrar nada."
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "La búsqueda llegó al principio sin encontrar nada."
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Búsqueda interrumpida."
 
@@ -3350,11 +4090,11 @@ msgstr "Entre contrase
 msgid "PGP passphrase forgotten."
 msgstr "Contraseña PGP olvidada."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- ¡Error: imposible crear subproceso PGP! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3362,60 +4102,23 @@ msgstr ""
 "[-- Fin de salida PGP --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PRINCIPIO DEL MENSAJE PGP --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PRINCIPIO DEL BLOQUE DE CLAVES PÚBLICAS PGP --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PRINCIPIO DEL MENSAJE FIRMADO CON PGP --]\n"
-"\n"
-
-#: pgp.c:423
+#: pgp.c:387 pgp.c:951
 #, fuzzy
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- FIN DEL MENSAJE PGP --]\n"
-"\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- FIN DEL BLOQUE DE CLAVES PÚBLICAS PGP --]\n"
+msgid "Could not decrypt PGP message"
+msgstr "No se pudo copiar el mensaje"
 
-#: pgp.c:427
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
 #, fuzzy
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- FIN DEL MENSAJE FIRMADO CON PGP --]\n"
-"\n"
-
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- ¡Error: no se encontró el principio del mensaje PGP! --]\n"
-"\n"
+msgid "PGP message successfully decrypted."
+msgstr "Firma PGP verificada con éxito."
 
-#: pgp.c:704
+#: pgp.c:723
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Error interno. Informe a <roessler@does-not-exist.org>."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3423,74 +4126,37 @@ msgstr ""
 "[-- ¡Error: imposible crear subproceso PGP! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- ¡Error: mensaje PGP/MIME mal formado! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- ¡Error: no se pudo cear archivo temporal! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- Lo siguiente está cifrado con PGP/MIME --]\n"
-"\n"
-
-#: pgp.c:915
+#: pgp.c:828
 #, fuzzy
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr ""
-"\n"
-"[-- Fin de datos cifrados con PGP/MIME --]\n"
+msgid "Decryption failed"
+msgstr "El login falló."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "¡No se pudo abrir subproceso PGP!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "¿Usar keyID = \"%s\" para %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Entre keyID para %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "No se pudo invocar PGP"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "¿co(d)ificar, f(i)rmar (c)omo, amb(o)s, inc(l)uido, o ca(n)celar? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1499
+#: pgp.c:1543
 #, fuzzy
 msgid "esabifc"
 msgstr "dicoln"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Firmar como: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "Recogiendo clave PGP..."
@@ -3500,16 +4166,6 @@ msgstr "Recogiendo clave PGP..."
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Todas las llaves que coinciden están marcadas expiradas/revocadas."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Seleccionar  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Verificar clave  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3524,43 +4180,6 @@ msgstr "Claves PGP que coinciden con \"%s\"."
 msgid "Can't open /dev/null"
 msgstr "No se pudo abrir /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "No se pudo crear archivo temporal"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Key ID: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Esta clave no se puede usar: expirada/desactivada/revocada."
-
-#: pgpkey.c:612
-#, fuzzy
-msgid "ID is expired/disabled/revoked."
-msgstr "Esta clave está expirada/desactivada/revocada"
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr ""
-
-#: pgpkey.c:619
-#, fuzzy
-msgid "ID is not valid."
-msgstr "Esta ID no es de confianza."
-
-#: pgpkey.c:622
-#, fuzzy
-msgid "ID is only marginally valid."
-msgstr "Esta ID es marginalmente de confianza."
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s ¿Realmente quiere utilizar la llave?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Por favor entre la identificación de la clave: "
@@ -3574,11 +4193,6 @@ msgstr "Invocando pgp..."
 msgid "PGP Key %s."
 msgstr "Clave PGP %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Buscando claves que coincidan con \"%s\"..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3636,7 +4250,7 @@ msgstr "
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d de %d mensajes leídos]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "¡El servidor cerró la conneción!"
 
@@ -3666,15 +4280,15 @@ msgstr "No es posible dejar los mensajes en el servidor."
 msgid "Error connecting to server: %s"
 msgstr "Error al conectar al servidor: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "Cerrando conexión al servidor POP..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Verificando índice de mensajes..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Conexión perdida. ¿Reconectar al servidor POP?"
 
@@ -4057,35 +4671,35 @@ msgstr "Mensaje enviado."
 msgid "Sending in background."
 msgstr "Enviando en un proceso en segundo plano."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "El parámetro límite no fue encontrado. [reporte este error]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "¡%s ya no existe!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
 msgstr "%s no es un buzón."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "No se pudo abrir %s"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Error al enviar mensaje, proceso hijo terminó %d (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Salida del proceso de repartición de correo"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
@@ -4210,7 +4824,7 @@ msgstr "
 msgid "No output from OpenSSL..."
 msgstr ""
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"
@@ -4219,26 +4833,26 @@ msgstr ""
 "[-- Fin de salida PGP --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 #, fuzzy
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- ¡Error: imposible crear subproceso PGP! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 #, fuzzy
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- Lo siguiente está cifrado con PGP/MIME --]\n"
 "\n"
 
-#: smime.c:1765
+#: smime.c:1767
 #, fuzzy
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- Los siguientes datos están firmados --]\n"
 "\n"
 
-#: smime.c:1829
+#: smime.c:1831
 #, fuzzy
 msgid ""
 "\n"
@@ -4247,7 +4861,7 @@ msgstr ""
 "\n"
 "[-- Fin de datos cifrados con PGP/MIME --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 #, fuzzy
 msgid ""
 "\n"
@@ -4256,27 +4870,27 @@ msgstr ""
 "\n"
 "[-- Fin de datos firmados --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr "¿co(d)ificar, f(i)rmar (c)omo, amb(o)s o ca(n)celar? "
 
-#: smime.c:1936
+#: smime.c:1945
 #, fuzzy
 msgid "eswabfc"
 msgstr "dicon"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr ""
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
@@ -4301,6 +4915,9 @@ msgstr "El mensaje anterior no es visible en vista limitada"
 msgid "Parent message is not available."
 msgstr "El mensaje anterior no está disponible."
 
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "No es posible agregar a buzones IMAP en este servidor."
+
 #, fuzzy
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "¿Crear un mensaje de tipo application/pgp?"
@@ -4353,9 +4970,6 @@ msgstr "El mensaje anterior no est
 #~ msgid "Copy"
 #~ msgstr "Copiar"
 
-#~ msgid "%s [%s]\n"
-#~ msgstr "%s [%s]\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "[-- End of PGP output --]\n"
diff --git a/po/et.po b/po/et.po
index 5f957a960..47aff9672 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutt 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2002-12-09 17:19+02:00\n"
 "Last-Translator: Toomas Soome <tsoome@muhv.pri.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -14,26 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "Kasutajanimi serveril %s: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s parool: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Välju"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Kustuta"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Taasta"
 
@@ -42,9 +42,9 @@ msgid "Select"
 msgstr "Vali"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Appi"
 
@@ -96,172 +96,172 @@ msgstr "Salvestan faili: "
 msgid "Alias added."
 msgstr "Hüüdnimi on lisatud."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Nimemuster ei sobi, jätkan?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap koostamise kirje nõuab %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Viga \"%s\" käivitamisel!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Faili avamine päiste analüüsiks ebaõnnestus."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Faili avamine päiste eemaldamiseks ebaõnnestus."
 
-#: attach.c:183
+#: attach.c:184
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "Faili avamine päiste analüüsiks ebaõnnestus."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "Mailcap koostamise kirjet %s jaoks puudub, loon tühja faili."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Mailcap toimeta kirje nõuab %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Mailcap toimeta kirjet %s jaoks ei ole."
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Sobivat mailcap kirjet pole. Käsitlen tekstina."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME tüüp ei ole defineeritud. Lisa ei saa vaadata."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Filtri loomine ebaõnnestus"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Ei õnnestu luua filtrit"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Viga kirjutamisel!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Ma ei tea, kuidas seda trükkida!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Chdir"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Mask"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ei ole kataloog."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Postkastid [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Tellitud [%s], faili mask: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Kataloog [%s], failimask: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Kataloogi ei saa lisada!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Maskile vastavaid faile ei ole"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Luua saab ainult IMAP postkaste"
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Luua saab ainult IMAP postkaste"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Kustutada saab ainult IMAP postkaste"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Kas tõesti kustutada postkast \"%s\"?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Postkast on kustutatud."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "Postkasti ei kustutatud."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Mine kataloogi: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Viga kataloogi skaneerimisel."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Failimask: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Järjestan tagurpidi (k)uup., (t)ähest., (s)uuruse järgi või (e)i järjesta? "
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Järjestan (k)uup., (t)ähest., (s)uuruse järgi või (e)i järjesta? "
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "ktse"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Uus failinimi: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Kataloogi ei saa vaadata"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Viga faili vaatamisel"
 
@@ -328,7 +328,7 @@ msgstr "vaikimisi v
 msgid "Verify PGP signature?"
 msgstr "Kontrollin PGP allkirja?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Ei õnnestu luua ajutist faili!"
 
@@ -340,116 +340,116 @@ msgstr "Filtri loomine eba
 msgid "Could not copy message"
 msgstr "Teadet ei õnnestu kopeerida."
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "S/MIME allkiri on edukalt kontrollitud."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "S/MIME sertifikaadi omanik ei ole kirja saatja."
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr ""
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "S/MIME allkirja EI ÕNNESTU kontrollida."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "PGP allkiri on edukalt kontrollitud."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "PGP allkirja EI ÕNNESTU kontrollida."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Käsklus: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Peegelda teade aadressile: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Peegelda märgitud teated aadressile: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Viga aadressi analüüsimisel!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Peegelda teade aadressile %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Peegelda teated aadressile %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Message not bounced."
 msgstr "Teade on peegeldatud."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Messages not bounced."
 msgstr "Teated on peegeldatud."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Teade on peegeldatud."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Teated on peegeldatud."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "Filterprotsessi loomine ebaõnnestus"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Toruga käsule: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Trükkimise käsklust ei ole defineeritud."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Trükin teate?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Trükin märgitud teated?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Teade on trükitud"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Teated on trükitud"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "Teadet ei saa trükkida"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Teateid ei saa trükkida"
 
-#: commands.c:508
+#: commands.c:509
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -457,7 +457,7 @@ msgid ""
 msgstr ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 
-#: commands.c:509
+#: commands.c:510
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
@@ -465,74 +465,74 @@ msgid ""
 msgstr ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 
-#: commands.c:510
+#: commands.c:511
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzc"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Käsurea käsk: "
 
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Dekodeeri-salvesta%s postkasti"
 
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Dekodeeri-kopeeri%s postkasti"
 
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Dekrüpti-salvesta%s postkasti"
 
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Dekrüpti-kopeeri%s postkasti"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Salvesta%s postkasti"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Kopeeri%s postkasti"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " märgitud"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Kopeerin kausta %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Teisendan saatmisel kooditabelisse %s?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Sisu tüübiks on nüüd %s."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Kooditabeliks on nüüd %s; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "ei teisenda"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "teisendan"
 
@@ -625,103 +625,669 @@ msgstr ""
 msgid "Attaching selected files..."
 msgstr "Lisan valitud failid..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "%s ei õnnestu lisada!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Avage postkast, millest lisada teade"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Selles kaustas ei ole teateid."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Märkige teada, mida soovite lisada!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Ei õnnestu lisada!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "Ümberkodeerimine puudutab ainult tekstilisasid."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "Käesolevat lisa ei teisendata."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "Käesolev lisa teisendatakse."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Vigane kodeering."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Salvestan sellest teatest koopia?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Uus nimi: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Ei saa lugeda %s atribuute: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Uus fail: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type on kujul baas/alam"
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Tundmatu Content-Type %s"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "Faili %s ei saa luua"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "See mis siin nüüd on, on viga lisa loomisel"
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "Panen teate postitusootele?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "Kirjuta teade postkasti"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Kirjutan teate faili %s ..."
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "Teade on kirjutatud."
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "S/MIME on juba valitud. Puhasta ja jätka ? "
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP on juba valitud. Puhasta ja jätka ? "
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "viga mustris: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "viga mustris: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "viga mustris: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "viga mustris: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "viga mustris: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "viga mustris: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "viga mustris: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "viga mustris: %s"
+
+#: crypt-gpgme.c:993
+msgid "Warning: One of the keys has been revoked\n"
+msgstr ""
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Serveri sertifikaat on aegunud"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL ei ole kasutatav."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Sõrmejälg: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Viga teate saatmisel."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Viga käsureal: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Allkirjastatud info lõpp --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Viga: ajutise faili loomine ebaõnnestus! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP TEATE ALGUS --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP AVALIKU VÕTME BLOKI ALGUS --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP ALLKIRJASTATUD TEATE ALGUS --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- PGP TEATE LÕPP --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP AVALIKU VÕTME BLOKI LÕPP --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- PGP ALLKIRJASTATUD TEATE LÕPP --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Viga: ei suuda leida PGP teate algust! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Viga: vigane PGP/MIME teade! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Viga: ajutise faili loomine ebaõnnestus! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Järgneb PGP/MIME krüptitud info --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Järgneb PGP/MIME krüptitud info --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- PGP/MIME krüptitud info lõpp --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- PGP/MIME krüptitud info lõpp --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr "[-- Järgneb S/MIME allkirjastatud info --]\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr "[-- Järgneb S/MIME krüptitud info --]\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- S/MIME Allkirjastatud info lõpp --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- S/MIME krüptitud info lõpp --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Vigane    "
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Vigane kuu: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Vigane kuu: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Krüpti"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Sertifikaat on salvestatud"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Võtme ID: 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "Tühistatud "
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Aegunud   "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Ei õnnestu avada ajutist faili"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Ühendus serverisse %s..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Viga serveriga ühenduse loomisel: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Võtme ID: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "SSL ebaõnnestus: %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Kõik sobivad võtmed on märgitud aegunuks/tühistatuks."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Välju  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Vali  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Võtme kontroll  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP võtmed, mis sisaldavad \"%s\"."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP võtmed, mis sisaldavad \"%s\"."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "S/MIME sertifikaadid, mis sisaldavad \"%s\"."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP võtmed, mis sisaldavad \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Seda võtit ei saa kasutada: aegunud/blokeeritud/tühistatud."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "ID on aegunud/blokeeritud/tühistatud."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "ID kehtivuse väärtus ei ole defineeritud."
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "ID ei ole kehtiv."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "ID on ainult osaliselt kehtiv."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Kas te soovite seda võtit tõesti kasutada?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Otsin võtmeid, mis sisaldavad \"%s\"..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "Kasutan kasutajat = \"%s\" teatel %s?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Sisestage kasutaja teatele %s: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr ""
+"PGP (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad, k(e)hasse, või (u)nusta? "
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "kaimu"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr ""
+"PGP (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad, k(e)hasse, või (u)nusta? "
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "kaimu"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Allkirjasta kui: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Faili avamine päiste analüüsiks ebaõnnestus."
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -737,29 +1303,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "Parool(id) on unustatud."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Käivitan PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Kirja ei saadetud."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "Sisu vihjeta S/MIME teateid ei toetata."
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "Proovin eraldada PGP võtmed...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Proovin eraldada S/MIME sertifikaadid...\n"
 
@@ -771,7 +1337,7 @@ msgstr ""
 "[-- Viga: Vigane multipart/signed struktuur! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -780,7 +1346,7 @@ msgstr ""
 "[-- Viga: Tundmatu multipart/signed protokoll %s! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -790,7 +1356,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -798,7 +1364,7 @@ msgstr ""
 "[-- Järgnev info on allkirjastatud --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -806,7 +1372,7 @@ msgstr ""
 "[-- Hoiatus: Ei leia ühtegi allkirja. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -814,225 +1380,255 @@ msgstr ""
 "\n"
 "[-- Allkirjastatud info lõpp --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Käivitan PGP..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "jah"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "ei"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Väljuda Muttist?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "tundmatu viga"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Jätkamiseks vajutage klahvi..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " ('?' annab loendi): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Avatud postkaste pole."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Teateid ei ole."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "Postkast on ainult lugemiseks."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Funktsioon ei ole teate lisamise moodis lubatud."
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "Nähtavaid teateid pole."
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Ainult lugemiseks postkastil ei saa kirjutamist lülitada!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Muudatused kaustas salvestatakse kaustast väljumisel."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Muudatusi kaustas ei kirjutata."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Välju"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Salvesta"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Kiri"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Vasta"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Grupp"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Postkasti on väliselt muudetud. Lipud võivad olla valed."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Selles postkastis on uus kiri."
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "Postkasti on väliselt muudetud."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Märgitud teateid pole."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 #, fuzzy
 msgid "Nothing to do."
 msgstr "Ühendus serverisse %s..."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Hüppa teatele: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "Argument peab olema teate number."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "See teate ei ole nähtav."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Vigane teate number."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Kustuta teated mustriga: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "Kehtivat piirangumustrit ei ole."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Piirang: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Piirdu teadetega mustriga: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Väljun Muttist?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Märgi teated mustriga: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Taasta teated mustriga: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Võta märk teadetelt mustriga: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Avan postkasti ainult lugemiseks"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Avan postkasti"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
-#, c-format
-msgid "%s is not a mailbox."
-msgstr "%s ei ole postkast."
+#: curs_main.c:1081 mx.c:512 mx.c:658
+#, c-format
+msgid "%s is not a mailbox."
+msgstr "%s ei ole postkast."
+
+#: curs_main.c:1176
+msgid "Exit Mutt without saving?"
+msgstr "Väljun Muttist salvestamata?"
+
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "Teemad ei ole lubatud."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "salvesta teade hilisemaks saatmiseks"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
 
-#: curs_main.c:1165
-msgid "Exit Mutt without saving?"
-msgstr "Väljun Muttist salvestamata?"
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Te olete viimasel teatel."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Kustutamata teateid pole."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Te olete esimesel teatel."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "Otsing pööras algusest tagasi."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "Otsing pööras lõpust tagasi."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Uusi teateid pole"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Lugemata teateid pole"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " selles piiratud vaates"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "POP serveril ei saa muuta lippu 'important' (tähtis)."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Rohkem teemasid pole."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Te olete esimesel teemal."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "Teemad ei ole lubatud."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "Teema sisaldab lugemata teateid."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "POP serveril ei saa teadet toimetada."
 
@@ -1165,107 +1761,107 @@ msgstr "Sea lipp"
 msgid "Clear flag"
 msgstr "Eemalda lipp"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- Viga:  Multipart/Alternative osasid ei saa näidata! --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Lisa #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Tüüp: %s/%s, Kodeering: %s, Maht: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Autovaade kasutades %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Käivitan autovaate käskluse: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- %s ei saa käivitada.--]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Autovaate %s stderr --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr "[-- Viga: message/external-body juurdepääsu parameeter puudub --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- See %s/%s lisa "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(maht %s baiti) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "on kustutatud --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- nimi: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Seda %s/%s lisa ei ole kaasatud, --]\n"
 
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr "[-- ja näidatud väline allikas on aegunud --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- ja näidatud juurdepääsu tüüpi %s ei toetata --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Viga: multipart/signed teatel puudub protokoll."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Viga: multipart/encrypted teatel puudub protokolli parameeter!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Ajutise faili avamine ebaõnnestus!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s ei toetata "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(selle osa vaatamiseks kasutage '%s')"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "('view-attachments' peab olema klahviga seotud!)"
 
@@ -1372,46 +1968,46 @@ msgstr "Autentimine (APOP)..."
 msgid "SASL authentication failed."
 msgstr "SASL autentimine ebaõnnestus."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s on vigane IMAP tee"
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Laen nimeruumid..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Laen kaustade nimekirja..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "Sellist värvi ei ole"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Loon postkasti: "
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "Postkastil peab olema nimi."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Postkast on loodud."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Loon postkasti: "
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "SSL ebaõnnestus: %s"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "Postkast on loodud."
@@ -1423,135 +2019,132 @@ msgstr "Postkast on suletud"
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Fataalne viga. Teadete arv ei ole sünkroonis!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Sulen ühendust serveriga %s..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "See IMAP server on iganenud. Mutt ei tööta sellega."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "Turvan ühenduse TLS protokolliga?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "TLS ühendust ei õnnestu kokku leppida"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Valin %s..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "Viga postkasti avamisel!"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Sellel serveril ei saa IMAP postkastidele lisada"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "Loon %s?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "märgin %d teadet kustutatuks..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "Kustutamine ebaõnnestus."
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Salvestan teadete olekud... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Kustutan serveril teateid..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE ebaõnnestus"
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "CLOSE ebaõnnestus."
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "Halb nimi postkastile"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Tellin %s..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Loobun kaustast %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Sellest IMAP serverist ei saa päiseid laadida."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Ajutise faili %s loomine ebaõnnestus"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Laen teadete päiseid... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Laen teadete päiseid... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Laen teadet..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "Teadete indeks on vigane. Proovige postkasti uuesti avada."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Saadan teadet ..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Kopeerin %d teadet kausta %s..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Kopeerin teadet %d kausta %s..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Jätkan?"
 
@@ -1560,124 +2153,124 @@ msgstr "J
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:678
+#: init.c:644
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "märgi mustrile vastavad teated"
 
-#: init.c:680
+#: init.c:646
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "eemalda märk mustrile vastavatelt teadetelt"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias: aadress puudub"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "vigane päiseväli"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: tundmatu järjestamise meetod"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): vigane regexp: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: tundmatu muutuja"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "reset käsuga ei ole prefiks lubatud"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "reset käsuga ei ole väärtus lubatud"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s on seatud"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s ei ole seatud"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: vigane postkasti tüüp"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: vigane väärtus"
 
-#: init.c:1589
+#: init.c:1555
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s: tundmatu tüüp"
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: tundmatu tüüp"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Viga failis %s, real %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: vead failis %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: lugemine katkestati, kuna %s on liialt vigane"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: viga kohal %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: liiga palju argumente"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: tundmatu käsk"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Viga käsureal: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "ei leia kodukataloogi"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "ei suuda tuvastada kasutajanime"
 
@@ -2136,402 +2729,411 @@ msgid "compose a new mail message"
 msgstr "koosta uus e-posti teade"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "ava teine kaust"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "ava teine kaust ainult lugemiseks"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "puhasta teate olekulipp"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "kustuta mustrile vastavad teated"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "lae kiri IMAP serverilt"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "lae kiri POP serverilt"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "liigu esimesele teatele"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "liigu viimasele teatele"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "näita ainult mustrile vastavaid teateid"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Peegelda märgitud teated aadressile: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "hüppa järgmisele uuele teatele"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 #, fuzzy
 msgid "jump to the next new or unread message"
 msgstr "hüppa järgmisele lugemata teatele"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "hüppa järgmisele alamteemale"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "hüppa järgmisele teemale"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "liigu järgmisele kustutamata teatele"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "hüppa järgmisele lugemata teatele"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "hüppa teema vanemteatele"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "hüppa eelmisele teemale"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "hüppa eelmisele alamteemale"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "liigu eelmisele kustutamata teatele"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "hüppa eelmisele uuele teatele"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 #, fuzzy
 msgid "jump to the previous new or unread message"
 msgstr "hüppa eelmisele lugemata teatele"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "hüppa eelmisele lugemata teatele"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "märgi jooksev teema loetuks"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "märgi jooksev alamteema loetuks"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "sea teate olekulipp"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "salvesta postkasti muutused"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "märgi mustrile vastavad teated"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "taasta mustrile vastavad teated"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "eemalda märk mustrile vastavatelt teadetelt"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "liigu lehe keskele"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "liigu järgmisele kirjele"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "keri üks rida alla"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "liigu järgmisele lehele"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "hüppa teate lõppu"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "lülita tsiteeritud teksti näitamist"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "liigu tsiteeritud teksti lõppu"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "hüppa teate algusse"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "saada teade/lisa käsu sisendisse"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "liigu eelmisele kirjele"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "keri üks rida üles"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "liigu eelmisele lehele"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "trüki jooksev kirje"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "otsi aadresse välise programmiga"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "lisa uue päringu tulemused olemasolevatele"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "salvesta postkasti muutused ja välju"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "võta postitusootel teade"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "puhasta ja joonista ekraan uuesti"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{sisemine}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "kustuta jooksev postkast (ainult IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "vasta teatele"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "võta teade aluseks uuele"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "salvesta teade/lisa faili"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "otsi regulaaravaldist"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "otsi regulaaravaldist tagaspidi"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "otsi järgmist"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "otsi järgmist vastasuunas"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "lülita otsingumustri värvimine"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "käivita käsk käsuinterpretaatoris"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "järjesta teated"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "järjesta teated tagurpidi"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "märgi jooksev kirje"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "kasuta funktsiooni märgitud teadetel"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 #, fuzzy
 msgid "apply next function ONLY to tagged messages"
 msgstr "kasuta funktsiooni märgitud teadetel"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "märgi jooksev alamteema"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "märgi jooksev teema"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "lülita teate 'värskuse' lippu"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "lülita postkasti ülekirjutatamist"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "lülita kas brausida ainult postkaste või kõiki faile"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "liigu lehe algusse"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "taasta jooksev kirje"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "taasta kõik teema teated"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "taasta kõik alamteema teated"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "näita Mutti versiooni ja kuupäeva"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "vaata lisa kasutades vajadusel mailcap kirjet"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "näita MIME lisasid"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr ""
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "näita praegu kehtivat piirangu mustrit"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "ava/sule jooksev teema"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "ava/sule kõik teemad"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "lisa PGP avalik võti"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "näita PGP võtmeid"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "saada PGP avalik võti"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "kontrolli PGP avalikku võtit"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "vaata võtme kasutaja identifikaatorit"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "kontrolli klassikalise pgp olemasolu"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Aktsepteeri koostatud ahelaga"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "Lisa edasisaatja ahela lõppu"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "Lisa edasisaatja ahelasse"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "Eemalda edasisaatja ahelast"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "Vali ahela eelmine element"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "Vali ahela järgmine element"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "saada teade läbi mixmaster vahendajate ahela"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "loo avateksti koopia ja kustuta"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "loo avateksti koopia"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "eemalda parool(id) mälust"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "eralda toetatud avalikud võtmed"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "näita S/MIME võtmeid"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr ""
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Mälu on otsas!"
 
@@ -2559,11 +3161,11 @@ msgstr ""
 #: main.c:61
 #, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2608,25 +3210,71 @@ msgstr ""
 "    along with this program; if not, write to the Free Software\n"
 "    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
 
-#: main.c:99
+#: main.c:99
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"kasutage: mutt [ -nRyzZ ] [ -e <käsk> ] [ -F <fail> ] [ -m <tüüp> ]\n"
+"               [ -f <fail> ]\n"
+"          mutt [ -nR ] [ -e <käsk> ] [ -F <fail> ] -Q <päring>\n"
+"               [ -Q <päring> ] [...]\n"
+"          mutt [ -nR ] [ -e <käsk> ] [ -F <fail> ] -A <hüüdnimi>\n"
+"               [ -A <hüüdnimi> ] [...]\n"
+"          mutt [ -nx ] [ -e <käsk> ] [ -a <fail> ] [ -F <fail> ] [ -H "
+"<fail> ]\n"
+"               [ -i <fail> ] [ -s <teema> ] [ -b <aadr> ] [ -c <aadr> ]\n"
+"               <aadr> [ ... ]\n"
+"          mutt [ -n ] [ -e <käsk> ] [ -F <fail> ] -p\n"
+"          mutt -v[v]\n"
+"\n"
+"võtmed:\n"
+"  -A <hüüdnimi>\tavalda antud hüüdnimi\n"
+"  -a <fail>\tlisa teatele fail\n"
+"  -b <aadress>\tmäära pimekoopia (BCC) aadress\n"
+"  -c <aadress>\tmäära koopia (CC) aadress\n"
+"  -e <käsk>\tkäivita peale algväärtutamist käsk\n"
+"  -f <fail>\tmillist postkasti lugeda\n"
+"  -F <fail>\tmäära alternatiivne muttrc fail\n"
+"  -H <fail>\tmäära päiste mustandi fail\n"
+"  -i <fail>\tfail mida mutt peab vastamisel lisama\n"
+"  -m <tüüp>\tmääta vaikimisi postkasti tüüp\n"
+"  -n\t\tära loe süsteemset Muttrc faili\n"
+"  -p\t\tlae postitusootel teade\n"
+"  -Q <muutuja>\tloe seadete muutuja\n"
+"  -R\t\tava postkast ainult lugemiseks\n"
+"  -s <teema>\tmäära teate teema (jutumärkides, kui on mitmesõnaline)\n"
+"  -v\t\tnäita versiooni ja kompileerimis-aegseid määranguid\n"
+"  -x\t\tsimuleeri mailx saatmise moodi\n"
+"  -y\t\tvali postkast teie 'postkastide' loendist\n"
+"  -z\t\tvälju kohe, kui postkastis pole uusi teateid\n"
+"  -Z\t\tava esimene kaust uue teatega, välju kohe, kui pole\n"
+"  -h\t\tesita see abiinfo"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
 #, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-"<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-"[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-"[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
-"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
-"\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2681,7 +3329,7 @@ msgstr ""
 "  -Z\t\tava esimene kaust uue teatega, välju kohe, kui pole\n"
 "  -h\t\tesita see abiinfo"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2689,47 +3337,47 @@ msgstr ""
 "\n"
 "Kompileerimise võtmed:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Viga terminali initsialiseerimisel."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Silumise tase %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG ei ole kompileerimise ajal defineeritud. Ignoreerin.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s ei ole. Loon selle?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "%s ei saa luua: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Saajaid ei ole määratud.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: faili ei saa lisada.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Uute teadetega postkaste ei ole."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Sissetulevate kirjade postkaste ei ole määratud."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "Postkast on tühi."
 
@@ -2746,11 +3394,11 @@ msgstr "Postkast on riknenud!"
 msgid "Mailbox was corrupted!"
 msgstr "Postkast oli riknenud!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Fataalne viga! Postkasti ei õnnestu uuesti avada!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Postkasti ei saa lukustada!"
 
@@ -2758,12 +3406,12 @@ msgstr "Postkasti ei saa lukustada!"
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: mbox on muudetud, aga muudetud teateid ei ole! (teatage sellest veast)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Kirjutan teateid... %d (%d%%)"
@@ -2771,187 +3419,148 @@ msgstr "Kirjutan teateid... %d (%d%%)"
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "Kinnitan muutused..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Kirjutamine ebaõnnestus! Osaline postkast salvestatud faili %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Postkasti ei õnnestu uuesti avada!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Avan postkasti uuesti..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Hüppa: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Vigane indeksi number."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Kirjeid pole."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Enam allapoole ei saa kerida."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Enam ülespoole ei saa kerida."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Te olete viimasel lehel."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Te olete esimesel lehel."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "Esimene kirje on näidatud."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "Viimane kirje on näidatud."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Te olete viimasel kirjel."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Te olete esimesel kirjel."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Otsi: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Otsi tagurpidi: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Otsingumuster puudub."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Ei leitud."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "Märgitud kirjeid pole."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "Selles menüüs ei ole otsimist realiseeritud."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "hüppamine ei ole dialoogidele realiseeritud."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Märkimist ei toetata."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Loen %s... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): ei õnnestu seada faili aegu"
 
-#: muttlib.c:846
-#, fuzzy
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Fail on kataloog, salvestan sinna?"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr ""
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "Fail on kataloog, salvestan sinna?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Fail kataloogis: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Fail on olemas, (k)irjutan üle, (l)isan või ka(t)kestan?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "klt"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Teadet ei saa POP postkasti salvestada."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s ei ole postkast!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Lisan teated kausta %s?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "Ühendus serveriga %s suleti"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL ei ole kasutatav."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "Preconnect käsklus ebaõnnestus"
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Viga serveriga %s suhtlemisel (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "Otsin serverit %s..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Ei leia masina \"%s\" aadressi"
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Ühendus serverisse %s..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Serveriga %s ei õnnestu ühendust luua (%s)."
@@ -2983,7 +3592,8 @@ msgstr "S/V viga"
 msgid "SSL failed: %s"
 msgstr "SSL ebaõnnestus: %s"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Ei õnnestu saada partneri sertifikaati"
 
@@ -2992,87 +3602,208 @@ msgstr "Ei 
 msgid "SSL connection using %s (%s)"
 msgstr "SSL ühendus kasutades %s (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[arvutamine ei õnnestu]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[vigane kuupäev]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "Serveri sertifikaat ei ole veel kehtiv"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "Serveri sertifikaat on aegunud"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Selle serveri omanik on:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Selle sertifikaadi väljastas:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "See sertifikaat on kehtiv"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   alates %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     kuni %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Sõrmejälg: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "SSL Sertifikaadi kontroll"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(k)eeldu, (n)õustu korra, nõustu (a)alati"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "kna"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(k)eeldu, (n)õustu korra"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "kn"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Välju  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Hoiatus: Sertifikaati ei saa salvestada"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Sertifikaat on salvestatud"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "SSL ühendus kasutades %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Sertifikaat on salvestatud"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Viga terminali initsialiseerimisel."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Sõrmejälg: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Sõrmejälg: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Serveri sertifikaat ei ole veel kehtiv"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Serveri sertifikaat on aegunud"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Serveri sertifikaat on aegunud"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "Serveri sertifikaat ei ole veel kehtiv"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "SSL Sertifikaadi kontroll"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Ühendus serverisse %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Viga serveriga %s suhtlemisel (%s)"
+
+#: muttlib.c:910
+#, fuzzy
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "Fail on kataloog, salvestan sinna?"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr ""
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "Fail on kataloog, salvestan sinna?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Fail kataloogis: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Fail on olemas, (k)irjutan üle, (l)isan või ka(t)kestan?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "klt"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Teadet ei saa POP postkasti salvestada."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Lisan teated kausta %s?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s ei ole postkast!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3150,7 +3881,7 @@ msgstr "Postkasti ei muudetud."
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d säilitatud, %d tõstetud, %d kustutatud."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d säilitatud, %d kustutatud."
@@ -3169,15 +3900,15 @@ msgstr "Kirjutamise uuesti lubamiseks kasutage 'toggle-write'!"
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Postkast on märgitud mittekirjutatavaks. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "Postkast on kontrollitud."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Teadet ei õnnestu kirjutada"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
@@ -3185,48 +3916,48 @@ msgstr ""
 msgid "Not available in this menu."
 msgstr "Ei ole selles menüüs kasutatav."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "EelmLk"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "JärgmLm"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Vaata lisa"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Järgm."
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Teate lõpp on näidatud."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Teate algus on näidatud."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "tagurpidi otsing: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Otsing: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "Te loete praegu abiinfot."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "Rohkem tsiteetitud teksti pole."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Tsiteeritud teksiti järel rohkem teksti ei ole."
 
@@ -3293,27 +4024,27 @@ msgstr "t
 msgid "error: unknown op %d (report this error)."
 msgstr "viga: tundmatu op %d (teatage sellest veast)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Kompileerin otsingumustrit..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Käivitan leitud teadetel käsu..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "Ühtegi mustrile vastavat teadet ei leitud."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "Otsing jõudis midagi leidmata lõppu"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "Otsing jõudis midagi leidmata algusse"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Otsing katkestati."
 
@@ -3325,11 +4056,11 @@ msgstr "Sisestage PGP parool:"
 msgid "PGP passphrase forgotten."
 msgstr "PGP parool on unustatud."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Viga: ei õnnestu luua PGP alamprotsessi! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3337,52 +4068,23 @@ msgstr ""
 "[-- PGP väljundi lõpp --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP TEATE ALGUS --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP AVALIKU VÕTME BLOKI ALGUS --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP ALLKIRJASTATUD TEATE ALGUS --]\n"
-"\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- PGP TEATE LÕPP --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP AVALIKU VÕTME BLOKI LÕPP --]\n"
-
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- PGP ALLKIRJASTATUD TEATE LÕPP --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "Teadet ei õnnestu kopeerida."
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Viga: ei suuda leida PGP teate algust! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "PGP allkiri on edukalt kontrollitud."
 
-#: pgp.c:704
+#: pgp.c:723
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Sisemine viga. Informeerige <roessler@does-not-exist.org>."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3390,72 +4092,38 @@ msgstr ""
 "[-- Viga: PGP alamprotsessi loomine ei õnnestu! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Viga: vigane PGP/MIME teade! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Viga: ajutise faili loomine ebaõnnestus! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- Järgneb PGP/MIME krüptitud info --]\n"
-"\n"
-
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- PGP/MIME krüptitud info lõpp --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "Dekrüptimine ebaõnnestus."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "PGP protsessi loomine ebaõnnestus!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "Kasutan kasutajat = \"%s\" teatel %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Sisestage kasutaja teatele %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "PGP käivitamine ei õnnestu"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr ""
 "PGP (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad, k(e)hasse, või (u)nusta? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1499
+#: pgp.c:1543
 #, fuzzy
 msgid "esabifc"
 msgstr "kaimeu"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Allkirjasta kui: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "Laen PGP võtit..."
@@ -3465,16 +4133,6 @@ msgstr "Laen PGP v
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Kõik sobivad võtmed on märgitud aegunuks/tühistatuks."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Vali  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Võtme kontroll  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3489,40 +4147,6 @@ msgstr "PGP v
 msgid "Can't open /dev/null"
 msgstr "/dev/null ei saa avada"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Ei õnnestu avada ajutist faili"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Võtme ID: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Seda võtit ei saa kasutada: aegunud/blokeeritud/tühistatud."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "ID on aegunud/blokeeritud/tühistatud."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "ID kehtivuse väärtus ei ole defineeritud."
-
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "ID ei ole kehtiv."
-
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "ID on ainult osaliselt kehtiv."
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Kas te soovite seda võtit tõesti kasutada?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Palun sisestage võtme ID: "
@@ -3536,11 +4160,6 @@ msgstr "K
 msgid "PGP Key %s."
 msgstr "PGP Võti %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Otsin võtmeid, mis sisaldavad \"%s\"..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3598,7 +4217,7 @@ msgstr "Viga postkasti kirjutamisel!"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d/%d teadet loetud]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "Server sulges ühenduse!"
 
@@ -3628,15 +4247,15 @@ msgstr "Teateid ei 
 msgid "Error connecting to server: %s"
 msgstr "Viga serveriga ühenduse loomisel: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "Sulen ühenduse POP serveriga..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Kontrollin teadete indekseid ..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Ühendus katkes. Taastan ühenduse POP serveriga?"
 
@@ -4012,35 +4631,35 @@ msgstr "Teade on saadetud."
 msgid "Sending in background."
 msgstr "Saadan taustal."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Eraldaja puudub! [teatage sellest veast]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s ei ole enam!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s ei ole tavaline fail."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "%s ei saa avada"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Viga teate saatmisel, alamprotsess lõpetas %d (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Väljund saatmise protsessist"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
@@ -4156,7 +4775,7 @@ msgstr "OpenSSL protsessi avamine eba
 msgid "No output from OpenSSL..."
 msgstr "OpenSSL väljundit pole..."
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4164,19 +4783,19 @@ msgstr ""
 "[-- OpenSSL väljundi lõpp --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Viga: ei õnnestu luua OpenSSL alamprotsessi! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- Järgneb S/MIME krüptitud info --]\n"
 
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- Järgneb S/MIME allkirjastatud info --]\n"
 
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4184,7 +4803,7 @@ msgstr ""
 "\n"
 "[-- S/MIME krüptitud info lõpp --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4192,27 +4811,27 @@ msgstr ""
 "\n"
 "[-- S/MIME Allkirjastatud info lõpp --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr "S/MIME (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad või (u)nusta? "
 
-#: smime.c:1936
+#: smime.c:1945
 #, fuzzy
 msgid "eswabfc"
 msgstr "kaimu"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr "1: DES, 2: 3DES, 3: RC2-40, 4: RC2-64, 5: RC2-128 või (u)nusta? "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345u"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
@@ -4236,6 +4855,9 @@ msgstr "Vanem teade ei ole selles piiratud vaates n
 msgid "Parent message is not available."
 msgstr "Vanem teade ei ole kättesaadav."
 
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Sellel serveril ei saa IMAP postkastidele lisada"
+
 #, fuzzy
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "Loon PGP teade kirja kehas?"
diff --git a/po/fr.po b/po/fr.po
index 582bdb556..57be1d26c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.5.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-13 17:35+0200\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2005-06-13 17:35+0200\n"
 "Last-Translator: Vincent Lefevre <vincent@vinc17.org>\n"
 "Language-Team: mutt-dev <mutt-dev@mutt.org>\n"
@@ -15,27 +15,27 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "Nom d'utilisateur sur %s : "
 
 # , c-format
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Mot de passe pour %s@%s : "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Quitter"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Effacer"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Récup"
 
@@ -44,9 +44,9 @@ msgid "Select"
 msgstr "Sélectionner"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Aide"
 
@@ -99,175 +99,175 @@ msgstr "Sauver dans le fichier : "
 msgid "Alias added."
 msgstr "Alias ajouté."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Ne correspond pas au nametemplate, continuer ?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "L'entrée compose du fichier mailcap nécessite %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Erreur en exécutant \"%s\" !"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Échec d'ouverture du fichier pour décoder les en-têtes."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Échec d'ouverture du fichier pour enlever les en-têtes."
 
-#: attach.c:183
+#: attach.c:184
 msgid "Failure to rename file."
 msgstr "Échec de renommage du fichier."
 
 # , c-format
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "Pas d'entrée compose pour %s dans mailcap, création d'un fichier vide."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "L'entrée Edit du fichier mailcap nécessite %%s"
 
 # , c-format
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Pas d'entrée edit pour %s dans mailcap"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Pas d'entrée mailcap correspondante. Visualisation en texte."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Type MIME non défini. Impossible de visualiser l'attachement."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Impossible de créer le filtre"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Impossible de créer le filtre"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Erreur d'écriture !"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Je ne sais pas comment imprimer ceci !"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Changement de répertoire"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Masque"
 
 # , c-format
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s n'est pas un répertoire."
 
 # , c-format
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Boîtes aux lettres [%d]"
 
 # , c-format
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Abonné [%s], masque de fichier : %s"
 
 # , c-format
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Répertoire [%s], masque de fichier : %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Impossible d'attacher un répertoire !"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Aucun fichier ne correspond au masque"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "La création n'est supportée que pour les boîtes aux lettres IMAP"
 
-#: browser.c:880
+#: browser.c:881
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Le renommage n'est supporté que pour les boîtes aux lettres IMAP"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "La suppression n'est supportée que pour les boîtes aux lettres IMAP"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Voulez-vous vraiment supprimer la boîte aux lettres \"%s\" ?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Boîte aux lettres supprimée."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "Boîte aux lettres non supprimée."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Changement de répertoire vers : "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Erreur de lecture du répertoire."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Masque de fichier : "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Tri inverse par (d)ate, (a)lphabétique, (t)aille ou (n)e pas trier ? "
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Tri par (d)ate, (a)lphabétique, (t)aille ou (n)e pas trier ? "
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "datn"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Nouveau nom de fichier : "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Impossible de visualiser un répertoire"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Erreur en essayant de visualiser le fichier"
 
@@ -341,7 +341,7 @@ msgstr "La couleur default n'est pas disponible"
 msgid "Verify PGP signature?"
 msgstr "Vérifier la signature PGP ?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Impossible de créer le fichier temporaire !"
 
@@ -353,116 +353,116 @@ msgstr "Impossible de cr
 msgid "Could not copy message"
 msgstr "Impossible de copier le message"
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "Signature S/MIME vérifiée avec succès."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "Le propriétaire du certificat S/MIME ne correspond pas à l'expéditeur."
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr "Attention ! Une partie de ce message n'a pas été signée."
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "La signature S/MIME n'a PAS pu être vérifiée."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "Signature PGP vérifiée avec succès."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "La signature PGP n'a PAS pu être vérifiée."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Commande : "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Renvoyer le message à : "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Renvoyer les messages marqués à : "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Erreur de décodage de l'adresse !"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "Mauvais IDN : '%s'"
 
 # , c-format
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Renvoyer le message à %s"
 
 # , c-format
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Renvoyer les messages à %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "Message non renvoyé."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "Messages non renvoyés."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Message renvoyé."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Messages renvoyés."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "Impossible de créer le processus filtrant"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Passer à la commande : "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Aucune commande d'impression n'a été définie."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Imprimer le message ?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Imprimer les messages marqués ?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Message imprimé"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Messages imprimés"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "Le message n'a pas pu être imprimé"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Les messages n'ont pas pu être imprimés"
 
-#: commands.c:508
+#: commands.c:509
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
@@ -470,7 +470,7 @@ msgstr ""
 "Tri inv (d)at/(a)ut/(r)eçu/(o)bj/de(s)t/d(i)sc/(n)on/(t)aille/s(c)or/s(p)"
 "am ? : "
 
-#: commands.c:509
+#: commands.c:510
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
@@ -478,81 +478,81 @@ msgstr ""
 "Tri (d)ate/(a)ut/(r)eçu/(o)bj/de(s)t/d(i)sc/(n)on/(t)aille/s(c)ore/s(p)"
 "am ? : "
 
-#: commands.c:510
+#: commands.c:511
 msgid "dfrsotuzcp"
 msgstr "darosintcp"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Commande shell : "
 
 # , c-format
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Décoder-sauver%s vers une BAL"
 
 # , c-format
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Décoder-copier%s vers une BAL"
 
 # , c-format
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Déchiffrer-sauver%s vers une BAL"
 
 # , c-format
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Déchiffrer-copier%s vers une BAL"
 
 # , c-format
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Sauver%s vers une BAL"
 
 # , c-format
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Copier%s vers une BAL"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " les messages marqués"
 
 # , c-format
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Copie vers %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Convertir en %s à l'envoi ?"
 
 # , c-format
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type changé à %s."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Jeu de caractères changé à %s ; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "pas de conversion"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "conversion"
 
@@ -646,107 +646,692 @@ msgstr "Mauvais IDN dans 
 msgid "Attaching selected files..."
 msgstr "J'attache les fichiers sélectionnés..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Impossible d'attacher %s !"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Ouvrir une boîte aux lettres d'où attacher un message"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Aucun message dans ce dossier."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Marquez les messages que vous voulez attacher !"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Impossible d'attacher !"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "Le recodage affecte uniquement les attachements textuels."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "L'attachement courant ne sera pas converti."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "L'attachement courant sera converti."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Codage invalide."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Sauver une copie de ce message ?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Renommer en : "
 
 # , c-format
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Impossible d'obtenir le statut de %s : %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Nouveau fichier : "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type est de la forme base/sous"
 
 # , c-format
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Content-Type %s inconnu"
 
 # , c-format
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "Impossible de créer le fichier %s"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "Nous sommes en présence d'un échec de fabrication d'un attachement"
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "Ajourner ce message ?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "Écrire le message dans la boîte aux lettres"
 
 # , c-format
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Écriture du message dans %s ..."
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "Message écrit."
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "S/MIME déjà sélectionné. Effacer & continuer ? "
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP déjà sélectionné. Effacer & continuer ? "
 
+# , c-format
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "erreur dans le motif à : %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+# , c-format
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "erreur dans le motif à : %s"
+
+# , c-format
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "erreur dans le motif à : %s"
+
+# , c-format
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "erreur dans le motif à : %s"
+
+# , c-format
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "erreur dans le motif à : %s"
+
+# , c-format
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "erreur dans le motif à : %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+# , c-format
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "erreur dans le motif à : %s"
+
+# , c-format
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "erreur dans le motif à : %s"
+
+#: crypt-gpgme.c:993
+#, fuzzy
+msgid "Warning: One of the keys has been revoked\n"
+msgstr "Attention ! Une partie de ce message n'a pas été signée."
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Le certificat du serveur a expiré"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL n'est pas disponible."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Empreinte: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Erreur en envoyant le message."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+# , c-format
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Erreur dans la ligne de commande : %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Fin des données signées --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Erreur : impossible de créer le fichier temporaire ! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- DÉBUT DE MESSAGE PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- DÉBUT DE BLOC DE CLÉ PUBLIQUE PGP --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- DÉBUT DE MESSAGE SIGNÉ PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- FIN DE MESSAGE PGP --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- FIN DE BLOC DE CLÉ PUBLIQUE PGP --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- FIN DE MESSAGE SIGNÉ PGP --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Erreur : impossible de trouver le début du message PGP ! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Erreur : message PGP/MIME mal formé ! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Erreur : impossible de créer le fichier temporaire ! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Les données suivantes sont chiffrées avec PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Les données suivantes sont chiffrées avec PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- Fin des données chiffrées avec PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- Fin des données chiffrées avec PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr "[-- Les données suivantes sont signées avec S/MIME --]\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr "[-- Les données suivantes sont chiffrées avec S/MIME --]\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Fin des données signées avec S/MIME. --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Fin des données chiffrées avec S/MIME. --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+# , c-format
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Invalide    "
+
+# , c-format
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Mois invalide : %s"
+
+# , c-format
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Mois invalide : %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Chiffrer"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Certificat sauvé"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+# , c-format
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "ID clé : 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "Révoqué     "
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Expiré      "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Impossible de créer le fichier temporaire"
+
+# , c-format
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Connexion à %s..."
+
+# , c-format
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Erreur de connexion au serveur : %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+# , c-format
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "ID clé : 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "Le renommage a échoué : %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr ""
+"Toutes les clés correspondantes sont expirées, annulées, ou désactivées."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Quitter  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Sélectionner  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Vérifier clé  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "Clés PGP correspondant à \"%s\"."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "Clés PGP correspondant à \"%s\"."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "Certificats S/MIME correspondant à \"%s\"."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "Clés PGP correspondant à \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Cette clé ne peut pas être utilisée : expirée/désactivée/annulée."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "L'ID est expiré/désactivé/annulé."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "L'ID a une validité indéfinie."
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "L'ID n'est pas valide."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "L'ID n'est que peu valide."
+
+# , c-format
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Voulez-vous vraiment utiliser la clé ?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Recherche des clés correspondant à \"%s\"..."
+
+# , c-format
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "Utiliser keyID = \"%s\" pour %s ?"
+
+# , c-format
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Entrez keyID pour %s : "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr "(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, %s, en clai(r) ? "
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "csaedor"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr "(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, %s, en clai(r) ? "
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "csaedor"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Signer en tant que : "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Échec d'ouverture du fichier pour décoder les en-têtes."
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -762,30 +1347,30 @@ msgid "Passphrase(s) forgotten."
 msgstr "Phrase(s) de passe oubliée(s)."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Appel de PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr "Le message ne peut pas être envoyé en ligne. Utiliser PGP/MIME ?"
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Message non envoyé."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 "Les messages S/MIME sans indication sur le contenu ne sont pas supportés."
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "Tentative d'extraction de clés PGP...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Tentative d'extraction de certificats S/MIME...\n"
 
@@ -797,7 +1382,7 @@ msgstr ""
 "[-- Erreur : Structure multipart/signed incohérente ! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -806,7 +1391,7 @@ msgstr ""
 "[-- Erreur : Protocole multipart/signed %s inconnu ! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -816,7 +1401,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -824,7 +1409,7 @@ msgstr ""
 "[-- Les données suivantes sont signées --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -832,7 +1417,7 @@ msgstr ""
 "[-- Attention : Impossible de trouver des signatures. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -840,230 +1425,260 @@ msgstr ""
 "\n"
 "[-- Fin des données signées --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Appel de PGP..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "oui"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "non"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Quitter Mutt ?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Appuyez sur une touche pour continuer..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " ('?' pour avoir la liste) : "
 
-#: curs_main.c:51 curs_main.c:617 curs_main.c:647
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Aucune boîte aux lettres n'est ouverte."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Il n'y a pas de messages."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "La boîte aux lettres est en lecture seule."
 
 # , c-format
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Fonction non autorisée en mode attach-message."
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "Pas de messages visibles."
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr ""
 "Impossible de rendre inscriptible une boîte aux lettres en lecture seule !"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Les modifications du dossier seront enregistrées à sa sortie."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Les modifications du dossier ne seront pas enregistrées."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Quitter"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Sauver"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Message"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Répondre"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Groupe"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
 "Boîte aux lettres modifiée extérieurement. Les indicateurs peuvent être faux."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Nouveau(x) message(s) dans cette boîte aux lettres."
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "La boîte aux lettres a été modifiée extérieurement."
 
-#: curs_main.c:623
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Pas de messages marqués."
 
 # , c-format
-#: curs_main.c:659 menu.c:915
+#: curs_main.c:662 menu.c:915
 msgid "Nothing to do."
 msgstr "Rien à faire."
 
-#: curs_main.c:745
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Aller au message : "
 
-#: curs_main.c:751
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "L'argument doit être un numéro de message."
 
-#: curs_main.c:784
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Ce message n'est pas visible."
 
-#: curs_main.c:787
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Numéro de message invalide."
 
-#: curs_main.c:806
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Effacer les messages correspondant à : "
 
-#: curs_main.c:828
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "Aucun motif de limite n'est en vigueur."
 
 # , c-format
 #. i18n: ask for a limit to apply
-#: curs_main.c:833
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Limite : %s"
 
-#: curs_main.c:843
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Limiter aux messages correspondant à : "
 
-#: curs_main.c:875
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Quitter Mutt ?"
 
-#: curs_main.c:954
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Marquer les messages correspondant à : "
 
-#: curs_main.c:968
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Récupérer les messages correspondant à : "
 
-#: curs_main.c:976
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Démarquer les messages correspondant à : "
 
-#: curs_main.c:1055
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Ouvre la boîte aux lettres en lecture seule"
 
-#: curs_main.c:1057
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Ouvre la boîte aux lettres"
 
 # , c-format
-#: curs_main.c:1073 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s n'est pas une boîte aux lettres."
 
-#: curs_main.c:1167
-msgid "Exit Mutt without saving?"
-msgstr "Quitter Mutt sans sauvegarder ?"
+#: curs_main.c:1176
+msgid "Exit Mutt without saving?"
+msgstr "Quitter Mutt sans sauvegarder ?"
+
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "L'affichage des discussions n'est pas activé."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "sauvegarder ce message pour l'envoyer plus tard"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
 
-#: curs_main.c:1201 curs_main.c:1226
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Vous êtes sur le dernier message."
 
-#: curs_main.c:1208 curs_main.c:1252
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Pas de message non effacé."
 
-#: curs_main.c:1245 curs_main.c:1269
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Vous êtes sur le premier message."
 
-#: curs_main.c:1344 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "La recherche est repartie du début."
 
-#: curs_main.c:1353 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "La recherche est repartie de la fin."
 
-#: curs_main.c:1394
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Pas de nouveaux messages"
 
-#: curs_main.c:1394
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Pas de messages non lus"
 
-#: curs_main.c:1395
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " dans cette vue limitée"
 
-#: curs_main.c:1416 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "Impossible de changer l'indicateur 'important' sur le serveur POP."
 
-#: curs_main.c:1540
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Pas d'autres discussions."
 
-#: curs_main.c:1542
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Vous êtes sur la première discussion."
 
-#: curs_main.c:1608 curs_main.c:1640 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "L'affichage des discussions n'est pas activé."
-
-#: curs_main.c:1626
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "Cette discussion contient des messages non-lus."
 
-#: curs_main.c:1813
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "Impossible d'éditer le message sur le serveur POP."
 
@@ -1202,124 +1817,124 @@ msgstr "Positionner l'indicateur"
 msgid "Clear flag"
 msgstr "Effacer l'indicateur"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Erreur : Aucune partie du Multipart/Alternative n'a pu être affichée ! "
 "--]\n"
 
 # , c-format
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Attachement #%d"
 
 # , c-format
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Type : %s/%s, Codage : %s, Taille : %s --]\n"
 
 # , c-format
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Visualisation automatique en utilisant %s --]\n"
 
 # , c-format
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Invocation de la commande de visualisation automatique : %s"
 
 # , c-format
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Impossible d'exécuter %s. --]\n"
 
 # , c-format
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Visualisation automatique stderr de %s --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Erreur : message/external-body n'a pas de paramètre access-type --]\n"
 
 # , c-format
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Cet attachement %s/%s "
 
 # , c-format
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(taille %s octets) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "a été effacé --]\n"
 
 # , c-format
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- le %s --]\n"
 
 # , c-format
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- nom: %s --]\n"
 
 # , c-format
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Cet attachement %s/%s n'est pas inclus, --]\n"
 
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr "[-- et la source externe indiquée a expiré. --]\n"
 
 # , c-format
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- et l'access-type %s indiqué n'est pas supporté --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Erreur : multipart/signed n'a pas de protocole."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Erreur : multipart/encrypted n'a pas de paramètre de protocole !"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Impossible d'ouvrir le fichier temporaire !"
 
 # , c-format
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s n'est pas disponible "
 
 # , c-format
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(utilisez '%s' pour voir cette partie)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(la fonction 'view-attachments' doit être affectée à une touche !)"
 
@@ -1429,47 +2044,47 @@ msgstr "Authentification (%s)..."
 msgid "SASL authentication failed."
 msgstr "L'authentification SASL a échoué."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s n'est pas un chemin IMAP valide"
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Récupération des espaces de noms..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Récupération de la liste des dossiers..."
 
 # , c-format
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "Ce dossier n'existe pas"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Créer la boîte aux lettres : "
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "La boîte aux lettres doit avoir un nom."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Boîte aux lettres créée."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Renommer la boîte aux lettres %s en : "
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, c-format
 msgid "Rename failed: %s"
 msgstr "Le renommage a échoué : %s"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 msgid "Mailbox renamed."
 msgstr "Boîte aux lettres renommée."
 
@@ -1480,148 +2095,145 @@ msgstr "Bo
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Erreur fatale. Le nombre de messages ne correspond pas !"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Fermeture de la connexion à %s..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Ce serveur IMAP est trop ancien. Mutt ne marche pas avec."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
-msgstr "Réponse inattendue reçue du serveur : %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
+msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "Connexion sécurisée avec TLS ?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "Impossible de négocier la connexion TLS"
 
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
 # , c-format
-#: imap/imap.c:590
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Sélection de %s..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "Erreur à l'ouverture de la boîte aux lettres"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Impossible d'ajouter aux boîtes aux lettres IMAP sur ce serveur"
-
 # , c-format
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:746 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "Créer %s ?"
 
 # , c-format
-#: imap/imap.c:1043 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Marquage de %d messages à effacer..."
 
-#: imap/imap.c:1052
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "Expunge a échoué"
 
 # , c-format
-#: imap/imap.c:1065
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Sauvegarde des indicateurs de statut du message... [%d/%d]"
 
-#: imap/imap.c:1096
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Effacement des messages sur le serveur..."
 
-#: imap/imap.c:1101
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE a échoué"
 
-#: imap/imap.c:1135
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "CLOSE a échoué"
 
-#: imap/imap.c:1378
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "Mauvaise boîte aux lettres"
 
 # , c-format
-#: imap/imap.c:1390
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Abonnement à %s..."
 
 # , c-format
-#: imap/imap.c:1392
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Désabonnement de %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr ""
 "Impossible de récupérer les en-têtes à partir de cette version du serveur "
 "IMAP."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Impossible de créer le fichier temporaire %s"
 
 # , c-format
-#: imap/message.c:134
+#: imap/message.c:128
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Évaluation du cache... [%d/%d]"
 
 # , c-format
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Récupération des en-têtes des messages... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Récupération du message..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 "L'index du message est incorrect. Essayez de rouvrir la boîte aux lettres."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Chargement du message ..."
 
 # , c-format
-#: imap/message.c:712
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Copie de %d messages dans %s..."
 
 # , c-format
-#: imap/message.c:716
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Copie du message %d dans %s..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Continuer ?"
 
@@ -1630,136 +2242,136 @@ msgstr "Continuer ?"
 msgid "Bad regexp: %s"
 msgstr "Mauvaise expression rationnelle : %s"
 
-#: init.c:642
+#: init.c:644
 msgid "spam: no matching pattern"
 msgstr "spam : pas de motif correspondant"
 
-#: init.c:644
+#: init.c:646
 msgid "nospam: no matching pattern"
 msgstr "nospam : pas de motif correspondant"
 
-#: init.c:847
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias : pas d'adresse"
 
-#: init.c:892
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Attention : mauvais IDN '%s' dans l'alias '%s'.\n"
 
-#: init.c:970
+#: init.c:972
 msgid "invalid header field"
 msgstr "en-tête invalide"
 
 # , c-format
-#: init.c:1023
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s : méthode de tri inconnue"
 
 # , c-format
-#: init.c:1133
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s) : erreur dans l'expression rationnelle : %s\n"
 
 # , c-format
-#: init.c:1198
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s : variable inconnue"
 
-#: init.c:1207
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "ce préfixe est illégal avec reset"
 
-#: init.c:1213
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "cette valeur est illégale avec reset"
 
 # , c-format
-#: init.c:1252
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s est positionné"
 
 # , c-format
-#: init.c:1252
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s n'est pas positionné"
 
 # , c-format
-#: init.c:1442
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s : type de boîte aux lettres invalide"
 
 # , c-format
-#: init.c:1467 init.c:1512
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s : valeur invalide"
 
 # , c-format
-#: init.c:1553
+#: init.c:1555
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s : type inconnu."
 
 # , c-format
-#: init.c:1579
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s : type inconnu"
 
 # , c-format
-#: init.c:1638
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Erreur dans %s, ligne %d : %s"
 
 # , c-format
 #. the muttrc source keyword
-#: init.c:1661
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source : erreurs dans %s"
 
-#: init.c:1662
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source : lecture interrompue car trop d'erreurs dans %s"
 
 # , c-format
-#: init.c:1676
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source : erreur dans %s"
 
-#: init.c:1681
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source : trop d'arguments"
 
 # , c-format
-#: init.c:1732
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s : commande inconnue"
 
 # , c-format
-#: init.c:2121
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Erreur dans la ligne de commande : %s\n"
 
-#: init.c:2170
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "impossible de déterminer le répertoire personnel"
 
-#: init.c:2178
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "impossible de déterminer le nom d'utilisateur"
 
@@ -2224,400 +2836,409 @@ msgid "compose a new mail message"
 msgstr "composer un nouveau message"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "ouvrir un dossier différent"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "ouvrir un dossier différent en lecture seule"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "effacer un indicateur de statut d'un message"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "effacer les messages correspondant à un motif"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "forcer la récupération du courrier depuis un serveur IMAP"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "récupérer le courrier depuis un serveur POP"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "aller au premier message"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "aller au dernier message"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "afficher seulement les messages correspondant à un motif"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Renvoyer les messages marqués à : "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "aller au nouveau message suivant"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "aller au message nouveau ou non lu suivant"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "aller à la sous-discussion suivante"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "aller à la discussion suivante"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "aller au message non effacé suivant"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "aller au message non lu suivant"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "aller au message père dans la discussion"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "aller à la discussion précédente"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "aller à la sous-discussion précédente"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "aller au message non effacé précédent"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "aller au nouveau message précédent"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "aller au message nouveau ou non lu précédent"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "aller au message non lu précédent"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "marquer la discussion courante comme lue"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "marquer la sous-discussion courante comme lue"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "mettre un indicateur d'état sur un message"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "sauver les modifications de la boîte aux lettres"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "marquer les messages correspondant à un motif"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "récupérer les messages correspondant à un motif"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "démarquer les messages correspondant à un motif"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "aller au milieu de la page"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "aller à l'entrée suivante"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "descendre d'une ligne"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "aller à la page suivante"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "aller à la fin du message"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "inverser l'affichage du texte cité"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "sauter le texte cité"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "aller au début du message"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "passer le message/l'attachement à une commande shell"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "aller à l'entrée précédente"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "remonter d'une ligne"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "aller à la page précédente"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "imprimer l'entrée courante"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "demander des adresses à un programme externe"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "ajouter les nouveaux résultats de la requête aux résultats courants"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "sauver les modifications de la boîte aux lettres et quitter"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "rappeler un message ajourné"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "effacer l'écran et réafficher"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{interne}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 msgid "rename the current mailbox (IMAP only)"
 msgstr "renommer la BAL courante (IMAP seulement)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "répondre à un message"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "utiliser le message courant comme modèle pour un nouveau message"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "sauver le message/l'attachement dans un fichier"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "rechercher une expression rationnelle"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "rechercher en arrière une expression rationnelle"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "rechercher la prochaine occurrence"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "rechercher la prochaine occurrence dans la direction opposée"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "inverser la coloration du motif de recherche"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "exécuter une commande dans un sous-shell"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "trier les messages"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "trier les messages dans l'ordre inverse"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "marquer l'entrée courante"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "appliquer la prochaine fonction aux messages marqués"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 msgid "apply next function ONLY to tagged messages"
 msgstr "appliquer la prochaine fonction SEULEMENT aux messages marqués"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "marquer la sous-discussion courante"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "marquer la discussion courante"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "inverser l'indicateur 'nouveau' d'un message"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "changer l'option de mise à jour de la boîte aux lettres"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "changer entre l'affichage des BAL et celui de tous les fichiers"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "aller en haut de la page"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "récupérer l'entrée courante"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "récupérer tous les messages de la discussion"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "récupérer tous les messages de la sous-discussion"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "afficher la version de Mutt (numéro et date)"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "visualiser l'attachement en utilisant l'entrée mailcap si nécessaire"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "afficher les attachements MIME"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "afficher le code d'une touche enfoncée"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "afficher le motif de limitation actuel"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "comprimer/décomprimer la discussion courante"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "comprimer/décomprimer toutes les discussions"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "attacher une clé publique PGP"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "afficher les options PGP"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "envoyer une clé publique PGP"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "vérifier une clé publique PGP"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "afficher le numéro d'utilisateur de la clé"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "reconnaissance pgp classique"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Accepter la chaîne construite"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "Ajouter un redistributeur de courrier à la fin de la chaîne"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "Insérer un redistributeur de courrier dans la chaîne"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "Retirer un redistributeur de courrier de la chaîne"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "Sélectionner l'élément précédent de la chaîne"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "Sélectionner l'élément suivant de la chaîne"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr ""
 "envoyer le message dans une chaîne de redistributeurs de courrier mixmaster"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "faire une copie déchiffrée et effacer"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "faire une copie déchiffrée"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "effacer la (les) phrase(s) de passe de la mémoire"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "extraire les clés publiques supportées"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "afficher les options S/MIME"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr ""
 "Dépassement de capacité sur entier -- impossible d'allouer la mémoire !"
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Plus de mémoire !"
 
@@ -2643,12 +3264,13 @@ msgstr ""
 "sous certaines conditions ; tapez `mutt -vv' pour les détails.\n"
 
 #: main.c:61
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2694,24 +3316,69 @@ msgstr ""
 "    avec ce programme ; si ce n'est pas le cas, écrivez à la Free Software\n"
 "    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
 
-#: main.c:99
+#: main.c:99
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"usage : mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <fich> ] [ -m <type> ] [ -f "
+"<fich> ]\n"
+"        mutt [ -nR ] [ -e <cmd> ] [ -F <fich> ] -Q <requête> [ -Q <req> ] "
+"[...]\n"
+"        mutt [ -nR ] [ -e <cmd> ] [ -F <fich> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"        mutt [ -nx ] [ -e <cmd> ] [ -a <fich> ] [ -F <fich> ] [ -H <fich> ] "
+"[ -i <fich> ] [ -s <obj> ] [ -b <adr> ] [ -c <adr> ] <adr> [ ... ]\n"
+"        mutt [ -n ] [ -e <cmd> ] [ -F <fich> ] -p\n"
+"        mutt -v[v]\n"
+"\n"
+"options :\n"
+"  -A <alias>\tdéveloppe l'alias mentionné\n"
+"  -a <fich>\tattache un fichier à ce message\n"
+"  -b <adresse>\tspécifie une adresse à mettre en copie aveugle (BCC)\n"
+"  -c <adresse>\tspécifie une adresse à mettre en copie (CC)\n"
+"  -e <commande>\tspécifie une commande à exécuter après l'initialisation\n"
+"  -f <fich>\tspécifie quelle boîte aux lettres lire\n"
+"  -F <fich>\tspécifie un fichier muttrc alternatif\n"
+"  -H <fich>\tspécifie un fichier de brouillon d'où lire en-têtes et corps\n"
+"  -i <fich>\tspécifie un fichier que Mutt doit inclure dans le corps\n"
+"  -m <type>\tspécifie un type de boîte aux lettres par défaut\n"
+"  -n\t\tfait que Mutt ne lit pas le fichier Muttrc système\n"
+"  -p\t\trappelle un message ajourné\n"
+"  -Q <variable>\tdemande la valeur d'une variable de configuration\n"
+"  -R\t\touvre la boîte aux lettres en mode lecture seule\n"
+"  -s <obj>\tspécifie un objet (entre guillemets s'il contient des espaces)\n"
+"  -v\t\taffiche la version et les définitions de compilation\n"
+"  -x\t\tsimule le mode d'envoi mailx\n"
+"  -y\t\tsélectionne une BAL spécifiée dans votre liste `mailboxes'\n"
+"  -z\t\tquitte immédiatement si pas de nouveau message dans la BAL\n"
+"  -Z\t\touvre le premier dossier ayant un nouveau message, quitte sinon\n"
+"  -h\t\tce message d'aide"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
+#, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-"<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-"[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-"[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
-"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
-"\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2764,7 +3431,7 @@ msgstr ""
 "  -Z\t\touvre le premier dossier ayant un nouveau message, quitte sinon\n"
 "  -h\t\tce message d'aide"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2772,50 +3439,50 @@ msgstr ""
 "\n"
 "Options de compilation :"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Erreur d'initialisation du terminal."
 
 # , c-format
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Débuggage au niveau %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG n'a pas été défini à la compilation. Ignoré.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s n'existe pas. Le créer ?"
 
 # , c-format
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Impossible de créer %s : %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Pas de destinataire spécifié.\n"
 
 # , c-format
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s : impossible d'attacher le fichier.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Pas de boîte aux lettres avec des nouveaux messages."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Pas de boîtes aux lettres recevant du courrier définies."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "La boîte aux lettres est vide."
 
@@ -2832,11 +3499,11 @@ msgstr "La bo
 msgid "Mailbox was corrupted!"
 msgstr "La boîte aux lettres a été altérée !"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Erreur fatale ! La boîte aux lettres n'a pas pu être réouverte !"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Impossible de verrouiller la boîte aux lettres !"
 
@@ -2844,11 +3511,11 @@ msgstr "Impossible de verrouiller la bo
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "sync : BAL modifiée, mais pas de message modifié ! (signalez ce bug)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Écriture des messages... %d (%d%%)"
@@ -2856,21 +3523,21 @@ msgstr "
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "Écriture des changements..."
 
 # , c-format
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Erreur d'écriture ! Boîte aux lettres partielle sauvée dans %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "La boîte aux lettres n'a pas pu être réouverte !"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Réouverture de la boîte aux lettres..."
 
@@ -2919,19 +3586,19 @@ msgstr "Vous 
 msgid "You are on the first entry."
 msgstr "Vous êtes sur la première entrée."
 
-#: menu.c:733 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Rechercher : "
 
-#: menu.c:734 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Rechercher en arrière : "
 
-#: menu.c:744 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Pas de motif de recherche."
 
-#: menu.c:774 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Non trouvé."
 
@@ -2961,92 +3628,51 @@ msgstr "Lecture de %s... %d"
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message() : impossible de fixer l'heure du fichier"
 
-#: muttlib.c:846
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr ""
-"Le fichier est un répertoire, sauver dans celui-ci ? [(o)ui, (n)on, (t)ous]"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr "ont"
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "Le fichier est un répertoire, sauver dans celui-ci ?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Fichier dans le répertoire : "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Le fichier existe, écras(e)r, (c)oncaténer ou (a)nnuler ?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "eca"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Impossible de sauver le message dans la boîte aux lettres POP."
-
-# , c-format
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s n'est pas une boîte aux lettres !"
-
-# , c-format
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Ajouter les messages à %s ?"
-
 # , c-format
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "Connexion à %s fermée"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL n'est pas disponible."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "La commande Preconnect a échoué."
 
 # , c-format
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Erreur en parlant à %s (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "Mauvais IDN « %s »."
 
 # , c-format
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "Recherche de %s..."
 
 # , c-format
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Impossible de trouver la machine \"%s\""
 
 # , c-format
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Connexion à %s..."
 
 # , c-format
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Impossible de se connecter à %s (%s)."
@@ -3078,7 +3704,8 @@ msgstr "erreur d'E/S"
 msgid "SSL failed: %s"
 msgstr "SSL a échoué : %s"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Impossible d'obtenir le certificat de la machine distante"
 
@@ -3088,89 +3715,215 @@ msgstr "Impossible d'obtenir le certificat de la machine distante"
 msgid "SSL connection using %s (%s)"
 msgstr "Connexion SSL utilisant %s (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Inconnu"
 
 # , c-format
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[impossible de calculer]"
 
 # , c-format
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[date invalide]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "Le certificat du serveur n'est pas encore valide"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "Le certificat du serveur a expiré"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Ce certificat appartient à :"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Ce certificat a été émis par :"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Ce certificat est valide"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "     de %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "      à %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Empreinte: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "Vérification du certificat SSL"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)ejeter, accepter (u)ne fois, (a)ccepter toujours"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "rua"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)ejeter, accepter (u)ne fois"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "ru"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Quitter  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Attention : le certificat n'a pas pu être sauvé"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Certificat sauvé"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+# , c-format
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "Connexion SSL utilisant %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Certificat sauvé"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Erreur d'initialisation du terminal."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Empreinte: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Empreinte: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Le certificat du serveur n'est pas encore valide"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Le certificat du serveur a expiré"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Le certificat du serveur a expiré"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "Le certificat du serveur n'est pas encore valide"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "Vérification du certificat SSL"
+
+# , c-format
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Connexion à %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+# , c-format
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Erreur en parlant à %s (%s)"
+
+#: muttlib.c:910
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr ""
+"Le fichier est un répertoire, sauver dans celui-ci ? [(o)ui, (n)on, (t)ous]"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr "ont"
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "Le fichier est un répertoire, sauver dans celui-ci ?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Fichier dans le répertoire : "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Le fichier existe, écras(e)r, (c)oncaténer ou (a)nnuler ?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "eca"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Impossible de sauver le message dans la boîte aux lettres POP."
+
+# , c-format
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Ajouter les messages à %s ?"
+
+# , c-format
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s n'est pas une boîte aux lettres !"
+
 # , c-format
 #: mx.c:120
 #, c-format
@@ -3261,7 +4014,7 @@ msgid "%d kept, %d moved, %d deleted."
 msgstr "%d gardé(s), %d déplacé(s), %d effacé(s)."
 
 # , c-format
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d gardé(s), %d effacé(s)."
@@ -3282,15 +4035,15 @@ msgstr "Utilisez 'toggle-write' pour r
 msgid "Mailbox is marked unwritable. %s"
 msgstr "La boîte aux lettres est protégée contre l'écriture. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "Boîte aux lettres vérifiée."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Impossible d'écrire le message"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr "Dépassement de capacité sur entier -- impossible d'allouer la mémoire."
 
@@ -3298,48 +4051,48 @@ msgstr "D
 msgid "Not available in this menu."
 msgstr "Non disponible dans ce menu."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "PgPréc"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "PgSuiv"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Voir attach."
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Suivant"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "La fin du message est affichée."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Le début du message est affiché."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Rechercher en arrière : "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Rechercher : "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "L'aide est actuellement affichée."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "Il n'y a plus de texte cité."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Il n'y a plus de texte non cité après le texte cité."
 
@@ -3415,27 +4168,27 @@ msgstr "motif vide"
 msgid "error: unknown op %d (report this error)."
 msgstr "erreur : opération inconnue %d (signalez cette erreur)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Compilation du motif de recherche..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Exécution de la commande sur les messages correspondants..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "Aucun message ne correspond au critère."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "Fin atteinte sans rien avoir trouvé"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "Début atteint sans rien avoir trouvé"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Recherche interrompue."
 
@@ -3447,11 +4200,11 @@ msgstr "Entrez la phrase de passe PGP :"
 msgid "PGP passphrase forgotten."
 msgstr "Phrase de passe PGP oubliée."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Erreur : impossible de créer le sous-processus PGP ! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3459,51 +4212,22 @@ msgstr ""
 "[-- Fin de sortie PGP --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- DÉBUT DE MESSAGE PGP --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- DÉBUT DE BLOC DE CLÉ PUBLIQUE PGP --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- DÉBUT DE MESSAGE SIGNÉ PGP --]\n"
-"\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- FIN DE MESSAGE PGP --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- FIN DE BLOC DE CLÉ PUBLIQUE PGP --]\n"
-
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- FIN DE MESSAGE SIGNÉ PGP --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "Impossible de copier le message"
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Erreur : impossible de trouver le début du message PGP ! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "Signature PGP vérifiée avec succès."
 
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Erreur interne. Veuillez avertir <roessler@does-not-exist.org>."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3511,72 +4235,36 @@ msgstr ""
 "[-- Erreur : impossible de créer un sous-processus PGP ! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Erreur : message PGP/MIME mal formé ! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Erreur : impossible de créer le fichier temporaire ! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- Les données suivantes sont chiffrées avec PGP/MIME --]\n"
-"\n"
-
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Fin des données chiffrées avec PGP/MIME --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "Le déchiffrage a échoué."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "Impossible d'ouvrir le sous-processus PGP !"
 
-# , c-format
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "Utiliser keyID = \"%s\" pour %s ?"
-
-# , c-format
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Entrez keyID pour %s : "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "Impossible d'invoquer PGP"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, %s, en clai(r) ? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr "PGP/M(i)ME"
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr "en l(i)gne"
 
-#: pgp.c:1499
+#: pgp.c:1543
 msgid "esabifc"
 msgstr "csedior"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Signer en tant que : "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "Récupération de la clé PGP..."
@@ -3586,16 +4274,6 @@ msgid "All matching keys are expired, revoked, or disabled."
 msgstr ""
 "Toutes les clés correspondantes sont expirées, annulées, ou désactivées."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Sélectionner  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Vérifier clé  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3610,42 +4288,6 @@ msgstr "Cl
 msgid "Can't open /dev/null"
 msgstr "Impossible d'ouvrir /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Impossible de créer le fichier temporaire"
-
-# , c-format
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "ID clé : 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Cette clé ne peut pas être utilisée : expirée/désactivée/annulée."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "L'ID est expiré/désactivé/annulé."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "L'ID a une validité indéfinie."
-
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "L'ID n'est pas valide."
-
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "L'ID n'est que peu valide."
-
-# , c-format
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Voulez-vous vraiment utiliser la clé ?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Veuillez entrer l'ID de la clé : "
@@ -3660,11 +4302,6 @@ msgstr "Appel de pgp..."
 msgid "PGP Key %s."
 msgstr "Clé PGP %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Recherche des clés correspondant à \"%s\"..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3724,7 +4361,7 @@ msgstr "Erreur 
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d messages lus sur %d]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "Le serveur a fermé la connexion !"
 
@@ -3755,16 +4392,16 @@ msgstr "Impossible de laisser les messages sur le serveur."
 msgid "Error connecting to server: %s"
 msgstr "Erreur de connexion au serveur : %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "Fermeture de la connexion au serveur POP..."
 
 # , c-format
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Vérification des index des messages..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Connexion perdue. Se reconnecter au serveur POP ?"
 
@@ -4148,39 +4785,39 @@ msgstr "Message envoy
 msgid "Sending in background."
 msgstr "Envoi en tâche de fond."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Pas de paramètre boundary trouvé !  [signalez cette erreur]"
 
 # , c-format
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s n'existe plus !"
 
 # , c-format
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s n'est pas un fichier ordinaire."
 
 # , c-format
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "Impossible d'ouvrir %s"
 
 # , c-format
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Erreur en envoyant le message, fils terminé avec le code %d (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Sortie du processus de livraison"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "Mauvais IDN %s lors de la préparation du resent-from."
@@ -4303,7 +4940,7 @@ msgstr "Impossible d'ouvrir le sous-processus OpenSSL !"
 msgid "No output from OpenSSL..."
 msgstr "Pas de sortie pour OpenSSL..."
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4311,19 +4948,19 @@ msgstr ""
 "[-- Fin de sortie OpenSSL --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Erreur : impossible de créer le sous-processus OpenSSL ! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- Les données suivantes sont chiffrées avec S/MIME --]\n"
 
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- Les données suivantes sont signées avec S/MIME --]\n"
 
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4331,7 +4968,7 @@ msgstr ""
 "\n"
 "[-- Fin des données chiffrées avec S/MIME. --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4339,27 +4976,27 @@ msgstr ""
 "\n"
 "[-- Fin des données signées avec S/MIME. --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
 "(c)hiffr S/MIME, (s)ign, ch. (a)vec, s. (e)n tant que, les (d)eux, clai(r) ? "
 
-#: smime.c:1936
+#: smime.c:1945
 msgid "eswabfc"
 msgstr "csaedor"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, ou (o)ublier ? "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345o"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 "Impossible de signer : pas de clé spécifiée. Utilisez « Signer en tant que »."
@@ -4383,3 +5020,9 @@ msgstr "Le message p
 #: thread.c:1095
 msgid "Parent message is not available."
 msgstr "Le message père n'est pas disponible."
+
+#~ msgid "Unexpected response received from server: %s"
+#~ msgstr "Réponse inattendue reçue du serveur : %s"
+
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Impossible d'ajouter aux boîtes aux lettres IMAP sur ce serveur"
diff --git a/po/gl.po b/po/gl.po
index f520cb66d..de664d485 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2001-04-22 22:05+0200\n"
 "Last-Translator: Roberto Suarez Soto <ask4it@bigfoot.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -14,26 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "Nome de usuario en %s: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Contrasinal para %s@%s: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Saír"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Borrar"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Recuperar"
 
@@ -42,9 +42,9 @@ msgid "Select"
 msgstr "Seleccionar"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Axuda"
 
@@ -96,36 +96,36 @@ msgstr "Gardar a ficheiro: "
 msgid "Alias added."
 msgstr "Alias engadido."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Non se puido atopa-lo nome, ¿continuar?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "A entrada \"compose\" no ficheiro Mailcap require %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "¡Erro executando \"%s\"!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Fallo ó abri-lo ficheiro para analiza-las cabeceiras."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Fallo ó abri-lo ficheiro para quitar as cabeceiras"
 
-#: attach.c:183
+#: attach.c:184
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "Fallo ó abri-lo ficheiro para analiza-las cabeceiras."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr ""
@@ -133,138 +133,138 @@ msgstr ""
 " ficheiro vacío."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "A entrada \"Edit\" do ficheiro Mailcap require %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Non hai entrada \"edit\" no ficheiro Mailcap para %s"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr ""
 "Non se atopou ningunha entrada coincidente no ficheiro mailcap.Vendo como "
 "texto"
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Tipo MIME non definido. Non se pode ver-lo ficheiro adxunto."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Non se puido crea-lo filtro"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Non podo crea-lo filtro"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "¡Fallo de escritura!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "¡Non lle sei cómo imprimir iso!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Directorio"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Máscara"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s non é un directorio."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Buzóns [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Subscrito [%s], máscara de ficheiro: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Directorio [%s], máscara de ficheiro: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Non é posible adxuntar un directorio"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Non hai ficheiros que coincidan coa máscara"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "A operación 'Crear' está soportada só en buzóns IMAP"
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "A operación 'Crear' está soportada só en buzóns IMAP"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "A operación 'Borrar' está soportada só en buzóns IMAP"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "¿Seguro de borra-lo buzón \"%s\"?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Buzón borrado."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "Buzón non borrado."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Cambiar directorio a: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Erro lendo directorio."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Máscara de ficheiro: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "¿Ordear inversamente por (d)ata, (a)lfabeto, (t)amaño ou (s)en orden?"
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "¿Ordear por (d)ata, (a)lfabeto, (t)amaño ou (s)en orden?"
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "dats"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Novo nome de ficheiro: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Non é posible ver un directorio"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Erro intentando ver ficheiro"
 
@@ -332,7 +332,7 @@ msgstr "colores por defecto non soportados"
 msgid "Verify PGP signature?"
 msgstr "¿Verificar firma PGP?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "¡Non foi posible crear o ficheiro temporal!"
 
@@ -344,119 +344,119 @@ msgstr "Non foi posible crea-lo filtro de visualizaci
 msgid "Could not copy message"
 msgstr "Non foi posible copia-la mensaxe."
 
-#: commands.c:186
+#: commands.c:187
 #, fuzzy
 msgid "S/MIME signature successfully verified."
 msgstr "Sinatura PGP verificada con éxito."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr ""
 
-#: commands.c:193
+#: commands.c:194
 #, fuzzy
 msgid "S/MIME signature could NOT be verified."
 msgstr "Non foi posible verifica-la sinatura PGP."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "Sinatura PGP verificada con éxito."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "Non foi posible verifica-la sinatura PGP."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Comando: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Rebotar mensaxe a: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Rebotar mensaxes marcadas a: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "¡Erro analizando enderezo!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Rebotar mensaxe a %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Rebotar mensaxes a %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Message not bounced."
 msgstr "Mensaxe rebotada."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Messages not bounced."
 msgstr "Mensaxes rebotadas."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Mensaxe rebotada."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Mensaxes rebotadas."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 #, fuzzy
 msgid "Can't create filter process"
 msgstr "Non podo crea-lo filtro"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Canalizar ó comando: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Non foi definido ningún comando de impresión."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "¿Imprimir mensaxe?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "¿Imprimir mensaxes marcadas?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Mensaxe impresa"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Mensaxes impresas"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "Non foi posible imprimi-la mensaxe"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Non foi posible imprimi-las mensaxes"
 
-#: commands.c:508
+#: commands.c:509
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -464,81 +464,81 @@ msgid ""
 msgstr ""
 "Ordear-inv (d)ata/d(e)/(r)ecb/(t)ema/(p)ara/(f)ío/(n)ada/t(a)m/p(u)nt: "
 
-#: commands.c:509
+#: commands.c:510
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr "Ordear (d)ata/d(e)/(r)ecb/(t)ema/(p)ara/(f)ío/(n)ada/t(a)m/p(u)nt: "
 
-#: commands.c:510
+#: commands.c:511
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dertpfnau"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Comando de shell: "
 
-#: commands.c:709
+#: commands.c:716
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "%s%s ó buzón"
 
-#: commands.c:710
+#: commands.c:717
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "%s%s ó buzón"
 
-#: commands.c:711
+#: commands.c:718
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "%s%s ó buzón"
 
-#: commands.c:712
+#: commands.c:719
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "%s%s ó buzón"
 
-#: commands.c:713
+#: commands.c:720
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
 msgstr "%s%s ó buzón"
 
-#: commands.c:713
+#: commands.c:720
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
 msgstr "%s%s ó buzón"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " marcado"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Copiando a %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr ""
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Tipo de contido cambiado a %s..."
 
-#: commands.c:924
+#: commands.c:941
 #, fuzzy, c-format
 msgid "Character set changed to %s; %s."
 msgstr "O xogo de caracteres foi cambiado a %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr ""
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr ""
 
@@ -633,103 +633,686 @@ msgstr ""
 msgid "Attaching selected files..."
 msgstr "Adxuntando ficheiros seleccionados ..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "¡Non foi posible adxuntar %s!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Abrir buzón do que adxuntar mensaxe"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Non hai mensaxes nese buzón."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "¡Marca as mensaxes que queres adxuntar!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "¡Non foi posible adxuntar!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "A recodificación só afecta ós adxuntos de texto."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "O adxunto actual non será convertido."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "O adxunto actual será convertido"
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Codificación inválida."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "¿Gardar unha copia desta mensaxe?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Cambiar nome a: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "Non foi atopado: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Novo ficheiro: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type é da forma base/subtipo"
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Non coñezo ó Content-Type %s"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "Non fun capaz de crea-lo ficheiro %s"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "O que temos aquí é un fallo ó face-lo adxunto"
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "¿Pospór esta mensaxe?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "Escribir mensaxe ó buzón"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Escribindo mensaxe a %s..."
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "Mensaxe escrita."
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "erro no patrón en: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "erro no patrón en: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "erro no patrón en: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "erro no patrón en: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "erro no patrón en: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "erro no patrón en: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "erro no patrón en: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "erro no patrón en: %s"
+
+#: crypt-gpgme.c:993
+msgid "Warning: One of the keys has been revoked\n"
+msgstr ""
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "O certificado do servidor expirou"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL non está accesible."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Fingerprint: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Erro enviando a mensaxe."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Erro na liña de comando: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Fin dos datos asinados --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Erro: ¡fin de ficheiro inesperado! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- COMEZA A MESAXE PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- COMEZA O BLOQUE DE CHAVE PÚBLICA PGP --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- COMEZA A MESAXE FIRMADA CON PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+#, fuzzy
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- FIN DA MESAXE PGP --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- FIN DO BLOQUE DE CHAVE PÚBLICA PGP --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+#, fuzzy
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- FIN DA MESAXE FIRMADA CON PGP --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Erro: ¡non se atopou o comezo da mensaxe PGP! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Erro: ¡mensaxe PGP/MIME mal formada! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Erro: ¡non foi posible crea-lo ficheiro temporal! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Os datos a continuación están encriptados con PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Os datos a continuación están encriptados con PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Fin dos datos con encriptación PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+#, fuzzy
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Fin dos datos con encriptación PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr ""
+"[-- Os datos a continuación están asinados --]\n"
+"\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Os datos a continuación están encriptados con PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Fin dos datos asinados --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Fin dos datos con encriptación PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Mes inválido: %s"
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Mes inválido: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Mes inválido: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Encriptar"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Certificado gardado"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Key ID: 0x%s"
+
+#: crypt-gpgme.c:3099
+msgid "[Revoked]"
+msgstr ""
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Saír  "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Non podo crea-lo ficheiro temporal"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Conectando con %s..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Erro ó conectar có servidor: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Key ID: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "O login fallou."
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Tódalas chaves coincidintes están marcadas como expiradas/revocadas."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Saír  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Seleccionar  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Comprobar chave  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "Chaves PGP coincidintes con \"%s\""
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "Chaves PGP coincidintes con \"%s\""
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "Chaves PGP coincidintes con \"%s\""
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "Chaves PGP coincidintes con \"%s\""
+
+#: crypt-gpgme.c:3592
+#, fuzzy, c-format
+msgid "%s <%s>."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3594
+#, fuzzy, c-format
+msgid "%s \"%s\"."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Esta chave non pode ser usada: expirada/deshabilitada/revocada."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+#, fuzzy
+msgid "ID is expired/disabled/revoked."
+msgstr "Este ID expirou/foi deshabilitado/foi revocado"
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr ""
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+#, fuzzy
+msgid "ID is not valid."
+msgstr "Este ID non é de confianza."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+#, fuzzy
+msgid "ID is only marginally valid."
+msgstr "Este ID é de confianza marxinal."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s ¿Está seguro de querer usa-la chave?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Buscando chaves que coincidan con \"%s\"..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "¿Usa-lo keyID = \"%s\" para %s?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Introduza keyID para %s: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr ""
+"¿(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas, (i)nterior, ou (o)lvidar? "
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "efcao"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr ""
+"¿(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas, (i)nterior, ou (o)lvidar? "
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "efcao"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Firmar como: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Fallo ó abri-lo ficheiro para analiza-las cabeceiras."
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -746,29 +1329,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "Contrasinal PGP esquecido."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Chamando ó PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Mensaxe non enviada."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
@@ -778,14 +1361,14 @@ msgid ""
 "\n"
 msgstr "[-- Erro: estructura multiparte/asinada inconsistente --]\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr "[-- Erro: protocolo multiparte/asinado %s descoñecido --]\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -795,7 +1378,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
@@ -804,7 +1387,7 @@ msgstr ""
 "[-- Os datos a continuación están asinados --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -812,7 +1395,7 @@ msgstr ""
 "[-- Atención: non se atoparon sinaturas. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 #, fuzzy
 msgid ""
 "\n"
@@ -821,230 +1404,260 @@ msgstr ""
 "\n"
 "[-- Fin dos datos asinados --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Chamando ó PGP..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "sí"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "non"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "¿Saír de Mutt?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "erro descoñecido"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Pulsa calquera tecla para seguir..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr "('?' para lista): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Non hai buzóns abertos."
 
 #
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Non hai mensaxes."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "O buzón é de só lectura."
 
 #
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Función non permitida no modo \"adxuntar-mensaxe\"."
 
-#: curs_main.c:55
+#: curs_main.c:56
 #, fuzzy
 msgid "No visible messages."
 msgstr "Non hai novas mensaxes"
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "¡Non se pode cambiar a escritura un buzón de só lectura!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Os cambios ó buzón serán escritos á saída da carpeta."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Os cambios á carpeta non serán gardados."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Saír"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Gardar"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Nova"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Responder"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Grupo"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "O buzón foi modificado externamente. Os indicadores poden ser erróneos"
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Novo correo neste buzón."
 
-#: curs_main.c:503
+#: curs_main.c:504
 #, fuzzy
 msgid "Mailbox was externally modified."
 msgstr "O buzón foi modificado externamente. Os indicadores poden ser erróneos"
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Non hai mensaxes marcadas."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 #, fuzzy
 msgid "Nothing to do."
 msgstr "Conectando con %s..."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Saltar á mensaxe: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "O parámetro debe ser un número de mensaxe."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Esa mensaxe non é visible."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Número de mensaxe inválido."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Borrar as mensaxes que coincidan con: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "Non hai patrón limitante efectivo."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Límite: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Limitar ás mensaxes que coincidan con: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "¿Saír de Mutt?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Marcar as mensaxes que coincidan con: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Recuperar as mensaxes que coincidan con: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Desmarcar as mensaxes que coincidan con: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Abrir buzón en modo de só lectura"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Abrir buzón"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s non é un buzón."
 
-#: curs_main.c:1165
-msgid "Exit Mutt without saving?"
-msgstr "¿Saír de Mutt sen gardar?"
+#: curs_main.c:1176
+msgid "Exit Mutt without saving?"
+msgstr "¿Saír de Mutt sen gardar?"
+
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "Enfiamento non habilitado."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "gardar esta mensaxe para mandar logo"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Está na última mensaxe."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Non hai mensaxes recuperadas."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Está na primeira mensaxe."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "A búsqueda volveu ó principio."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "A búsqueda volveu ó final."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Non hai novas mensaxes"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Non hai mensaxes sen ler"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " nesta vista limitada"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 #, fuzzy
 msgid "Can't change 'important' flag on POP server."
 msgstr "Non é posible editar unha mensaxe no servidor POP."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Non hai máis fíos"
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Está no primeiro fío"
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "Enfiamento non habilitado."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "O fío contén mensaxes sen ler."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "Non é posible editar unha mensaxe no servidor POP."
 
@@ -1177,76 +1790,76 @@ msgstr "P
 msgid "Clear flag"
 msgstr "Limpar indicador"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Erro: ¡Non foi posible amosar ningunha parte de Multipart/"
 "Alternative!--]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Adxunto #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Tipo: %s/%s, Codificación: %s, Tamaño: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Automostra usando %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Chamando ó comando de automostra: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, fuzzy, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- o %s --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Automostra da stderr de %s --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr "[-- Erro: mensaxe/corpo externo non ten parámetro \"access-type\"--]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Este adxunto %s/%s "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(tamaño %s bytes) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "foi borrado --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- o %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- nome: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, fuzzy, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Este adxunto %s/%s "
 
-#: handler.c:1696
+#: handler.c:1712
 #, fuzzy
 msgid ""
 "[-- and the indicated external source has --]\n"
@@ -1255,36 +1868,36 @@ msgstr ""
 "[-- Este adxunto %s/%s non está incluido --]\n"
 "[-- e a fonte externa indicada expirou--]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 "[-- Este adxunto %s/%s non está incluido, --]\n"
 "[-- e o \"access-type\" %s indicado non está soportado --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Erro: multipart/signed non ten protocolo."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Erro: ¡multipart/encrypted non ten parámetro de protocolo!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "¡Non foi posible abri-lo ficheiro temporal!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s non está soportado "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(use '%s' para ver esta parte)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(cómpre que 'view-attachments' esté vinculado a unha tecla!)"
 
@@ -1392,48 +2005,48 @@ msgstr "Autenticando (APOP)..."
 msgid "SASL authentication failed."
 msgstr "Autenticación SASL fallida."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr ""
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Recollendo entornos de nomes..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Recollendo lista de carpetas..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 #, fuzzy
 msgid "No such folder"
 msgstr "%s: non hai tal color"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Crear buzón:"
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 #, fuzzy
 msgid "Mailbox must have a name."
 msgstr "O buzón non cambiou."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Buzón creado."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Crear buzón:"
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "O login fallou."
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "Buzón creado."
@@ -1446,139 +2059,137 @@ msgstr "Buz
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Erro fatal. ¡A conta de mensaxes non está sincronizada!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Pechando conexión con %s..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Este servidor IMAP é moi vello. Mutt non traballa con el."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "¿Usar conexión segura con TLS?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr ""
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+#, fuzzy
+msgid "Encrypted connection unavailable"
+msgstr "Chave da sesión encriptada"
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Seleccionando %s..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 #, fuzzy
 msgid "Error opening mailbox"
 msgstr "¡Erro cando se estaba a escribi-lo buzón!"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Non é posible engadir ós buzóns IMAP deste servidor"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "¿Crear %s?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Marcando %d mensaxes borradas ..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 #, fuzzy
 msgid "Expunge failed"
 msgstr "O login fallou."
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Gardando indicadores de estado da mensaxe... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Borrando mensaxes do servidor..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 #, fuzzy
 msgid "CLOSE failed"
 msgstr "O login fallou."
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 #, fuzzy
 msgid "Bad mailbox name"
 msgstr "Crear buzón:"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Subscribindo a %s..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Borrando a subscripción con %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Non foi posible recoller cabeceiras da versión de IMAP do servidor"
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, fuzzy, c-format
 msgid "Could not create temporary file %s"
 msgstr "¡Non foi posible crear o ficheiro temporal!"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Recollendo cabeceiras de mensaxes... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Recollendo cabeceiras de mensaxes... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Recollendo mensaxe..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "O índice de mensaxes é incorrecto. Tente reabri-lo buzón."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Enviando mensaxe ..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Copiando %d mensaxes a %s..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Copiando mensaxe %d a %s..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "¿Seguir?"
 
@@ -1587,124 +2198,124 @@ msgstr "
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:678
+#: init.c:644
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "marcar mensaxes coincidintes cun patrón"
 
-#: init.c:680
+#: init.c:646
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "quitar marca a mensaxes coincidintes cun patrón"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias: sen enderezo"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "campo de cabeceira inválido"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: método de ordeación descoñecido"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): erro en regexp: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: variable descoñecida"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "prefixo ilegal con reset"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "valor ilegal con reset"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s está activada"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s non está activada"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: tipo de buzón inválido"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: valor inválido"
 
-#: init.c:1589
+#: init.c:1555
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s: tipo descoñecido"
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: tipo descoñecido"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Erro en %s, liña %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: erros en %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: a lectura foi abortada por haber demasiados erros in %s"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: erro en %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: demasiados parámetros"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: comando descoñecido"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Erro na liña de comando: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "non foi posible determina-lo directorio \"home\""
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "non foi posible determina-lo nome de usuario"
 
@@ -2166,405 +2777,414 @@ msgid "compose a new mail message"
 msgstr "compór unha nova mensaxe"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "abrir unha carpeta diferente"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "abrir unha carpeta diferente en modo de só lectura"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "limpar a marca de estado dunha mensaxe"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "borrar mensaxes coincidentes cun patrón"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "forza-la recollida de correo desde un servidor IMAP"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "recoller correo dun servidor POP"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "moverse á primeira mensaxe"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "moverse á última mensaxe"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "amosar só mensaxes que coincidan cun patrón"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Rebotar mensaxes marcadas a: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "saltar á vindeira nova mensaxe"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 #, fuzzy
 msgid "jump to the next new or unread message"
 msgstr "saltar á vindeira mensaxe recuperada"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "saltar ó vindeiro subfío"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "saltar ó vindeiro fío"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "moverse á vindeira mensaxe recuperada"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "saltar á vindeira mensaxe recuperada"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "saltar á mensaxe pai no fío"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "saltar ó fío anterior"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "saltar ó subfío anterior"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "moverse á anterior mensaxe recuperada"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "saltar á vindeira mensaxe nova"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 #, fuzzy
 msgid "jump to the previous new or unread message"
 msgstr "saltar á anterior mensaxe non lida"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "saltar á anterior mensaxe non lida"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "marca-lo fío actual como lido"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "marca-lo subfío actual como lido"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "pór un indicador de estado nunha mensaxe"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "gardar cambios ó buzón"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "marcar mensaxes coincidintes cun patrón"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "recuperar mensaxes coincidindo cun patrón"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "quitar marca a mensaxes coincidintes cun patrón"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "moverse ó medio da páxina"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "moverse á vindeira entrada"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "avanzar unha liña"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "moverse á vindeira páxina"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "saltar ó final da mensaxe"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "cambiar a visualización do texto citado"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "saltar o texto citado"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "saltar ó comezo da mensaxe"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "canalizar mensaxe/adxunto a un comando de shell"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "moverse á entrada anterior"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "retroceder unha liña"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "moverse á vindeira páxina"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "imprimi-la entrada actual"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "consultar o enderezo a un programa externo"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "engadir os resultados da nova consulta ós resultados actuais"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "gardar cambios ó buzón e saír"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "reeditar unha mensaxe posposta"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "limpar e redibuxa-la pantalla"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{interno}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "borra-lo buzón actual (só IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "responder a unha mensaxe"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "usa-la mensaxe actual como patrón para unha nova"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "gardar mensaxe/adxunto a un ficheiro"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "buscar unha expresión regular"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "buscar unha expresión regular cara atrás"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "busca-la vindeira coincidencia"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "busca-la vindeira coincidencia en dirección oposta"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "cambia-la coloración do patrón de búsqueda"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "chamar a un comando nun subshell"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "ordear mensaxes"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "ordear mensaxes en orden inverso"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "marca-la entrada actual"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "aplica-la vindeira función ás mensaxes marcadas"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 #, fuzzy
 msgid "apply next function ONLY to tagged messages"
 msgstr "aplica-la vindeira función ás mensaxes marcadas"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "marca-lo subfío actual"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "marca-lo fío actual"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "cambia-lo indicador de 'novo' dunha mensaxe"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "cambia-la opción de reescribir/non-reescribi-lo buzón"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "cambia-la opción de ver buzóns/tódolos ficheiros"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "moverse ó comezo da páxina"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "recupera-la entrada actual"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "recuperar tódalas mensaxes en fío"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "recuperar tódalas mensaxes en subfío"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "amosa-lo número e data de versión de Mutt"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "ver adxunto usando a entrada de mailcap se cómpre"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "amosar adxuntos MIME"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr ""
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "amosar o patrón limitante actual"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "colapsar/expandir fío actual"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "colapsar/expandir tódolos fíos"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "adxuntar unha chave pública PGP"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "amosa-las opcións PGP"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "enviar por correo unha chave pública PGP"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "verificar unha chave pública PGP"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "ve-la identificación de usuario da chave"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "verificar para pgp clásico"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Acepta-la cadea construida"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "Engadir un remailer á cadea"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "Insertar un remailer na cadea"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "Borrar un remailer da cadea"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "Selecciona-lo anterior elemento da cadea"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "Selecciona-lo vindeiro elemento da cadea"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "envia-la mensaxe a través dunha cadea de remailers mixmaster"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "facer unha copia desencriptada e borrar"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "facer unha copia desencriptada"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 #, fuzzy
 msgid "wipe passphrase(s) from memory"
 msgstr "borra-lo contrasinal PGP de memoria"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 #, fuzzy
 msgid "extract supported public keys"
 msgstr "extraer chaves públicas PGP"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 #, fuzzy
 msgid "show S/MIME options"
 msgstr "amosa-las opcións PGP"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr ""
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "¡Memoria agotada!"
 
@@ -2594,11 +3214,11 @@ msgstr ""
 #: main.c:61
 #, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2644,25 +3264,65 @@ msgstr ""
 "    xunto deste programa; se non foi así, escriba á Free Software\n"
 "    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
 
-#: main.c:99
+#: main.c:99
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"uso: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> ]\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <ficheiro> ] [ -F <ficheiro> ]\n"
+" [ -H <ficheiro> ] [ -i <ficheiro> ] [ -s <tema> ] [ -b <enderz> ] [ -c "
+"<enderz> ] <enderz> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <ficheiro> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -a <ficheiro>\tadxuntar un ficheiro á mensaxe\n"
+"  -b <enderezo>\tespecificar un enderezo para carbon-copy cego (BCC)\n"
+"  -c <enderezo>\tespecificar un enderezo para carbon-copy (CC)\n"
+"  -e <comando>\tespecificar un comando a executar despois do inicio\n"
+"  -f <ficheiro>\tespecificar que buzón ler\n"
+"  -F <ficheiro>\tespecificar un ficheiro muttrc alternativo\n"
+"  -H <ficheiro>\tespecificar un ficheiro borrador do que le-la cabeceira\n"
+"  -i <ficheiro>\tespecificar un ficheiro que Mutt deberá incluir na "
+"resposta\n"
+"  -m <tipo>\tespecificar un tipo de buzón por defecto\n"
+"  -n\t\tfai que Mutt non lea o Muttrc do sistema\n"
+"  -p\t\teditar unha mensaxe posposta\n"
+"  -R\t\tabrir un buzón en modo de só lectura\n"
+"  -s <tema>\tespecificar un tema (debe ir entre comillas se ten espacios)\n"
+"  -v\t\tamosa-la versión e las definicións en tempo de compilación\n"
+"  -x\t\tsimula-lo modo de envío de mailx\n"
+"  -y\t\tseleccionar un buzón especificado na súa lista de buzóns\n"
+"  -z\t\tsalir de contado se non quedan mensaxes no buzón\n"
+"  -Z\t\tabri-la primeira carpeta con algunha mensaxe nova, saír de contado "
+"si non hai tal\n"
+"  -h\t\testa mensaxe de axuda"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
 #, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-"<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-"[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-"[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
-"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
-"\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2711,7 +3371,7 @@ msgstr ""
 "si non hai tal\n"
 "  -h\t\testa mensaxe de axuda"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2719,48 +3379,48 @@ msgstr ""
 "\n"
 "Opcións de compilación:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Error iniciando terminal."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Depurando a nivel %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr ""
 "A opción \"DEBUG\" non foi especificada durante a compilación. Ignorado.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s non existe. ¿Desexa crealo?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Non foi posible crear %s: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Non foi especificado ningún destinatario.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: non foi posible adxuntar ficheiro.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Non hai buzóns con novo correo."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Non se definiron buzóns para correo entrante."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "O buzón está valeiro."
 
@@ -2777,11 +3437,11 @@ msgstr "
 msgid "Mailbox was corrupted!"
 msgstr "¡O buzón foi corrompido!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "¡Erro fatal! ¡Non foi posible reabri-lo buzón!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "¡Imposible bloquea-lo buzón!"
 
@@ -2789,13 +3449,13 @@ msgstr "
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: ¡buzón modificado, mais non hai mensaxes modificadas! (informe deste "
 "fallo)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Escribindo mensaxes... %d (%d%%)"
@@ -2803,188 +3463,149 @@ msgstr "Escribindo mensaxes... %d (%d%%)"
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 #, fuzzy
 msgid "Committing changes..."
 msgstr "Compilando patrón de búsqueda..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "¡Fallou a escritura! Gardado buzón parcialmente a %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "¡Non foi posible reabri-lo buzón!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Reabrindo buzón..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Saltar a: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Número de índice inválido."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Non hai entradas."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Non é posible moverse máis abaixo."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Non é posible moverse máis arriba."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Está na derradeira páxina."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Está na primeira páxina."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "Amosase a primeira entrada."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "Amosase a derradeira entrada."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Está na derradeira entrada."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Está na primeira entrada."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Búsqueda de: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Búsqueda inversa de: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Non hai patrón de búsqueda."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Non se atopou."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "Non hai entradas marcadas."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "A búsqueda non está implementada neste menú."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "O salto non está implementado nos diálogos."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "O marcado non está soportado."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Lendo %s... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
-#: muttlib.c:846
-#, fuzzy
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "O ficheiro é un directorio, ¿gardar nel?"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr ""
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "O ficheiro é un directorio, ¿gardar nel?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Ficheiro no directorio: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "O ficheiro existe, ¿(s)obreescribir, (e)ngadir ou (c)ancelar?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "sec"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Non foi posible garda-la mensaxe no buzón POP."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "¡%s non é un buzón!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "¿engadir mensaxes a %s?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, fuzzy, c-format
 msgid "Connection to %s closed"
 msgstr "Fallou a conexión con %s."
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL non está accesible."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "O comando de preconexión fallou."
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, fuzzy, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Erro ó conectar có servidor: %s"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "Buscando %s..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Non foi posible atopa-lo servidor \"%s\""
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Conectando con %s..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Non foi posible conectar con %s (%s)"
@@ -3016,7 +3637,8 @@ msgstr ""
 msgid "SSL failed: %s"
 msgstr "O login fallou."
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Non foi posible obter un certificado do outro extremo"
 
@@ -3025,87 +3647,208 @@ msgstr "Non foi posible obter un certificado do outro extremo"
 msgid "SSL connection using %s (%s)"
 msgstr "Conectando mediante SSL usando %s (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[imposible calcular]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[ data incorrecta ]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "O certificado do servidor non é aínda válido"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "O certificado do servidor expirou"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Este certificado pertence a:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Este certificado foi emitido por:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Este certificado é válido"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   de %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     a %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Fingerprint: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "Comprobación do certificado SSL"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)exeitar, aceptar (e)sta vez, (a)ceptar sempre"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "rea"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)exeitar, aceptar (e)sta vez"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "re"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Saír  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Atención: non foi posible garda-lo certificado"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Certificado gardado"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "Conectando mediante SSL usando %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Certificado gardado"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Error iniciando terminal."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Fingerprint: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Fingerprint: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "O certificado do servidor non é aínda válido"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "O certificado do servidor expirou"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "O certificado do servidor expirou"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "O certificado do servidor non é aínda válido"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "Comprobación do certificado SSL"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Conectando con %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Erro ó conectar có servidor: %s"
+
+#: muttlib.c:910
+#, fuzzy
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "O ficheiro é un directorio, ¿gardar nel?"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr ""
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "O ficheiro é un directorio, ¿gardar nel?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Ficheiro no directorio: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "O ficheiro existe, ¿(s)obreescribir, (e)ngadir ou (c)ancelar?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "sec"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Non foi posible garda-la mensaxe no buzón POP."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "¿engadir mensaxes a %s?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "¡%s non é un buzón!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3183,7 +3926,7 @@ msgstr "O buz
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d conservados, %d movidos, %d borrados."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d conservados, %d borrados."
@@ -3202,15 +3945,15 @@ msgstr "
 msgid "Mailbox is marked unwritable. %s"
 msgstr "O buzón está marcado como non escribible. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "Buzón marcado para comprobación."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Non foi posible escribi-la mensaxe"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
@@ -3219,48 +3962,48 @@ msgstr ""
 msgid "Not available in this menu."
 msgstr "Non dispoñible neste menú."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "PáxAnt"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "SegPáx"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Ver adxunto"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Seguinte"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Amosase o final da mensaxe."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Amosase o principio da mensaxe."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Búsqueda inversa: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Búsqueda: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "Estase a amosa-la axuda"
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "Non hai máis texto citado."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Non hai máis texto sen citar despois do texto citado."
 
@@ -3327,27 +4070,27 @@ msgstr "patr
 msgid "error: unknown op %d (report this error)."
 msgstr "erro: operador descoñecido %d (informe deste erro)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Compilando patrón de búsqueda..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Executando comando nas mensaxes coincidintes..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "Non hai mensaxes que coincidan co criterio."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "A búsqueda cheou ó final sen atopar coincidencias"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "A búsqueda chegou ó comezo sen atopar coincidencia"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Búsqueda interrompida."
 
@@ -3359,68 +4102,33 @@ msgstr "Introduza o contrasinal PGP:"
 msgid "PGP passphrase forgotten."
 msgstr "Contrasinal PGP esquecido."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Erro: ¡non foi posible crear subproceso PGP! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
 msgstr "[-- Fin da saída PGP --]\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- COMEZA A MESAXE PGP --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- COMEZA O BLOQUE DE CHAVE PÚBLICA PGP --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- COMEZA A MESAXE FIRMADA CON PGP --]\n"
-"\n"
-
-#: pgp.c:423
+#: pgp.c:387 pgp.c:951
 #, fuzzy
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- FIN DA MESAXE PGP --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- FIN DO BLOQUE DE CHAVE PÚBLICA PGP --]\n"
+msgid "Could not decrypt PGP message"
+msgstr "Non foi posible copia-la mensaxe."
 
-#: pgp.c:427
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
 #, fuzzy
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- FIN DA MESAXE FIRMADA CON PGP --]\n"
-
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Erro: ¡non se atopou o comezo da mensaxe PGP! --]\n"
-"\n"
+msgid "PGP message successfully decrypted."
+msgstr "Sinatura PGP verificada con éxito."
 
-#: pgp.c:704
+#: pgp.c:723
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Erro interno. Informe a <roessler@does-not-exist.org>."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3428,75 +4136,38 @@ msgstr ""
 "[-- Erro: ¡non foi posible crear un subproceso PGP! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Erro: ¡mensaxe PGP/MIME mal formada! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Erro: ¡non foi posible crea-lo ficheiro temporal! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- Os datos a continuación están encriptados con PGP/MIME --]\n"
-"\n"
-
-#: pgp.c:915
+#: pgp.c:828
 #, fuzzy
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr ""
-"\n"
-"[-- Fin dos datos con encriptación PGP/MIME --]\n"
+msgid "Decryption failed"
+msgstr "O login fallou."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "¡Non foi posible abri-lo subproceso PGP!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "¿Usa-lo keyID = \"%s\" para %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Introduza keyID para %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "Non foi posible invocar ó PGP"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr ""
 "¿(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas, (i)nterior, ou (o)lvidar? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1499
+#: pgp.c:1543
 #, fuzzy
 msgid "esabifc"
 msgstr "efcaio"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Firmar como: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "Recollendo chave PGP..."
@@ -3506,16 +4177,6 @@ msgstr "Recollendo chave PGP..."
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Tódalas chaves coincidintes están marcadas como expiradas/revocadas."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Seleccionar  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Comprobar chave  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3530,43 +4191,6 @@ msgstr "Chaves PGP coincidintes con \"%s\""
 msgid "Can't open /dev/null"
 msgstr "Non foi posible abrir /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Non podo crea-lo ficheiro temporal"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Key ID: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Esta chave non pode ser usada: expirada/deshabilitada/revocada."
-
-#: pgpkey.c:612
-#, fuzzy
-msgid "ID is expired/disabled/revoked."
-msgstr "Este ID expirou/foi deshabilitado/foi revocado"
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr ""
-
-#: pgpkey.c:619
-#, fuzzy
-msgid "ID is not valid."
-msgstr "Este ID non é de confianza."
-
-#: pgpkey.c:622
-#, fuzzy
-msgid "ID is only marginally valid."
-msgstr "Este ID é de confianza marxinal."
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s ¿Está seguro de querer usa-la chave?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Introduza o key ID: "
@@ -3580,11 +4204,6 @@ msgstr "Chamando 
 msgid "PGP Key %s."
 msgstr "Chave PGP %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Buscando chaves que coincidan con \"%s\"..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3642,7 +4261,7 @@ msgstr "
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d de %d mensaxes lidas]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "¡O servidor pechou a conexión!"
 
@@ -3672,15 +4291,15 @@ msgstr "Non foi posible deixa-las mensaxes no servidor."
 msgid "Error connecting to server: %s"
 msgstr "Erro ó conectar có servidor: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "Pechando conexión có servidor POP..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Verificando os índices de mensaxes..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Perdeuse a conexión. ¿Volver a conectar ó servidor POP?"
 
@@ -4065,35 +4684,35 @@ msgstr "Mensaxe enviada."
 msgid "Sending in background."
 msgstr "Mandando en segundo plano."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "¡Non se atopout parámetro \"boundary\"! [informe deste erro]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "¡Xa non existe %s!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
 msgstr "%s non é un buzón."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "Non foi posible abrir %s"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Erro enviando mensaxe, o proceso fillo saíu con %d (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Saída do proceso de distribución"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
@@ -4218,33 +4837,33 @@ msgstr "
 msgid "No output from OpenSSL..."
 msgstr ""
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
 msgstr "[-- Fin da saída PGP --]\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 #, fuzzy
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Erro: ¡non foi posible crear subproceso PGP! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 #, fuzzy
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- Os datos a continuación están encriptados con PGP/MIME --]\n"
 "\n"
 
-#: smime.c:1765
+#: smime.c:1767
 #, fuzzy
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- Os datos a continuación están asinados --]\n"
 "\n"
 
-#: smime.c:1829
+#: smime.c:1831
 #, fuzzy
 msgid ""
 "\n"
@@ -4253,7 +4872,7 @@ msgstr ""
 "\n"
 "[-- Fin dos datos con encriptación PGP/MIME --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 #, fuzzy
 msgid ""
 "\n"
@@ -4262,27 +4881,27 @@ msgstr ""
 "\n"
 "[-- Fin dos datos asinados --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr "¿(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas ou (o)lvidar? "
 
-#: smime.c:1936
+#: smime.c:1945
 #, fuzzy
 msgid "eswabfc"
 msgstr "efcao"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr ""
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
@@ -4307,6 +4926,9 @@ msgstr "A mensaxe pai non 
 msgid "Parent message is not available."
 msgstr "A mensaxe pai non é accesible."
 
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Non é posible engadir ós buzóns IMAP deste servidor"
+
 #, fuzzy
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "¿Crear unha mensaxe aplicación/pgp?"
@@ -4359,9 +4981,6 @@ msgstr "A mensaxe pai non 
 #~ msgid "Copy"
 #~ msgstr "Copiar"
 
-#~ msgid "%s [%s]\n"
-#~ msgstr "%s [%s]\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "[-- End of PGP output --]\n"
@@ -4399,9 +5018,6 @@ msgstr "A mensaxe pai non 
 #~ msgstr ""
 #~ "Algoritmo MIC descoñecido, os válidos son: pgp-md5, pgp-sha1, pgp-rmd160"
 
-#~ msgid "[-- Error: unexpected end of file! --]\n"
-#~ msgstr "[-- Erro: ¡fin de ficheiro inesperado! --]\n"
-
 #~ msgid "IMAP Username: "
 #~ msgstr "Usuario IMAP: "
 
@@ -4513,9 +5129,6 @@ msgstr "A mensaxe pai non 
 #~ msgid "reserved"
 #~ msgstr "reservado"
 
-#~ msgid "Encrypted Session Key"
-#~ msgstr "Chave da sesión encriptada"
-
 #~ msgid "Signature Packet"
 #~ msgstr "Paquete da firma"
 
diff --git a/po/hu.po b/po/hu.po
index 7374966a0..f18c96671 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.5.4i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2003-08-01 13:56+0000\n"
 "Last-Translator: Szabolcs Horváth <horvaths@fi.inf.elte.hu>\n"
 "Language-Team: LME Magyaritasok Lista <magyar@lists.linux.hu>\n"
@@ -15,26 +15,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "%s azonosító: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s jelszava: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Kilép"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Töröl"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Visszaállít"
 
@@ -43,9 +43,9 @@ msgid "Select"
 msgstr "Választ"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Súgó"
 
@@ -97,172 +97,172 @@ msgstr "Ment
 msgid "Alias added."
 msgstr "Cím bejegyezve."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Nem felel meg a névmintának, tovább?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "A mailcap-ba \"compose\" bejegyzés szükséges %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Hiba a(z) \"%s\" futtatásakor!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Fájl megnyitási hiba a fejléc vizsgálatakor."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Fájl megnyitási hiba a fejléc eltávolításkor."
 
-#: attach.c:183
+#: attach.c:184
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "Fájl megnyitási hiba a fejléc vizsgálatakor."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr ""
 "Nincs mailcap \"compose\" bejegyzés a(z) %s esetre, üres fájl létrehozása."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "A mailcap-ba \"edit\" bejegyzés szükséges %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Nincs \"edit\" bejegyzés a mailcap-ban a(z) %s esetre"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Nincs megfelelõ mailcap bejegyzés. Megjelenítés szövegként."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "A MIME típus nincs definiálva. A melléklet nem jeleníthetõ meg."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Nem lehet szûrõt létrehozni."
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Szûrõt nem lehet létrehozni"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Írási hiba!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Nem ismert, hogy ezt hogyan kell kinyomtatni!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Könyvtárváltás"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Maszk"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "A(z) %s nem könyvtár."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Postafiókok [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Felírt [%s], Fájlmaszk: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Könyvtár [%s], Fájlmaszk: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Könyvtár nem csatolható!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Nincs a fájlmaszknak megfelelõ fájl"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Csak IMAP postafiókok létrehozása támogatott"
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Csak IMAP postafiókok létrehozása támogatott"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Csak IMAP postafiókok törlése támogatott"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Valóban törli a \"%s\" postafiókot?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Postafiók törölve."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "A postafiók nem lett törölve."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Könyvtár: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Hiba a könyvtár beolvasásakor."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Fájlmaszk: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Fordított rendezés (d)átum, (n)év, (m)éret szerint vagy (r)endezetlen?"
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Rendezés (d)átum, (n)év, (m)éret szerint vagy (r)endezetlen?"
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "dnmr"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Az új fájl neve: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "A könyvtár nem jeleníthetõ meg"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Hiba a fájl megjelenítéskor"
 
@@ -329,7 +329,7 @@ msgstr "az alap
 msgid "Verify PGP signature?"
 msgstr "Ellenõrizzük a PGP aláírást?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Nem lehet átmeneti fájlt létrehozni!"
 
@@ -341,114 +341,114 @@ msgstr "Nem lehet megjelen
 msgid "Could not copy message"
 msgstr "A levelet nem tudtam másolni"
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "S/MIME aláírás sikeresen ellenõrizve."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "Az S/MIME tanúsítvány tulajdonosa nem egyezik a küldõvel. "
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr ""
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "Az S/MIME aláírást NEM tudtam ellenõrizni."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "A PGP aláírás sikeresen ellenõrizve."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "A PGP aláírást NEM tudtam ellenõrizni."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Parancs: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Levél visszaküldése. Címzett: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Kijelölt levelek visszaküldése. Címzett: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Hibás cím!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "Hibás IDN: '%s'"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Levél visszaküldése %s részére"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Levél visszaküldése %s részére"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "A levél nem lett visszaküldve."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "A levél nem lett visszaküldve."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Levél visszaküldve."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Levél visszaküldve."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "Szûrõfolyamatot nem lehet létrehozni"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Parancs, aminek továbbít: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Nincs nyomtatási parancs megadva."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Kinyomtatod a levelet?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Kinyomtatod a kijelölt leveleket?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Levél kinyomtatva"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Levél kinyomtatva"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "A levelet nem tudtam kinyomtatni"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "A leveleket nem tudtam kinyomtatni"
 
-#: commands.c:508
+#: commands.c:509
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -457,7 +457,7 @@ msgstr ""
 "Fordítva rendez Dátum/Feladó/érK/tárGy/Címzett/Téma/Rendetlen/Méret/"
 "Pontszám: "
 
-#: commands.c:509
+#: commands.c:510
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
@@ -465,74 +465,74 @@ msgid ""
 msgstr ""
 "Rendez Dátum/Feladó/érKezés/tárGy/Címzett/Téma/Rendezetlen/Méret/Pontszám: "
 
-#: commands.c:510
+#: commands.c:511
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dfkgctrmp"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Shell parancs: "
 
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Dekódolás-mentés%s postafiókba"
 
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Dekódolás-másolás%s postafiókba"
 
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Visszafejtés-mentés%s postafiókba"
 
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Visszafejtés-másolás%s postafiókba"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Mentés%s postafiókba"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Másolás%s postafiókba"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " kijelölt"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Másolás a(z) %s-ba..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Átalakítsam %s formátumra küldéskor?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Tartalom-típus megváltoztatva %s-ra."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Karakterkészlet beállítva: %s; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "nem alakítom át"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "átalakítom"
 
@@ -625,103 +625,671 @@ msgstr "Hib
 msgid "Attaching selected files..."
 msgstr "A kiválasztott fájlok csatolása..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "%s nem csatolható!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Postafiók megnyitása levél csatolásához"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Nincs levél ebben a postafiókban."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Jelöld ki a csatolandó levelet!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Nem lehet csatolni!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "Az újrakódolás csak a szöveg mellékleteket érinti."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "Ez a melléklet nem lesz konvertálva."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "Ez a melléklet konvertálva lesz."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Érvénytelen kódolás."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Mented egy másolatát a levélnek?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Átnevezés: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "%s nem olvasható: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Új fájl: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "A tartalom-típus alap-/altípus formájú."
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "%s ismeretlen tartalom-típus"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "Nem lehet a(z) %s fájlt létrehozni"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "Hiba a melléklet csatolásakor"
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "Eltegyük a levelet késõbbre?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "Levél mentése postafiókba"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Levél mentése %s-ba ..."
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "Levél elmentve."
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "S/MIME már ki van jelölve. Törlés & folytatás ?"
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP már ki van jelölve. Törlés & folytatás ?"
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "hiba a mintában: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "hiba a mintában: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "hiba a mintában: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "hiba a mintában: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "hiba a mintában: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "hiba a mintában: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "hiba a mintában: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "hiba a mintában: %s"
+
+#: crypt-gpgme.c:993
+msgid "Warning: One of the keys has been revoked\n"
+msgstr ""
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "A szerver tanúsítványa lejárt"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL nem elérhetõ."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Ujjlenyomat: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Hiba a levél elküldésekor."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Hibás parancssor: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Aláírt adat vége --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Hiba: nem lehet létrehozni az ideiglenes fájlt! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP LEVÉL KEZDÕDIK --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP NYILVÁNOS KULCS KEZDÕDIK --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP ALÁÍRT LEVÉL KEZDÕDIK --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- PGP LEVÉL VÉGE --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP NYILVÁNOS KULCS VÉGE --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- PGP ALÁÍRT LEVÉL VÉGE --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Hiba: nem található a PGP levél kezdete! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Hiba: hibás PGP/MIME levél! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Hiba: nem lehet létrehozni az ideiglenes fájlt! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- A következõ adat PGP/MIME-vel titkosított --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- A következõ adat PGP/MIME-vel titkosított --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- PGP/MIME titkosított adat vége --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- PGP/MIME titkosított adat vége --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr "[-- A következõ adatok S/MIME-vel alá vannak írva --]\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr "[-- A következõ adat S/MIME-vel titkosított --]\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- S/MIME aláírt adat vége --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- S/MIME titkosított adat vége. --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Érvénytelen   "
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Érvénytelen hónap: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Érvénytelen hónap: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Titkosít"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "A tanúsítvány elmentve"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Kulcs ID: 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "Visszavont    "
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Lejárt        "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Nem lehet ideiglenes fájlt létrehozni"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Kapcsolódás %s-hez..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Hiba a szerverre való csatlakozás közben: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Kulcs ID: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "SSL sikertelen: %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Minden illeszkedõ kulcs lejárt/letiltott/visszavont."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Kilép  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Választ  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Kulcs ellenõrzése  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP kulcsok egyeznek \"%s\"."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP kulcsok egyeznek \"%s\"."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "S/MIME kulcsok egyeznek \"%s\"."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP kulcsok egyeznek \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Ez a kulcs nem használható: lejárt/letiltott/visszahívott."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "ID lejárt/letiltott/visszavont."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "ID-nek nincs meghatározva az érvényessége."
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "Az ID nem érvényes."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "Az ID csak részlegesen érvényes."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Valóban szeretnéd használni ezt a kulcsot?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Egyezõ \"%s\" kulcsok keresése..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "Használjam a kulcsID = \"%s\" ehhez: %s?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Add meg a kulcsID-t %s-hoz: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr ""
+"PGP (t)itkosít, (a)láír, aláír (m)int, titkosít é(s) aláír, (b)eágyazott, mé"
+"(g)se? "
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "tapmsg"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr ""
+"PGP (t)itkosít, (a)láír, aláír (m)int, titkosít é(s) aláír, (b)eágyazott, mé"
+"(g)se? "
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "tapmsg"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Aláír mint: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Fájl megnyitási hiba a fejléc vizsgálatakor."
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -737,29 +1305,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "Jelszó elfelejtve."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "PGP betöltés..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "A levél nem lett elküldve."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "Tartalom-útmutatás nélküli S/MIME üzenetek nem támogatottak."
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "PGP kulcsok kibontása...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "S/MIME tanúsítványok kibontása...\n"
 
@@ -771,7 +1339,7 @@ msgstr ""
 "[-- Hiba: Ellentmondó többrészes/aláírt struktúra! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -780,7 +1348,7 @@ msgstr ""
 "[-- Hiba: Ismeretlen többrészes/aláírt protokoll %s! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -790,7 +1358,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -798,7 +1366,7 @@ msgstr ""
 "[-- A következõ adatok alá vannak írva --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -806,7 +1374,7 @@ msgstr ""
 "[-- Figyelmeztetés: Nem találtam egy aláírást sem. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -814,226 +1382,256 @@ msgstr ""
 "\n"
 "[-- Aláírt adat vége --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "PGP betöltés..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "igen"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "nem"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Kilépsz a Mutt-ból?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "ismeretlen hiba"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Nyomj le egy billentyût a folytatáshoz..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " ('?' lista): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Nincs megnyitott postafiók."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Nincs levél."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "A postafiók csak olvasható."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "A funkció levél-csatolás módban le van tiltva."
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "Nincs látható levél."
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "A csak olvasható postafiókba nem lehet írni!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr ""
 "A postafiók módosításai a postafiókból történõ kilépéskor lesznek elmentve."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "A postafiók módosításai nem lesznek elmentve."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Kilép"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Ment"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Levél"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Válasz"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Csoport"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "A postafiókot más program módosította. A jelzõk hibásak lehetnek."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Új levél érkezett a postafiókba."
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "A postafiókot más program módosította."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Nincs kijelölt levél."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 #, fuzzy
 msgid "Nothing to do."
 msgstr "Kapcsolódás %s-hez..."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Levélre ugrás: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "A paraméternek levélszámnak kell lennie."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Ez a levél nem látható."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Érvénytelen levélszám."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "A mintára illeszkedõ levelek törlése: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "A szûrõ mintának nincs hatása."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Szûkítés: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Minta a levelek szûkítéséhez: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Kilépsz a Muttból?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Minta a levelek kijelöléséhez: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Minta a levelek visszaállításához: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Minta a levélkijelölés megszüntetéséhez:"
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Postafiók megnyitása csak olvasásra"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Postafiók megnyitása"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "A(z) %s nem egy postafiók."
 
-#: curs_main.c:1165
+#: curs_main.c:1176
 msgid "Exit Mutt without saving?"
 msgstr "Kilépsz a Muttból mentés nélül?"
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "A témázás le van tiltva."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "üzenet elmentése késõbbi küldéshez"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Ez az utolsó levél."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Nincs visszaállított levél."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Ez az elsõ levél."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "Keresés az elejétõl."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "Keresés a végétõl."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Nincs új levél"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Nincs olvasatlan levél"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " ebben a szûkített megjelenítésben"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "A POP kiszolgálón nem lehet a 'fontos' jelzõt állítani."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Nincs több téma."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Ez az elsõ téma."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "A témázás le van tiltva."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "A témában olvasatlan levelek vannak."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "A POP kiszolgálón nem lehet szerkeszteni a levelet."
 
@@ -1166,75 +1764,75 @@ msgstr "Jelz
 msgid "Clear flag"
 msgstr "Jelzõ törlése"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- Hiba:  Egy Többrészes/Alternatív rész sem jeleníthetõ meg! --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Melléklet #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Típus: %s/%s, Kódolás: %s, Méret: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Automatikus megjelenítés a(z) %s segítségével --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Megjelenítõ parancs indítása: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Nem futtatható: %s --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- A(z) %s hiba kimenete --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Hiba: az üzenetnek/külsõ-törzsének nincs elérési-típus paramétere --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Ez a %s/%s melléklet "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(mérete %s bájt)"
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr " törölve lett --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- %s-on --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- név: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- A %s/%s melléklet nincs beágyazva, --]\n"
 
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
@@ -1242,34 +1840,34 @@ msgstr ""
 "[-- és a jelzett külsõ forrás --]\n"
 "[-- megszûnt. --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- és a jelzett elérési-típus, %s nincs támogatva --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Hiba: a többrészes/aláírt részhez nincs protokoll megadva."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Hiba: a többrészes/kódolt rész protokoll paramétere hiányzik!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Nem lehet megnyitni átmeneti fájlt!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s nincs támogatva "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(E rész megjelenítéséhez használja a(z) '%s'-t)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(a mellélet megtekintéshez billentyû lenyomás szükséges!)"
 
@@ -1376,46 +1974,46 @@ msgstr "Azonos
 msgid "SASL authentication failed."
 msgstr "SASL azonosítás nem sikerült."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s érvénytelen IMAP útvonal"
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Névterek letöltése..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Postafiókok listájának letöltése..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "Nincs ilyen postafiók"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Postafiók létrehozása: "
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "A postafióknak nevet kell adni."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Postafiók létrehozva."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Postafiók létrehozása: "
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "SSL sikertelen: %s"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "Postafiók létrehozva."
@@ -1427,136 +2025,133 @@ msgstr "Postafi
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Végzetes hiba.  Az üzenetszámláló nincs szinkronban."
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "%s kapcsolat lezárása..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Ez az IMAP kiszolgáló nagyon régi. A Mutt nem tud együttmûködni vele."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "Biztonságos TLS kapcsolat?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "Nem lehetett megtárgyalni a TLS kapcsolatot"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "%s választása..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "Hiba a postafiók megnyitásaor"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Ezen a szerveren az IMAP postafiókokhoz nem lehet hozzáfûzni"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "%s létrehozása?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "%d levél megjelölése töröltnek..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "Sikertelen törlés"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Állapotjelzõk mentése... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Levelek törlése a szerverrõl..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE sikertelen"
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "Sikertelen CLOSE"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "Hibás postafiók név"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "%s felírása..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "%s leírása..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Nem lehet a fejléceket letölteni ezen verziójú IMAP szerverrõl"
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Nem lehet a %s átmeneti fájlt létrehozni"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Levélfejlécek letöltése... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Levélfejlécek letöltése... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Levél letöltése..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 "A levelek tartalomjegyzéke hibás. Próbáld megnyitni újra a postafiókot."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Levél feltöltése..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "%d levél másolása a %s postafiókba..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "%d levél másolása %s-ba ..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Folytatod?"
 
@@ -1565,124 +2160,124 @@ msgstr "Folytatod?"
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:678
+#: init.c:644
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "levelek kijelölése mintára illesztéssel"
 
-#: init.c:680
+#: init.c:646
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "kijelölés megszüntetése mintára illesztéssel"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "címjegyzék: nincs cím"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Figyelmeztetés: Hibás IDN '%s' a '%s' álnévben.\n"
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "érvénytelen mezõ a fejlécben"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: ismeretlen rendezési mód"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): hibás reguláris kifejezés: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: ismeretlen változó"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "\"reset\"-nél nem adható meg elõtag"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "\"reset\"-nél nem adható meg érték"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s beállítva"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s beállítása törölve"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: érvénytelen postafiók típus"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: érvénytelen érték"
 
-#: init.c:1589
+#: init.c:1555
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s: ismeretlen típus"
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: ismeretlen típus"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Hiba a %s-ban, sor %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: hiba a %s fájlban"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: az olvasás megszakadt, a %s fájlban túl sok a hiba"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: hiba a %s-nál"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: túl sok paraméter"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: ismeretlen parancs"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Hibás parancssor: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "meghatározhatatlan felhasználói könyvtár"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "meghatározhatatlan felhasználónév"
 
@@ -2140,400 +2735,409 @@ msgid "compose a new mail message"
 msgstr "új levél szerkesztése"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "más postafiók megnyitása"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "más postafiók megnyitása csak olvasásra"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "levél-állapotjelzõ törlése"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "mintára illeszkedõ levelek törlése"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "kényszerített levélletöltés az IMAP kiszolgálóról"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "levelek törlése POP kiszolgálóról"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "ugrás az elsõ levélre"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "ugrás az utolsó levélre"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "csak a mintára illeszkedõ levelek mutatása"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Kijelölt levelek visszaküldése. Címzett: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "ugrás a következõ új levélre"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "ugrás a következõ új vagy olvasatlan levélre"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "ugrás a következõ témarészre"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "ugrás a következõ témára"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "ugrás a következõ visszaállított levélre"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "ugrás a következõ olvasatlan levélre"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "ugrás a levél elõzményére ebben a témában"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "ugrás az elõzõ témára"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "ugrás az elõzõ témarészre"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "ugrás az elõzõ visszaállított levélre"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "ugrás az elõzõ új levélre"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "ugrás az elõzõ új vagy olvasatlan levélre"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "ugrás az elõzõ olvasatlan levélre"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "téma jelölése olvasottnak"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "témarész jelölése olvasottnak"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "levél-állapotjelzõ beállítása"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "mentés postafiókba"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "levelek kijelölése mintára illesztéssel"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "levelek visszaállítása mintára illesztéssel"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "kijelölés megszüntetése mintára illesztéssel"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "mozgatás az oldal közepére"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "mozgatás a következõ bejegyzésre"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "mozgás egy sorral lejjebb"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "ugrás a következõ oldalra"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "ugrás az üzenet aljára"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "idézett szöveg mutatása/elrejtése"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "idézett szöveg átlépése"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "ugrás az üzenet tetejére"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "üzenet/melléklet átadása csövön shell parancsnak"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "ugrás az elõzõ bejegyzésre"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "mozgás egy sorral feljebb"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "ugrás az elõzõ oldalra"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "bejegyzés nyomtatása"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "címek lekérdezése külsõ program segítségével"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "új lekérdezés eredményének hozzáfûzése az eddigiekhez"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "változások mentése és kilépés"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "elhalasztott levél újrahívása"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "képernyõ törlése és újrarajzolása"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "(belsõ)"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "aktuális postafiók törlése (csak IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "válasz a levélre"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "levél sablonként használata egy új levélhez"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "levél/melléklet mentése fájlba"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "reguláris kifejezés keresése"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "reguláris kifejezés keresése visszafelé"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "keresés tovább"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "keresés visszafelé"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "keresett minta színezése ki/be"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "parancs végrehajtása rész-shellben"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "üzenetek rendezése"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "üzenetek rendezése fordított sorrendben"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "bejegyzés megjelölése"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "csoportos mûvelet végrehajtás a kijelölt üzenetekre"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 #, fuzzy
 msgid "apply next function ONLY to tagged messages"
 msgstr "csoportos mûvelet végrehajtás a kijelölt üzenetekre"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "témarész megjelölése"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "téma megjelölése"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "levél 'új' jelzõjének állítása"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "a postafiók újraírásának ki/bekapcsolása"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "váltás a csak postafiókok/összes fájl böngészése között"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "ugrás az oldal tetejére"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "aktuális bejegyzés visszaállítása"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "a téma összes levelének visszaállítása"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "a témarész összes levelének visszaállítása"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "a Mutt verziójának és dátumának megjelenítése"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "melléklet mutatása mailcap bejegyzés használatával, ha szükséges"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "MIME mellékletek mutatása"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "billentyûleütés kódjának mutatása"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "aktuális szûrõminta mutatása"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "téma kinyitása/bezárása"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "összes téma kinyitása/bezárása"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "PGP nyilvános kulcs csatolása"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "PGP paraméterek mutatása"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "PGP nyilvános kulcs elküldése"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "PGP nyilvános kulcs ellenõrzése"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "a kulcstulajdonos azonosítójának megtekintése"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "klasszikus php keresése"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Összeállított lánc elfogadása"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "Újraküldõ hozzáfûzése a lánchoz"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "Újraküldõ beszúrása a láncba"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "Újraküldõ törlése a láncból"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "A lánc elõzõ elemének kijelölése"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "A lánc következõ elemének kijelölése"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "üzenet küldése egy mixmaster újraküldõ láncon keresztül"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "visszafejtett másolat készítése és törlés"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "visszafejtett másolat készítése"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "jelszó törlése a memóriából"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "támogatott nyilvános kulcsok kibontása"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "S/MIME opciók mutatása"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr ""
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Elfogyott a memória!"
 
@@ -2558,12 +3162,13 @@ msgstr ""
 "szerint; írd be a `mutt -vv'-t a részletekért.\n"
 
 #: main.c:61
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2608,25 +3213,74 @@ msgstr ""
 "    másolatát; ha nem, írj a Szabad Szoftver Alapítványnak: Free Software\n"
 "    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
 
-#: main.c:99
+#: main.c:99
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"használat:\n"
+"     mutt [ -nRyzZ ] [ -e <par.> ] [ -F <fájl> ] [ -m <típus> ] [ -f "
+"<fájl> ]\n"
+"     mutt [ -nR ] [ -e <par.> ] [ -F <fájl> ] -Q <kérd.> [ -Q <kérd.> ] "
+"[...]\n"
+"     mutt [ -nR ] [ -e <par.> ] [ -F <fájl> ] -A <álnév> [ -A <álnév> ] "
+"[...]\n"
+"     mutt [ -nx ] [ -e <par.> ] [ -a <fájl> ] [ -F <fájl> ] [ -H <fájl> ]\n"
+"\t[ -i <fájl> ] [ -s <tárgy> ] [ -b <címek> ] [ -c <címek> ] <címek>\n"
+"\t[ ... ]\n"
+"     mutt [ -n ] [ -e <par.> ] [ -F <fájl> ] -p\n"
+"     mutt -v[v]\n"
+"\n"
+"paraméterek:\n"
+"  -A <álnév>\trövid név kifejtése\n"
+"  -a <fájl>\tfájl csatolása a levélhez\n"
+"  -b <cím>\trejtett másolatot (BCC) küld a megadott címre\n"
+"  -c <cím>\tmásolatot (CC) küld a megadott címre\n"
+"  -e <parancs>\tmegadott parancs végrehajtása inicializálás után\n"
+"  -f <fájl>\tbetöltendõ levelesláda megadása\n"
+"  -F <fájl>\talternatív muttrc fájl használata\n"
+"  -H <fájl>\tvázlat (draft) fájl megadása, amibõl a fejlécet és\n"
+"\t\ta törzset kell beolvasni\n"
+"  -i <fájl>\tválasz esetén a Mutt beleteszi ezt a fájlt a válaszba\n"
+"  -m <típus>\taz alapértelmezett postafiók típusának megadása\n"
+"  -n\t\ta Mutt nem fogja beolvasni a rendszerre vonatkozó Muttrc-t\n"
+"  -p\t\telhalasztott levél visszahívása\n"
+"  -Q <változó>\tkonfigurációs beállítása lekérdezése\n"
+"  -R\t\tpostafiók megnyitása csak olvasható módban\n"
+"  -s <tárgy>\ttárgy megadása (idézõjelek közé kell tenni, ha van benne "
+"szóköz)\n"
+"  -v\t\tverziószám és fordítási opciók mutatása\n"
+"  -x\t\tmailx küldés szimulálása\n"
+"  -y\t\tpostafiók megadása a `mailboxes' listából\n"
+"  -z\t\tkilép rögtön, ha nincs új levél a postafiókban\n"
+"  -Z\t\tmegnyitja az elsõ olyan postafiókot, amiben új levél van (ha nincs, "
+"kilép)\n"
+"  -h\t\tkiírja ezt az üzenetet"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
 #, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-"<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-"[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-"[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
-"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
-"\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2684,7 +3338,7 @@ msgstr ""
 "kilép)\n"
 "  -h\t\tkiírja ezt az üzenetet"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2692,48 +3346,48 @@ msgstr ""
 "\n"
 "Fordítási opciók:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Hiba a terminál inicializálásakor."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Hibakövetés szintje: %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr ""
 "A HIBAKÖVETÉS nem volt engedélyezve fordításkor.  Figyelmen kívül hagyva.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s nem létezik. Létrehozzam?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Nem tudom létrehozni %s: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Nincs címzett megadva.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: nem tudom csatolni a fájlt.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Nincs új levél egyik postafiókban sem."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Nincs bejövõ postafiók megadva."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "A postafiók üres."
 
@@ -2750,11 +3404,11 @@ msgstr "A postafi
 msgid "Mailbox was corrupted!"
 msgstr "A postafiók megsérült!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Végzetes hiba!  A postafiókot nem lehet újra megnyitni!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Nem tudom zárolni a postafiókot!"
 
@@ -2762,12 +3416,12 @@ msgstr "Nem tudom z
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: mbox megváltozott, de nincs módosított levél! (jelentsd ezt a hibát)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Levelek írása... %d (%d%%)"
@@ -2775,187 +3429,148 @@ msgstr "Levelek 
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "Változások mentése..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Írás nem sikerült!  Részleges postafiókot elmentettem a(z) %s fájlba"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Nem lehetett újra megnyitni a postafiókot!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Postafiók újra megnyitása..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Ugrás: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Érvénytelen indexszám."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Nincsenek bejegyzések."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Nem lehet tovább lefelé scrollozni."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Nem lehet tovább felfelé scrollozni."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Ez az utolsó oldal."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Ez az elsõ oldal."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "Az elsõ bejegyzés látható."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "Az utolsó bejegyzés látható."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Az utolsó bejegyzésen vagy."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Az elsõ bejegyzésen vagy."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Keresés: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Keresés visszafelé: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Nincs keresési minta."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Nem található."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "Nincsenek kijelölt bejegyzések."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "A keresés nincs megírva ehhez a menühöz."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "Az ugrás funkció nincs megírva ehhez a menühöz."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Kijelölés nem támogatott."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "%s olvasása... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message (): a fájlidõ beállítása nem sikerült"
 
-#: muttlib.c:846
-#, fuzzy
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "A fájl egy könyvtár, elmentsem ebbe a könyvtárba?"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr ""
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "A fájl egy könyvtár, elmentsem ebbe a könyvtárba?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Könyvtárbeli fájlok: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "A fájl létezik, (f)elülírjam, (h)ozzáfûzzem, vagy (m)égsem?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "fhm"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Levelet nem lehet menteni POP postafiókba."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "A %s nem postafiók!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Levelek hozzáfûzése %s postafiókhoz?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "%s kapcsolat lezárva"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL nem elérhetõ."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "A \"preconnect\" parancs nem sikerült."
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Hiba a %s kapcsolat közben (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "Hibás IDN \"%s\"."
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "%s feloldása..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "A \"%s\" host nem található."
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Kapcsolódás %s-hez..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "%s-hoz nem lehet kapcsolódni %s (%s)."
@@ -2987,7 +3602,8 @@ msgstr "I/O hiba"
 msgid "SSL failed: %s"
 msgstr "SSL sikertelen: %s"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "A szervertõl nem lehet tanusítványt kapni"
 
@@ -2996,87 +3612,208 @@ msgstr "A szervert
 msgid "SSL connection using %s (%s)"
 msgstr "SSL kapcsolódás a(z) %s használatával (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[nem kiszámítható]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[érvénytelen dátum]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "A szerver tanúsítványa még nem érvényes"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "A szerver tanúsítványa lejárt"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Akire a tanusítvány vonatkozik:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "A tanusítványt kiállította:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Ez a tanúsítvány érvényes"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   kezdete: %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     vége: %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Ujjlenyomat: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "SSL Tanúsítvány ellenõrzés"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(v)isszautasít, (e)gyszer elfogad, (m)indig elfogad"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "vem"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(v)isszautasít, (e)gyszer elfogad"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "ve"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Kilép  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Figyelmeztetés: A tanúsítvány nem menthetõ"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "A tanúsítvány elmentve"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "SSL kapcsolódás a(z) %s használatával (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "A tanúsítvány elmentve"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Hiba a terminál inicializálásakor."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Ujjlenyomat: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Ujjlenyomat: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "A szerver tanúsítványa még nem érvényes"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "A szerver tanúsítványa lejárt"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "A szerver tanúsítványa lejárt"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "A szerver tanúsítványa még nem érvényes"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "SSL Tanúsítvány ellenõrzés"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Kapcsolódás %s-hez..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Hiba a %s kapcsolat közben (%s)"
+
+#: muttlib.c:910
+#, fuzzy
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "A fájl egy könyvtár, elmentsem ebbe a könyvtárba?"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr ""
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "A fájl egy könyvtár, elmentsem ebbe a könyvtárba?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Könyvtárbeli fájlok: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "A fájl létezik, (f)elülírjam, (h)ozzáfûzzem, vagy (m)égsem?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "fhm"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Levelet nem lehet menteni POP postafiókba."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Levelek hozzáfûzése %s postafiókhoz?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "A %s nem postafiók!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3154,7 +3891,7 @@ msgstr "Postafi
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d megtartva, %d átmozgatva, %d törölve."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d megtartva, %d törölve."
@@ -3173,15 +3910,15 @@ msgstr "Haszn
 msgid "Mailbox is marked unwritable. %s"
 msgstr "A postafiókot megjelöltem nem írhatónak. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "A postafiók ellenõrizve."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Nem lehet írni a levelet"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
@@ -3189,48 +3926,48 @@ msgstr ""
 msgid "Not available in this menu."
 msgstr "Nem elérhetõ ebben a menüben."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "ElõzõO"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "KövO"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Melléklet"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Köv."
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Ez az üzenet vége."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Ez az üzenet eleje."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Keresés visszafelé: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Keresés: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "A súgó már meg van jelenítve."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "Nincs több idézett szöveg."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Nincs nem idézett szöveg az idézett szöveg után."
 
@@ -3297,27 +4034,27 @@ msgstr "
 msgid "error: unknown op %d (report this error)."
 msgstr "hiba: ismeretlen operandus %d (jelentsd ezt a hibát)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Keresési minta fordítása..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Parancs végrehajtása az egyezõ leveleken..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "Nincs a kritériumnak megfelelõ levél."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "A keresõ elérte a végét, és nem talált egyezést"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "A keresõ elérte az elejét, és nem talált egyezést"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Keresés megszakítva."
 
@@ -3329,11 +4066,11 @@ msgstr "K
 msgid "PGP passphrase forgotten."
 msgstr "PGP jelszó elfelejtve."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Hiba: nem lehet létrehozni a PGP alfolyamatot! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3341,51 +4078,22 @@ msgstr ""
 "[-- PGP kimenet vége --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP LEVÉL KEZDÕDIK --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP NYILVÁNOS KULCS KEZDÕDIK --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP ALÁÍRT LEVÉL KEZDÕDIK --]\n"
-"\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- PGP LEVÉL VÉGE --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP NYILVÁNOS KULCS VÉGE --]\n"
-
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- PGP ALÁÍRT LEVÉL VÉGE --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "A levelet nem tudtam másolni"
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Hiba: nem található a PGP levél kezdete! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "A PGP aláírás sikeresen ellenõrizve."
 
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Belsõ hiba. Kérlek értesítsd <roessler@does-not-exist.org>-t."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3393,73 +4101,39 @@ msgstr ""
 "[-- Hiba: nem lehet a PGP alfolyamatot létrehozni! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Hiba: hibás PGP/MIME levél! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Hiba: nem lehet létrehozni az ideiglenes fájlt! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- A következõ adat PGP/MIME-vel titkosított --]\n"
-"\n"
-
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- PGP/MIME titkosított adat vége --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "Visszafejtés sikertelen."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "PGP alfolyamatot nem lehet megnyitni"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "Használjam a kulcsID = \"%s\" ehhez: %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Add meg a kulcsID-t %s-hoz: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "PGP-t nem tudom meghívni"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr ""
 "PGP (t)itkosít, (a)láír, aláír (m)int, titkosít é(s) aláír, (b)eágyazott, mé"
 "(g)se? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1499
+#: pgp.c:1543
 #, fuzzy
 msgid "esabifc"
 msgstr "tamsbg"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Aláír mint: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "PGP kulcs leszedése..."
@@ -3468,16 +4142,6 @@ msgstr "PGP kulcs leszed
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Minden illeszkedõ kulcs lejárt/letiltott/visszavont."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Választ  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Kulcs ellenõrzése  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3492,40 +4156,6 @@ msgstr "PGP kulcsok egyeznek \"%s\"."
 msgid "Can't open /dev/null"
 msgstr "Nem lehet a /dev/null-t megnyitni"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Nem lehet ideiglenes fájlt létrehozni"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Kulcs ID: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Ez a kulcs nem használható: lejárt/letiltott/visszahívott."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "ID lejárt/letiltott/visszavont."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "ID-nek nincs meghatározva az érvényessége."
-
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "Az ID nem érvényes."
-
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "Az ID csak részlegesen érvényes."
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Valóban szeretnéd használni ezt a kulcsot?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Kérlek írd be a kulcs ID-t: "
@@ -3539,11 +4169,6 @@ msgstr "pgp h
 msgid "PGP Key %s."
 msgstr "PGP Kulcs %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Egyezõ \"%s\" kulcsok keresése..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3601,7 +4226,7 @@ msgstr "Hiba a postafi
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d/%d levél beolvasva]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "A szerver lezárta a kapcsolatot!"
 
@@ -3631,15 +4256,15 @@ msgstr "Nem lehet a leveleket a szerveren hagyni."
 msgid "Error connecting to server: %s"
 msgstr "Hiba a szerverre való csatlakozás közben: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "POP kapcsolat lezárása..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Levelek tartalomjegyzékének ellenõrzése..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "A kapcsolatot elveszett. Újracsatlakozik a POP kiszolgálóhoz?"
 
@@ -4018,35 +4643,35 @@ msgstr "Lev
 msgid "Sending in background."
 msgstr "Küldés a háttérben."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Nem található határoló paraméter! [jelentsd ezt a hibát]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s többé nem létezik!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s nem egy hagyományos fájl."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "%s nem nyitható meg"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Hiba a levél elküldése közben, a gyermek folyamat kilépett: %d (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "A kézbesítõ folyamat kimenete"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "Hibás IDN %s a resent-from mezõ elõkészítésekor"
@@ -4162,7 +4787,7 @@ msgstr "OpenSSL alfolyamatot nem lehet megnyitni!"
 msgid "No output from OpenSSL..."
 msgstr "Nincs kimenet az OpenSSLtõl..."
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4170,19 +4795,19 @@ msgstr ""
 "[-- OpenSSL kimenet vége --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Hiba: nem lehet létrehozni az OpenSSL alfolyamatot! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- A következõ adat S/MIME-vel titkosított --]\n"
 
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- A következõ adatok S/MIME-vel alá vannak írva --]\n"
 
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4190,7 +4815,7 @@ msgstr ""
 "\n"
 "[-- S/MIME titkosított adat vége. --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4198,7 +4823,7 @@ msgstr ""
 "\n"
 "[-- S/MIME aláírt adat vége --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
@@ -4206,22 +4831,22 @@ msgstr ""
 "S/MIME (t)itkosít, (a)láír, titkosít (p)rg, aláír (m)int, titkosít é(s) "
 "aláír, mé(g)se? "
 
-#: smime.c:1936
+#: smime.c:1945
 #, fuzzy
 msgid "eswabfc"
 msgstr "tapmsg"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, vagy (m)égse? "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345m"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
@@ -4245,6 +4870,9 @@ msgstr "A nyit
 msgid "Parent message is not available."
 msgstr "A nyitóüzenet nem áll rendelkezésre."
 
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Ezen a szerveren az IMAP postafiókokhoz nem lehet hozzáfûzni"
+
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "Hagyományos (beágyazott) PGP üzenet készítése?"
 
diff --git a/po/id.po b/po/id.po
index 538bef1cd..1b9393b82 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.5.9i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2005-03-21 17:31+1100\n"
 "Last-Translator: Ronny Haryanto <ronny-mutt-po-file@haryan.to>\n"
 "Language-Team: Indonesia <web@linux.or.id>\n"
@@ -14,26 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 7bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "Nama user di %s: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Password utk %s@%s: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Keluar"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Hapus"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Nggak jadi hapus"
 
@@ -42,9 +42,9 @@ msgid "Select"
 msgstr "Pilih"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Bantuan"
 
@@ -96,171 +96,171 @@ msgstr "Simpan ke file: "
 msgid "Alias added."
 msgstr "Alias telah ditambahkan."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Tidak cocok dengan nametemplate, lanjutkan?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "'compose' di file mailcap membutuhkan %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Gagal menjalankan \"%s\"!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Gagal membuka file untuk menge-parse headers."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Gagal membuka file untuk menghapus headers."
 
-#: attach.c:183
+#: attach.c:184
 msgid "Failure to rename file."
 msgstr "Gagal mengganti nama file."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr ""
 "'compose' di file mailcap tidak ditemukan untuk %s, membuat file kosong."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "'Edit' di file mailcap membutuhkan %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "'Edit' di file mailcap tidak ditemukan untuk %s"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Tidak ada jenis yang cocok di file mailcap. Ditampilkan sebagai teks."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Jenis MIME tidak didefinisikan. Tidak bisa melihat lampiran."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Tidak bisa membuat filter"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Tidak bisa membuat filter"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Gagal menulis!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Saya tidak tahu bagaimana mencetak itu!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Pindah dir"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Mask"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s bukan direktori."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Kotak surat [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Berlangganan [%s], File mask: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Direktori [%s], File mask: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Tidak bisa melampirkan sebuah direktori"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Tidak ada file yang sesuai dengan mask"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Pembuatan hanya didukung untuk kotak surat jenis IMAP."
 
-#: browser.c:880
+#: browser.c:881
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Penggantian nama hanya didukung untuk kotak surat jenis IMAP."
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Penghapusan hanya didukung untuk kotak surat jenis IMAP."
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Yakin hapus kotak surat \"%s\"?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Kotak surat telah dihapus."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "Kotak surat tidak dihapus."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Pindah dir ke: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Gagal membaca direktori."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "File Mask: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Urut terbalik berdasarkan (t)anggal, (a)bjad, (u)kuran atau (n)ggak diurut? "
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Urut berdasarkan (t)anggal, (a)bjad, (u)kuran atau (n)ggak diurut? "
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "taun"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Nama file baru: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Tidak bisa menampilkan sebuah direktori"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Gagal menampilkan file"
 
@@ -327,7 +327,7 @@ msgstr "warna default tidak didukung"
 msgid "Verify PGP signature?"
 msgstr "Periksa tandatangan PGP?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Tidak bisa membuat file sementara!"
 
@@ -339,114 +339,114 @@ msgstr "Tidak bisa membuat tampilan filter"
 msgid "Could not copy message"
 msgstr "Tidak bisa menyalin surat"
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "Tanda tangan S/MIME berhasil diverifikasi."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "Pemilik sertifikat S/MIME tidak sesuai dg pengirim."
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr "Peringatan: Sebagian dari pesan ini belum ditandatangani."
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "Tanda tangan S/MIME TIDAK berhasil diverifikasi."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "Tanda tangan PGP berhasil diverifikasi."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "Tanda tangan PGP TIDAK berhasil diverifikasi."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Perintah: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Bounce surat ke: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Bounce surat yang telah ditandai ke: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Gagal menguraikan alamat!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "IDN salah: '%s'"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Bounce surat ke %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Bounce surat-surat ke %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "Surat tidak dibounce."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "Surat-surat tidak dibounce."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Surat telah dibounce."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Surat-surat telah dibounce."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "Tidak bisa membuat proses filter"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Pipe ke perintah: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Perintah untuk mencetak belum didefinisikan."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Cetak surat?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Cetak surat-surat yang ditandai?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Surat telah dicetak"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Surat-surat telah dicetak"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "Surat tidak dapat dicetak"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Surat-surat tidak dapat dicetak"
 
-#: commands.c:508
+#: commands.c:509
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
@@ -454,7 +454,7 @@ msgstr ""
 "Urut terbalik tan(g)gal/d(a)ri/t(e)rima/(s)ubj/(k)e/(t)hread/(n)ggak urut/(u)"
 "kuran/n(i)lai/s(p)am?: "
 
-#: commands.c:509
+#: commands.c:510
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
@@ -462,73 +462,73 @@ msgstr ""
 "Urut tan(g)gal/d(a)ri/t(e)rima/(s)ubj/(k)e/(t)hread/(n)ggak urut/(u)kuran/n"
 "(i)lai/s(p)am?: "
 
-#: commands.c:510
+#: commands.c:511
 msgid "dfrsotuzcp"
 msgstr "gaesktnuip"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Perintah shell: "
 
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Urai-simpan%s ke kotak surat"
 
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Urai-salin%s ke kotak surat"
 
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Dekripsi-simpan%s ke kotak surat"
 
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Dekripsi-salin%s ke kotak surat"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Simpan%s ke kotak surat"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Salin%s ke kotak surat"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " telah ditandai"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Sedang menyalin ke %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Ubah ke %s saat mengirim?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type diubah ke %s."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Character set diubah ke %s; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "tidak melakukan konversi"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "melakukan konversi"
 
@@ -620,102 +620,669 @@ msgstr "IDN di \"%s\" tidak benar: '%s'"
 msgid "Attaching selected files..."
 msgstr "Melampirkan file-file yang dipilih..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Tidak bisa melampirkan %s!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Buka kotak surat untuk mengambil lampiran"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Tidak ada surat di kotak tersebut."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Tandai surat-surat yang mau dilampirkan!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Tidak bisa dilampirkan!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "Peng-coding-an ulang hanya berpengaruh terhadap lampiran teks."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "Lampiran yg dipilih tidak akan dikonersi."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "Lampiran yg dipilih akan dikonversi."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Encoding tidak betul."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Simpan salinan dari surat ini?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Ganti nama ke: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Tidak bisa stat %s: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "File baru: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type harus dalam format jenis-dasar/sub-jenis"
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Content-Type %s tak dikenali"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "Tidak bisa membuat file %s"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "Gagal membuat lampiran, nih..."
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "Tunda surat ini?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "Simpan surat ke kotak surat"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Menyimpan surat ke %s ..."
 
-#: compose.c:1208
-msgid "Message written."
-msgstr "Surat telah disimpan."
+#: compose.c:1213
+msgid "Message written."
+msgstr "Surat telah disimpan."
+
+#: compose.c:1225
+msgid "S/MIME already selected. Clear & continue ? "
+msgstr "S/MIME sudah dipilih. Bersihkan & lanjut ? "
+
+#: compose.c:1251
+msgid "PGP already selected. Clear & continue ? "
+msgstr "PGP sudah dipilih. Bersihkan & lanjut ? "
+
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "error pada kriteria pada: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "error pada kriteria pada: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "error pada kriteria pada: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "error pada kriteria pada: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "error pada kriteria pada: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "error pada kriteria pada: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "error pada kriteria pada: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "error pada kriteria pada: %s"
+
+#: crypt-gpgme.c:993
+#, fuzzy
+msgid "Warning: One of the keys has been revoked\n"
+msgstr "Peringatan: Sebagian dari pesan ini belum ditandatangani."
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Sertifikat server sudah kadaluwarsa"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL tidak tersedia."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Cap jari: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Gagal mengirim surat."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Error di baris perintah: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Akhir data yang ditandatangani --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Error: akhir file tak diduga! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- AWAL SURAT PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- AWAL PGP PUBLIC KEY BLOCK --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- AWAL SURAT DG TANDATANGAN PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- AKHIR PESAN PGP --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- AKHIR PGP PUBLIC KEY BLOCK --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- AKHIR PESAN DG TANDATANGAN PGP --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Error: tidak tahu dimana surat PGP dimulai! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Error: surat PGP/MIME tidak dalam format yg betul! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Error: tidak bisa membuat file sementara! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Data berikut dienkripsi dg PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Data berikut dienkripsi dg PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- Akhir data yang dienkripsi dg PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- Akhir data yang dienkripsi dg PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr "[-- Data berikut ditandatangani dg S/MIME --]\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr "[-- Data berikut dienkripsi dg S/MIME --]\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Akhir data yg ditandatangani dg S/MIME. --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Akhir data yang dienkripsi dg S/MIME. --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Tdk valid "
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Tidak ada bulan: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Tidak ada bulan: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Enkrip"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Sertifikat telah disimpan"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Identifikasi kunci: 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "Dicabut   "
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Kadaluarsa"
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Tidak bisa membuat file sementara"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Menghubungi %s..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Kesalahan waktu menghubungi ke server: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Identifikasi kunci: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "Penggantian nama gagal: %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Semua kunci yang cocok telah kadaluwarsa, dicabut, atau disabled."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Keluar  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Pilih  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Cek key  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP keys yg cocok dg \"%s\"."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP keys yg cocok dg \"%s\"."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "Sertifikat2 S/MIME yg cocok dg \"%s\"."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP keys yg cocok dg \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, fuzzy, c-format
+msgid "%s <%s>."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3594
+#, fuzzy, c-format
+msgid "%s \"%s\"."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Kunci ini tidak dapat digunakan: kadaluwarsa/disabled/dicabut."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "ID telah kadaluwarsa/disabled/dicabut."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "Validitas ID tidak terdifinisikan."
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "ID tidak valid."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "ID hanya valid secara marginal."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Anda yakin mau menggunakan kunci tsb?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Mencari kunci yg cocok dengan \"%s\"..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "Gunakan keyID = '%s' untuk %s?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Masukkan keyID untuk %s: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr ""
+"PGP (e)nkrip, (t)andatangan, tandatangan (s)bg, ke(d)uanya, %s, (b)ersih? "
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "etgsdlb"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr ""
+"PGP (e)nkrip, (t)andatangan, tandatangan (s)bg, ke(d)uanya, %s, (b)ersih? "
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "etgsdlb"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Tandatangani sebagai: "
 
-#: compose.c:1220
-msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME sudah dipilih. Bersihkan & lanjut ? "
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
 
-#: compose.c:1246
-msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP sudah dipilih. Bersihkan & lanjut ? "
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Gagal membuka file untuk menge-parse headers."
 
 #: crypt.c:69
 #, c-format
@@ -732,29 +1299,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "Passphrase sudah dilupakan."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Memanggil PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr "Pesan tdk bisa dikirim inline. Gunakan PGP/MIME?"
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Surat tidak dikirim."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "Surat2 S/MIME tanpa hints pada isi tidak didukung."
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "Mencoba mengekstrak kunci2 PGP...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Mencoba mengekstrak sertifikat2 S/MIME...\n"
 
@@ -766,7 +1333,7 @@ msgstr ""
 "[-- Error: Struktur multipart/signed tidak konsisten! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -775,7 +1342,7 @@ msgstr ""
 "[-- Error: Protokol multipart/signed %s tidak dikenal! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -785,7 +1352,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -793,7 +1360,7 @@ msgstr ""
 "[-- Data berikut ini ditandatangani --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -801,7 +1368,7 @@ msgstr ""
 "[-- Warning: Tidak dapat menemukan tandatangan. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -809,226 +1376,256 @@ msgstr ""
 "\n"
 "[-- Akhir data yang ditandatangani --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Memanggil PGP..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "ya"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "nggak"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Keluar dari Mutt?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "eh..eh.. napa nih?"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Tekan sembarang tombol untuk lanjut..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " ('?' utk lihat daftar): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Tidak ada kotak surat yang terbuka."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Tidak ada surat."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "Kotak surat hanya bisa dibaca."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Fungsi ini tidak diperbolehkan pada mode pelampiran-surat"
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "Tidak ada surat yg bisa dilihat."
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Kotak surat read-only, tidak bisa toggle write!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Perubahan ke folder akan dilakukan sewaktu keluar dari folder."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Perubahan ke folder tidak akan dilakukan."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Keluar"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Simpan"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Surat"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Balas"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Grup"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
 "Kotak surat diobok-obok oleh program lain. Tanda-tanda surat mungkin tidak "
 "tepat."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Surat baru di kotak ini."
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "Kotak surat diobok-obok oleh program lain."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Tidak ada surat yang ditandai."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 msgid "Nothing to do."
 msgstr "Gak ngapa-ngapain."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Ke surat no: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "Parameter harus berupa nomer surat."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Surat itu tidak bisa dilihat."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Tidak ada nomer begitu."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Hapus surat-surat yang: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "Pola batas (limit pattern) tidak ditentukan."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr " Batas: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Hanya surat-surat yang: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Keluar dari Mutt?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Tandai surat-surat yang: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Tidak jadi hapus surat-surat yang: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Tidak jadi tandai surat-surat yang: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Buka kotak surat dengan mode read-only"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Buka kotak surat"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s bukan kotak surat."
 
-#: curs_main.c:1165
+#: curs_main.c:1176
 msgid "Exit Mutt without saving?"
 msgstr "Keluar dari Mutt tanpa menyimpan?"
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "Tidak disetting untuk melakukan threading."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "simpan surat ini untuk dikirim nanti"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Anda sudah di surat yang terakhir."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Tidak ada surat yang tidak jadi dihapus."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Anda sudah di surat yang pertama."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "Pencarian kembali ke atas."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "Pencarian kembali ke bawah."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Tidak ada surat baru"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Tidak ada surat yang belum dibaca"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " di tampilan terbatas ini"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "Tidak bisa mengubah tanda 'penting' di server POP."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Tidak ada thread lagi."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Anda di thread yang pertama."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "Tidak disetting untuk melakukan threading."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "Thread berisi surat yang belum dibaca."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "Tidak bisa menyunting surat di server POP"
 
@@ -1161,76 +1758,76 @@ msgstr "Tandai"
 msgid "Clear flag"
 msgstr "Batal ditandai"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Error: Tidak ada bagian Multipart/Alternative yg bisa ditampilkan! --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Lampiran #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Jenis: %s/%s, Encoding: %s, Ukuran: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Tampil-otomatis dengan %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Menjalankan perintah tampil-otomatis: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Tidak bisa menjalankan %s. --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Stderr dari tampil-otomatis %s --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Error:  message/external-body tidak punya parameter access-type --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Lampiran %s/%s ini "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(ukuran %s bytes) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "telah dihapus --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- pada %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- nama: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Lampiran %s/%s ini tidak disertakan, --]\n"
 
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
@@ -1238,34 +1835,34 @@ msgstr ""
 "[-- dan sumber eksternal yg disebutkan telah --]\n"
 "[-- kadaluwarsa. --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- dan tipe akses %s tsb tidak didukung --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Error: multipart/signed tidak punya protokol."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Error: multipart/encrypted tidak punya parameter protokol!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Tidak bisa membuka file sementara!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s tidak didukung "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(gunakan '%s' untuk melihat bagian ini)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(tombol untuk 'view-attachments' belum ditentukan!)"
 
@@ -1372,46 +1969,46 @@ msgstr "Mengauthentikasi (%s)..."
 msgid "SASL authentication failed."
 msgstr "Authentikasi SASL gagal."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s bukan path IMAP yang valid"
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Mencari namespaces..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Mengambil daftar kotak surat..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "Tidak ada folder itu"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Membuat kotak surat: "
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "Kotak surat harus punya nama."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Kotak surat telah dibuat."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Ganti nama kotak surat %s ke: "
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, c-format
 msgid "Rename failed: %s"
 msgstr "Penggantian nama gagal: %s"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 msgid "Mailbox renamed."
 msgstr "Kotak surat telah diganti namanya."
 
@@ -1422,135 +2019,132 @@ msgstr "Kotak surat telah ditutup."
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Fatal error. Jumlah surat tidak konsisten dengan server!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Menutup hubungan ke %s..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "IMAP server ini sudah kuno. Mutt tidak bisa menggunakannya."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
-msgstr "Respons yg tdk diharapkan dari server: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
+msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "Gunakan hubungan aman dg TLS?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "Tidak dapat negosiasi hubungan TLS"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Memilih %s..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "Error sewaktu membuka kotak surat"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Tidak dapat menambah ke kotak surat IMAP di server ini"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "Buat %s?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Menandai %d surat-surat \"dihapus\"..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "Penghapusan gagal"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Menyimpan tanda-tanda status surat... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Menghapus surat-surat di server..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE (hapus) gagal"
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "CLOSE (penutupan) gagal."
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "Nama kotak surat yg buruk"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Berlangganan ke %s..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Berhenti langganan dari %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Tidak dapat mengambil header dari IMAP server versi ini."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Tidak bisa membuat file sementara %s"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Memeriksa cache... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Mengambil header surat... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Mengambil surat..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "Index dari surat tidak benar. Cobalah membuka kembali kotak surat tsb."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Meletakkan surat ..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Menyalin %d surat ke %s..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Menyalin surat %d ke %s..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Lanjutkan?"
 
@@ -1559,122 +2153,122 @@ msgstr "Lanjutkan?"
 msgid "Bad regexp: %s"
 msgstr "Regexp tidak benar: %s"
 
-#: init.c:678
+#: init.c:644
 msgid "spam: no matching pattern"
 msgstr "spam: tidak ada pola yg cocok"
 
-#: init.c:680
+#: init.c:646
 msgid "nospam: no matching pattern"
 msgstr "nospam: tidak ada pola yg cocok"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias: tidak ada alamat email"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Peringatan: IDN '%s' di alias '%s' tidak benar.\n"
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "kolom header tidak dikenali"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: metoda pengurutan tidak dikenali"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): error pada regexp: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: variable tidak diketahui"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "prefix tidak diperbolehkan dengan reset"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "nilai tidak diperbolehkan dengan reset"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s hidup"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s mati"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: jenis kotak surat tidak dikenali"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: nilai tidak betul"
 
-#: init.c:1589
+#: init.c:1555
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: Jenis tidak dikenali."
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: jenis tidak dikenali"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Error di %s, baris %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: errors di %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: pembacaan dibatalkan sebab terlalu banyak error di %s"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: error pada %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: parameter terlalu banyak"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: perintah tidak dikenali"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Error di baris perintah: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "tidak bisa menentukan home direktori"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "tidak bisa menentukan username"
 
@@ -2132,398 +2726,407 @@ msgid "compose a new mail message"
 msgstr "menulis surat baru"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "membuka folder lain"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "membuka folder lain dengan mode read-only"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "bersihkan suatu tanda status pada surat"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "hapus surat yang cocok dengan suatu kriteria"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "paksa mengambil surat dari server IMAP"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "mengambil surat dari server POP"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "ke surat pertama"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "ke surat terakhir"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "hanya tunjukkan surat yang cocok dengan suatu kriteria"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Bounce surat yang telah ditandai ke: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "ke surat berikutnya yang baru"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "ke surat berikutnya yang baru atau belum dibaca"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "ke subthread berikutnya"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "ke thread berikutnya"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "ke surat berikutnya yang tidak dihapus"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "ke surat berikutnya yang belum dibaca"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "loncat ke surat induk di thread ini"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "ke thread sebelumnya"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "ke subthread sebelumnya"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "ke surat sebelumnya yang tidak dihapus"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "ke surat sebelumnya yang baru"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "ke surat sebelumnya yang baru atau belum dibaca"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "ke surat sebelumnya yang belum dibaca"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "tandai thread ini 'sudah dibaca'"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "tandai subthread ini 'sudah dibaca'"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "tandai status dari surat"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "simpan perubahan ke kotak surat"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "tandai surat-surat yang cocok dengan kriteria"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "tidak jadi menghapus surat-surat yang cocok dengan kriteria"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "tidak jadi menandai surat-surat yang cocok dengan kriteria"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "ke tengah halaman"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "ke entry berikutnya"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "geser ke bawah satu baris"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "ke halaman berikutnya"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "ke akhir surat"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "tampilkan atau tidak teks yang dikutip"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "lompati setelah teks yang dikutip"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "ke awal surat"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "pipe surat/lampiran ke perintah shell"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "ke entry sebelumnya"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "geser ke atas satu baris"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "ke halaman sebelumnya"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "cetak entry ini"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "gunakan program lain untuk mencari alamat"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "tambahkan hasil pencarian baru ke hasil yang sudah ada"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "simpan perubahan ke kotak surat dan keluar"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "lanjutkan surat yang ditunda"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "bersihkan layar dan redraw"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{jerohan}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 msgid "rename the current mailbox (IMAP only)"
 msgstr "ganti nama kotak surat ini (untuk IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "balas surat"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "gunakan surat ini sebagai template"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "simpan surat/lampiran ke suatu file"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "cari dengan regular expression"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "cari mundur dengan regular expression"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "cari yang cocok berikutnya"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "cari mundur yang cocok berikutnya"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "diwarnai atau tidak jika ketemu"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "jalankan perintah di subshell"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "urutkan surat-surat"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "urutkan terbalik surat-surat"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "tandai entry ini"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "lakukan fungsi berikutnya ke surat-surat yang ditandai"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 msgid "apply next function ONLY to tagged messages"
 msgstr "lakukan fungsi berikutnya HANYA ke surat-surat yang ditandai"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "tandai subthread ini"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "tandai thread ini"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "tandai atau tidak sebuah surat 'baru'"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "apakah kotak surat akan ditulis ulang"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "apakah menjelajahi kotak-kotak surat saja atau semua file"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "ke awal halaman"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "tidak jadi hapus entry ini"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "tidak jadi hapus semua surat di thread"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "tidak jadi hapus semua surat di subthread"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "tunjukkan versi dan tanggal dari Mutt"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "tampilkan lampiran berdasarkan mailcap jika perlu"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "tampilkan lampiran MIME"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "tampilkan keycode untuk penekanan tombol"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "tampilkan kriteria batas yang sedang aktif"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "collapse/uncollapse thread ini"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "collapse/uncollapse semua thread"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "lampirkan PGP public key"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "tunjukan opsi2 PGP"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "kirim PGP public key lewat surat"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "periksa PGP public key"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "tampilkan user ID dari key"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "periksa pgp klasik"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Terima rangkaian yang dibentuk"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "Tambahkan remailer ke rangkaian"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "Sisipkan remailer ke rangkaian"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "Hapus remailer dari rangkaian"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "Pilih elemen sebelumnya dalam rangkaian"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "Pilih elemen berikutnya dalam rangkaian"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "kirim surat melalui sebuah rangkaian remailer mixmaster"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "buat salinan yang sudah di-decrypt dan hapus"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "buat salinan yang sudah di-decrypt"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "hapus passphrase dari memory"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "ekstrak kunci2 publik yg didukung"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "tunjukan opsi2 S/MIME"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr "Integer overflow -- tidak bisa mengalokasikan memori!"
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Buset, memory abis!"
 
@@ -2548,12 +3151,13 @@ msgstr ""
 "dengan beberapa persyaratan; baca 'mutt -vv' utk jelasnya.\n"
 
 #: main.c:61
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2602,6 +3206,7 @@ msgstr ""
 "02111, USA.\n"
 
 #: main.c:99
+#, fuzzy
 msgid ""
 "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
@@ -2609,16 +3214,60 @@ msgid ""
 "[...]\n"
 "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"penggunaan: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
 "       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
 "[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"opsi:\n"
+"  -A <alias>\tekspansi alias\n"
+"  -a <file>\tlampirkan file ke surat\n"
+"  -b <alamat>\talamat blind carbon-copy (BCC)\n"
+"  -c <alamat>\talamat carbon-copy (CC)\n"
+"  -e <perintah>\tperintah yang dijalankan setelah inisialisasi\n"
+"  -f <file>\tkotak surat yang dibaca\n"
+"  -F <file>\tfile muttrc alternatif\n"
+"  -H <file>\tfile draft sebagai sumber header dan badan\n"
+"  -i <file>\tfile yang disertakan dalam badan surat\n"
+"  -m <jenis>\tjenis kotak surat yang digunakan\n"
+"  -n\t\tmenyuruh Mutt untuk tidak membaca muttrc dari system\n"
+"  -p\t\tlanjutkan surat yang ditunda\n"
+"  -Q <variabel>\tmelakukan query thd suatu variabel konfigurasi\n"
+"  -R\t\tbuka kotak surat dengan mode read-only\n"
+"  -s <subj>\tsubjek surat (harus dikutip jika mengandung spasi)\n"
+"  -v\t\ttunjukkan versi dan definisi sewaktu compile\n"
+"  -x\t\tsimulasi mailx untuk mengirim surat\n"
+"  -y\t\tpilih kotak surat yg ada di daftar `mailboxes'\n"
+"  -z\t\tlangsung keluar jika tidak ada surat di kotak surat\n"
+"  -Z\t\tbuka folder pertama dg surat baru, langsung keluar jika tidak ada\n"
+"  -h\t\tpesan bantuan ini"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
+#, fuzzy
+msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2671,7 +3320,7 @@ msgstr ""
 "  -Z\t\tbuka folder pertama dg surat baru, langsung keluar jika tidak ada\n"
 "  -h\t\tpesan bantuan ini"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2679,47 +3328,47 @@ msgstr ""
 "\n"
 "Opsi2 sewaktu kompilasi:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Gagal menginisialisasi terminal."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Melakukan debug tingkat %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG tidak digunakan sewaktu compile. Cuek.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s tidak ada. Buat?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Tidak bisa membuat %s: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Tidak ada penerima yang disebutkan.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: tidak bisa melampirkan file.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Tidak ada kotak surat dengan surat baru."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Tidak ada kotak surat incoming yang didefinisikan."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "Kotak surat kosong."
 
@@ -2736,11 +3385,11 @@ msgstr "Kotak surat kacau!"
 msgid "Mailbox was corrupted!"
 msgstr "Kotak surat diobok-obok sampe kacau!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Fatal error! Tidak bisa membuka kembali kotak surat!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Tidak bisa mengunci kotak surat!"
 
@@ -2748,12 +3397,12 @@ msgstr "Tidak bisa mengunci kotak surat!"
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: mbox diubah, tapi tidak ada surat yang berubah! (laporkan bug ini)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Menulis surat-surat... %d (%d%%)"
@@ -2761,187 +3410,148 @@ msgstr "Menulis surat-surat... %d (%d%%)"
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "Melakukan perubahan..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Gagal menulis! Sebagian dari kotak surat disimpan ke %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Tidak bisa membuka kembali mailbox!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Membuka kembali kotak surat..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Ke: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Nomer indeks tidak betul."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Tidak ada entry."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Sudah tidak bisa geser lagi. Jebol nanti."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Sudah tidak bisa geser lagi. Jebol nanti."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Anda di halaman terakhir."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Anda di halaman pertama."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "Entry pertama sudah ditampilkan."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "Entry terakhir sudah ditampilkan."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Anda di entry terakhir."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Anda di entry pertama."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Cari: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Cari mundur: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Tidak ada kriteria pencarian."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Tidak ketemu."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "Tidak ada entry yang ditandai."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "Pencarian tidak bisa dilakukan untuk menu ini."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "Pelompatan tidak diimplementasikan untuk dialogs."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Penandaan tidak didukung."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Membaca %s... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): tidak dapat mengeset waktu pada file"
 
-#: muttlib.c:846
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr ""
-"File adalah sebuah direktori, simpan di dalamnya? [(y)a, (t)idak, (s)emua]"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr "yts"
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "File adalah sebuah direktori, simpan di dalamnya?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "File di dalam direktori: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "File sudah ada, (t)impa, t(a)mbahkan, atau (b)atal?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "tab"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Tidak bisa menyimpan surat ke kotak surat POP"
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s bukan kotak surat!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Tambahkan surat-surat ke %s?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "Hubungan ke %s ditutup."
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL tidak tersedia."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "Perintah pra-koneksi gagal."
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Kesalahan waktu menghubungi ke server %s (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "IDN \"%s\" tidak benar."
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "Mencari %s..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Tidak dapat menemukan host \"%s\""
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Menghubungi %s..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Tidak bisa berhubungan ke %s (%s)"
@@ -2973,7 +3583,8 @@ msgstr "Kesalahan I/O"
 msgid "SSL failed: %s"
 msgstr "SSL gagal: %s"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Tidak bisa mengambil sertifikat"
 
@@ -2982,87 +3593,208 @@ msgstr "Tidak bisa mengambil sertifikat"
 msgid "SSL connection using %s (%s)"
 msgstr "Hubungan SSL menggunakan %s (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[tidak bisa melakukan penghitungan]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[tanggal tidak betul]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "Sertifikat server belum sah"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "Sertifikat server sudah kadaluwarsa"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Sertifikat ini dimiliki oleh:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Sertifikat ini dikeluarkan oleh:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Sertifikat ini sah"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   dari %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     ke %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Cap jari: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "Cek sertifikat SSL"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(t)olak, terima (s)ekali, terima selal(u)"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "tsu"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(t)olak, terima (s)ekali"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "ts"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Keluar  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Warning: Tidak dapat menyimpan sertifikat"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Sertifikat telah disimpan"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "Hubungan SSL menggunakan %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Sertifikat telah disimpan"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Gagal menginisialisasi terminal."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Cap jari: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Cap jari: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Sertifikat server belum sah"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Sertifikat server sudah kadaluwarsa"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Sertifikat server sudah kadaluwarsa"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "Sertifikat server belum sah"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "Cek sertifikat SSL"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Menghubungi %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Kesalahan waktu menghubungi ke server %s (%s)"
+
+#: muttlib.c:910
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr ""
+"File adalah sebuah direktori, simpan di dalamnya? [(y)a, (t)idak, (s)emua]"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr "yts"
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "File adalah sebuah direktori, simpan di dalamnya?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "File di dalam direktori: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "File sudah ada, (t)impa, t(a)mbahkan, atau (b)atal?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "tab"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Tidak bisa menyimpan surat ke kotak surat POP"
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Tambahkan surat-surat ke %s?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s bukan kotak surat!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3140,7 +3872,7 @@ msgstr "Kotak surat tidak berubah."
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d disimpan, %d dipindahkan, %d dihapus."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d disimpan, %d dihapus."
@@ -3159,15 +3891,15 @@ msgstr "Gunakan 'toggle-write' supaya bisa menulis lagi!"
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Kotak surat ditandai tidak boleh ditulisi. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "Kotak surat telah di-checkpoint."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Tidak dapat menulis surat"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr "Integer overflow -- tidak bisa mengalokasikan memori."
 
@@ -3175,48 +3907,48 @@ msgstr "Integer overflow -- tidak bisa mengalokasikan memori."
 msgid "Not available in this menu."
 msgstr "Tidak ada di menu ini."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "HlmnSblm"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "HlmnBrkt"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Lampiran"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Brkt"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Sudah paling bawah."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Sudah paling atas."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Cari mundur: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Cari: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "Bantuan sedang ditampilkan."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "Tidak ada lagi teks kutipan."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Tidak ada lagi teks yang tidak dikutp setelah teks kutipan."
 
@@ -3283,27 +4015,27 @@ msgstr "kriteria kosong"
 msgid "error: unknown op %d (report this error)."
 msgstr "error: %d tidak dikenali (laporkan error ini)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Menyusun kriteria pencarian..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Menjalankan perintah terhadap surat-surat yang cocok..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "Tidak ada surat yang memenuhi kriteria."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "Sudah dicari sampe bawah, tapi tidak ketemu"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "Sudah dicari sampe atas, tapi tidak ketemu"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Pencarian dibatalkan."
 
@@ -3315,11 +4047,11 @@ msgstr "Masukkan passphrase PGP: "
 msgid "PGP passphrase forgotten."
 msgstr "Passphrase PGP sudah dilupakan."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Error: tidak bisa membuat subproses utk PGP! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3327,51 +4059,22 @@ msgstr ""
 "[-- Akhir keluaran PGP --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- AWAL SURAT PGP --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- AWAL PGP PUBLIC KEY BLOCK --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- AWAL SURAT DG TANDATANGAN PGP --]\n"
-"\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- AKHIR PESAN PGP --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- AKHIR PGP PUBLIC KEY BLOCK --]\n"
-
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- AKHIR PESAN DG TANDATANGAN PGP --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "Tidak bisa menyalin surat"
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Error: tidak tahu dimana surat PGP dimulai! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "Tanda tangan PGP berhasil diverifikasi."
 
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Internal error. Beritahukan kepada <roessler@does-not-exist.org>."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3379,71 +4082,37 @@ msgstr ""
 "[-- Error: tidak bisa membuat subproses PGP! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Error: surat PGP/MIME tidak dalam format yg betul! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Error: tidak bisa membuat file sementara! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- Data berikut dienkripsi dg PGP/MIME --]\n"
-"\n"
-
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Akhir data yang dienkripsi dg PGP/MIME --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "Dekripsi gagal."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "Tidak bisa membuka subproses PGP!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "Gunakan keyID = '%s' untuk %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Masukkan keyID untuk %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "Tidak dapat menjalankan PGP"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr ""
 "PGP (e)nkrip, (t)andatangan, tandatangan (s)bg, ke(d)uanya, %s, (b)ersih? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr "PGP/M(i)ME"
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr "(i)nline"
 
-#: pgp.c:1499
+#: pgp.c:1543
 msgid "esabifc"
 msgstr "etsdilb"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Tandatangani sebagai: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "Mengambil PGP key..."
@@ -3452,16 +4121,6 @@ msgstr "Mengambil PGP key..."
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Semua kunci yang cocok telah kadaluwarsa, dicabut, atau disabled."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Pilih  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Cek key  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3476,40 +4135,6 @@ msgstr "PGP keys yg cocok dg \"%s\"."
 msgid "Can't open /dev/null"
 msgstr "Tidak bisa membuka /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Tidak bisa membuat file sementara"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Identifikasi kunci: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Kunci ini tidak dapat digunakan: kadaluwarsa/disabled/dicabut."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "ID telah kadaluwarsa/disabled/dicabut."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "Validitas ID tidak terdifinisikan."
-
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "ID tidak valid."
-
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "ID hanya valid secara marginal."
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Anda yakin mau menggunakan kunci tsb?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Masukkan key ID: "
@@ -3523,11 +4148,6 @@ msgstr "Menjalankan PGP..."
 msgid "PGP Key %s."
 msgstr "Kunci PGP %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Mencari kunci yg cocok dengan \"%s\"..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3585,7 +4205,7 @@ msgstr "Error sewaktu menulis ke kotak surat!"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d dari %d surat dibaca]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "Server menutup hubungan!"
 
@@ -3615,15 +4235,15 @@ msgstr "Tidak bisa meninggalkan surat-surat di server."
 msgid "Error connecting to server: %s"
 msgstr "Kesalahan waktu menghubungi ke server: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "Menutup hubungan ke server POP..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Memverifikasi indeks surat..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Hubungan terputus. Hubungi kembali server POP?"
 
@@ -3997,35 +4617,35 @@ msgstr "Surat telah dikirim."
 msgid "Sending in background."
 msgstr "Mengirim di latar belakang."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Tidak ada parameter batas yang bisa ditemukan! [laporkan error ini]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s tidak ada lagi!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s bukan file biasa."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "Tidak bisa membuka %s"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Error mengirimkan surat, proses keluar dengan kode %d (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Keluaran dari proses pengiriman"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "IDN %s pada saat mempersiapkan resent-from tidak benar."
@@ -4141,7 +4761,7 @@ msgstr "Tidak bisa membuka subproses OpenSSL!"
 msgid "No output from OpenSSL..."
 msgstr "Tdk ada keluaran dr OpenSSL..."
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4149,19 +4769,19 @@ msgstr ""
 "[-- Akhir keluaran OpenSSL --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Error: tidak bisa membuat subproses utk OpenSSL! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- Data berikut dienkripsi dg S/MIME --]\n"
 
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- Data berikut ditandatangani dg S/MIME --]\n"
 
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4169,7 +4789,7 @@ msgstr ""
 "\n"
 "[-- Akhir data yang dienkripsi dg S/MIME. --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4177,28 +4797,28 @@ msgstr ""
 "\n"
 "[-- Akhir data yg ditandatangani dg S/MIME. --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
 "S/MIME (e)nkrip, (t)andatangan, enkrip d(g), tandatangan (s)bg, ke(d)uanya, "
 "atau (b)ersih? "
 
-#: smime.c:1936
+#: smime.c:1945
 msgid "eswabfc"
 msgstr "etgsdlb"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, atau (b)atal? "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345b"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr "Tdk bisa tandatangan: Kunci tdk diberikan. Gunakan Tandatangan Sbg."
 
@@ -4222,6 +4842,12 @@ msgstr "Surat induk tidak bisa dilihat di tampilan terbatas ini."
 msgid "Parent message is not available."
 msgstr "Surat induk tidak ada."
 
+#~ msgid "Unexpected response received from server: %s"
+#~ msgstr "Respons yg tdk diharapkan dari server: %s"
+
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Tidak dapat menambah ke kotak surat IMAP di server ini"
+
 #~ msgid "unspecified protocol error"
 #~ msgstr "kesalahan protokol tak terdefinisikan"
 
@@ -4283,9 +4909,6 @@ msgstr "Surat induk tidak ada."
 #~ "[-- dan sumber luar yang dimaksud sudah --]\n"
 #~ "[-- kadaluwarsa. --]\n"
 
-#~ msgid "%s [%s]\n"
-#~ msgstr "%s [%s]\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "[-- End of PGP output --]\n"
@@ -4376,9 +4999,6 @@ msgstr "Surat induk tidak ada."
 #~ msgid "Skipping CRAM-MD5 authentication."
 #~ msgstr "Melewati authentikasi CRAM-MD5."
 
-#~ msgid "[-- Error: unexpected end of file! --]\n"
-#~ msgstr "[-- Error: akhir file tak diduga! --]\n"
-
 #~ msgid "Sending APPEND command ..."
 #~ msgstr "Mengirim perintah APPEND ..."
 
diff --git a/po/it.po b/po/it.po
index 1a2f28589..da7ecf4a7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutt-1.3.23\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2004-08-22 22:12+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: none\n"
@@ -16,26 +16,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "Nome dell'utente su %s: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Password per %s@%s: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Esci"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Canc"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "DeCanc"
 
@@ -44,9 +44,9 @@ msgid "Select"
 msgstr "Seleziona"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Aiuto"
 
@@ -99,174 +99,174 @@ msgid "Alias added."
 msgstr "Alias aggiunto."
 
 # FIXME
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Il nametemplate non corrisponde, continuo?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "La voce compose di mailcap richiede %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Errore eseguendo \"%s\"!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Errore nell'apertura del file per leggere gli header."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Errore nell'apertura del file per rimuovere gli header."
 
-#: attach.c:183
+#: attach.c:184
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "Errore nell'apertura del file per leggere gli header."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "Manca la voce compose di mailcap per %s, creo un file vuoto."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "La voce edit di mailcap richiede %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Manca la voce edit di mailcap per %s"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr ""
 "Non è stata trovata la voce di mailcap corrispondente.  Visualizzo come "
 "testo."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Tipo MIME non definito.  Impossibile visualizzare l'allegato."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Impossibile creare il filtro"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Impossibile creare il filtro"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Errore di scrittura!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Non so come stamparlo!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "CambiaDir"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Maschera"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s non è una directory."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Mailbox [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Iscritto [%s], Maschera dei file: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Directory [%s], Maschera dei file: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Impossibile allegare una directory!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Non ci sono file corrispondenti alla maschera"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "È possibile creare solo mailbox IMAP"
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "È possibile creare solo mailbox IMAP"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "È possibile cancellare solo mailbox IMAP"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Cancello davvero la mailbox \"%s\"?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Mailbox cancellata."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "Mailbox non cancellata."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Cambia directory:"
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Errore nella lettura della directory."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Maschera dei file: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Ordino al contrario per (d)ata, (a)lfabetico, dimensioni(z) o (n)ulla? "
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Ordino per (d)ata, (a)lfabetico, dimensioni(z) o (n)ulla? "
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "dazn"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Nuovo nome del file: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Impossibile vedere una directory"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "C'è stato un errore nella visualizzazione del file"
 
@@ -333,7 +333,7 @@ msgstr "i colori predefiniti non sono gestiti"
 msgid "Verify PGP signature?"
 msgstr "Verifico la firma PGP?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Impossibile creare il file temporaneo!"
 
@@ -345,114 +345,114 @@ msgstr "Impossibile creare il filtro di visualizzazione"
 msgid "Could not copy message"
 msgstr "Impossibile copiare il messaggio"
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "Firma S/MIME verificata con successo."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "Il proprietario del certificato S/MIME non corrisponde al mittente."
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr "Attenzione: una parte di questo messaggio non è stata firmata."
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "Non è stato possibile verificare la firma S/MIME."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "Firma PGP verificata con successo."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "Non è stato possibile verificare la firma PGP."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Comando: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Rimbalza il messaggio a: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Rimbalza i messaggi segnati a: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Errore nella lettura dell'indirizzo!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "IDN non valido: '%s'"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Rimbalza il messaggio a %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Rimbalza i messaggi a %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "Messaggio non rimbalzato."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "Messaggi non rimbalzati."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Messaggio rimbalzato."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Messaggi rimbalzati."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "Impossibile creare il processo filtro"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Apri una pipe con il comando: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Non è stato definito un comando di stampa."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Stampo il messaggio?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Stampo i messaggi segnati?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Messaggio stampato"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Messaggi stampati"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "Impossibile stampare il messaggio"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Impossibile stampare i messaggi"
 
-#: commands.c:508
+#: commands.c:509
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -460,7 +460,7 @@ msgid ""
 msgstr ""
 "OrdContr (d)ata/(f)rom/(r)icev/(s)ogg/t(o)/(t)hread/n(u)lla/si(z)e/s(c)ore?: "
 
-#: commands.c:509
+#: commands.c:510
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
@@ -469,74 +469,74 @@ msgstr ""
 "Ordina per (d)ata/(f)rom/(r)icev/(s)ogg/t(o)/(t)hread/n(u)lla/si(z)e/s(c)"
 "ore?: "
 
-#: commands.c:510
+#: commands.c:511
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzc"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Comando della shell: "
 
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Decodifica e salva nella mailbox%s"
 
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Decodifica e copia nella mailbox%s"
 
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Decifra e salva nella mailbox%s"
 
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Decifra e copia nella mailbox%s"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Salva nella mailbox%s"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Copia nella mailbox%s"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " i messaggi segnati"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Copio in %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Convertire in %s al momento dell'invio?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Il Content-Type è stato cambiato in %s."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Il set di caratteri è stato cambiato in %s; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "non convertito"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "convertito"
 
@@ -629,102 +629,661 @@ msgstr "IDN non valido in \"%s\": '%s'"
 msgid "Attaching selected files..."
 msgstr "Allego i file selezionati..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Impossibile allegare %s!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Apri la mailbox da cui allegare il messaggio"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "In questo folder non ci sono messaggi."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Segna i messaggi che vuoi allegare!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Impossibile allegare!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "La ricodifica ha effetti solo sugli allegati di testo."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "L'allegato corrente non sarà convertito."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "L'allegato corrente sarà convertito."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Codifica non valida."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Salvo una copia di questo messaggio?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Rinomina in: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Impossibile fare stat di %s: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Nuovo file: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type non è nella forma base/sub"
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Content-Type %s sconosciuto"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "Impossibile creare il file %s"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "Quel che abbiamo qui è l'impossibilità di fare un allegato"
 
-#: compose.c:1139
-msgid "Postpone this message?"
-msgstr "Rimando a dopo questo messaggio?"
+#: compose.c:1142
+msgid "Postpone this message?"
+msgstr "Rimando a dopo questo messaggio?"
+
+#: compose.c:1201
+msgid "Write message to mailbox"
+msgstr "Salva il messaggio nella mailbox"
+
+#: compose.c:1204
+#, c-format
+msgid "Writing message to %s ..."
+msgstr "Scrivo il messaggio in %s..."
+
+#: compose.c:1213
+msgid "Message written."
+msgstr "Messaggio scritto."
+
+#: compose.c:1225
+msgid "S/MIME already selected. Clear & continue ? "
+msgstr "S/MIME già selezionato. Annullare & continuare? "
+
+#: compose.c:1251
+msgid "PGP already selected. Clear & continue ? "
+msgstr "PGP già selezionato. Annullare & continuare? "
+
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "errore nel modello in: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "errore nel modello in: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "errore nel modello in: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "errore nel modello in: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "errore nel modello in: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "errore nel modello in: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "errore nel modello in: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "errore nel modello in: %s"
+
+#: crypt-gpgme.c:993
+#, fuzzy
+msgid "Warning: One of the keys has been revoked\n"
+msgstr "Attenzione: una parte di questo messaggio non è stata firmata."
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Il certificato del server è scaduto"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL non è disponibile."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Fingerprint: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Errore durante l'invio del messaggio."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Errore nella riga di comando: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Fine dei dati firmati --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Errore: impossibile creare il file temporaneo! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr "[-- INIZIO DEL MESSAGGIO DI PGP --]\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- INIZIO DEL BLOCCO DELLA CHIAVE PUBBLICA --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr "[-- INIZIO DEL MESSAGGIO FIRMATO CON PGP --]\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- FINE DEL MESSAGGIO DI PGP --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- FINE DEL BLOCCO DELLA CHIAVE PUBBLICA --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- FINE DEL MESSAGGIO FIRMATO CON PGP --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Errore: impossibile trovare l'inizio del messaggio di PGP! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Errore: impossibile trovare l'inizio del messaggio di PGP! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Errore: impossibile creare il file temporaneo! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr "[-- I seguenti dati sono cifrati con PGP/MIME  --]\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr "[-- I seguenti dati sono cifrati con PGP/MIME  --]\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- Fine dei dati cifrati con PGP/MIME  --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- Fine dei dati cifrati con PGP/MIME  --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr "[-- I seguenti dati sono firmati con S/MIME --]\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr "[-- I seguenti dati sono cifrati con S/MIME --]\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Fine dei dati firmati com S/MIME. --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Fine dei dati cifrati con S/MIME --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Non valido   "
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Mese non valido: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Mese non valido: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Crittografa"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Certificato salvato"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Key ID: 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "Revocato   "
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Scaduto   "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Impossibile creare il file temporaneo"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Mi connetto a %s..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Errore nella connessione al server: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Key ID: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "SSL fallito: %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Tutte le chiavi corrispondenti sono scadute, revocate o disattivate."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Esci  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Seleziona  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Controlla la chiave  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "Chiavi PGP corrispondenti a \"%s\"."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "Chiavi PGP corrispondenti a \"%s\"."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "Certificati S/MIME corrispondenti a \"%s\"."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "Chiavi PGP corrispondenti a \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Questa chiave non può essere usata: è scaduta/disabilitata/revocata."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "L'ID è scaduto/disabilitato/revocato."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "L'ID ha validità indefinita."
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "L'ID non è valido."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "L'ID è solo marginalmente valido."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Vuoi veramente usare questa chiave?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Cerco chiavi corrispondenti a \"%s\"..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "Uso il keyID \"%s\" per %s?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Inserisci il keyID per %s: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr ""
+"PGP: cifra(e), firma(s), firma (c)ome, entram(b)i, in l(i)nea, (a)nnullare? "
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "esocba"
 
-#: compose.c:1196
-msgid "Write message to mailbox"
-msgstr "Salva il messaggio nella mailbox"
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr ""
+"PGP: cifra(e), firma(s), firma (c)ome, entram(b)i, in l(i)nea, (a)nnullare? "
 
-#: compose.c:1199
-#, c-format
-msgid "Writing message to %s ..."
-msgstr "Scrivo il messaggio in %s..."
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "esocba"
 
-#: compose.c:1208
-msgid "Message written."
-msgstr "Messaggio scritto."
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Firma come: "
 
-#: compose.c:1220
-msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME già selezionato. Annullare & continuare? "
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
 
-#: compose.c:1246
-msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP già selezionato. Annullare & continuare? "
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Errore nell'apertura del file per leggere gli header."
 
 #: crypt.c:69
 #, c-format
@@ -741,29 +1300,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "Passphrase dimenticata/e."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Eseguo PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Il messaggio non è stato spedito."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "I messaggi S/MIME senza suggerimenti del contenuto non sono gestiti."
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "Cerco di estrarre le chiavi PGP...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Cerco di estrarre i certificati S/MIME...\n"
 
@@ -775,14 +1334,14 @@ msgstr ""
 "[-- Errore: struttura multipart/signed incoerente! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr "[-- Errore: protocollo multipart/signed %s sconosciuto! --]\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -790,7 +1349,7 @@ msgid ""
 msgstr "[-- Attenzione: impossibile verificare firme %s/%s. --]\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -798,7 +1357,7 @@ msgstr ""
 "[-- I seguenti dati sono firmati --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -806,7 +1365,7 @@ msgstr ""
 "[-- Attenzione: non è stata trovata alcuna firma. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -814,225 +1373,255 @@ msgstr ""
 "\n"
 "[-- Fine dei dati firmati --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Eseguo PGP..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "sì"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "no"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Esci da mutt?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "errore sconosciuto"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Premi un tasto per continuare..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " ('?' per la lista): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Nessuna mailbox aperta."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Non ci sono messaggi."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "La mailbox è di sola lettura."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Funzione non permessa nella modalità attach-message."
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "Non ci sono messaggi visibili"
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Impossibile (dis)abilitare la scrittura a una mailbox di sola lettura!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "I cambiamenti al folder saranno scritti all'uscita dal folder."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "I cambiamenti al folder non saranno scritti."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Esci"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Salva"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Mail"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Rispondi"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Gruppo"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
 "La mailbox è stata modificata dall'esterno.  I flag possono essere sbagliati."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "C'è nuova posta in questa mailbox."
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "La mailbox è stata modificata dall'esterno."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Nessun messaggio segnato."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 msgid "Nothing to do."
 msgstr "Niente da fare."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Salta al messaggio: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "L'argomento deve essere il numero di un messaggio."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Questo messaggio non è visibile."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Numero del messaggio non valido."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Cancella i messaggi corrispondenti a: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "Non è attivo alcun modello limitatore."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Limita: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Limita ai messaggi corrispondenti a: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Esci da Mutt?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Segna i messaggi corrispondenti a: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "De-cancella i messaggi corrispondenti a: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Togli il segno ai messaggi corrispondenti a: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Apri la mailbox in sola lettura"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Apri la mailbox"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s non è una mailbox."
 
-#: curs_main.c:1165
+#: curs_main.c:1176
 msgid "Exit Mutt without saving?"
 msgstr "Esci da Mutt senza salvare?"
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "Il threading non è attivo."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "salva questo messaggio per inviarlo in seguito"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Sei all'ultimo messaggio."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Nessun messaggio da de-cancellare."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Sei al primo messaggio."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "La ricerca è ritornata all'inizio."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "La ricerca è ritornata al fondo."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Non ci sono nuovi messaggi"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Non ci sono messaggi non letti"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " in questa visualizzazione limitata"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "Impossibile cambiare il flag \"importante\" sul server POP."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Non ci sono altri thread."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Sei al primo thread."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "Il threading non è attivo."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "Il thread contiene messaggi non letti."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "Impossibile modificare i messaggi sul server POP."
 
@@ -1165,110 +1754,110 @@ msgstr "Imposta il flag"
 msgid "Clear flag"
 msgstr "Cancella il flag"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Errore: impossibile visualizzare ogni parte di multipart/alternative! "
 "--]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Allegato #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Tipo: %s/%s, Codifica: %s, Dimensioni: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Visualizzato automaticamente con %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Richiamo il comando di autovisualizzazione: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Impossibile eseguire %s. --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- stderr dell'autoview di %s --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Errore: message/external-body non ha un parametro access-type --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Questo allegato %s/%s "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(dimensioni %s byte) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "è stato cancellato -- ]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- su %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- nome: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Questo allegato %s/%s non è incluso, --]\n"
 
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr "[-- e l'origine esterna indicata è scaduta. --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- e il l'access-type %s indicato non è gestito --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Errore: multipart/signed non ha protocollo."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Errore: multipart/encrypted non ha il parametro protocol!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Impossibile aprire il file temporaneo!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s non è gestito "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(usa '%s' per vederlo)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "('view-attachments' deve essere assegnato a un tasto!)"
 
@@ -1375,46 +1964,46 @@ msgstr "Autenticazione in corso (%s)..."
 msgid "SASL authentication failed."
 msgstr "Autenticazione SASL fallita."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s non è un percorso IMAP valido"
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Scarico i namespace..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Scarico la lista dei folder..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "Folder inesistente"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Crea la mailbox:"
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "La mailbox deve avere un nome."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Mailbox creata."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Crea la mailbox:"
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "SSL fallito: %s"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "Mailbox creata."
@@ -1426,135 +2015,132 @@ msgstr "Mailbox chiusa"
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Errore fatale. Il numero dei messaggi non è sincronizzato!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Chiudo la connessione a %s..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Questo server IMAP è troppo vecchio, mutt non può usarlo."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
-msgstr "È stata ricevuta dal server una risposta inattesa: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
+msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "Vuoi usare TLS per rendere sicura la connessione?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "Impossibile negoziare la connessione TLS"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Seleziono %s..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "Errore durante l'apertura della mailbox"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Impossibile accodare alle mailbox IMAP di questo server"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "Creo %s?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Segno cancellati %d messaggi..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "Expunge fallito"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Salvo i flag di stato dei messaggi... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Cancello i messaggi dal server..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE fallito"
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "CLOSE fallito"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "Nome della mailbox non valido"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Mi iscrivo a %s..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Mi deiscrivo da %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Impossibile scaricare gli header da questa versione del server IMAP."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Impossibile creare il file temporaneo %s"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Prendo gli header dei messaggi... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Prendo gli header dei messaggi... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Prendo il messaggio..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "L'indice dei messaggi non è corretto; prova a riaprire la mailbox."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Mando il messaggio..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Copio %d messaggi in %s..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Copio il messaggio %d in %s..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Continua?"
 
@@ -1563,124 +2149,124 @@ msgstr "Continua?"
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:678
+#: init.c:644
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "segna i messaggi corrispondenti al modello"
 
-#: init.c:680
+#: init.c:646
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "togli il segno ai messaggi corrispondenti al modello"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias: nessun indirizzo"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Attenzione: l'IDN '%s' nell'alias '%s' non è valido.\n"
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "Campo dell'header non valido"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: metodo di ordinamento sconosciuto"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): errore nella regexp: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: variabile sconosciuta"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "prefix non è consentito con reset"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "value non è consentito con reset"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s è attivo"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s non è attivo"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: tipo di mailbox non valido"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: valore non valido"
 
-#: init.c:1589
+#: init.c:1555
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: tipo sconosciuto."
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: tipo sconosciuto"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Errore in %s, linea %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: errori in %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: lettura terminata a causa di troppi errori in %s"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: errore in %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: troppi argomenti"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: comando sconosciuto"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Errore nella riga di comando: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "impossibile determinare la home directory"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "impossibile determinare l'username"
 
@@ -2139,399 +2725,408 @@ msgid "compose a new mail message"
 msgstr "componi un nuovo messaggio"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "apri un altro folder"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "apri un altro folder in sola lettura"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "cancella il flag di stato da un messaggio"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "cancella i messaggi corrispondenti al modello"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "recupera la posta dal server IMAP"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "recupera la posta dal server POP"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "spostati al primo messaggio"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "spostati all'ultimo messaggio"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "mostra solo i messaggi corrispondenti al modello"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Rimbalza i messaggi segnati a: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "salta al successivo nuovo messaggio"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "salta al successivo messaggio nuovo o non letto"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "salta al subthread successivo"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "salta al thread successivo"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "salta al messaggio de-cancellato successivo"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "salta al successivo messaggio non letto"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "salta al messaggio padre nel thread"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "salta al thread precedente"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "salta al thread seguente"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "salta al precedente messaggio de-cancellato"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "salta al precedente messaggio nuovo"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "salta al precedente messaggio nuovo o non letto"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "salta al precedente messaggio non letto"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "segna il thread corrente come già letto"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "segna il subthread corrente come già letto"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "imposta un flag di stato su un messaggio"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "salva i cambiamenti nella mailbox"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "segna i messaggi corrispondenti al modello"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "de-cancella i messaggi corrispondenti al modello"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "togli il segno ai messaggi corrispondenti al modello"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "spostati in mezzo alla pagina"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "spostati alla voce successiva"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "spostati una riga in basso"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "spostati alla pagina successiva"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "salta in fondo al messaggio"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "(dis)attiva la visualizzazione del testo citato"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "salta oltre il testo citato"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "salta all'inizio del messaggio"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "manda un messaggio/allegato a un comando della shell con una pipe"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "spostati alla voce precedente"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "spostati in alto di una riga"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "spostati alla pagina precedente"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "stampa la voce corrente"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "chiedi gli indirizzi a un programma esterno"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "aggiungi i risultati della nuova ricerca ai risultati attuali"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "salva i cambiamenti alla mailbox ed esci"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "richiama un messaggio rimandato"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "cancella e ridisegna lo schermo"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{internal}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "cancella la mailbox corrente (solo IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "rispondi a un messaggio"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "usa il messaggio corrente come modello per uno nuovo"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "salva in un file un messaggio/allegato"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "cerca una espressione regolare"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "cerca all'indietro una espressione regolare"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "cerca la successiva corrispondenza"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "cerca la successiva corrispondenza nella direzione opposta"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "(dis)attiva la colorazione del modello cercato"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "esegui un comando in una subshell"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "ordina i messaggi"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "ordina i messaggi in ordine inverso"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "segna la voce corrente"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "applica la funzione successiva ai messaggi segnati"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 msgid "apply next function ONLY to tagged messages"
 msgstr "applica la successiva funzione SOLO ai messaggi segnati"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "segna il subthread corrente"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "segna il thread corrente"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "(dis)attiva il flag 'nuovo' di un messaggio"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "(dis)attiva se la mailbox sarà riscritta"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "(dis)attiva se visualizzare le mailbox o tutti i file"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "spostati all'inizio della pagina"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "de-cancella la voce corrente"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "de-cancella tutti i messaggi nel thread"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "de-cancella tutti i messaggi nel subthread"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "mostra il numero di versione e la data di Mutt"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "visualizza l'allegato usando se necessario la voce di mailcap"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "mostra gli allegati MIME"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "mostra il keycode per un tasto premuto"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "mostra il modello limitatore attivo"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "(de)comprimi il thread corrente"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "(de)comprimi tutti i thread"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "allega una chiave pubblica PGP"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "mostra le opzioni PGP"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "spedisci una chiave pubblica PGP"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "verifica una chiave pubblica PGP"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "visualizza la chiave dell'user id"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "controlla una firma PGP tradizionale"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Accetta la catena costruita"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "Accoda un remailer alla catena"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "Inserisce un remailer nella catena"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "Toglie un remail dalla catena"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "Seleziona l'elemento precedente della catena"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "Seleziona il successivo elemento della catena"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "invia il messaggio attraverso una catena di remailer mixmaster"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "fai una copia decodificata e cancellalo"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "fai una copia decodificata"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "cancella la/le passphrase dalla memoria"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "estra le chiavi pubbliche PGP"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "mostra le opzioni S/MIME"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr "Overflow intero.-- impossibile allocare memoria!"
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Memoria esaurita!"
 
@@ -2556,12 +3151,13 @@ msgstr ""
 "sotto certe condizioni; scrivere `mutt -vv' per i dettagli.\n"
 
 #: main.c:61
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2616,6 +3212,7 @@ msgid ""
 "[...]\n"
 "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
 "       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
 "[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
@@ -2626,6 +3223,47 @@ msgid ""
 "  -a <file>\tattach a file to the message\n"
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"uso: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <tipo> ] [ -f <file> ]\n"
+"····· ·mutt·[·-nR·]·[·-e·<cmd>·]·[·-F·<file>·]·-Q·<query>·[·-Q·<query>·]·"
+"[...]\n"
+"·······mutt·[·-nR·]·[·-e·<cmd>·]·[·-F·<file>·]·-A·<alias>·[·-A·<alias>·]·"
+"[...]\n"
+"·······mutt·[·-nx·]·[·-e·<cmd>·]·[·-a·<file>·]·[·-F·<file>·]·[·-H·<file>·]·"
+"[·-i·<file>·]·[·-s·<subj>·]·[·-b·<indir>·]·[·-c·<indir>·]·<indir>·[·...·]\n"
+"·······mutt·[·-n·]·[·-e·<cmd>·]·[·-F·<file>·]·-p\n"
+"·······mutt·-v[v]\n"
+"\n"
+"opzioni\n"
+"  -A <alias>\tespande l'alias indicato\n"
+"  -a <file>\tallega un file al messaggio\n"
+"  -b <indir>\tindirizzo in blind carbon copy (BCC)\n"
+"  -c <indir>\tindirizzo in carbon copy (CC)\n"
+"  -e <cmd>\tcomando da eseguire dopo l'inizializzazione\n"
+"  -f <file>\tquale mailbox leggere\n"
+"  -F <file>\tun file muttrc alternativo\n"
+"  -H <file>\tun file di esempio da cui leggere gli header\n"
+"  -i <file>\tun file che mutt dovrebbe includere nella risposta\n"
+"  -m <tipo>\til tipo di mailbox predefinita\n"
+"  -n\t\tdisabilita la lettura del Muttrc di sistema\n"
+"  -p\t\trichiama un messaggio rimandato\n"
+"  -R\t\tapri la mailbox in sola lettura\n"
+"  -s <sogg>\tspecifica il Subject (deve essere tra apici se ha spazi)\n"
+"  -v\t\tmostra la versione e le definizioni della compilazione\n"
+"  -x\t\tsimula la modalità invio di mailx\n"
+"  -y\t\tseleziona una mailbox specificata nella lista `mailboxes'\n"
+"  -z\t\tesce immediatamente se non ci sono messaggi nella mailbox\n"
+"  -Z\t\tapre il primo folder con un nuovo messaggio, esce se non ce ne sono\n"
+"  -h\t\tquesto messaggio di aiuto"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
+#, fuzzy
+msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2676,7 +3314,7 @@ msgstr ""
 "  -Z\t\tapre il primo folder con un nuovo messaggio, esce se non ce ne sono\n"
 "  -h\t\tquesto messaggio di aiuto"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2684,47 +3322,47 @@ msgstr ""
 "\n"
 "Opzioni di compilazione:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Errore nell'inizializzazione del terminale."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Debugging al livello %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG non è stato definito durante la compilazione.  Ignorato.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s non esiste. Lo creo?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Impossibile creare %s: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Nessun destinatario specificato.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: impossibile allegare il file.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Nessuna mailbox con nuova posta."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Non è stata definita una mailbox di ingresso."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "La mailbox è vuota."
 
@@ -2741,11 +3379,11 @@ msgstr "La mailbox 
 msgid "Mailbox was corrupted!"
 msgstr "La mailbox è stata rovinata!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Errore fatale!  Impossibile riaprire la mailbox!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Impossibile bloccare la mailbox."
 
@@ -2753,11 +3391,11 @@ msgstr "Impossibile bloccare la mailbox."
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "sync: mbox modified, but no modified messages! (segnala questo bug)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Scrivo i messaggi... %d (%d%%)"
@@ -2765,186 +3403,148 @@ msgstr "Scrivo i messaggi... %d (%d%%)"
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "Applico i cambiamenti..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Scrittura fallita!  Salvo la mailbox parziale in %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Impossibile riaprire la mailbox!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Riapro la mailbox..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Salta a: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Numero dell'indice non valido."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Nessuna voce."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Non puoi spostarti più in basso."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Non puoi spostarti più in alto."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Sei all'ultima pagina."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Sei alla prima pagina."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "La prima voce è questa."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "L'ultima voce è questa."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Sei all'ultima voce."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Sei alla prima voce."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Cerca: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Cerca all'indietro: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Nessun modello di ricerca."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Non trovato."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "Nessuna voce segnata."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "In questo menù la ricerca non è stata implementata."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "I salti non sono implementati per i dialog."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Non è possibile segnare un messaggio."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Leggo %s... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message():·impossibile impostare l'orario del file"
 
-#: muttlib.c:846
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Il file è una directory, salvo lì dentro? [(s)ì, (n)o, (t)utti]"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr "yna"
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "Il file è una directory, salvo lì dentro?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "File nella directory: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Il file esiste, lo s(o)vrascrivo, (a)ccodo, o (c)ancello l'operazione?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "oac"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Impossibile salvare il messaggio nella mailbox POP."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s non è una mailbox!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Accodo i messaggi a %s?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "Connessione a %s chiusa."
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL non è disponibile."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "Comando di preconnessione fallito."
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Errore parlando a %s (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "L'IDN \"%s\" non è valido."
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "Cerco %s..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Impossibile trovare l'host \"%s\"."
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Mi connetto a %s..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Impossibile connettersi a %s (%s)."
@@ -2976,7 +3576,8 @@ msgstr "errore di I/O"
 msgid "SSL failed: %s"
 msgstr "SSL fallito: %s"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Impossibile ottenere il certificato dal peer"
 
@@ -2985,87 +3586,207 @@ msgstr "Impossibile ottenere il certificato dal peer"
 msgid "SSL connection using %s (%s)"
 msgstr "Connessione SSL con %s (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[impossibile da calcolare]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[data non valida]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "Il certificato del server non è ancora valido"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "Il certificato del server è scaduto"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Questo certificato appartiene a:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Questo certificato è stato emesso da:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Questo certificato è valido"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "    da %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "    a %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Fingerprint: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "Controllo del certificato SSL"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)ifiuta, accetta questa v(o)lta, (a)ccetta sempre"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "roa"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)ifiuta, accetta questa v(o)lta"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "ro"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Esci  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Attenzione: impossibile salvare il certificato"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Certificato salvato"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "Connessione SSL con %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Certificato salvato"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Errore nell'inizializzazione del terminale."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Fingerprint: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Fingerprint: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Il certificato del server non è ancora valido"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Il certificato del server è scaduto"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Il certificato del server è scaduto"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "Il certificato del server non è ancora valido"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "Controllo del certificato SSL"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Mi connetto a %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Errore parlando a %s (%s)"
+
+#: muttlib.c:910
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "Il file è una directory, salvo lì dentro? [(s)ì, (n)o, (t)utti]"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr "yna"
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "Il file è una directory, salvo lì dentro?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "File nella directory: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Il file esiste, lo s(o)vrascrivo, (a)ccodo, o (c)ancello l'operazione?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "oac"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Impossibile salvare il messaggio nella mailbox POP."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Accodo i messaggi a %s?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s non è una mailbox!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3143,7 +3864,7 @@ msgstr "La mailbox non 
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d tenuti, %d spostati, %d cancellati."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d tenuti, %d cancellati."
@@ -3162,15 +3883,15 @@ msgstr "Usa 'toggle-write' per riabilitare la scrittura!"
 msgid "Mailbox is marked unwritable. %s"
 msgstr "La mailbox è indicata non scrivibile. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "Effettuato il checkpoint della mailbox."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Impossibile scrivere il messaggio"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr "Overflow intero -- impossibile allocare memoria."
 
@@ -3178,48 +3899,48 @@ msgstr "Overflow intero -- impossibile allocare memoria."
 msgid "Not available in this menu."
 msgstr "Non disponibile in questo menù."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "PgPrec"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "PgSucc"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Vedi Allegato"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Succ"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Il messaggio finisce qui."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "L'inizio del messaggio è questo."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Cerca all'indietro: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Cerca: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "L'help è questo."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "Non c'è altro testo citato."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Non c'è altro testo non citato dopo quello citato."
 
@@ -3286,27 +4007,27 @@ msgstr "modello vuoto"
 msgid "error: unknown op %d (report this error)."
 msgstr "errore: unknown op %d (segnala questo errore)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Compilo il modello da cercare..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Eseguo il comando sui messaggi corrispondenti..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "Nessun messaggio corrisponde al criterio."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "La ricerca è arrivata in fondo senza trovare una corrispondenza"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "La ricerca è arrivata all'inizio senza trovare una corrispondenza"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Ricerca interrotta."
 
@@ -3318,11 +4039,11 @@ msgstr "Inserisci la passphrase di PGP:"
 msgid "PGP passphrase forgotten."
 msgstr "Passphrase di PGP dimenticata."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Errore: impossibile creare il sottoprocesso PGP --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3330,47 +4051,22 @@ msgstr ""
 "[-- Fine dell'output di PGP --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr "[-- INIZIO DEL MESSAGGIO DI PGP --]\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- INIZIO DEL BLOCCO DELLA CHIAVE PUBBLICA --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr "[-- INIZIO DEL MESSAGGIO FIRMATO CON PGP --]\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- FINE DEL MESSAGGIO DI PGP --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- FINE DEL BLOCCO DELLA CHIAVE PUBBLICA --]\n"
-
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- FINE DEL MESSAGGIO FIRMATO CON PGP --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "Impossibile copiare il messaggio"
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Errore: impossibile trovare l'inizio del messaggio di PGP! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "Firma PGP verificata con successo."
 
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Errore interno. Informa <roessler@does-not-exist.org>."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3378,70 +4074,38 @@ msgstr ""
 "[-- Errore: non è stato possibile creare un sottoprocesso PGP! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Errore: impossibile trovare l'inizio del messaggio di PGP! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Errore: impossibile creare il file temporaneo! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr "[-- I seguenti dati sono cifrati con PGP/MIME  --]\n"
-
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Fine dei dati cifrati con PGP/MIME  --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "Decifratura fallita."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "Impossibile aprire il sottoprocesso PGP!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "Uso il keyID \"%s\" per %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Inserisci il keyID per %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "Impossibile eseguire PGP"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr ""
 "PGP: cifra(e), firma(s), firma (c)ome, entram(b)i, in l(i)nea, (a)nnullare? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1499
+#: pgp.c:1543
 #, fuzzy
 msgid "esabifc"
 msgstr "escbia"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Firma come: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "Prendo la chiave PGP..."
@@ -3450,16 +4114,6 @@ msgstr "Prendo la chiave PGP..."
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Tutte le chiavi corrispondenti sono scadute, revocate o disattivate."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Seleziona  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Controlla la chiave  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3474,40 +4128,6 @@ msgstr "Chiavi PGP corrispondenti a \"%s\"."
 msgid "Can't open /dev/null"
 msgstr "Impossibile aprire /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Impossibile creare il file temporaneo"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Key ID: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Questa chiave non può essere usata: è scaduta/disabilitata/revocata."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "L'ID è scaduto/disabilitato/revocato."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "L'ID ha validità indefinita."
-
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "L'ID non è valido."
-
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "L'ID è solo marginalmente valido."
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Vuoi veramente usare questa chiave?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Inserisci il key ID: "
@@ -3521,11 +4141,6 @@ msgstr "Eseguo PGP..."
 msgid "PGP Key %s."
 msgstr "Chiave PGP %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Cerco chiavi corrispondenti a \"%s\"..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3583,7 +4198,7 @@ msgstr "Errore durante la scrittura della mailbox!"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d messaggi letti su %d]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "Il server ha chiuso la connessione!"
 
@@ -3613,15 +4228,15 @@ msgstr "Impossibile lasciare i messaggi sul server."
 msgid "Error connecting to server: %s"
 msgstr "Errore nella connessione al server: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "Chiudo la connessione al server POP..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Verifica degli indici dei messaggi..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Connessione persa. Mi riconnetto al server POP?"
 
@@ -3995,35 +4610,35 @@ msgstr "Messaggio spedito."
 msgid "Sending in background."
 msgstr "Invio in background."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "No boundary parameter found! [segnala questo errore]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s non esiste più!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s non è un file regolare."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "Impossibile aprire %s"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Errore nella spedizione del messaggio, il figlio è uscito con %d (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Output del processo di consegna"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "Trovato l'IDN %s non valido preparando l'header resent-from"
@@ -4140,7 +4755,7 @@ msgstr "Impossibile aprire il sottoprocesso di OpenSSL!"
 msgid "No output from OpenSSL..."
 msgstr "Nessun output da OpenSSL..."
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4148,19 +4763,19 @@ msgstr ""
 "[-- Fine dell'output di OpenSSL --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Errore: impossibile creare il sottoprocesso di OpenSSL! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- I seguenti dati sono cifrati con S/MIME --]\n"
 
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- I seguenti dati sono firmati con S/MIME --]\n"
 
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4168,7 +4783,7 @@ msgstr ""
 "\n"
 "[-- Fine dei dati cifrati con S/MIME --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4176,7 +4791,7 @@ msgstr ""
 "\n"
 "[-- Fine dei dati firmati com S/MIME. --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
@@ -4184,22 +4799,22 @@ msgstr ""
 "S/MIME: cifra(e), firma(s), firma c(o)n, firma (c)ome, entram(b)i, (a)"
 "nnullare? "
 
-#: smime.c:1936
+#: smime.c:1945
 #, fuzzy
 msgid "eswabfc"
 msgstr "esocba"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 "1: DES, 2: Triplo DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (a)nnullare? "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345a"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
@@ -4224,6 +4839,12 @@ msgstr "Il messaggio padre non 
 msgid "Parent message is not available."
 msgstr "Il messaggio padre non è disponibile."
 
+#~ msgid "Unexpected response received from server: %s"
+#~ msgstr "È stata ricevuta dal server una risposta inattesa: %s"
+
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Impossibile accodare alle mailbox IMAP di questo server"
+
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "Creare un messaggio PGP tradizionale (inline)?"
 
diff --git a/po/ja.po b/po/ja.po
index 136962a27..90b54b767 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.5.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2004-08-30 14:00+0900\n"
 "Last-Translator: Tamotsu TAKAHASHI <tamo@momonga-linux.org>\n"
 "Language-Team: mutt-j <mutt-j@ribbon.or.jp>\n"
@@ -16,26 +16,26 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "%s ¤Î¥æ¡¼¥¶Ì¾: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s ¤Î¥Ñ¥¹¥ï¡¼¥É: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Ìá¤ë"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "ºï½ü"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "ºï½ü¤ò²ò½ü"
 
@@ -44,9 +44,9 @@ msgid "Select"
 msgstr "ÁªÂò"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "¥Ø¥ë¥×"
 
@@ -98,170 +98,170 @@ msgstr "
 msgid "Alias added."
 msgstr "ÊÌ̾¤òÄɲä·¤¿¡£"
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "̾Á°¤Î¥Æ¥ó¥×¥ì¡¼¥È¤Ë°ìÃפµ¤»¤é¤ì¤Ê¤¤¡£Â³¹Ô?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap ÊÔ½¸¥¨¥ó¥È¥ê¤Ë %%s ¤¬É¬Í×"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "\"%s\" ¼Â¹Ô¥¨¥é¡¼!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "¥Ø¥Ã¥À²òÀϤΤ¿¤á¤Î¥Õ¥¡¥¤¥ë¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¡£"
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "¥Ø¥Ã¥Àºï½ü¤Î¤¿¤á¤Î¥Õ¥¡¥¤¥ë¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¡£"
 
-#: attach.c:183
+#: attach.c:184
 msgid "Failure to rename file."
 msgstr "¥Õ¥¡¥¤¥ë¤Î¥ê¥Í¡¼¥à (°ÜÆ°) ¤Ë¼ºÇÔ¡£"
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "%s ¤Î¤¿¤á¤Î mailcap ÊÔ½¸¥¨¥ó¥È¥ê¤¬¤Ê¤¤¤Î¤Ç¶õ¥Õ¥¡¥¤¥ë¤òºîÀ®¡£"
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Mailcap ÊÔ½¸¥¨¥ó¥È¥ê¤Ë¤Ï %%s ¤¬É¬Í×"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "%s ¤Î¤¿¤á¤Î mailcap ÊÔ½¸¥¨¥ó¥È¥ê¤¬¤Ê¤¤"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "mailcap ¤Ë°ìÃ×¥¨¥ó¥È¥ê¤¬¤Ê¤¤¡£¥Æ¥­¥¹¥È¤È¤·¤Æɽ¼¨Ãæ¡£"
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME ·Á¼°¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¡£ÅºÉÕ¥Õ¥¡¥¤¥ë¤òɽ¼¨¤Ç¤­¤Ê¤¤¡£"
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "¥Õ¥£¥ë¥¿¤òºîÀ®¤Ç¤­¤Ê¤¤"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "¥Õ¥£¥ë¥¿¤òºîÀ®¤Ç¤­¤Ê¤¤"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "½ñ¤­¹þ¤ß¼ºÇÔ!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "¤É¤Î¤è¤¦¤Ë°õºþ¤¹¤ë¤«ÉÔÌÀ!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "¥Ç¥£¥ì¥¯¥È¥êÊѹ¹"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "¥Þ¥¹¥¯"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤Ê¤¤¡£"
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "¹ØÆÉ [%s], ¥Õ¥¡¥¤¥ë¥Þ¥¹¥¯: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê [%s], ¥Õ¥¡¥¤¥ë¥Þ¥¹¥¯: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÏźÉդǤ­¤Ê¤¤!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "¥Õ¥¡¥¤¥ë¥Þ¥¹¥¯¤Ë°ìÃפ¹¤ë¥Õ¥¡¥¤¥ë¤¬¤Ê¤¤"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "ºîÀ®µ¡Ç½¤Ï IMAP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¤ß¤Î¥µ¥Ý¡¼¥È"
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "ºîÀ®µ¡Ç½¤Ï IMAP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¤ß¤Î¥µ¥Ý¡¼¥È"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "ºï½üµ¡Ç½¤Ï IMAP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¤ß¤Î¥µ¥Ý¡¼¥È"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "ËÜÅö¤Ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ \"%s\" ¤òºï½ü?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ïºï½ü¤µ¤ì¤¿¡£"
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ïºï½ü¤µ¤ì¤Ê¤«¤Ã¤¿¡£"
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "¥Ç¥£¥ì¥¯¥È¥êÊѹ¹Àè: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î¥¹¥­¥ã¥ó¥¨¥é¡¼¡£"
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "¥Õ¥¡¥¤¥ë¥Þ¥¹¥¯: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "µÕ½ç¤ÎÀ°Îó (d:ÆüÉÕ, a:ABC½ç, z:¥µ¥¤¥º, n:À°Î󤷤ʤ¤)"
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "À°Îó (d:ÆüÉÕ, a:ABC½ç, z:¥µ¥¤¥º, n:À°Î󤷤ʤ¤)"
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "dazn"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "¿·µ¬¥Õ¥¡¥¤¥ë̾: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Ï±ÜÍ÷¤Ç¤­¤Ê¤¤"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "¥Õ¥¡¥¤¥ë±ÜÍ÷¥¨¥é¡¼"
 
@@ -328,7 +328,7 @@ msgstr "
 msgid "Verify PGP signature?"
 msgstr "PGP ½ð̾¤ò¸¡¾Ú?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿!"
 
@@ -340,114 +340,114 @@ msgstr "ɽ
 msgid "Could not copy message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥³¥Ô¡¼¤Ç¤­¤Ê¤«¤Ã¤¿"
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "S/MIME ½ð̾¤Î¸¡¾Ú¤ËÀ®¸ù¤·¤¿¡£"
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "S/MIME ¾ÚÌÀ½ñ½êÍ­¼Ô¤¬Á÷¿®¼Ô¤Ë°ìÃפ·¤Ê¤¤¡£"
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr "·Ù¹ð: ¥á¥Ã¥»¡¼¥¸¤Î°ìÉô¤Ï½ð̾¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "S/MIME ½ð̾¤Ï¸¡¾Ú¤Ç¤­¤Ê¤«¤Ã¤¿¡£"
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "PGP ½ð̾¤Î¸¡¾Ú¤ËÀ®¸ù¤·¤¿¡£"
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "PGP ½ð̾¤Ï¸¡¾Ú¤Ç¤­¤Ê¤«¤Ã¤¿¡£"
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "¥³¥Þ¥ó¥É: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "¥á¥Ã¥»¡¼¥¸¤ÎºÆÁ÷Àè: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤ÎºÆÁ÷Àè: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "¥¢¥É¥ì¥¹²òÀÏ¥¨¥é¡¼!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "ÉÔÀµ¤Ê IDN: '%s'"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "%s ¤Ø¥á¥Ã¥»¡¼¥¸ºÆÁ÷"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "%s ¤Ø¥á¥Ã¥»¡¼¥¸ºÆÁ÷"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "¥á¥Ã¥»¡¼¥¸¤ÏºÆÁ÷¤µ¤ì¤Ê¤«¤Ã¤¿¡£"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "¥á¥Ã¥»¡¼¥¸¤ÏºÆÁ÷¤µ¤ì¤Ê¤«¤Ã¤¿¡£"
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "¥á¥Ã¥»¡¼¥¸¤òºÆÁ÷¤·¤¿¡£"
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "¥á¥Ã¥»¡¼¥¸¤òºÆÁ÷¤·¤¿¡£"
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "¥Õ¥£¥ë¥¿¥×¥í¥»¥¹¤òºîÀ®¤Ç¤­¤Ê¤¤"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "¥³¥Þ¥ó¥É¤Ø¤Î¥Ñ¥¤¥×: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "°õºþ¥³¥Þ¥ó¥É¤¬Ì¤ÄêµÁ¡£"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò°õºþ?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤ò°õºþ?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ï°õºþ¤µ¤ì¤¿"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ï°õºþ¤µ¤ì¤¿"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ï°õºþ¤Ç¤­¤Ê¤«¤Ã¤¿"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ï°õºþ¤Ç¤­¤Ê¤«¤Ã¤¿"
 
-#: commands.c:508
+#: commands.c:509
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
@@ -455,80 +455,80 @@ msgstr ""
 "µÕ½çÀ°Îó (d:»þ f:Á÷¼Ô r:Ãå½ç s:Âê o:°¸Àè t:¥¹¥ì u:̵ z:¥µ¥¤¥º c:ÆÀÅÀ p:¥¹¥Ñ"
 "¥à)"
 
-#: commands.c:509
+#: commands.c:510
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
 "À°Îó (d:»þ f:Á÷¼Ô r:Ãå½ç s:Âê o:°¸Àè t:¥¹¥ì u:̵ z:¥µ¥¤¥º c:ÆÀÅÀ p:¥¹¥Ñ¥à)"
 
-#: commands.c:510
+#: commands.c:511
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzcp"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "¥·¥§¥ë¥³¥Þ¥ó¥É: "
 
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¥Ç¥³¡¼¥É¤·¤ÆÊݸ"
 
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¥Ç¥³¡¼¥É¤·¤Æ¥³¥Ô¡¼"
 
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ËÉü¹æ²½¤·¤ÆÊݸ"
 
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ËÉü¹æ²½¤·¤Æ¥³¥Ô¡¼"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ËÊݸ"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¥³¥Ô¡¼"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤ò"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "%s ¤Ë¥³¥Ô¡¼Ãæ..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Á÷¿®»þ¤Ë %s ¤ËÊÑ´¹?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type¤ò %s ¤ËÊѹ¹¤·¤¿¡£"
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "ʸ»ú¥»¥Ã¥È¤ò %s ¤ËÊѹ¹¤·¤¿; %s¡£"
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "ÊÑ´¹¤Ê¤·"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "ÊÑ´¹¤¢¤ê"
 
@@ -620,104 +620,670 @@ msgstr "\"%s\" 
 msgid "Attaching selected files..."
 msgstr "ÁªÂò¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤òźÉÕÃæ..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "%s ¤ÏźÉդǤ­¤Ê¤¤!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Ãæ¤Î¥á¥Ã¥»¡¼¥¸¤òźÉÕ¤¹¤ë¤¿¤á¤Ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò¥ª¡¼¥×¥ó"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "¤½¤Î¥Õ¥©¥ë¥À¤Ë¤Ï¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "źÉÕ¤·¤¿¤¤¥á¥Ã¥»¡¼¥¸¤Ë¥¿¥°¤òÉÕ¤±¤è!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "źÉդǤ­¤Ê¤¤!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "¥³¡¼¥ÉÊÑ´¹¤Ï¥Æ¥­¥¹¥È·¿ÅºÉÕ¥Õ¥¡¥¤¥ë¤Ë¤Î¤ßÍ­¸ú¡£"
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "¸½ºß¤ÎźÉÕ¥Õ¥¡¥¤¥ë¤ÏÊÑ´¹¤µ¤ì¤Ê¤¤¡£"
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "¸½ºß¤ÎźÉÕ¥Õ¥¡¥¤¥ë¤ÏÊÑ´¹¤µ¤ì¤ë¡£"
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "ÉÔÀµ¤Ê¥¨¥ó¥³¡¼¥ÉË¡¡£"
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Î¥³¥Ô¡¼¤òÊݸ?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "¥ê¥Í¡¼¥à (°ÜÆ°) Àè: "
 
 # system call ¤Î stat() ¤ò¡Ö°À­Ä´ºº¡×¤ÈÌõ¤·¤Æ¤¤¤ë
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "%s ¤ò°À­Ä´ºº¤Ç¤­¤Ê¤¤: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "¿·µ¬¥Õ¥¡¥¤¥ë: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type ¤Ï base/sub ¤È¤¤¤¦·Á¼°¤Ë¤¹¤ë¤³¤È"
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "%s ¤ÏÉÔÌÀ¤Ê Content-Type"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Ê¤¤"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "¤Ä¤Þ¤êźÉÕ¥Õ¥¡¥¤¥ë¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤¿¤È¤¤¤¦¤³¤È¤À"
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ò½ñ¤­¤«¤±¤ÇÊÝα?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë½ñ¤­¹þ¤à"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò %s ¤Ë½ñ¤­¹þ¤ßÃæ..."
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ï½ñ¤­¹þ¤Þ¤ì¤¿¡£"
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "S/MIME ¤¬´û¤ËÁªÂò¤µ¤ì¤Æ¤¤¤ë¡£²ò½ü¤·¤Æ·Ñ³?"
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP ¤¬´û¤ËÁªÂò¤µ¤ì¤Æ¤¤¤ë¡£²ò½ü¤·¤Æ·Ñ³?"
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+
+#: crypt-gpgme.c:993
+#, fuzzy
+msgid "Warning: One of the keys has been revoked\n"
+msgstr "·Ù¹ð: ¥á¥Ã¥»¡¼¥¸¤Î°ìÉô¤Ï½ð̾¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL ¤¬ÍøÍѤǤ­¤Ê¤¤¡£"
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "¥á¥Ã¥»¡¼¥¸Á÷¿®¥¨¥é¡¼¡£"
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥¨¥é¡¼: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- ½ð̾¥Ç¡¼¥¿½ªÎ» --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- ¥¨¥é¡¼: °ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP ¥á¥Ã¥»¡¼¥¸³«»Ï --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP ¸ø³«¸°¥Ö¥í¥Ã¥¯³«»Ï --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP ½ð̾¥á¥Ã¥»¡¼¥¸³«»Ï --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- PGP¥á¥Ã¥»¡¼¥¸½ªÎ» --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP ¸ø³«¸°¥Ö¥í¥Ã¥¯½ªÎ» --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- PGP ½ð̾¥á¥Ã¥»¡¼¥¸½ªÎ» --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- ¥¨¥é¡¼: PGP ¥á¥Ã¥»¡¼¥¸¤Î³«»ÏÅÀ¤òȯ¸«¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- ¥¨¥é¡¼: ÉÔÀµ¤Ê·Á¼°¤Î PGP/MIME ¥á¥Ã¥»¡¼¥¸! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- ¥¨¥é¡¼: °ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï PGP/MIME ¤Ç°Å¹æ²½¤µ¤ì¤Æ¤¤¤ë --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï PGP/MIME ¤Ç°Å¹æ²½¤µ¤ì¤Æ¤¤¤ë --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- PGP/MIME °Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- PGP/MIME °Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr "[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï S/MIME ¤Ç½ð̾¤µ¤ì¤Æ¤¤¤ë --]\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr "[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï S/MIME ¤Ç°Å¹æ²½¤µ¤ì¤Æ¤¤¤ë --]\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- S/MIME ½ð̾¥Ç¡¼¥¿½ªÎ» --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- S/MIME °Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+# ÉÔÀµ¤è¤êÉÔ¿®¤«¡©
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "ÉÔÀµ      "
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "%s ¤ÏÉÔÀµ¤Ê·î"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "%s ¤ÏÉÔÀµ¤Ê·î"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "°Å¹æ²½"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "¾ÚÌÀ½ñ¤òÊݸ¤·¤¿"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "¸° ID: 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "ÇÑ´þºÑ¤ß  "
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "´ü¸ÂÀÚ¤ì  "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤¤"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "%s ¤ËÀܳÃæ..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "¥µ¡¼¥Ð %s ¤Ø¤ÎÀܳ¥¨¥é¡¼¡£"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "¸° ID: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "SSL ¤Ï %s ¤Ç¼ºÇÔ¡£"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "°ìÃפ·¤¿¸°¤Ï¤¹¤Ù¤Æ´ü¸ÂÀڤ줫ÇÑ´þºÑ¤ß¡¢¤Þ¤¿¤Ï»ÈÍѶػߡ£"
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "½ªÎ»  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "ÁªÂò  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "PGP ¸°¸¡ºº  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP ¸°¤Ï \"%s\" ¤Ë°ìÃס£"
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP ¸°¤Ï \"%s\" ¤Ë°ìÃס£"
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "S/MIME ¾ÚÌÀ½ñ¤Ï \"%s\" ¤Ë°ìÃס£"
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP ¸°¤Ï \"%s\" ¤Ë°ìÃס£"
+
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "¤³¤Î¸°¤Ï´ü¸ÂÀڤ줫»ÈÍÑÉԲĤ«ÇÑ´þºÑ¤ß¤Î¤¿¤á¡¢»È¤¨¤Ê¤¤¡£"
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "ID ¤Ï´ü¸ÂÀڤ줫»ÈÍÑÉԲĤ«ÇÑ´þºÑ¤ß¡£"
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "ID ¤Ï¿®ÍÑÅÙ¤¬Ì¤ÄêµÁ¡£"
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "ID ¤Ï¿®ÍѤµ¤ì¤Æ¤¤¤Ê¤¤¡£"
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "ID ¤Ï¤«¤í¤¦¤¸¤Æ¿®ÍѤµ¤ì¤Æ¤¤¤ë¡£"
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s ËÜÅö¤Ë¤³¤Î¸°¤ò»ÈÍÑ?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "\"%s\" ¤Ë°ìÃפ¹¤ë¸°¤ò¸¡º÷Ãæ..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "¸° ID = \"%s\" ¤ò %s ¤Ë»È¤¦?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "%s ¤Î¸° ID ÆþÎÏ: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr "PGP e:°Å¹æ²½, s:½ð̾, a:½ð̾¸°ÁªÂò, b:°Å¹æ+½ð̾, %s, c:¤Ê¤· "
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "eswabfc"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr "PGP e:°Å¹æ²½, s:½ð̾, a:½ð̾¸°ÁªÂò, b:°Å¹æ+½ð̾, %s, c:¤Ê¤· "
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "eswabfc"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "½ð̾¤Ë»È¤¦¸°: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "¥Ø¥Ã¥À²òÀϤΤ¿¤á¤Î¥Õ¥¡¥¤¥ë¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¡£"
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -733,29 +1299,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¹¤Ù¤Æ¥á¥â¥ê¤«¤é¾Ãµî¤µ¤ì¤¿¡£"
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "PGP µ¯Æ°Ãæ..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥¤¥ó¥é¥¤¥ó¤ÇÁ÷¿®¤Ç¤­¤Ê¤¤¡£PGP/MIME ¤ò»È¤¦?"
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "¥á¡¼¥ë¤ÏÁ÷¿®¤µ¤ì¤Ê¤«¤Ã¤¿¡£"
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "ÆâÍÆ¥Ò¥ó¥È¤Î¤Ê¤¤ S/MIME ¥á¥Ã¥»¡¼¥¸¤Ï̤¥µ¥Ý¡¼¥È¡£"
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "PGP ¸°¤ÎŸ³«¤ò»î¹ÔÃæ...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "S/MIME ¾ÚÌÀ½ñ¤ÎŸ³«¤ò»î¹ÔÃæ...\n"
 
@@ -767,7 +1333,7 @@ msgstr ""
 "[-- ¥¨¥é¡¼: multipart/signed ¹½Â¤¤¬Ì·½â¤·¤Æ¤¤¤ë! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -776,7 +1342,7 @@ msgstr ""
 "[-- ¥¨¥é¡¼: ÉÔÌÀ¤Ê multipart/signed ¥×¥í¥È¥³¥ë %s! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -786,7 +1352,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -794,7 +1360,7 @@ msgstr ""
 "[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï½ð̾¤µ¤ì¤Æ¤¤¤ë --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -802,7 +1368,7 @@ msgstr ""
 "[-- ·Ù¹ð: °ì¤Ä¤â½ð̾¤ò¸¡½Ð¤Ç¤­¤Ê¤«¤Ã¤¿ --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -810,226 +1376,256 @@ msgstr ""
 "\n"
 "[-- ½ð̾¥Ç¡¼¥¿½ªÎ» --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "PGP µ¯Æ°Ãæ..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "yes"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "no"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Mutt ¤òÈ´¤±¤ë?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "³¤±¤ë¤Ë¤Ï²¿¤«¥­¡¼¤ò..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr "('?' ¤Ç°ìÍ÷): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "³«¤¤¤Æ¤¤¤ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¤Ê¤¤¡£"
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÏÆɤ߽Ф·ÀìÍÑ¡£"
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "¤³¤Îµ¡Ç½¤Ï¥á¥Ã¥»¡¼¥¸ÅºÉե⡼¥É¤Ç¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "²Ä»ë¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Æɤ߽Ф·ÀìÍѥ᡼¥ë¥Ü¥Ã¥¯¥¹¤Ç¤ÏÊѹ¹¤Î½ñ¤­¹þ¤ß¤òÀÚÂؤǤ­¤Ê¤¤!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "¥Õ¥©¥ë¥Àæ½Ð»þ¤Ë¥Õ¥©¥ë¥À¤Ø¤ÎÊѹ¹¤¬½ñ¤­¹þ¤Þ¤ì¤ë¡£"
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "¥Õ¥©¥ë¥À¤Ø¤ÎÊѹ¹¤Ï½ñ¤­¹þ¤Þ¤ì¤Ê¤¤¡£"
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "̾ȧ"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Êݸ"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "¥á¡¼¥ë"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "ÊÖ¿®"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Á´°÷¤ËÊÖ¿®"
 
 # ¡ÖÉÔÀµ¤Ê²ÄǽÀ­¤¢¤ê¡×¤À¤È½ÅÂç¤Ê¤³¤È¤Î¤è¤¦¤Ë»×¤¨¤Æ¤·¤Þ¤¦¤Î¤ÇÊѹ¹¤·¤¿¡£
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬³°Éô¤«¤éÊѹ¹¤µ¤ì¤¿¡£¥Õ¥é¥°¤¬Àµ³Î¤Ç¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤¡£"
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "¤³¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¿·Ãå¥á¡¼¥ë¡£"
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬³°Éô¤«¤éÊѹ¹¤µ¤ì¤¿¡£"
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 msgid "Nothing to do."
 msgstr "²¿¤â¤·¤Ê¤¤¡£"
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "¥á¥Ã¥»¡¼¥¸ÈÖ¹æ¤ò»ØÄê: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "°ú¿ô¤Ï¥á¥Ã¥»¡¼¥¸ÈÖ¹æ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£"
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "¤½¤Î¥á¥Ã¥»¡¼¥¸¤Ï²Ä»ë¤Ç¤Ï¤Ê¤¤¡£"
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "ÉÔÀµ¤Ê¥á¥Ã¥»¡¼¥¸Èֹ档"
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "¥á¥Ã¥»¡¼¥¸¤òºï½ü¤¹¤ë¤¿¤á¤Î¥Ñ¥¿¡¼¥ó: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "¸½ºßÍ­¸ú¤ÊÀ©¸Â¥Ñ¥¿¡¼¥ó¤Ï¤Ê¤¤¡£"
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "À©¸Â¥Ñ¥¿¡¼¥ó: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "¥á¥Ã¥»¡¼¥¸¤Îɽ¼¨¤òÀ©¸Â¤¹¤ë¥Ñ¥¿¡¼¥ó: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Mutt ¤òÃæ»ß?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ë¥¿¥°¤òÉÕ¤±¤ë¤¿¤á¤Î¥Ñ¥¿¡¼¥ó: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "¥á¥Ã¥»¡¼¥¸¤Îºï½ü¤ò²ò½ü¤¹¤ë¤¿¤á¤Î¥Ñ¥¿¡¼¥ó: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î¥¿¥°¤ò³°¤¹¤¿¤á¤Î¥Ñ¥¿¡¼¥ó: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Æɤ߽Ф·ÀìÍѥ⡼¥É¤Ç¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò¥ª¡¼¥×¥ó"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò¥ª¡¼¥×¥ó"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s ¤Ï¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ç¤Ï¤Ê¤¤¡£"
 
-#: curs_main.c:1165
-msgid "Exit Mutt without saving?"
-msgstr "Êݸ¤·¤Ê¤¤¤Ç Mutt ¤òÈ´¤±¤ë?"
+#: curs_main.c:1176
+msgid "Exit Mutt without saving?"
+msgstr "Êݸ¤·¤Ê¤¤¤Ç Mutt ¤òÈ´¤±¤ë?"
+
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "¥¹¥ì¥Ã¥Éɽ¼¨¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤¤¡£"
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ò¡Ö½ñ¤­¤«¤±¡×¤Ë¤¹¤ë"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "¤¹¤Ç¤ËºÇ¸å¤Î¥á¥Ã¥»¡¼¥¸¡£"
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "̤ºï½ü¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥á¥Ã¥»¡¼¥¸¡£"
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "¸¡º÷¤Ï°ìÈÖ¾å¤ËÌá¤Ã¤¿¡£"
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "¸¡º÷¤Ï°ìÈÖ²¼¤ËÌá¤Ã¤¿¡£"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "̤ÆÉ¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤"
 
 # ÆüËܸì¤Ç¤Ï¸ì½ç¤¬°ã¤¦¤Î¤Ç¤¹ (T_T
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " (¤³¤ÎÀ©¸Âɽ¼¨¾õÂ֤ǤÏ)"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "POP ¥µ¡¼¥Ð¾å¤Ç¤Ï¡Ö½ÅÍסץե饰¤òÊѹ¹¤Ç¤­¤Ê¤¤¡£"
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "¤â¤¦¥¹¥ì¥Ã¥É¤¬¤Ê¤¤¡£"
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥¹¥ì¥Ã¥É¡£"
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "¥¹¥ì¥Ã¥Éɽ¼¨¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤¤¡£"
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "¥¹¥ì¥Ã¥ÉÃæ¤Ë̤ÆÉ¥á¥Ã¥»¡¼¥¸¤¬¤¢¤ë¡£"
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "POP ¥µ¡¼¥Ð¾å¤Ç¤Ï¥á¥Ã¥»¡¼¥¸¤òÊÔ½¸¤Ç¤­¤Ê¤¤¡£"
 
@@ -1164,79 +1760,79 @@ msgstr "
 msgid "Clear flag"
 msgstr "¥Õ¥é¥°²ò½ü"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- ¥¨¥é¡¼: ¤É¤Î Multipart/Alternative ¥Ñ¡¼¥È¤âɽ¼¨¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- źÉÕ¥Õ¥¡¥¤¥ë #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- ¥¿¥¤¥×: %s/%s, ¥¨¥ó¥³¡¼¥ÉË¡: %s, ¥µ¥¤¥º: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- %s ¤ò»È¤Ã¤¿¼«Æ°É½¼¨ --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "¼«Æ°É½¼¨¥³¥Þ¥ó¥É %s µ¯Æ°"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- %s ¤ò¼Â¹Ô¤Ç¤­¤Ê¤¤¡£ --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- %s ¤Îɸ½à¥¨¥é¡¼½ÐÎϤò¼«Æ°É½¼¨ --]\n"
 
 # ¡Ö»ØÄê¡×¤Ã¤ÆɬÍס©¤Ï¤ß¤Ç¤½¤¦¤Ê¤ó¤Ç¤¹¤±¤É
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- ¥¨¥é¡¼: message/external-body ¤Ë access-type ¥Ñ¥é¥á¡¼¥¿¤Î»ØÄ꤬¤Ê¤¤ --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- ¤³¤Î %s/%s ·Á¼°ÅºÉÕ¥Õ¥¡¥¤¥ë"
 
 # °ì¹Ô¤Ë¤ª¤µ¤Þ¤é¤Ê¤¤¤Èµ¤»ý¤Á°­¤¤¤Î¤Ç¡Ö¥µ¥¤¥º¡×¤ò¤±¤º¤Ã¤¿¤ê¤·¤¿
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(%s ¥Ð¥¤¥È)"
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "¤Ïºï½üºÑ¤ß --]\n"
 
 # ËÜÅö¤Ï¡Ö¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡Á·î¡ÁÆü¤Ëºï½üºÑ¤ß¡×¤È¤·¤¿¤¤¤Î¤À¤¬¡£
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- (%s ¤Ëºï½ü) --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- ̾Á°: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- ¤³¤Î %s/%s ·Á¼°ÅºÉÕ¥Õ¥¡¥¤¥ë¤Ï´Þ¤Þ¤ì¤Æ¤ª¤é¤º¡¢ --]\n"
 
 # °ì¹Ô¤Ë¤·¤Æ¤âÂç¾æÉפÀ¤È»×¤¦¤Î¤À¤¬¤Ê¤¡¡Ä¡Ä
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
@@ -1244,34 +1840,34 @@ msgstr ""
 "[-- ¤«¤Ä¡¢»ØÄꤵ¤ì¤¿³°Éô¤Î¥½¡¼¥¹¤Ï´ü¸Â¤¬ --]\n"
 "[-- Ëþλ¤·¤Æ¤¤¤ë¡£ --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- ¤«¤Ä¡¢»ØÄꤵ¤ì¤¿ access-type %s ¤Ï̤¥µ¥Ý¡¼¥È --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "¥¨¥é¡¼: multipart/signed ¤Ë¥×¥í¥È¥³¥ë¤¬¤Ê¤¤¡£"
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "¥¨¥é¡¼: multipart/encrypted ¤Ë¥×¥í¥È¥³¥ë¥Ñ¥é¥á¡¼¥¿¤¬¤Ê¤¤!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s ·Á¼°¤Ï̤¥µ¥Ý¡¼¥È "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(¤³¤Î¥Ñ¡¼¥È¤òɽ¼¨¤¹¤ë¤Ë¤Ï '%s' ¤ò»ÈÍÑ)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(¥­¡¼¤Ë 'view-attachments' ¤ò³ä¤êÅö¤Æ¤ëɬÍפ¬¤¢¤ë!)"
 
@@ -1378,46 +1974,46 @@ msgstr "ǧ
 msgid "SASL authentication failed."
 msgstr "SASL ǧ¾Ú¤Ë¼ºÇÔ¤·¤¿¡£"
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s ¤ÏÉÔÀµ¤Ê IMAP ¥Ñ¥¹"
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "¥Í¡¼¥à¥¹¥Ú¡¼¥¹¼èÆÀÃæ..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "¥Õ¥©¥ë¥À¥ê¥¹¥È¼èÆÀÃæ..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "¤½¤Î¤è¤¦¤Ê¥Õ¥©¥ë¥À¤Ï¤Ê¤¤"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òºîÀ®: "
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¤Ï̾Á°¤¬É¬Íס£"
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬ºîÀ®¤µ¤ì¤¿¡£"
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òºîÀ®: "
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "SSL ¤Ï %s ¤Ç¼ºÇÔ¡£"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬ºîÀ®¤µ¤ì¤¿¡£"
@@ -1429,136 +2025,133 @@ msgstr "
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Ã×̿Ū¥¨¥é¡¼¡£¥á¥Ã¥»¡¼¥¸¿ô¤¬Æ±´ü¤·¤Æ¤¤¤Ê¤¤!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "%s ¤Ø¤ÎÀܳ¤ò½ªÎ»Ãæ..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "¤³¤Î IMAP ¥µ¡¼¥Ð¤Ï¸Å¤¤¡£¤³¤ì¤Ç¤Ï Mutt ¤Ï¤¦¤Þ¤¯µ¡Ç½¤·¤Ê¤¤¡£"
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
-msgstr "¥µ¡¼¥Ð¤«¤éͽ´ü¤»¤ÌÈ¿±þ¤ò¼õ¤±¼è¤Ã¤¿: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
+msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "TLS ¤ò»È¤Ã¤¿°ÂÁ´¤ÊÀܳ?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "TLS Àܳ¤ò³ÎΩ¤Ç¤­¤Ê¤«¤Ã¤¿"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "%s ¤òÁªÂòÃæ..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¥ª¡¼¥×¥ó»þ¥¨¥é¡¼"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "¤³¤Î¥µ¡¼¥Ð¤Î IMAP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¤ÏÄɲäǤ­¤Ê¤¤"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "%s ¤òºîÀ®?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "%d ¸Ä¤Î¥á¥Ã¥»¡¼¥¸¤Ëºï½ü¤ò¥Þ¡¼¥¯Ãæ..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "ºï½ü¤Ë¼ºÇÔ¤·¤¿"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "¥á¥Ã¥»¡¼¥¸¥¹¥Æ¡¼¥¿¥¹¥Õ¥é¥°¤òÊݸÃæ... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "¥µ¡¼¥Ð¤«¤é¥á¥Ã¥»¡¼¥¸¤òºï½üÃæ..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: ºï½ü¤Ë¼ºÇÔ¤·¤¿"
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "¥¯¥í¡¼¥º¤Ë¼ºÇÔ¤·¤¿"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "ÉÔÀµ¤Ê¥á¡¼¥ë¥Ü¥Ã¥¯¥¹Ì¾"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "%s ¤Î¹ØÆɤò³«»ÏÃæ..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "%s ¤Î¹ØÆɤò¼è¤ê¾Ã¤·Ãæ..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î IMAP ¥µ¡¼¥Ð¤«¤é¤Ï¤Ø¥Ã¥À¤ò¼èÆÀ¤Ç¤­¤Ê¤¤¡£"
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "¥­¥ã¥Ã¥·¥åÆɤ߽Ф·Ãæ... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "¥á¥Ã¥»¡¼¥¸¥Ø¥Ã¥À¼èÆÀÃæ... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "¥á¥Ã¥»¡¼¥¸¼èÆÀÃæ..."
 
 # ¤³¤Î Try ¤¬Ì¿Îá¤Ç¤Ê¤±¤ì¤Ð¤è¤¤¤Î¤À¤¬¡£
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "¥á¥Ã¥»¡¼¥¸º÷°ú¤¬ÉÔÀµ¡£¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ºÆ¥ª¡¼¥×¥ó¤ò»î¤ß¤ë¡£"
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥¢¥Ã¥×¥í¡¼¥ÉÃæ..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "%d ¥á¥Ã¥»¡¼¥¸¤ò %s ¤Ë¥³¥Ô¡¼Ãæ..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "¥á¥Ã¥»¡¼¥¸ %d ¤ò %s ¤Ë¥³¥Ô¡¼Ãæ..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "·Ñ³?"
 
@@ -1567,122 +2160,122 @@ msgstr "
 msgid "Bad regexp: %s"
 msgstr "ÉÔÀµ¤ÊÀµµ¬É½¸½: %s"
 
-#: init.c:678
+#: init.c:644
 msgid "spam: no matching pattern"
 msgstr "spam: °ìÃפ¹¤ë¥Ñ¥¿¡¼¥ó¤¬¤Ê¤¤"
 
-#: init.c:680
+#: init.c:646
 msgid "nospam: no matching pattern"
 msgstr "nospam: °ìÃפ¹¤ë¥Ñ¥¿¡¼¥ó¤¬¤Ê¤¤"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias (ÊÌ̾): ¥¢¥É¥ì¥¹¤¬¤Ê¤¤"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "·Ù¹ð: ÉÔÀµ¤Ê IDN '%s' ¤¬¥¨¥¤¥ê¥¢¥¹ '%s' Ãæ¤Ë¤¢¤ë¡£\n"
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "ÉÔÀµ¤Ê¤Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s ¤ÏÉÔÌÀ¤ÊÀ°ÎóÊýË¡"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): Àµµ¬É½¸½¤Ç¥¨¥é¡¼: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s ¤ÏÉÔÌÀ¤ÊÊÑ¿ô"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "reset ¤È¶¦¤Ë»È¤¦ÀÜƬ¼­¤¬ÉÔÀµ"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "reset ¤È¶¦¤Ë»È¤¦Ãͤ¬ÉÔÀµ"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s ¤ÏÀßÄꤵ¤ì¤Æ¤¤¤ë"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s ¤Ï²ò½ü¤µ¤ì¤Æ¤¤¤ë"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s ¤ÏÉÔÀµ¤Ê¥á¡¼¥ë¥Ü¥Ã¥¯¥¹·Á¼°"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s ¤ÏÉÔÀµ¤ÊÃÍ"
 
-#: init.c:1589
+#: init.c:1555
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s ¤ÏÉÔÌÀ¤Ê¥¿¥¤¥×"
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s ¤ÏÉÔÌÀ¤Ê¥¿¥¤¥×"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "%s Ãæ¤Î %d ¹ÔÌܤǥ¨¥é¡¼: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: %s Ãæ¤Ç¥¨¥é¡¼"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: %s Ãæ¤Ë¥¨¥é¡¼¤¬Â¿¤¹¤®¤ë¤Î¤ÇÆɤ߽Ф·Ãæ»ß"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: %s ¤Ç¥¨¥é¡¼"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: °ú¿ô¤¬Â¿¤¹¤®¤ë"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: ÉÔÌÀ¤Ê¥³¥Þ¥ó¥É"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥¨¥é¡¼: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤ò¼±Ê̤Ǥ­¤Ê¤¤"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "¥æ¡¼¥¶Ì¾¤ò¼±Ê̤Ǥ­¤Ê¤¤"
 
@@ -2140,401 +2733,410 @@ msgid "compose a new mail message"
 msgstr "¿·µ¬¥á¥Ã¥»¡¼¥¸¤òºîÀ®"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "Ê̤Υե©¥ë¥À¤ò¥ª¡¼¥×¥ó"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "Æɤ߽Ф·ÀìÍѥ⡼¥É¤ÇÊ̤Υե©¥ë¥À¤ò¥ª¡¼¥×¥ó"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î¥¹¥Æ¡¼¥¿¥¹¥Õ¥é¥°¤ò²ò½ü"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ·¤¿¥á¥Ã¥»¡¼¥¸¤òºï½ü"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "IMAP ¥µ¡¼¥Ð¤«¤é¥á¡¼¥ë¤ò¼èÆÀ"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "POP ¥µ¡¼¥Ð¤«¤é¥á¡¼¥ë¤ò¼èÆÀ"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "ºÇ½é¤Î¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "ºÇ¸å¤Î¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ·¤¿¥á¥Ã¥»¡¼¥¸¤À¤±É½¼¨"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤ÎºÆÁ÷Àè: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "¼¡¤Î¿·Ãå¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "¼¡¤Î¿·Ãå¤Þ¤¿¤Ï̤ÆɤΥá¥Ã¥»¡¼¥¸¤Ø°ÜÆ°"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "¼¡¤Î¥µ¥Ö¥¹¥ì¥Ã¥É¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "¼¡¤Î¥¹¥ì¥Ã¥É¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "¼¡¤Î̤ºï½ü¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "¼¡¤Î̤ÆÉ¥á¥Ã¥»¡¼¥¸¤Ø°ÜÆ°"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "¥¹¥ì¥Ã¥É¤Î¿Æ¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "Á°¤Î¥¹¥ì¥Ã¥É¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "Á°¤Î¥µ¥Ö¥¹¥ì¥Ã¥É¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "Á°¤Î̤ºï½ü¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "Á°¤Î¿·Ãå¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "Á°¤Î¿·Ãå¤Þ¤¿¤Ï̤ÆÉ¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "Á°¤Î̤ÆÉ¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "¸½ºß¤Î¥¹¥ì¥Ã¥É¤ò´ûÆɤˤ¹¤ë"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "¸½ºß¤Î¥µ¥Ö¥¹¥ì¥Ã¥É¤ò´ûÆɤˤ¹¤ë"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ë¥¹¥Æ¡¼¥¿¥¹¥Õ¥é¥°¤òÀßÄê"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "Êѹ¹¤ò¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ËÊݸ"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ·¤¿¥á¥Ã¥»¡¼¥¸¤Ë¥¿¥°¤òÉÕ¤±¤ë"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ·¤¿¥á¥Ã¥»¡¼¥¸¤Îºï½ü¾õÂÖ¤ò²ò½ü"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ·¤¿¥á¥Ã¥»¡¼¥¸¤Î¥¿¥°¤ò¤Ï¤º¤¹"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "¥Ú¡¼¥¸¤ÎÃæ±û¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "¼¡¤Î¥¨¥ó¥È¥ê¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "°ì¹Ô²¼¤Ë¥¹¥¯¥í¡¼¥ë"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "¼¡¥Ú¡¼¥¸¤Ø°ÜÆ°"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î°ìÈÖ²¼¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "°úÍÑʸ¤Îɽ¼¨¤ò¤¹¤ë¤«¤É¤¦¤«ÀÚÂØ"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "°úÍÑʸ¤ò¥¹¥­¥Ã¥×¤¹¤ë"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î°ìÈÖ¾å¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "¥á¥Ã¥»¡¼¥¸/źÉÕ¥Õ¥¡¥¤¥ë¤ò¥³¥Þ¥ó¥É¤Ë¥Ñ¥¤¥×"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "Á°¤Î¥¨¥ó¥È¥ê¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "°ì¹Ô¾å¤Ë¥¹¥¯¥í¡¼¥ë"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "Á°¤Î¥Ú¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "¸½ºß¤Î¥¨¥ó¥È¥ê¤ò°õºþ"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "³°Éô¥×¥í¥°¥é¥à¤Ë¥¢¥É¥ì¥¹¤òÌ䤤¹ç¤ï¤»"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "¿·¤¿¤ÊÌ䤤¹ç¤ï¤»·ë²Ì¤ò¸½ºß¤Î·ë²Ì¤ËÄɲÃ"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "Êѹ¹¤ò¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ËÊݸ¸å½ªÎ»"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "½ñ¤­¤«¤±¤Î¥á¥Ã¥»¡¼¥¸¤ò¸Æ¤Ó½Ð¤¹"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "²èÌ̤ò¥¯¥ê¥¢¤·ºÆÉÁ²è"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{ÆâÉô}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "¸½ºß¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òºï½ü(IMAP¤Î¤ß)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ËÊÖ¿®"
 
 # ¤³¤ì¤Ç¥®¥ê¥®¥ê°ì¹Ô¤Ë¤ª¤µ¤Þ¤ë¥Ï¥º
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "¸½ºß¤Î¥á¥Ã¥»¡¼¥¸¤ò¿·¤·¤¤¤â¤Î¤Î¸¶·Á¤È¤·¤ÆÍøÍÑ"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "¥á¥Ã¥»¡¼¥¸/źÉÕ¥Õ¥¡¥¤¥ë¤ò¥Õ¥¡¥¤¥ë¤ËÊݸ"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "Àµµ¬É½¸½¸¡º÷"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "µÕ½ç¤ÎÀµµ¬É½¸½¸¡º÷"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "¼¡¤Ë°ìÃפ¹¤ë¤â¤Î¤ò¸¡º÷"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "µÕ½ç¤Ç°ìÃפ¹¤ë¤â¤Î¤ò¸¡º÷"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "¸¡º÷¥Ñ¥¿¡¼¥ó¤òÃ忧¤¹¤ë¤«¤É¤¦¤«ÀÚÂØ"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "¥µ¥Ö¥·¥§¥ë¤Ç¥³¥Þ¥ó¥É¤òµ¯Æ°"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "¥á¥Ã¥»¡¼¥¸¤òÀ°Îó"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "¥á¥Ã¥»¡¼¥¸¤òµÕ½ç¤ÇÀ°Îó"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ë¥¿¥°ÉÕ¤±"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "¼¡¤ËÆþÎϤ¹¤ëµ¡Ç½¤ò¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤ËŬÍÑ"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 msgid "apply next function ONLY to tagged messages"
 msgstr "¼¡¤ËÆþÎϤ¹¤ëµ¡Ç½¤ò¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤Ë¤Î¤ßŬÍÑ"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "¸½ºß¤Î¥µ¥Ö¥¹¥ì¥Ã¥É¤Ë¥¿¥°¤òÉÕ¤±¤ë"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "¸½ºß¤Î¥¹¥ì¥Ã¥É¤Ë¥¿¥°¤òÉÕ¤±¤ë"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î¡Ö¿·Ãå¡×¥Õ¥é¥°¤òÀÚÂØ"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ËÊѹ¹¤ò½ñ¤­¹þ¤à¤«¤É¤¦¤«¤òÀÚÂØ"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "±ÜÍ÷Ë¡¤ò¡Ö¥á¡¼¥ë¥Ü¥Ã¥¯¥¹/Á´¥Õ¥¡¥¤¥ë¡×´Ö¤ÇÀÚÂØ"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "¥Ú¡¼¥¸¤Î°ìÈÖ¾å¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "¥¨¥ó¥È¥ê¤Îºï½ü¾õÂÖ¤ò²ò½ü"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "¥¹¥ì¥Ã¥É¤Î¤¹¤Ù¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤Îºï½ü¾õÂÖ¤ò²ò½ü"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "¥µ¥Ö¥¹¥ì¥Ã¥É¤Î¤¹¤Ù¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤Îºï½ü¤ò²ò½ü"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "Mutt ¤Î¥Ð¡¼¥¸¥ç¥ó¤ÎÈÖ¹æ¤ÈÆüÉÕ¤òɽ¼¨"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "źÉÕ¥Õ¥¡¥¤¥ë±ÜÍ÷(ɬÍפʤémailcap¥¨¥ó¥È¥ê»ÈÍÑ)"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "MIME źÉÕ¥Õ¥¡¥¤¥ë¤òɽ¼¨"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "¼¡¤Ë²¡¤¹¥­¡¼¤Î¥³¡¼¥É¤òɽ¼¨"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "¸½ºßÍ­¸ú¤ÊÀ©¸Â¥Ñ¥¿¡¼¥ó¤ÎÃͤòɽ¼¨"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "¸½ºß¤Î¥¹¥ì¥Ã¥É¤òŸ³«/È󟳫"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "¤¹¤Ù¤Æ¤Î¥¹¥ì¥Ã¥É¤òŸ³«/È󟳫"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "PGP ¸ø³«¸°¤òźÉÕ"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "PGP ¥ª¥×¥·¥ç¥ó¤òɽ¼¨"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "PGP ¸ø³«¸°¤ò¥á¡¼¥ëÁ÷¿®"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "PGP ¸ø³«¸°¤ò¸¡¾Ú"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "¸°¤Î¥æ¡¼¥¶ ID ¤òɽ¼¨"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "µì·Á¼°¤Î PGP ¤ò¥Á¥§¥Ã¥¯"
 
 # ¡Ö¤¹¤Ù¤Æ¤Î¡×¤Ã¤ÆɬÍס©
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "¹½ÃÛ¤µ¤ì¤¿Á´¤Æ¤Î¥Á¥§¡¼¥ó¤ò¼õÍÆ"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "¥Á¥§¡¼¥ó¤Ë remailer ¤òÄɲÃ"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "¥Á¥§¡¼¥ó¤Ë remailer ¤òÁÞÆþ"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "¥Á¥§¡¼¥ó¤«¤é remailer ¤òºï½ü"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "Á°¤Î¥Á¥§¡¼¥ó¥¨¥ì¥á¥ó¥È¤òÁªÂò"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "¼¡¤Î¥Á¥§¡¼¥ó¥¨¥ì¥á¥ó¥È¤òÁªÂò"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "mixmaster remailer ¥Á¥§¡¼¥ó¤ò»È¤Ã¤ÆÁ÷¿®"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "Éü¹æ²½¤·¤¿¥³¥Ô¡¼¤òºî¤Ã¤Æ¤«¤éºï½ü"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "Éü¹æ²½¤·¤¿¥³¥Ô¡¼¤òºîÀ®"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ò¤¹¤Ù¤Æ¥á¥â¥ê¤«¤é¾Ãµî"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¸ø³«¸°¤òÃê½Ð"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "S/MIME ¥ª¥×¥·¥ç¥ó¤òɽ¼¨"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr "·å¤¢¤Õ¤ì -- ¥á¥â¥ê¤ò³ä¤êÅö¤Æ¤é¤ì¤Ê¤¤!"
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "¥á¥â¥êÉÔ­!"
 
@@ -2557,11 +3159,11 @@ msgstr ""
 
 #: main.c:61
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2583,25 +3185,70 @@ msgid ""
 "    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
 msgstr ""
 
-#: main.c:99
+#: main.c:99
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"»ÈÍÑË¡: mutt [-nRyzZ] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] [-m <¥¿¥¤¥×>] \n"
+"             [-f <¥Õ¥¡¥¤¥ë>]\n"
+"        mutt [-nR] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] -Q <Ì䤤¹ç¤ï¤»> \n"
+"             [-Q <Ì䤤¹ç¤ï¤»> ]\n"
+"        mutt [-nR] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] -A <ÊÌ̾> \n"
+"             [-A <ÊÌ̾> ]\n"
+"        mutt [-nx] [-e <¥³¥Þ¥ó¥É>] [-a <¥Õ¥¡¥¤¥ë>] [-F <¥Õ¥¡¥¤¥ë>] \n"
+"             [-H <¥Õ¥¡¥¤¥ë>] [-i <¥Õ¥¡¥¤¥ë>] [-s <Âê̾>] [-b <¥¢¥É¥ì¥¹>] \n"
+"             [-c <¥¢¥É¥ì¥¹>] <¥¢¥É¥ì¥¹> [ ... ]\n"
+"        mutt [-n] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] -p\n"
+"        mutt -v[v]\n"
+"\n"
+"¥ª¥×¥·¥ç¥ó:\n"
+"  -A <ÊÌ̾>\t»ØÄꤷ¤¿ÊÌ̾¤ÎŸ³«\n"
+"  -a <¥Õ¥¡¥¤¥ë>\t¥á¥Ã¥»¡¼¥¸¤Ë¥Õ¥¡¥¤¥ë¤òźÉÕ\n"
+"  -b <¥¢¥É¥ì¥¹>\tblind carbon-copy (BCC) ¥¢¥É¥ì¥¹¤Î»ØÄê\n"
+"  -c <¥¢¥É¥ì¥¹>\tcarbon-copy (CC) ¥¢¥É¥ì¥¹¤Î»ØÄê\n"
+"  -e <¥³¥Þ¥ó¥É>\t½é´ü²½¸å¤Ë¼Â¹Ô¤¹¤ë¥³¥Þ¥ó¥É¤Î»ØÄê\n"
+"  -f <¥Õ¥¡¥¤¥ë>\tÆɤ߽Ф·¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î»ØÄê\n"
+"  -F <¥Õ¥¡¥¤¥ë>\tÂåÂØ muttrc ¥Õ¥¡¥¤¥ë¤Î»ØÄê\n"
+"  -H <¥Õ¥¡¥¤¥ë>\t¤Ø¥Ã¥À¤òÆɤि¤á¤Ë²¼½ñ¥Õ¥¡¥¤¥ë¤ò»ØÄê\n"
+"  -i <¥Õ¥¡¥¤¥ë>\tÊÖ¿®»þ¤Ë Mutt ¤¬ÁÞÆþ¤¹¤ë¥Õ¥¡¥¤¥ë¤Î»ØÄê\n"
+"  -m <¥¿¥¤¥×>\t¥á¡¼¥ë¥Ü¥Ã¥¯¥¹·Á¼°¤Î»ØÄê\n"
+"  -n\t\t¥·¥¹¥Æ¥à´ûÄê¤Î Muttrc ¤òÆɤޤʤ¤¤³¤È¤Î»ØÄê\n"
+"  -p\t\tÊݸ¤µ¤ì¤Æ¤¤¤ë (½ñ¤­¤«¤±) ¥á¥Ã¥»¡¼¥¸¤ÎºÆÆɤ߽Ф·¤Î»ØÄê\n"
+"  -Q <variable>\tÀßÄêÊÑ¿ô¤ÎÌ䤤¹ç¤ï¤»\n"
+"  -R\t\t¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òÆɤ߽Ф·ÀìÍѥ⡼¥É¤Ç¥ª¡¼¥×¥ó¤¹¤ë¤³¤È¤Î»ØÄê\n"
+"  -s <Âê̾>\tÂê̾¤Î»ØÄê (¶õÇò¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï°úÍÑÉä¤Ç¤¯¤¯¤ë¤³¤È)\n"
+"  -v\t\t¥Ð¡¼¥¸¥ç¥ó¤È¥³¥ó¥Ñ¥¤¥ë»þ»ØÄê¤Îɽ¼¨\n"
+"  -x\t\tmailx Á÷¿®¥â¡¼¥É¤Î¥·¥ß¥å¥ì¡¼¥È\n"
+"  -y\t\t»ØÄꤵ¤ì¤¿ `mailboxes' ¥ê¥¹¥È¤ÎÃ椫¤é¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÎÁªÂò\n"
+"  -z\t\t¥á¡¼¥ë¥Ü¥Ã¥¯¥¹Ãæ¤Ë¥á¥Ã¥»¡¼¥¸¤¬Ìµ¤±¤ì¤Ð¤¹¤°¤Ë½ªÎ»\n"
+"  -Z\t\t¿·Ãå¥á¥Ã¥»¡¼¥¸¤¬Ìµ¤±¤ì¤Ð¤¹¤°¤Ë½ªÎ»\n"
+"  -h\t\t¤³¤Î¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
 #, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-"<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-"[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-"[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
-"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
-"\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2655,7 +3302,7 @@ msgstr ""
 "  -Z\t\t¿·Ãå¥á¥Ã¥»¡¼¥¸¤¬Ìµ¤±¤ì¤Ð¤¹¤°¤Ë½ªÎ»\n"
 "  -h\t\t¤³¤Î¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2663,47 +3310,47 @@ msgstr ""
 "\n"
 "¥³¥ó¥Ñ¥¤¥ë»þ¥ª¥×¥·¥ç¥ó:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "üËö½é´ü²½¥¨¥é¡¼"
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "¥ì¥Ù¥ë %d ¤Ç¥Ç¥Ð¥Ã¥°Ãæ¡£\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG ¤¬¥³¥ó¥Ñ¥¤¥ë»þ¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¡£Ìµ»ë¤¹¤ë¡£\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s ¤¬Â¸ºß¤·¤Ê¤¤¡£ºîÀ®?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "%s ¤¬ %s ¤Î¤¿¤á¤ËºîÀ®¤Ç¤­¤Ê¤¤¡£"
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "¼õ¼è¿Í¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¡£\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: ¥Õ¥¡¥¤¥ë¤òźÉդǤ­¤Ê¤¤¡£\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "¿·Ãå¥á¡¼¥ë¤Î¤¢¤ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ï¤Ê¤¤¡£"
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "ÅþÃåÍѥ᡼¥ë¥Ü¥Ã¥¯¥¹¤¬Ì¤ÄêµÁ¡£"
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¶õ¡£"
 
@@ -2720,11 +3367,11 @@ msgstr "
 msgid "Mailbox was corrupted!"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¤³¤ï¤ì¤¿!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Ã×̿Ū¤Ê¥¨¥é¡¼! ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òºÆ¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤«¤Ã¤¿!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¥í¥Ã¥¯ÉÔǽ!"
 
@@ -2732,12 +3379,12 @@ msgstr "
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬Êѹ¹¤µ¤ì¤¿¤¬¡¢Êѹ¹¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤(¤³¤Î¥Ð¥°¤òÊó¹ð¤»¤è)!"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "¥á¥Ã¥»¡¼¥¸½ñ¤­¹þ¤ßÃæ... %d (%d%%)"
@@ -2745,188 +3392,148 @@ msgstr "
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "Êѹ¹·ë²Ì¤òÈ¿±ÇÃæ..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "½ñ¤­¹þ¤ß¼ºÇÔ! ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÎÃÇÊÒ¤ò %s ¤ËÊݸ¤·¤¿"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òºÆ¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤«¤Ã¤¿!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ºÆ¥ª¡¼¥×¥óÃæ..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "°ÜÆ°À襤¥ó¥Ç¥Ã¥¯¥¹ÈÖ¹æ¤ò»ØÄê: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "ÉÔÀµ¤Ê¥¤¥ó¥Ç¥Ã¥¯¥¹Èֹ档"
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "¥¨¥ó¥È¥ê¤¬¤Ê¤¤¡£"
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "¤³¤ì¤è¤ê²¼¤Ë¤Ï¥¹¥¯¥í¡¼¥ë¤Ç¤­¤Ê¤¤¡£"
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "¤³¤ì¤è¤ê¾å¤Ë¤Ï¥¹¥¯¥í¡¼¥ë¤Ç¤­¤Ê¤¤¡£"
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "¤¹¤Ç¤ËºÇ¸å¤Î¥Ú¡¼¥¸¡£"
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥Ú¡¼¥¸¡£"
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "ºÇ½é¤Î¥¨¥ó¥È¥ê¤¬É½¼¨¤µ¤ì¤Æ¤¤¤ë¡£"
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "ºÇ¸å¤Î¥¨¥ó¥È¥ê¤¬É½¼¨¤µ¤ì¤Æ¤¤¤ë¡£"
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "¤¹¤Ç¤ËºÇ¸å¤Î¥¨¥ó¥È¥ê¡£"
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥¨¥ó¥È¥ê¡£"
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "¸¡º÷¥Ñ¥¿¡¼¥ó: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "µÕ½ç¸¡º÷¥Ñ¥¿¡¼¥ó: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "¸¡º÷¥Ñ¥¿¡¼¥ó¤¬¤Ê¤¤¡£"
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¡£"
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "¥¿¥°ÉÕ¤­¥¨¥ó¥È¥ê¤¬¤Ê¤¤¡£"
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "¤³¤Î¥á¥Ë¥å¡¼¤Ç¤Ï¸¡º÷µ¡Ç½¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "¥¸¥ã¥ó¥×µ¡Ç½¤Ï¥À¥¤¥¢¥í¥°¤Ç¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "¥¿¥°ÉÕ¤±µ¡Ç½¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "%s ¤«¤éÆɤ߽Ф·Ãæ... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): ¥Õ¥¡¥¤¥ë¤Ë»þ¹ï¤òÀßÄê¤Ç¤­¤Ê¤¤"
 
-# »²¹Í: "Save to file: " => "Êݸ¤¹¤ë¥Õ¥¡¥¤¥ë: " (alias.c, recvattach.c)
-#: muttlib.c:846
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "¤½¤³¤Ï¥Ç¥£¥ì¥¯¥È¥ê¡£¤½¤ÎÃæ¤ËÊݸ? (y:¤¹¤ë, n:¤·¤Ê¤¤, a:¤¹¤Ù¤ÆÊݸ)"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr "yna"
-
-# »²¹Í: "Save to file: " => "Êݸ¤¹¤ë¥Õ¥¡¥¤¥ë: " (alias.c, recvattach.c)
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "¤½¤³¤Ï¥Ç¥£¥ì¥¯¥È¥ê¡£¤½¤ÎÃæ¤ËÊݸ?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "¥Ç¥£¥ì¥¯¥È¥êÇÛ²¼¤Î¥Õ¥¡¥¤¥ë: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ë¡£o:¾å½ñ¤­, a:ÄɲÃ, c:Ãæ»ß"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "oac"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "POP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¤Ï¥á¥Ã¥»¡¼¥¸¤òÊݸ¤Ç¤­¤Ê¤¤"
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s ¤Ï¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ç¤Ï¤Ê¤¤!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "%s ¤Ë¥á¥Ã¥»¡¼¥¸¤òÄɲÃ?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "%s ¤Ø¤ÎÀܳ¤ò½ªÎ»¤·¤¿"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL ¤¬ÍøÍѤǤ­¤Ê¤¤¡£"
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "»öÁ°Àܳ¥³¥Þ¥ó¥É¤¬¼ºÇÔ¡£"
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "%s ¤Ø¤Î¸ò¿®¥¨¥é¡¼ (%s)¡£"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "ÉÔÀµ¤Ê IDN \"%s\"."
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "%s ¸¡º÷Ãæ..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "¥Û¥¹¥È \"%s\" ¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿"
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "%s ¤ËÀܳÃæ..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "%s ¤ËÀܳ¤Ç¤­¤Ê¤«¤Ã¤¿ (%s)¡£"
@@ -2958,7 +3565,8 @@ msgstr "I/O 
 msgid "SSL failed: %s"
 msgstr "SSL ¤Ï %s ¤Ç¼ºÇÔ¡£"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "ÀܳÀ褫¤é¾ÚÌÀ½ñ¤òÆÀ¤é¤ì¤Ê¤«¤Ã¤¿"
 
@@ -2967,87 +3575,209 @@ msgstr "
 msgid "SSL connection using %s (%s)"
 msgstr "%s ¤ò»È¤Ã¤¿ SSL Àܳ (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "ÉÔÌÀ"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[·×»»ÉÔǽ]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[ÉÔÀµ¤ÊÆüÉÕ]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤Ï¤Þ¤ÀÍ­¸ú¤Ç¤Ê¤¤"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "¤³¤Î¾ÚÌÀ½ñ¤Î½ê°Àè:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "¤³¤Î¾ÚÌÀ½ñ¤Îȯ¹Ô¸µ:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "¤³¤Î¾ÚÌÀ½ñ¤ÎÍ­¸ú´ü´Ö¤Ï"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   %s ¤«¤é"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "   %s ¤Þ¤Ç"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "SSL ¾ÚÌÀ½ñ¸¡ºº"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "r:µñÈÝ, o:º£²ó¤Î¤ß¾µÇ§, a:¾ï¤Ë¾µÇ§"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "roa"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "r:µñÈÝ, o:º£²ó¤Î¤ß¾µÇ§"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "ro"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "½ªÎ»  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "·Ù¹ð: ¾ÚÌÀ½ñ¤òÊݸ¤Ç¤­¤Ê¤«¤Ã¤¿"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "¾ÚÌÀ½ñ¤òÊݸ¤·¤¿"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "%s ¤ò»È¤Ã¤¿ SSL Àܳ (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, fuzzy, c-format
+msgid "Certificate verification error (%s)"
+msgstr "¾ÚÌÀ½ñ \"%s\" ¤¬ \"%s\" ¤ËÂФ·¤Æ¸ºß¤¹¤ë¡£"
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "¾ÚÌÀ½ñ¤òÊݸ¤·¤¿"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "üËö½é´ü²½¥¨¥é¡¼"
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤Ï¤Þ¤ÀÍ­¸ú¤Ç¤Ê¤¤"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤Ï¤Þ¤ÀÍ­¸ú¤Ç¤Ê¤¤"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "SSL ¾ÚÌÀ½ñ¸¡ºº"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "%s ¤ËÀܳÃæ..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "%s ¤Ø¤Î¸ò¿®¥¨¥é¡¼ (%s)¡£"
+
+# »²¹Í: "Save to file: " => "Êݸ¤¹¤ë¥Õ¥¡¥¤¥ë: " (alias.c, recvattach.c)
+#: muttlib.c:910
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "¤½¤³¤Ï¥Ç¥£¥ì¥¯¥È¥ê¡£¤½¤ÎÃæ¤ËÊݸ? (y:¤¹¤ë, n:¤·¤Ê¤¤, a:¤¹¤Ù¤ÆÊݸ)"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr "yna"
+
+# »²¹Í: "Save to file: " => "Êݸ¤¹¤ë¥Õ¥¡¥¤¥ë: " (alias.c, recvattach.c)
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "¤½¤³¤Ï¥Ç¥£¥ì¥¯¥È¥ê¡£¤½¤ÎÃæ¤ËÊݸ?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "¥Ç¥£¥ì¥¯¥È¥êÇÛ²¼¤Î¥Õ¥¡¥¤¥ë: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ë¡£o:¾å½ñ¤­, a:ÄɲÃ, c:Ãæ»ß"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "oac"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "POP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¤Ï¥á¥Ã¥»¡¼¥¸¤òÊݸ¤Ç¤­¤Ê¤¤"
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "%s ¤Ë¥á¥Ã¥»¡¼¥¸¤òÄɲÃ?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s ¤Ï¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ç¤Ï¤Ê¤¤!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3125,7 +3855,7 @@ msgstr "
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d ÊÝ»ý¡¢%d °ÜÆ°¡¢%d ÇÑ´þ"
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d ÊÝ»ý¡¢%d ÇÑ´þ"
@@ -3144,15 +3874,15 @@ msgstr "'toggle-write' 
 msgid "Mailbox is marked unwritable. %s"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ï½ñ¤­¹þ¤ßÉÔǽ¤Ë¥Þ¡¼¥¯¤µ¤ì¤¿¡£%s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¥Á¥§¥Ã¥¯¥Ý¥¤¥ó¥È¤òºÎ¼è¤·¤¿¡£"
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò½ñ¤­¹þ¤á¤Ê¤¤"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr "·å¤¢¤Õ¤ì -- ¥á¥â¥ê¤ò³ä¤êÅö¤Æ¤é¤ì¤Ê¤¤¡£"
 
@@ -3160,48 +3890,48 @@ msgstr "
 msgid "Not available in this menu."
 msgstr "¤³¤Î¥á¥Ë¥å¡¼¤Ç¤ÏÍøÍѤǤ­¤Ê¤¤¡£"
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "Á°ÊÇ"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "¼¡ÊÇ"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "źÉÕ¥Õ¥¡¥¤¥ë"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "¼¡"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î°ìÈÖ²¼¤¬É½¼¨¤µ¤ì¤Æ¤¤¤ë"
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î°ìÈ־夬ɽ¼¨¤µ¤ì¤Æ¤¤¤ë"
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "µÕ½ç¤Î¸¡º÷: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "¸¡º÷: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "¸½ºß¥Ø¥ë¥×¤òɽ¼¨Ãæ"
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "¤³¤ì°Ê¾å¤Î°úÍÑʸ¤Ï¤Ê¤¤¡£"
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "°úÍÑʸ¤Î¸å¤Ë¤Ï¤â¤¦Èó°úÍÑʸ¤¬¤Ê¤¤¡£"
 
@@ -3268,27 +3998,27 @@ msgstr "
 msgid "error: unknown op %d (report this error)."
 msgstr "¥¨¥é¡¼: ÉÔÌÀ¤Ê op %d (¤³¤Î¥¨¥é¡¼¤òÊó¹ð¤»¤è)¡£"
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "¸¡º÷¥Ñ¥¿¡¼¥ó¤ò¥³¥ó¥Ñ¥¤¥ëÃæ..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "¥á¥Ã¥»¡¼¥¸¥Ñ¥¿¡¼¥ó¸¡º÷¤Î¤¿¤á¤Ë¥³¥Þ¥ó¥É¼Â¹ÔÃæ..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ¹¤ë¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤«¤Ã¤¿¡£"
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "°ìÈÖ²¼¤Þ¤Ç¡¢²¿¤â¸¡º÷¤Ë°ìÃפ·¤Ê¤«¤Ã¤¿¡£"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "°ìÈÖ¾å¤Þ¤Ç¡¢²¿¤â¸¡º÷¤Ë°ìÃפ·¤Ê¤«¤Ã¤¿¡£"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "¸¡º÷¤¬ÃæÃǤµ¤ì¤¿¡£"
 
@@ -3300,11 +4030,11 @@ msgstr "PGP 
 msgid "PGP passphrase forgotten."
 msgstr "PGP ¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¥á¥â¥ê¤«¤é¾Ãµî¤µ¤ì¤¿¡£"
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- ¥¨¥é¡¼: PGP »Ò¥×¥í¥»¥¹¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3312,51 +4042,22 @@ msgstr ""
 "[-- PGP ½ÐÎϽªÎ» --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP ¥á¥Ã¥»¡¼¥¸³«»Ï --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP ¸ø³«¸°¥Ö¥í¥Ã¥¯³«»Ï --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP ½ð̾¥á¥Ã¥»¡¼¥¸³«»Ï --]\n"
-"\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- PGP¥á¥Ã¥»¡¼¥¸½ªÎ» --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP ¸ø³«¸°¥Ö¥í¥Ã¥¯½ªÎ» --]\n"
-
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- PGP ½ð̾¥á¥Ã¥»¡¼¥¸½ªÎ» --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥³¥Ô¡¼¤Ç¤­¤Ê¤«¤Ã¤¿"
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- ¥¨¥é¡¼: PGP ¥á¥Ã¥»¡¼¥¸¤Î³«»ÏÅÀ¤òȯ¸«¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "PGP ½ð̾¤Î¸¡¾Ú¤ËÀ®¸ù¤·¤¿¡£"
 
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "ÆâÉô¥¨¥é¡¼¡£<roessler@does-not-exist.org> ¤ËÊó¹ð¤»¤è¡£"
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3364,70 +4065,36 @@ msgstr ""
 "[-- ¥¨¥é¡¼: PGP »Ò¥×¥í¥»¥¹¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- ¥¨¥é¡¼: ÉÔÀµ¤Ê·Á¼°¤Î PGP/MIME ¥á¥Ã¥»¡¼¥¸! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- ¥¨¥é¡¼: °ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï PGP/MIME ¤Ç°Å¹æ²½¤µ¤ì¤Æ¤¤¤ë --]\n"
-"\n"
-
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- PGP/MIME °Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "Éü¹æ²½¤Ë¼ºÇÔ¤·¤¿¡£"
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "PGP »Ò¥×¥í¥»¥¹¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "¸° ID = \"%s\" ¤ò %s ¤Ë»È¤¦?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "%s ¤Î¸° ID ÆþÎÏ: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "PGP µ¯Æ°¤Ç¤­¤Ê¤¤"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "PGP e:°Å¹æ²½, s:½ð̾, a:½ð̾¸°ÁªÂò, b:°Å¹æ+½ð̾, %s, c:¤Ê¤· "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr "i:PGP/MIME"
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr "i:¥¤¥ó¥é¥¤¥ó"
 
-#: pgp.c:1499
+#: pgp.c:1543
 msgid "esabifc"
 msgstr "esabifc"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "½ð̾¤Ë»È¤¦¸°: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "PGP ¸°¤ò¼èÆÀÃæ..."
@@ -3436,16 +4103,6 @@ msgstr "PGP 
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "°ìÃפ·¤¿¸°¤Ï¤¹¤Ù¤Æ´ü¸ÂÀڤ줫ÇÑ´þºÑ¤ß¡¢¤Þ¤¿¤Ï»ÈÍѶػߡ£"
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "ÁªÂò  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "PGP ¸°¸¡ºº  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3460,40 +4117,6 @@ msgstr "PGP 
 msgid "Can't open /dev/null"
 msgstr "/dev/null ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤¤"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "¸° ID: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "¤³¤Î¸°¤Ï´ü¸ÂÀڤ줫»ÈÍÑÉԲĤ«ÇÑ´þºÑ¤ß¤Î¤¿¤á¡¢»È¤¨¤Ê¤¤¡£"
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "ID ¤Ï´ü¸ÂÀڤ줫»ÈÍÑÉԲĤ«ÇÑ´þºÑ¤ß¡£"
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "ID ¤Ï¿®ÍÑÅÙ¤¬Ì¤ÄêµÁ¡£"
-
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "ID ¤Ï¿®ÍѤµ¤ì¤Æ¤¤¤Ê¤¤¡£"
-
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "ID ¤Ï¤«¤í¤¦¤¸¤Æ¿®ÍѤµ¤ì¤Æ¤¤¤ë¡£"
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s ËÜÅö¤Ë¤³¤Î¸°¤ò»ÈÍÑ?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "¸° ID ¤òÆþÎÏ: "
@@ -3507,11 +4130,6 @@ msgstr "PGP 
 msgid "PGP Key %s."
 msgstr "PGP ¸° %s"
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "\"%s\" ¤Ë°ìÃפ¹¤ë¸°¤ò¸¡º÷Ãæ..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3569,7 +4187,7 @@ msgstr "
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d / %d ¥á¥Ã¥»¡¼¥¸Æɤ߽Ф·]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "¥µ¡¼¥Ð¤¬Àܳ¤òÀڤä¿!"
 
@@ -3599,15 +4217,15 @@ msgstr "
 msgid "Error connecting to server: %s"
 msgstr "¥µ¡¼¥Ð %s ¤Ø¤ÎÀܳ¥¨¥é¡¼¡£"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "POP ¥µ¡¼¥Ð¤Ø¤ÎÀܳ½ªÎ»Ãæ..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "¥á¥Ã¥»¡¼¥¸º÷°ú¸¡¾ÚÃæ..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Àܳ¤¬Àڤ줿¡£POP ¥µ¡¼¥Ð¤ËºÆÀܳ?"
 
@@ -3978,36 +4596,36 @@ msgstr "
 msgid "Sending in background."
 msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤ÇÁ÷¿®¡£"
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "boundary ¥Ñ¥é¥á¡¼¥¿¤¬¤ß¤Ä¤«¤é¤Ê¤¤! [¤³¤Î¥¨¥é¡¼¤òÊó¹ð¤»¤è]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s ¤Ï¤â¤Ï¤ä¸ºß¤·¤Ê¤¤!"
 
 # regular file ¤Ã¤Æ¡ÖÄ̾ï¥Õ¥¡¥¤¥ë¡×¤Ç¤¹¤«¡©
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s ¤Ïɸ½à¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¡£"
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤«¤Ã¤¿"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "¥á¥Ã¥»¡¼¥¸Á÷¿®¥¨¥é¡¼¡£»Ò¥×¥í¥»¥¹¤¬ %d (%s) ¤Ç½ªÎ»¤·¤¿¡£"
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "ÇÛ¿®¥×¥í¥»¥¹¤Î½ÐÎÏ"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "ÉÔÀµ¤Ê IDN %s ¤ò resent-from ¤Î½àÈ÷Ãæ¤Ëȯ¸«¡£"
@@ -4123,7 +4741,7 @@ msgstr "OpenSSL 
 msgid "No output from OpenSSL..."
 msgstr "OpenSSL ¤«¤é½ÐÎϤ¬¤Ê¤¤..."
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4131,19 +4749,19 @@ msgstr ""
 "[-- OpenSSL ½ÐÎϽªÎ» --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- ¥¨¥é¡¼: OpenSSL »Ò¥×¥í¥»¥¹¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï S/MIME ¤Ç°Å¹æ²½¤µ¤ì¤Æ¤¤¤ë --]\n"
 
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï S/MIME ¤Ç½ð̾¤µ¤ì¤Æ¤¤¤ë --]\n"
 
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4151,7 +4769,7 @@ msgstr ""
 "\n"
 "[-- S/MIME °Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4159,26 +4777,26 @@ msgstr ""
 "\n"
 "[-- S/MIME ½ð̾¥Ç¡¼¥¿½ªÎ» --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
 "S/MIME e:°Å¹æ²½, s:½ð̾, w:°Å¹æÁªÂò, a:½ð̾¸°ÁªÂò, b:°Å¹æ+½ð̾, c:¤Ê¤· "
 
-#: smime.c:1936
+#: smime.c:1945
 msgid "eswabfc"
 msgstr "eswabfc"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr "1:DES, 2:Triple-DES, 3:RC2-40, 4:RC2-64, 5:RC2-128, f:Êѹ¹¤Ê¤· "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345f"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr "¸°¤¬Ì¤»ØÄê¤Î¤¿¤á½ð̾ÉÔǽ: ¡Ö½ð̾¸°ÁªÂò¡×¤ò¤»¤è¡£"
 
@@ -4202,6 +4820,12 @@ msgstr "
 msgid "Parent message is not available."
 msgstr "¿Æ¥á¥Ã¥»¡¼¥¸¤¬ÍøÍѤǤ­¤Ê¤¤¡£"
 
+#~ msgid "Unexpected response received from server: %s"
+#~ msgstr "¥µ¡¼¥Ð¤«¤éͽ´ü¤»¤ÌÈ¿±þ¤ò¼õ¤±¼è¤Ã¤¿: %s"
+
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "¤³¤Î¥µ¡¼¥Ð¤Î IMAP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¤ÏÄɲäǤ­¤Ê¤¤"
+
 #~ msgid "unspecified protocol error"
 #~ msgstr "ÆÃÄê¤Ç¤­¤Ê¤¤¥×¥í¥È¥³¥ë¥¨¥é¡¼"
 
@@ -4237,9 +4861,6 @@ msgstr "
 #~ msgid "Alert: Certificate does *NOT* belong to \"%s\".\n"
 #~ msgstr "·Ù¹ð: ¾ÚÌÀ½ñ¤¬ \"%s\" ¤Ë½ê°¤·¤Æ *¤¤¤Ê¤¤*¡£\n"
 
-#~ msgid "Certificate \"%s\" exists for \"%s\"."
-#~ msgstr "¾ÚÌÀ½ñ \"%s\" ¤¬ \"%s\" ¤ËÂФ·¤Æ¸ºß¤¹¤ë¡£"
-
 #~ msgid "Successfully added certificate \"%s\" for \"%s\". "
 #~ msgstr "¾ÚÌÀ½ñ \"%s\" ¤ò \"%s\" ¤ËÄɲÃÀ®¸ù¡£"
 
diff --git a/po/ko.po b/po/ko.po
index cebd3abdd..39314e262 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.5.6i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2004-03-03 10:25+900\n"
 "Last-Translator: Im Eunjea <eunjea@kldp.org>\n"
 "Language-Team: Im Eunjea <eunjea@kldp.org>\n"
@@ -16,26 +16,26 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "À̸§ ¹Ù²Ù±â (%s): "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%sÀÇ ¾ÏÈ£: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Á¾·á"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "»èÁ¦"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "º¹±¸"
 
@@ -44,9 +44,9 @@ msgid "Select"
 msgstr "¼±ÅÃ"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "µµ¿ò¸»"
 
@@ -98,171 +98,171 @@ msgstr "
 msgid "Alias added."
 msgstr "º°Äª Ãß°¡µÊ."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "À̸§ ÅÛÇ÷¹ÀÌÆ®¿Í ÀÏÄ¡ÇÏÁö ¾ÊÀ½. °è¼ÓÇÒ±î¿ä?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap ÀÛ¼º Ç׸ñÀº %%s°¡ ÇÊ¿äÇÔ"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "\"%s\" ½ÇÇà ¿À·ù!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Çì´õ¸¦ ºÐ¼®Çϱâ À§ÇÑ ÆÄÀÏ ¿­±â ½ÇÆÐ"
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Çì´õ Á¦°Å¸¦ À§ÇÑ ÆÄÀÏ ¿­±â ½ÇÆÐ"
 
-#: attach.c:183
+#: attach.c:184
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "Çì´õ¸¦ ºÐ¼®Çϱâ À§ÇÑ ÆÄÀÏ ¿­±â ½ÇÆÐ"
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "%sÀÇ mailcap ÀÛ¼º Ç׸ñÀÌ ¾øÀ½, ºó ÆÄÀÏ »ý¼º."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Mailcap ÆíÁý Ç׸ñÀº %%s°¡ ÇÊ¿äÇÔ"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "ÆíÁýÀ» À§ÇÑ %sÀÇ mailcap Ç׸ñÀÌ ¾øÀ½"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "mailcap Ç׸ñ¿¡¼­ ÀÏÄ¡ÇÏ´Â °ÍÀ» ãÀ» ¼ö ¾øÀ½. text·Î º¸±â."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Á¤ÀǵÇÁö ¾ÊÀº MIME Çü½Ä. ÷ºÎ¹°À» º¼ ¼ö ¾øÀ½."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "ÇÊÅ͸¦ ¸¸µé ¼ö ¾øÀ½"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "ÇÊÅ͸¦ ¸¸µé ¼ö ¾øÀ½"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "¾²±â ½ÇÆÐ!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "¾î¶»°Ô Ãâ·ÂÇÒ Áö ¾Ë ¼ö ¾øÀ½!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "µð·ºÅ丮 À̵¿"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "¸Å½ºÅ©"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s´Â µð·ºÅ丮°¡ ¾Æ´Õ´Ï´Ù."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "¸ÞÀÏÇÔ [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "°¡ÀÔ [%s], ÆÄÀÏ ¸Å½ºÅ©: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "µð·ºÅ丮 [%s], ÆÄÀÏ ¸Å½ºÅ©: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "µð·ºÅ丮´Â ÷ºÎÇÒ ¼ö ¾øÀ½!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "ÆÄÀÏ ¸Å½ºÅ©¿Í ÀÏÄ¡ÇÏ´Â ÆÄÀÏ ¾øÀ½."
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "»ý¼ºÀº IMAP ¸ÞÀÏÇÔ¿¡¼­¸¸ Áö¿øµÊ"
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "»ý¼ºÀº IMAP ¸ÞÀÏÇÔ¿¡¼­¸¸ Áö¿øµÊ"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "»èÁ¦´Â IMAP ¸ÞÀÏÇÔ¿¡¼­¸¸ Áö¿øµÊ"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Á¤¸»·Î \"%s\" ¸ÞÀÏÇÔÀ» Áö¿ï±î¿ä?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "¸ÞÀÏÇÔ »èÁ¦µÊ."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "¸ÞÀÏÇÔÀÌ »èÁ¦µÇÁö ¾ÊÀ½."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "À̵¿ÇÒ µð·ºÅ丮: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "µð·ºÅ丮 °Ë»çÁß ¿À·ù."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "ÆÄÀÏ ¸Å½ºÅ©: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "¿ª¼øÁ¤·Ä ¹æ¹ý: ³¯Â¥(d), ³¹¸»(a), Å©±â(z), ¾ÈÇÔ(n)?"
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Á¤·Ä ¹æ¹ý: ³¯Â¥(d), ±ÛÀÚ(a), Å©±â(z), ¾ÈÇÔ(n)?"
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "dazn"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "»õ ÆÄÀÏ À̸§: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "µð·ºÅ丮¸¦ º¼ ¼ö ¾øÀ½"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "ÆÄÀÏ º¸±â ½Ãµµ Áß ¿À·ù"
 
@@ -329,7 +329,7 @@ msgstr "
 msgid "Verify PGP signature?"
 msgstr "PGP ¼­¸íÀ» È®ÀÎÇÒ±î¿ä?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Àӽà ÆÄÀÏÀ» ¸¸µé ¼ö ¾øÀ½!"
 
@@ -341,114 +341,114 @@ msgstr "Ç¥
 msgid "Could not copy message"
 msgstr "¸ÞÀÏÀ» º¹»çÇÒ ¼ö ¾øÀ½"
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "S/MIME ¼­¸í È®Àο¡ ¼º°øÇÔ."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "S/MIME ÀÎÁõ¼­ ¼ÒÀ¯ÀÚ¿Í º¸³½ÀÌ°¡ ÀÏÄ¡ÇÏÁö ¾ÊÀ½."
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr ""
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "S/MIME ¼­¸í °ËÁõ¿¡ ½ÇÆÐÇÔ."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "PGP ¼­¸í È®Àο¡ ¼º°øÇÔ."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "PGP ¼­¸í °ËÁõ¿¡ ½ÇÆÐÇÔ."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "¸í·É¾î: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "¸ÞÀÏÀ» Àü´ÞÇÒ ÁÖ¼Ò: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "¼±ÅÃÇÑ ¸ÞÀÏÀ» Àü´ÞÇÑ ÁÖ¼Ò: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "ÁÖ¼Ò ºÐ¼® Áß ¿À·ù!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "À߸øµÈ IDN: '%s'"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "%s¿¡°Ô ¸ÞÀÏ Àü´Þ"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "%s¿¡°Ô ¸ÞÀÏ Àü´Þ"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "¸ÞÀÏÀÌ Àü´Þ µÇÁö ¾ÊÀ½."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "¸ÞÀϵéÀÌ Àü´Þ µÇÁö ¾ÊÀ½."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "¸ÞÀÏÀÌ Àü´ÞµÊ."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "¸ÞÀϵéÀÌ Àü´ÞµÊ."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "ÇÊÅÍ°úÁ¤À» »ý¼ºÇÒ ¼ö ¾øÀ½"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "¸í·É¾î·Î ¿¬°á: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "ÇÁ¸°Æ® ¸í·ÉÀÌ Á¤ÀǵÇÁö ¾ÊÀ½."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "¸ÞÀÏÀ» ÇÁ¸°Æ® ÇÒ±î¿ä?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Ç¥½ÃÇÑ ¸ÞÀÏÀ» ÇÁ¸°Æ® ÇÒ±î¿ä?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "¸ÞÀÏÀ» ÇÁ¸°Æ®ÇÔ"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "¸ÞÀϵéÀ» ÇÁ¸°Æ®ÇÔ"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "¸ÞÀÏÀ» ÇÁ¸°Æ® ÇÒ ¼ö ¾øÀ½"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "¸ÞÀϵéÀ» ÇÁ¸°Æ® ÇÒ ¼ö ¾øÀ½"
 
-#: commands.c:508
+#: commands.c:509
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -456,7 +456,7 @@ msgid ""
 msgstr ""
 "¿ª¼øÁ¤·Ä: (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 
-#: commands.c:509
+#: commands.c:510
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
@@ -464,74 +464,74 @@ msgid ""
 msgstr ""
 "Á¤·Ä: (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 
-#: commands.c:510
+#: commands.c:511
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzc"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "½© ¸í·É¾î: "
 
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "º¹È£È­-ÀúÀå%s ¸ÞÀÏÇÔÀ¸·Î"
 
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "º¹È£È­-º¹»ç%s ¸ÞÀÏÇÔÀ¸·Î"
 
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Çص¶-ÀúÀå%s ¸ÞÀÏÇÔÀ¸·Î"
 
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Çص¶-º¹»ç%s ¸ÞÀÏÇÔÀ¸·Î"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "ÀúÀå%s ¸ÞÀÏÇÔÀ¸·Î"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "º¹»ç%s ¸ÞÀÏÇÔÀ¸·Î"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " Ç¥½ÃµÊ"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "%s·Î º¹»ç..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "º¸³¾¶§ %s·Î º¯È¯ÇÒ±î¿ä?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "%s·Î Content-TypeÀÌ ¹Ù²ñ."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "¹®ÀÚ¼ÂÀÌ %s¿¡¼­ %s·Î ¹Ù²ñ."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "º¯È¯ÇÏÁö ¾ÊÀ½"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "º¯È¯Áß"
 
@@ -624,103 +624,671 @@ msgstr "
 msgid "Attaching selected files..."
 msgstr "¼±ÅÃµÈ ÆÄÀÏÀ» ÷ºÎÁß..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "%s¸¦ ÷ºÎÇÒ ¼ö ¾øÀ½!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "¸ÞÀÏÀ» ÷ºÎÇϱâ À§ÇØ ¸ÞÀÏÇÔÀ» ¿°"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Æú´õ¿¡ ¸ÞÀÏÀÌ ¾øÀ½."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "÷ºÎÇÏ°íÀÚ ÇÏ´Â ¸ÞÀÏÀ» Ç¥½ÃÇϼ¼¿ä."
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "÷ºÎÇÒ ¼ö ¾øÀ½!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "ÀúÀåÀº ÅؽºÆ® ÷ºÎ¹°¿¡¸¸ Àû¿ëµÊ."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "ÇöÀç ÷ºÎ¹°Àº º¯È¯ÇÒ¼ö ¾øÀ½."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "ÇöÀç ÷ºÎ¹°Àº º¯È¯ °¡´ÉÇÔ."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "À߸øµÈ ÀÎÄÚµù"
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "ÀÌ ¸ÞÀÏÀÇ º¹»çº»À» ÀúÀåÇÒ±î¿ä?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "À̸§ ¹Ù²Ù±â: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "%s: %sÀÇ »óŸ¦ ¾Ë¼ö ¾øÀ½."
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "»õ ÆÄÀÏ: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-TypeÀÌ base/sub Çü½ÄÀÓ."
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "¾Ë ¼ö ¾ø´Â Content-Type %s"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "%s ÆÄÀÏÀ» ¸¸µé ¼ö ¾øÀ½"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "¿©±â¿¡ ÀÖ´Â °ÍµéÀº ÷ºÎ °úÁ¤¿¡¼­ ½ÇÆÐÇÑ °ÍµéÀÔ´Ï´Ù."
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "ÀÌ ¸ÞÀÏÀ» ³ªÁß¿¡ º¸³¾±î¿ä?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "¸ÞÀÏÇÔ¿¡ ¸ÞÀÏ ¾²±â"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "%s¿¡ ¸ÞÀÏ ¾²´ÂÁß..."
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "¸ÞÀÏ ¾²±â ¿Ï·á."
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "ÀÌ¹Ì S/MIMEÀÌ ¼±ÅõÊ. Áö¿ì°í °è¼ÓÇÒ±î¿ä? "
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP°¡ ¼±ÅõÊ. Áö¿ì°í °è¼ÓÇÒ±î¿ä? "
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "ÆÐÅÏ ¿À·ù: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "ÆÐÅÏ ¿À·ù: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "ÆÐÅÏ ¿À·ù: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "ÆÐÅÏ ¿À·ù: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "ÆÐÅÏ ¿À·ù: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "ÆÐÅÏ ¿À·ù: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "ÆÐÅÏ ¿À·ù: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "ÆÐÅÏ ¿À·ù: %s"
+
+#: crypt-gpgme.c:993
+msgid "Warning: One of the keys has been revoked\n"
+msgstr ""
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "¼­¹ö ÀÎÁõ¼­°¡ ¸¸±âµÊ"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL »ç¿ë ºÒ°¡."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Fingerprint: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "¸ÞÀÏ º¸³»´Â Áß ¿À·ù."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "¸í·É¾î ¿À·ù: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- ¼­¸í ÀÚ·áÀÇ ³¡ --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- ¿À·ù: Àӽà ÆÄÀÏÀ» ¸¸µé ¼ö°¡ ¾øÀ½! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP ¸ÞÀÏ ½ÃÀÛ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP °ø°³ ¿­¼è ºÎºÐ ½ÃÀÛ --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP ¼­¸í ¸ÞÀÏ ½ÃÀÛ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- PGP ¸ÞÀÏ ³¡ --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP °ø°³ ¿­¼è ºÎºÐ ³¡--]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- PGP ¼­¸í ¸ÞÀÏ ³¡ --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- ¿À·ù: PGP ¸ÞÀÏÀÇ ½ÃÀÛÀ» ãÀ» ¼ö ¾øÀ½! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- ¿À·ù: À߸ø ¸¸µé¾îÁø PGP/MIME Çü½ÄÀÇ ¸ÞÀÏ! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- ¿À·ù: Àӽà ÆÄÀÏÀ» ¸¸µé ¼ö°¡ ¾øÀ½! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- ¾Æ·¡ÀÇ ÀÚ·á´Â PGP/MIME ¾Ïȣȭ µÇ¾úÀ½ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- ¾Æ·¡ÀÇ ÀÚ·á´Â PGP/MIME ¾Ïȣȭ µÇ¾úÀ½ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- PGP/MIME ¾Ïȣȭ ÀÚ·á ³¡ --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- PGP/MIME ¾Ïȣȭ ÀÚ·á ³¡ --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr ""
+"[-- ¾Æ·¡ÀÇ ÀÚ·á´Â S/MIME ¼­¸í µÇ¾úÀ½ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- ¾Æ·¡ÀÇ ÀÚ·á´Â S/MIME ¾Ïȣȭ µÇ¾úÀ½ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- S/MIME ¼­¸í ÀÚ·á ³¡ --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- S/MIME ¾Ïȣȭ ÀÚ·á ³¡ --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "¹«È¿   "
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "À߸øµÈ ´Þ ÀÔ·Â: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "À߸øµÈ ´Þ ÀÔ·Â: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "¾Ïȣȭ"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "ÀÎÁõ¼­ ÀúÀåµÊ"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "¿­¼è ID: 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "Ãë¼ÒµÊ   "
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "¸¸±âµÊ  "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Àӽà ÆÄÀÏÀ» ¸¸µé ¼ö ¾øÀ½"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "%s·Î ¿¬°á Áß..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "%s ¼­¹ö¿ÍÀÇ ¿¬°á ¿À·ù"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "¿­¼è ID: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "SSL ½ÇÆÐ: %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "¸ðµç Å°°¡ ¸¸±â/Ãë¼Ò/»ç¿ë ºÒ°¡ ÀÔ´Ï´Ù."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "³¡³»±â  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "¼±Åà  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "¿­¼è È®ÀÎ  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP Å°°¡ \"%s\"¿Í ÀÏÄ¡ÇÔ."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP Å°°¡ \"%s\"¿Í ÀÏÄ¡ÇÔ."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "S/MIME ÀÎÁõ¼­°¡ \"%s\"¿Í ÀÏÄ¡."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP Å°°¡ \"%s\"¿Í ÀÏÄ¡ÇÔ."
+
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "ÀÌ Å°´Â »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù: ¸¸±â/»ç¿ëÁßÁö/Ãë¼ÒµÊ."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "ÀÌ Å°´Â ¸¸±â/»ç¿ëÁßÁö/Ãë¼ÒµÊ."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "IDÀÇ ÀÎÁõÀÚ°¡ Á¤ÀǵÇÁö ¾ÊÀ½."
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "ÀÌ ID´Â È®½ÇÇÏÁö ¾ÊÀ½."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "ÀÌ ID´Â ½Å¿ëµµ°¡ ³·À½"
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s ÀÌ Å°¸¦ Á¤¸»·Î »ç¿ëÀ» ÇÏ°Ú½À´Ï±î?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "\"%s\"¿Í ÀÏÄ¡ÇÏ´Â Å°¸¦ ã´Â Áß..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "keyID = \"%s\"¸¦ %s¿¡ »ç¿ëÇÒ±î¿ä?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "%sÀÇ keyID ÀÔ·Â: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr "PGP ¾Ïȣȭ(e), ¼­¸í(s), »ç¿ë ¼­¸í(a), µÑ ´Ù(b), (i)nline, Ãë¼Ò(f)? "
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "eswabf"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr "PGP ¾Ïȣȭ(e), ¼­¸í(s), »ç¿ë ¼­¸í(a), µÑ ´Ù(b), (i)nline, Ãë¼Ò(f)? "
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "eswabf"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "»ç¿ë ¼­¸í: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Çì´õ¸¦ ºÐ¼®Çϱâ À§ÇÑ ÆÄÀÏ ¿­±â ½ÇÆÐ"
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -736,29 +1304,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "¾ÏÈ£ ¹®±¸ ÀØÀ½."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "PGP¸¦ ±¸µ¿ÇÕ´Ï´Ù..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "º¸³»Áö ¾ÊÀ½."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "³»¿ë¿¡ S/MIME Ç¥½Ã°¡ ¾ø´Â °æ¿ì´Â Áö¿øÇÏÁö ¾ÊÀ½."
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "PGP ¿­¼è¸¦ ÃßÃâÇÏ´Â Áß...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "S/MIME ÀÎÁõ¼­ ÃßÃâÇÏ´Â Áß...\n"
 
@@ -770,7 +1338,7 @@ msgstr ""
 "[-- ¿À·ù: ÀÏÄ¡ÇÏÁö ¾Ê´Â multipart/signed ±¸Á¶! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -779,7 +1347,7 @@ msgstr ""
 "[-- ¿À·ù: ¾Ë ¼ö ¾ø´Â multipart/signed ÇÁ·ÎÅäÄÝ %s! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -789,7 +1357,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -797,7 +1365,7 @@ msgstr ""
 "[-- ¾Æ·¡ÀÇ ÀÚ·á´Â ¼­¸í µÇ¾úÀ½ --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -805,7 +1373,7 @@ msgstr ""
 "[-- °æ°í: ¼­¸íÀ» ãÀ» ¼ö ¾øÀ½. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -813,224 +1381,254 @@ msgstr ""
 "\n"
 "[-- ¼­¸í ÀÚ·áÀÇ ³¡ --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "PGP¸¦ ±¸µ¿ÇÕ´Ï´Ù..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "yes"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "no"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "MuttÀ» Á¾·áÇÒ±î¿ä?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "¾Æ¹«Å°³ª ´©¸£¸é °è¼ÓÇÕ´Ï´Ù..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr "(¸ñ·Ï º¸±â '?'): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "¿­¸° ¸ÞÀÏÇÔÀÌ ¾øÀ½."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "¸ÞÀÏÀÌ ¾øÀ½."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "Àбâ Àü¿ë ¸ÞÀÏÇÔ."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "¸ÞÀÏ Ã·ºÎ ¸ðµå¿¡¼­ Çã°¡µÇÁö ¾Ê´Â ±â´ÉÀÓ."
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "¸ÞÀÏ ¾øÀ½."
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Àбâ Àü¿ë ¸ÞÀÏÇÔ¿¡ ¾µ¼ö ¾øÀ½!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "º¯°æ »çÇ×Àº Æú´õ¸¦ ´ÝÀ»¶§ ±â·ÏµÊ."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "º¯°æ »çÇ×À» ±â·Ï ÇÏÁö ¾ÊÀ½."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Á¾·á"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "ÀúÀå"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "¸ÞÀÏ"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "´äÀå"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "±×·ì"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "¿ÜºÎ¿¡¼­ ¸ÞÀÏÇÔÀÌ º¯°æµÊ. Ç÷¡±×°¡ Ʋ¸± ¼ö ÀÖÀ½"
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "ÇöÀç ¸ÞÀÏÇÔ¿¡ »õ ¸ÞÀÏ µµÂø."
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "¿ÜºÎ¿¡¼­ ¸ÞÀÏÇÔÀÌ º¯°æµÊ."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Ç¥½ÃµÈ ¸ÞÀÏÀÌ ¾øÀ½."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 msgid "Nothing to do."
 msgstr "¾Æ¹«°Íµµ ÇÏÁö ¾ÊÀ½."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "À̵¿: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "¸ÞÀÏÀÇ ¹øÈ£¸¸ °¡´É."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "¸ÞÀÏÀÌ º¼ ¼ö ¾ø´Â »óÅÂÀÓ."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "À߸øµÈ ¸ÞÀÏ ¹øÈ£."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "ÀÏÄ¡ÇÏ´Â ¸ÞÀÏ »èÁ¦: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "Á¦ÇÑ ÆÐÅÏÀÌ ¾øÀ½."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "ÆÐÅÏ: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "ÆÐÅÏ°ú ÀÏÄ¡ÇÏ´Â ¸ÞÀÏ: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "MuttÀ» Á¾·áÇÒ±î¿ä?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "ÀÏÄ¡ÇÏ´Â ¸ÞÀÏ¿¡ Ç¥½ÃÇÔ: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "ÀÏÄ¡ÇÏ´Â ¸ÞÀÏÀ» »èÁ¦ Ãë¼Ò: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "ÀÏÄ¡ÇÏ´Â ¸ÞÀÏÀ» Ç¥½Ã ÇØÁ¦: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Àбâ Àü¿ëÀ¸·Î ¸ÞÀÏÇÔ ¿­±â"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "¸ÞÀÏÇÔ ¿­±â"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s´Â ¸ÞÀÏÇÔÀÌ ¾Æ´Ô."
 
-#: curs_main.c:1165
-msgid "Exit Mutt without saving?"
-msgstr "ÀúÀåÇÏÁö ¾Ê°í MuttÀ» ³¡³¾±î¿ä?"
+#: curs_main.c:1176
+msgid "Exit Mutt without saving?"
+msgstr "ÀúÀåÇÏÁö ¾Ê°í MuttÀ» ³¡³¾±î¿ä?"
+
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "±ÛŸ·¡ ¸ðµå°¡ ¾Æ´Ô."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "ÇöÀç ¸ÞÀÏÀ» ÀúÀå ÈÄ ³ªÁß¿¡ º¸³¿"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "¸¶Áö¸· ¸Þ¼¼ÁöÀÔ´Ï´Ù."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "»èÁ¦ Ãë¼ÒµÈ ¸ÞÀÏ ¾øÀ½."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "ù¹ø° ¸Þ¼¼ÁöÀÔ´Ï´Ù."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "À§ºÎÅÍ ´Ù½Ã °Ë»ö."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "¾Æ·¡ºÎÅÍ ´Ù½Ã °Ë»ö."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "»õ ¸ÞÀÏ ¾øÀ½"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "ÀÐÁö ¾ÊÀº ¸ÞÀÏ ¾øÀ½"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " º¸±â Á¦ÇÑ"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "POP ¼­¹ö¿¡¼­ 'Áß¿ä' Ç¥½Ã¸¦ ¹Ù²Ü ¼ö ¾øÀ½."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "´õ ÀÌ»ó ±ÛŸ·¡ ¾øÀ½."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "óÀ½ ±ÛŸ·¡ÀÔ´Ï´Ù."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "±ÛŸ·¡ ¸ðµå°¡ ¾Æ´Ô."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "±ÛŸ·¡¿¡ ÀÐÁö ¾ÊÀº ¸Þ¼¼Áö ÀÖÀ½."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "POP ¼­¹öÀÇ ¸ÞÀÏÀ» ¼öÁ¤ÇÒ ¼ö ¾øÀ½."
 
@@ -1162,107 +1760,107 @@ msgstr "
 msgid "Clear flag"
 msgstr "Ç÷¡±× Áö¿ò"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- ¿À·ù:  Multipart/Alternative ºÎºÐÀ» Ç¥½Ã ¼ö ¾øÀ½! --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- ÷ºÎ¹° #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Á¾·ù: %s/%s, ÀÎÄÚµù ¹æ½Ä: %s, Å©±â: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- %s¸¦ »ç¿ëÇÑ ÀÚµ¿ º¸±â --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "ÀÚµ¿ º¸±â ¸í·É ½ÇÇà: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- %s¸¦ ½ÇÇàÇÒ ¼ö ¾øÀ½. --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- %sÀÇ ÀÚµ¿ º¸±â ¿À·ù --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr "[-- ¿À·ù: message/external-body¿¡ access-type º¯¼ö°¡ ¾øÀ½ --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[ -- %s/%s ÷ºÎ¹° "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(Å©±â: %s ¹ÙÀÌÆ®) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "»èÁ¦ µÇ¾úÀ½ --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- %s¿¡ --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- À̸§: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- ÀÌ %s/%s ÷ºÎ¹°Àº Æ÷ÇÔµÇÁö ¾ÊÀ½, --]\n"
 
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr "[-- ÁöÁ¤µÈ ¿ÜºÎ ¼Ò½º°¡ ¸¸±âµÊ --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- ÁöÁ¤µÈ access-type %s´Â Áö¿øµÇÁö ¾ÊÀ½ --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "¿À·ù: multipart/signed ÇÁ·ÎÅäÄÝÀÌ ¾øÀ½."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "¿À·ù: multipart/encrypted ÇÁ·ÎÅäÄÝ º¯¼ö°¡ ¾øÀ½!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Àӽà ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- '%s/%s'´Â Áö¿øµÇÁö ¾ÊÀ½ "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "('%s' Å°: ºÎºÐ º¸±â)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "('÷ºÎ¹° º¸±â' ±Û¼è Á¤ÀÇ°¡ ÇÊ¿äÇÔ!)"
 
@@ -1369,46 +1967,46 @@ msgstr "
 msgid "SASL authentication failed."
 msgstr "SASL ÀÎÁõ¿¡ ½ÇÆÐÇÔ."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s´Â À߸øµÈ IMAP ÆнºÀÓ"
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "³×ÀÓ½ºÆäÀ̽º ¹Þ´Â Áß..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Æú´õ ¸ñ·Ï ¹Þ´Â Áß..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "Æú´õ ¾øÀ½"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "¸ÞÀÏÇÔ ¿­±â"
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "¸ÞÀÏÇÔÀº À̸§À» °¡Á®¾ß ÇÔ."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "¸ÞÀÏÇÔÀÌ »ý¼ºµÊ."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "¸ÞÀÏÇÔ ¿­±â"
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "SSL ½ÇÆÐ: %s"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "¸ÞÀÏÇÔÀÌ »ý¼ºµÊ."
@@ -1420,135 +2018,132 @@ msgstr "
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Ä¡¸íÀû ¿À·ù. ¸Þ¼¼Áö ¼ýÀÚ°¡ µ¿±âµÇÁö ¾ÊÀ½!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "%s¿ÍÀÇ ¿¬°áÀ» ´Ý´ÂÁß..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "¿À·¡µÈ ¹öÁ¯ÀÇ IMAP ¼­¹ö·Î Mutt¿Í »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "TLS¸¦ »ç¿ëÇÏ¿© ¿¬°á ÇÒ±î¿ä?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "TLS ¿¬°á ÇÒ¼ö ¾øÀ½"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "%s ¼±Åà Áß..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "¸ÞÀÏÇÔ ¿©´ÂÁß ¿À·ù"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "ÀÌ ¼­¹ö¿¡ IMAP ¸ÞÀÏÇÔÀ» Ãß°¡ÇÒ ¼ö ¾øÀ½"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "%s¸¦ ¸¸µé±î¿ä?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "%d°³ÀÇ ¸ÞÀÏÀ» »èÁ¦ Ç¥½ÃÇÔ..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "»èÁ¦ ½ÇÆÐ"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "¸Þ¼¼Áö »óÅ Ç÷¡±× ÀúÀå... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "¼­¹ö¿¡¼­ ¸Þ¼¼Áö »èÁ¦ Áß..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: »èÁ¦ ½ÇÆÐ"
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "´Ý±â ½ÇÆÐ"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "À߸øµÈ ¸ÞÀÏÇÔ À̸§"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "%s¿¡ °¡ÀÔ Áß..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "%s¿¡¼­ °¡ÀÔ Å»Åð Áß..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "ÀÌ ¹öÁ¯ÀÇ IAMP ¼­¹ö¿¡¼­ Çì´õ¸¦ °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Àӽà ÆÄÀÏ %s¸¦ ¸¸µé ¼ö ¾øÀ½!"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "¸Þ¼¼Áö Çì´õ °¡Á®¿À´Â Áß... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "¸Þ¼¼Áö Çì´õ °¡Á®¿À´Â Áß... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "¸Þ¼¼Áö °¡Á®¿À´Â Áß..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "À߸øµÈ ¸ÞÀÏ À妽º. ¸ÞÀÏÇÔ ¿­±â Àç½Ãµµ."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "¸ÞÀÏÀ» ¾÷·Îµå ÇÏ´Â Áß..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "%d°³ÀÇ ¸Þ¼¼Áö¸¦ %s·Î º¹»ç Áß..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "¸Þ¼¼Áö %d¸¦ %s·Î º¹»ç Áß..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "°è¼ÓÇÒ±î¿ä?"
 
@@ -1557,124 +2152,124 @@ msgstr "
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:678
+#: init.c:644
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "ÆÐÅÏ°ú ÀÏÄ¡ÇÏ´Â ¸ÞÀÏ¿¡ ÅÂ±× ºÙÀÓ"
 
-#: init.c:680
+#: init.c:646
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "ÆÐÅÏ°ú ÀÏÄ¡ÇÏ´Â ¸ÞÀÏÀÇ ÅÂ±× ÇØÁ¦"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "º°Äª: ÁÖ¼Ò ¾øÀ½"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "°æ°í: À߸øµÈ IDN '%s' ¾Ë¸®¾Æ½º '%s'.\n"
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "À߸øµÈ Çì´õ Çʵå"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: ¾Ë ¼ö ¾ø´Â Á¤·Ä ¹æ¹ý"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): Á¤±ÔÇ¥Çö½Ä ¿À·ù: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: ¾Ë ¼ö ¾ø´Â º¯¼ö"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "À߸øµÈ Á¢µÎ»ç"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "À߸øµÈ º¯¼ö°ª"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s ¼³Á¤"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s ¼³Á¤ ÇØÁ¦"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: À߸øµÈ ¸ÞÀÏÇÔ Çü½Ä"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: À߸øµÈ °ª"
 
-#: init.c:1589
+#: init.c:1555
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: ¾Ë ¼ö ¾ø´Â Çü½Ä"
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: ¾Ë ¼ö ¾ø´Â Çü½Ä"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "%sÀÇ %d¹ø ÁÙ¿¡ ¿À·ù: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: %s¿¡ ¿À·ù"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: %s¿¡ ¿À·ù°¡ ¸¹À¸¹Ç·Î Àбâ Ãë¼Ò"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: %s¿¡ ¿À·ù"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: Àμö°¡ ³Ê¹« ¸¹À½"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: ¾Ë ¼ö ¾ø´Â ¸í·É¾î"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "¸í·É¾î ¿À·ù: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "Ȩ µð·ºÅ丮¸¦ ãÀ» ¼ö ¾øÀ½"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "»ç¿ëÀÚ À̸§À» ¾Ë¼ö ¾øÀ½"
 
@@ -2132,399 +2727,408 @@ msgid "compose a new mail message"
 msgstr "»õ·Î¿î ¸ÞÀÏ ÀÛ¼º"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "´Ù¸¥ Æú´õ ¿­±â"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "´Ù¸¥ Æú´õ¸¦ Àбâ Àü¿ëÀ¸·Î ¿­±â"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "¸ÞÀÏÀÇ »óÅ Ç÷¡±× ÇØÁ¦Çϱâ"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "ÆÐÅÏ°ú ÀÏÄ¡ÇÏ´Â ¸ÞÀÏ »èÁ¦"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "IMAP ¼­¹ö¿¡¼­ ¸ÞÀÏ °¡Á®¿À±â"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "POP ¼­¹ö¿¡¼­ ¸ÞÀÏ °¡Á®¿À±â"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "óÀ½ ¸ÞÀÏ·Î À̵¿"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "¸¶Áö¸· ¸ÞÀÏ·Î À̵¿"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "ÆÐÅÏ°ú ÀÏÄ¡ÇÏ´Â ¸ÞÀϸ¸ º¸ÀÓ"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "¼±ÅÃÇÑ ¸ÞÀÏÀ» Àü´ÞÇÑ ÁÖ¼Ò: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "´ÙÀ½ »õ ¸ÞÀÏ·Î À̵¿"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "ÀÐÁö ¾ÊÀº ´ÙÀ½ ¸ÞÀÏ/»õ ¸ÞÀÏ·Î À̵¿"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "´ÙÀ½ ºÎ¼Ó ±ÛŸ·¡·Î À̵¿"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "´ÙÀ½ ±ÛŸ·¡·Î À̵¿"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "»èÁ¦µÇÁö ¾ÊÀº ´ÙÀ½ ¸ÞÀÏ·Î À̵¿"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "ÀÐÁö ¾ÊÀº ´ÙÀ½ ¸ÞÀÏ·Î À̵¿"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "±ÛŸ·¡ÀÇ ºÎ¸ð ¸ÞÀÏ·Î À̵¿"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "ÀÌÀü ±ÛŸ·¡·Î À̵¿"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "ÀÌÀü ºÎ¼Ó ±ÛŸ·¡·Î À̵¿"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "»èÁ¦µÇÁö ¾ÊÀº ÀÌÀü ¸ÞÀÏ·Î À̵¿"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "ÀÌÀü »õ ¸ÞÀÏ·Î À̵¿"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "ÀÐÁö ¾ÊÀº ÀÌÀü ¸ÞÀÏ/»õ ¸ÞÀÏ·Î À̵¿"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "ÀÐÁö ¾ÊÀº ÀÌÀü ¸ÞÀÏ·Î À̵¿"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "ÇöÀç ±ÛŸ·¡¿¡ ÀÐÀº Ç¥½ÃÇϱâ"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "ÇöÀç ºÎ¼Ó ±ÛŸ·¡¿¡ ÀÐÀº Ç¥½ÃÇϱâ"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "¸ÞÀÏÀÇ »óÅ Ç÷¡±× ¼³Á¤Çϱâ"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "¸ÞÀÏÇÔ º¯°æ »çÇ× ÀúÀå"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "ÆÐÅÏ°ú ÀÏÄ¡ÇÏ´Â ¸ÞÀÏ¿¡ ÅÂ±× ºÙÀÓ"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "ÆÐÅÏ°ú ÀÏÄ¡ÇÏ´Â ¸ÞÀÏ º¹±¸"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "ÆÐÅÏ°ú ÀÏÄ¡ÇÏ´Â ¸ÞÀÏÀÇ ÅÂ±× ÇØÁ¦"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "ÆäÀÌÁö Áß°£À¸·Î À̵¿"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "´ÙÀ½ Ç׸ñÀ¸·Î À̵¿"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "ÇÑÁÙ¾¿ ³»¸®±â"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "´ÙÀ½ ÆäÀÌÁö·Î À̵¿"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "¸Þ¼¼Áö ¸¶Áö¸·À¸·Î À̵¿"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "Àο빮ÀÇ Ç¥½Ã »óÅ ¹Ù²Ù±â"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "Àο빮 ´ÙÀ½À¸·Î ³Ñ¾î°¡±â"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "¸Þ¼¼Áö óÀ½À¸·Î À̵¿"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "¸ÞÀÏ/÷ºÎ¹°À» ½© ¸í·ÉÀ¸·Î ¿¬°áÇϱâ"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "ÀÌÀü Ç׸ñÀ¸·Î À̵¿"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "ÇÑÁÙ¾¿ ¿Ã¸®±â"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "ÀÌÀü ÆäÀÌÁö·Î À̵¿"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "ÇöÀç Ç׸ñ Ãâ·Â"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "ÁÖ¼Ò¸¦ ¾ò±â À§ÇØ ¿ÜºÎ ÇÁ·Î±×·¥ ½ÇÇà"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "Äõ¸® °á°ú¸¦ ÇöÀç °á°ú¿¡ Ãß°¡"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "¸ÞÀÏÇÔÀÇ º¯°æ »çÇ× ÀúÀå ÈÄ ³¡³»±â"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "¹ß¼Û ¿¬±âÇÑ ¸ÞÀÏ ´Ù½Ã ºÎ¸£±â"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "È­¸é ´Ù½Ã ±×¸®±â"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{³»ºÎÀÇ}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "ÇöÀç ¸ÞÀÏÇÔÀ» »èÁ¦ (IMAP¿¡¼­¸¸)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "¸ÞÀÏ¿¡ ´äÀåÇϱâ"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "ÇöÀç ¸ÞÀÏÀ» »õ ¸ÞÀÏÀÇ ÅÛÇ÷¹ÀÌÆ®·Î »ç¿ëÇÔ"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "¸ÞÀÏ/÷ºÎ¹° ÆÄÀÏ·Î ÀúÀå"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "Á¤±Ô Ç¥Çö½ÄÀ» ÀÌ¿ëÇØ °Ë»ö"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "Á¤±Ô Ç¥Çö½ÄÀ» ÀÌ¿ëÇØ ¿ª¼ø °Ë»ö"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "´ÙÀ½ ã±â"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "¿ª¼øÀ¸·Î ã±â"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "°Ë»ö ÆÐÅÏ Ä÷¯¸µ ¼±ÅÃ"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "ÇϺΠ½© ½ÇÇà"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "¸ÞÀÏ Á¤·Ä"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "¸ÞÀÏ ¿ª¼ø Á¤·Ä"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "ÇöÀç Ç׸ñ¿¡ ÅÂ±× ºÙÀÓ"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "´ÙÀ½ ±â´ÉÀ» űװ¡ ºÙÀº ¸ÞÀÏ¿¡ Àû¿ë"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 msgid "apply next function ONLY to tagged messages"
 msgstr "´ÙÀ½ ±â´ÉÀ» űװ¡ ºÙÀº ¸ÞÀÏ¿¡ Àû¿ë"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "ÇöÀç ºÎ¼Ó ±ÛŸ·¡¿¡ ÅÂ±× ºÙÀÓ"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "ÇöÀç ±ÛŸ·¡¿¡ ÅÂ±× ºÙÀÓ"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "¸ÞÀÏÀÇ '»õ±Û' Ç÷¡±× »óÅ ¹Ù²Þ"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "¸ÞÀÏÇÔÀ» ´Ù½Ã ¾µ °ÍÀÎÁö ¼±ÅÃ"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "¸ÞÀÏÇÔÀ» º¼Áö ¸ðµç ÆÄÀÏÀ» º¼Áö ¼±ÅÃ"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "ù ÆäÀÌÁö·Î À̵¿"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "ÇöÀç Ç׸ñ º¹±¸"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "±ÛŸ·¡ÀÇ ¸ðµç ¸ÞÀÏ º¹±¸Çϱâ"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "ºÎ¼Ó ±ÛŸ·¡ÀÇ ¸ðµç ¸ÞÀÏ º¹±¸Çϱâ"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "MuttÀÇ ¹öÁ¯°ú Á¦ÀÛÀÏ º¸±â"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "ÇÊ¿äÇÏ´Ù¸é mailcap Ç׸ñÀ» »ç¿ëÇØ Ã·ºÎ¹°À» º¸¿©ÁÜ"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "MIME ÷ºÎ¹° º¸±â"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "´­·ÁÁø Å° °ª Ç¥½ÃÇϱâ"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "ÇöÀç Á¦ÇÑ ÆÐÅÏ º¸±â"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "ÇöÀç ±ÛŸ·¡ Æì±â/Á¢±â"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "¸ðµç ±ÛŸ·¡ Æì±â/Á¢±â"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "PGP °ø°³ ¿­¼è ÷ºÎ"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "PGP ¿É¼Ç º¸±â"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "PGP °ø°³ ¿­¼è ¹ß¼Û"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "PGP °ø°³ ¿­¼è È®ÀÎ"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "¿­¼èÀÇ »ç¿ëÀÚ ID º¸±â"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "Classic PGP È®ÀÎ"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "üÀÎ ±¸Á¶¸¦ Çã°¡ÇÔ"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "üÀο¡ ¸®¸ÞÀÏ·¯ ÷°¡"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "üÀο¡ ¸®¸ÞÀÏ·¯ »ðÀÔ"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "üÀο¡¼­ ¸®¸ÞÀÏ·¯ »èÁ¦"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "üÀÎÀÇ ÀÌÀü Ç׸ñ ¼±ÅÃ"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "üÀÎÀÇ ´ÙÀ½ Ç׸ñ ¼±ÅÃ"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "mixmaster ¸®¸ÞÀÏ·¯ üÀÎÀ» ÅëÇÑ ¸ÞÀÏ º¸³»±â"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "Çص¶ »çº» ¸¸µç ÈÄ »èÁ¦Çϱâ"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "Çص¶ »çº» ¸¸µé±â"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "¸Þ¸ð¸®¿¡¼­ ¾ÏÈ£ ¹®±¸ Áö¿ò"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "°ø°³ ¿­¼è ÃßÃâ"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "S/MIME ¿É¼Ç º¸±â"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr "Integer overflow -- ¸Þ¸ð¸® ÇÒ´ç ºÒ°¡!"
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "¸Þ¸ð¸® ºÎÁ·!"
 
@@ -2549,12 +3153,13 @@ msgstr ""
 "·ÎÀÌ Àç¹èÆ÷ÇÒ ¼ö ÀÖ½À´Ï´Ù. ÀÚ¼¼ÇÑ »çÇ×Àº 'mutt -vv'·Î È®ÀÎÇϽñ⠹ٶø´Ï´Ù.\n"
 
 #: main.c:61
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2601,25 +3206,69 @@ msgstr ""
 "    Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  "
 "02111, USA.\n"
 
-#: main.c:99
+#: main.c:99
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"usage: mutt [ -nRyzZ ] [ -e <¸í·É¾î> ] [ -F <ÆÄÀÏ> ] [ -m <Á¾·ù> ] [ -f <ÆÄÀÏ"
+"> ]\n"
+"       mutt [ -nR ] [ -e <¸í·É¾î> ] [ -F <ÆÄÀÏ> ] -Q <Äõ¸®> [ -Q <Äõ¸®> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <¸í·É¾î> ] [ -F <ÆÄÀÏ> ] -A <¾Ë¸®¾Æ½º> [ -A <¾Ë¸®¾Æ"
+"½º> ] [...]\n"
+"       mutt [ -nx ] [ -e <¸í·É¾î> ] [ -a <ÆÄÀÏ> ] [ -F <ÆÄÀÏ> ] [ -H <ÆÄÀÏ"
+"> ] [ -i <ÆÄÀÏ> ] [ -s <Á¦¸ñ> ] [ -b <ÁÖ¼Ò> ] [ -c <ÁÖ¼Ò> ] <ÁÖ¼Ò> [ ... ]\n"
+"       mutt [ -n ] [ -e <¸í·É¾î> ] [ -F <ÆÄÀÏ> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"¼±ÅûçÇ×:\n"
+"  -A <¾Ë¸®¾Æ½º>\tÁÖ¾îÁø ¾Ë¸®¾Æ½º È®Àå\n"
+"  -a <ÆÄÀÏ>\t¸ÞÀÏ¿¡ ÆÄÀÏ Ã·ºÎ\n"
+"  -b <ÁÖ¼Ò>\tBCC ÁÖ¼Ò ÁöÁ¤\n"
+"  -c <ÁÖ¼Ò>\tCC ÁÖ¼Ò ÁöÁ¤\n"
+"  -e <¸í·É¾î>\tÃʱâÈ­ ÈÄ ½ÇÇàÇÒ ¸í·É¾î ÁöÁ¤\n"
+"  -f <ÆÄÀÏ>\tÀÐÀ» ¸ÞÀÏÇÔ ÁöÁ¤\n"
+"  -F <ÆÄÀÏ>\tº°µµÀÇ muttrc ÆÄÀÏ ÁöÁ¤\n"
+"  -H <ÆÄÀÏ>\tÇì´õºÎÅÍ ÀÐÀ» ÃÊ¾È ÆÄÀÏ ÁöÁ¤\n"
+"  -i <ÆÄÀÏ>\tMutt °¡ ´äÀå¿¡ Æ÷ÇÔ½Ãų ÆÄÀÏ ÁöÁ¤\n"
+"  -m <À¯Çü>\t±âº» ¸ÞÀÏÇÔ À¯Çü ÁöÁ¤\n"
+"  -n\t\tMutt ½Ã½ºÅÛ Muttrc ÆÄÀÏ ÀÐÁö ¾ÊÀ½\n"
+"  -p\t\t¹ß¼Û ¿¬±âµÈ ¸ÞÀÏ ´Ù½Ã ¿­±â\n"
+"  -Q <º¯¼ö>\t¼³Á¤ º¯¼ö Äõ¸®\n"
+"  -R\t\t¸ÞÀÏÇÔ Àбâ Àü¿ë ¹æ½ÄÀ¸·Î ¿­±â\n"
+"  -s <Á¦¸ñ>\tÁ¦¸ñ ÁöÁ¤ (°ø¹éÀÌ ÀÖÀ» °æ¿ì ÀÎ¿ë ºÎÈ£ »ç¿ë)\n"
+"  -v\t\t¹öÁ¯, ÄÄÆÄÀÏ ¿É¼Ç º¸±â\n"
+"  -x\t\tmailx Àü¼Û ¹æ½Ä Èä³»³»±â\n"
+"  -y\t\t`¸ÞÀÏÇÔ'ÀÇ ¸ñ·Ï Áß ¸ÞÀÏÇÔ ÁöÁ¤\n"
+"  -z\t\t¸ÞÀÏÇÔ¿¡ ¸ÞÀÏÀÌ ¾øÀ¸¸é Áï½Ã ³¡³»±â\n"
+"  -Z\t\t»õ ¸ÞÀÏÀÌ Àִ ù¹ø° ¸ÞÀÏÇÔ ¿­±â, ¾øÀ» °æ¿ì ³¡³¿\n"
+"  -h\t\tÇöÀç µµ¿ò¸»"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
 #, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-"<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-"[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-"[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
-"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
-"\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2672,7 +3321,7 @@ msgstr ""
 "  -Z\t\t»õ ¸ÞÀÏÀÌ Àִ ù¹ø° ¸ÞÀÏÇÔ ¿­±â, ¾øÀ» °æ¿ì ³¡³¿\n"
 "  -h\t\tÇöÀç µµ¿ò¸»"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2680,47 +3329,47 @@ msgstr ""
 "\n"
 "ÄÄÆÄÀÏ ¼±ÅûçÇ×:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Å͹̳ΠÃʱâÈ­ ¿À·ù."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "µð¹ö±ë ·¹º§ %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG°¡ ÄÄÆÄÀϽà Á¤ÀǵÇÁö ¾ÊÀ½. ¹«½ÃÇÔ\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s°¡ ¾øÀ½. ¸¸µé±î¿ä?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "%s¸¦ ¸¸µé ¼ö ¾øÀ½: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "¼ö½ÅÀÚ°¡ ÁöÁ¤µÇÁö ¾ÊÀ½.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: ÆÄÀÏÀ» ÷ºÎÇÒ ¼ö ¾øÀ½.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "»õ ¸ÞÀÏÀÌ µµÂøÇÑ ¸ÞÀÏÇÔ ¾øÀ½."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "¼ö½Å ¸ÞÀÏÇÔÀÌ Á¤ÀǵÇÁö ¾ÊÀ½."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "¸ÞÀÏÇÔÀÌ ºñ¾úÀ½"
 
@@ -2737,11 +3386,11 @@ msgstr "
 msgid "Mailbox was corrupted!"
 msgstr "¸ÞÀÏÇÔÀÌ ¼Õ»óµÇ¾úÀ½!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Ä¡¸íÀû ¿À·ù! ¸ÞÀÏÇÔÀ» ´Ù½Ã ¿­ ¼ö ¾øÀ½!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "¸ÞÀÏÇÔÀ» Àá±Û ¼ö ¾øÀ½!"
 
@@ -2749,11 +3398,11 @@ msgstr "
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "sync: mbox°¡ ¼öÁ¤µÇ¾úÀ¸³ª, ¼öÁ¤µÈ ¸ÞÀÏ´Â ¾øÀ½! (¹ö±× º¸°í ¹Ù¶÷)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "¸ÞÀÏ ¾²´Â Áß... %d (%d%%)"
@@ -2761,188 +3410,148 @@ msgstr "
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "¼öÁ¤Áß..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "¾²±â ½ÇÆÐ! ¸ÞÀÏÇÔÀÇ ÀϺΰ¡ %s¿¡ ÀúÀåµÇ¾úÀ½"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "¸ÞÀÏÇÔÀ» ´Ù½Ã ¿­ ¼ö ¾øÀ½!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "¸ÞÀÏÇÔÀ» ´Ù½Ã ¿©´Â Áß..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "À̵¿ÇÒ À§Ä¡: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "À߸øµÈ »öÀÎ ¹øÈ£."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Ç׸ñÀÌ ¾øÀ½."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "´õ ÀÌ»ó ³»·Á°¥ ¼ö ¾øÀ½."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "´õ ÀÌ»ó ¿Ã¶ó°¥ ¼ö ¾øÀ½."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "¸¶Áö¸· ÆäÀÌÁöÀÔ´Ï´Ù."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "ù¹ø° ÆäÀÌÁöÀÔ´Ï´Ù."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "ù¹ø° Ç׸ñ º¸ÀÓ."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "¸¶Áö¸· Ç׸ñ º¸ÀÓ."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "¸¶Áö¸· Ç׸ñ¿¡ À§Ä¡ÇÏ°í ÀÖ½À´Ï´Ù."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "ù¹ø° Ç׸ñ¿¡ À§Ä¡ÇÏ°í ÀÖ½À´Ï´Ù."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "ã¾Æº¸±â: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "¹Ý´ë ¹æÇâÀ¸·Î ã¾Æº¸±â: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "ÆÐÅÏÀ» ãÀ» ¼ö ¾øÀ½."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "ãÀ» ¼ö ¾øÀ½."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "űװ¡ ºÙÀº Ç׸ñ ¾øÀ½."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "ÀÌ ¸Þ´º¿¡´Â °Ë»ö ±â´ÉÀÌ ¾ø½À´Ï´Ù."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "¼±ÅÃâ¿¡´Â ¹Ù·Î °¡±â ±â´ÉÀÌ ¾ø½À´Ï´Ù."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "ű׸¦ ºÙÀÌ´Â °ÍÀ» Áö¿øÇÏÁö ¾ÊÀ½."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "%s Àд Áß... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): ÆÄÀÏ ½Ã°£À» ¼³Á¤ÇÒ ¼ö ¾øÀ½"
 
-#: muttlib.c:846
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr ""
-"ÆÄÀÏÀÌ ¾Æ´Ï¶ó µð·ºÅ丮ÀÔ´Ï´Ù, ±× ¾Æ·¡¿¡ ÀúÀåÇÒ±î¿ä? [(y)³×, (n)¾Æ´Ï¿À, (a)¸ð"
-"µÎ]"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr ""
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "ÆÄÀÏÀÌ ¾Æ´Ï¶ó µð·ºÅ丮ÀÔ´Ï´Ù, ±× ¾Æ·¡¿¡ ÀúÀåÇÒ±î¿ä?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "µð·ºÅ丮¾È¿¡ ÀúÀåÇÒ ÆÄÀÏ:"
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "ÆÄÀÏÀÌ Á¸ÀçÇÔ, µ¤¾î¾²±â(o), ÷°¡(a), Ãë¼Ò(c)?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "oac"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "POP ¸ÞÀÏÇÔ¿¡ ¸ÞÀÏÀ» ÀúÀåÇÒ ¼ö ¾øÀ½."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s´Â ¸ÞÀÏÇÔÀÌ ¾Æ´Ô!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "%s¿¡ ¸ÞÀÏÀ» ÷°¡ÇÒ±î¿ä?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "%sÀÇ Á¢¼ÓÀÌ ²÷¾îÁü"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL »ç¿ë ºÒ°¡."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "Ãʱâ Á¢¼Ó(preconnect) ¸í·É ½ÇÆÐ."
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "%s (%s) ¿À·ù"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "À߸øµÈ IDN \"%s\"."
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "%s¸¦ ã´Â Áß..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "%s È£½ºÆ®¸¦ ãÀ» ¼ö ¾øÀ½."
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "%s·Î ¿¬°á Áß..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "%s (%s)·Î ¿¬°áÇÒ ¼ö ¾øÀ½."
@@ -2974,7 +3583,8 @@ msgstr "
 msgid "SSL failed: %s"
 msgstr "SSL ½ÇÆÐ: %s"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "ÁöÁ¤ÇÑ °÷¿¡¼­ ÀÎÁõ¼­¸¦ °¡Á®¿Ã ¼ö ¾øÀ½"
 
@@ -2983,87 +3593,209 @@ msgstr "
 msgid "SSL connection using %s (%s)"
 msgstr "%s¸¦ »ç¿ëÇØ SSL ¿¬°á (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "¾Ë ¼ö ¾øÀ½"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[°è»êÇÒ ¼ö ¾øÀ½]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[À߸øµÈ ³¯Â¥]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "¼­¹ö ÀÎÁõ¼­°¡ ¾ÆÁ÷ À¯È¿ÇÏÁö ¾ÊÀ½ "
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "¼­¹ö ÀÎÁõ¼­°¡ ¸¸±âµÊ"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "ÀÌ ÀÎÁõ¼­´Â ´ÙÀ½¿¡ ¼ÓÇÔ:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "ÀÌ ÀÎÁõ¼­ÀÇ ¹ßÇàÀÎÀº:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "ÀÌ ÀÎÁõ¼­´Â À¯È¿ÇÔ"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   from %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     to %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Fingerprint: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "SSL ÀÎÁõ¼­ °Ë»ç"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "°ÅºÎ(r), À̹ø¸¸ Çã°¡(o), ¾ðÁ¦³ª Çã°¡(a)"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "roa"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "°ÅºÎ(r), À̹ø¸¸ Çã°¡(o)"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "ro"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "³¡³»±â  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "°æ°í: ÀÎÁõ¼­¸¦ ÀúÀåÇÏÁö ¸øÇÔ"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "ÀÎÁõ¼­ ÀúÀåµÊ"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "%s¸¦ »ç¿ëÇØ SSL ¿¬°á (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "ÀÎÁõ¼­ ÀúÀåµÊ"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Å͹̳ΠÃʱâÈ­ ¿À·ù."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Fingerprint: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Fingerprint: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "¼­¹ö ÀÎÁõ¼­°¡ ¾ÆÁ÷ À¯È¿ÇÏÁö ¾ÊÀ½ "
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "¼­¹ö ÀÎÁõ¼­°¡ ¸¸±âµÊ"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "¼­¹ö ÀÎÁõ¼­°¡ ¸¸±âµÊ"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "¼­¹ö ÀÎÁõ¼­°¡ ¾ÆÁ÷ À¯È¿ÇÏÁö ¾ÊÀ½ "
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "SSL ÀÎÁõ¼­ °Ë»ç"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "%s·Î ¿¬°á Áß..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "%s (%s) ¿À·ù"
+
+#: muttlib.c:910
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr ""
+"ÆÄÀÏÀÌ ¾Æ´Ï¶ó µð·ºÅ丮ÀÔ´Ï´Ù, ±× ¾Æ·¡¿¡ ÀúÀåÇÒ±î¿ä? [(y)³×, (n)¾Æ´Ï¿À, (a)¸ð"
+"µÎ]"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr ""
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "ÆÄÀÏÀÌ ¾Æ´Ï¶ó µð·ºÅ丮ÀÔ´Ï´Ù, ±× ¾Æ·¡¿¡ ÀúÀåÇÒ±î¿ä?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "µð·ºÅ丮¾È¿¡ ÀúÀåÇÒ ÆÄÀÏ:"
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "ÆÄÀÏÀÌ Á¸ÀçÇÔ, µ¤¾î¾²±â(o), ÷°¡(a), Ãë¼Ò(c)?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "oac"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "POP ¸ÞÀÏÇÔ¿¡ ¸ÞÀÏÀ» ÀúÀåÇÒ ¼ö ¾øÀ½."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "%s¿¡ ¸ÞÀÏÀ» ÷°¡ÇÒ±î¿ä?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s´Â ¸ÞÀÏÇÔÀÌ ¾Æ´Ô!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3141,7 +3873,7 @@ msgstr "
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d°³ º¸°ü, %d°³ À̵¿, %d°³ »èÁ¦"
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d°³ º¸°ü, %d°³ »èÁ¦"
@@ -3160,15 +3892,15 @@ msgstr "
 msgid "Mailbox is marked unwritable. %s"
 msgstr "¸ÞÀÏÇÔÀÌ ¾²±â ºÒ°¡´ÉÀ¸·Î Ç¥½Ã µÇ¾úÀ½. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "¸ÞÀÏÇÔÀÌ Ç¥½ÃµÊ."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "¸ÞÀÏÀ» ¾²Áö ¸øÇÔ"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
@@ -3176,48 +3908,48 @@ msgstr ""
 msgid "Not available in this menu."
 msgstr "ÀÌ ¸Þ´º¿¡¼± À¯È¿ÇÏÁö ¾ÊÀ½."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "ÀÌÀüÆäÀÌÁö"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "´ÙÀ½ÆäÀÌÁö"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "÷ºÎ¹°º¸±â"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "´ÙÀ½"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "¸Þ¼¼ÁöÀÇ ³¡ÀÔ´Ï´Ù."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "¸Þ¼¼ÁöÀÇ Ã³À½ÀÔ´Ï´Ù."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "°Å²Ù·Î ã±â: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "ã±â: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "ÇöÀç µµ¿ò¸»À» º¸°í ÀÖ½À´Ï´Ù."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "´õ ÀÌ»óÀÇ Àο빮 ¾øÀ½."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Àο빮 ÀÌÈÄ¿¡ ´õ ÀÌ»óÀÇ ºñ Àο빮 ¾øÀ½."
 
@@ -3284,27 +4016,27 @@ msgstr "
 msgid "error: unknown op %d (report this error)."
 msgstr "¿À·ù: ¾Ë ¼ö ¾ø´Â ÀÛµ¿ %d (¿À·ù º¸°í ¹Ù¶÷)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "°Ë»ö ÆÐÅÏ ÄÄÆÄÀÏ Áß..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "¼±ÅÃµÈ ¸ÞÀÏ¿¡ ¸í·É ½ÇÇàÁß..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "±âÁØ°ú ÀÏÄ¡ÇÏ´Â ¸ÞÀÏÀÌ ¾øÀ½."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "ÀÏÄ¡ÇÏ´Â °á°ú°¡ ¾Æ·¡¿¡ ¾øÀ½"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "ÀÏÄ¡ÇÏ´Â °á°ú°¡ À§¿¡ ¾øÀ½"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "ã´Â µµÁß ÁߴܵÊ."
 
@@ -3316,11 +4048,11 @@ msgstr "PGP 
 msgid "PGP passphrase forgotten."
 msgstr "PGP ¾ÏÈ£ ¹®±¸ ÀØÀ½."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- ¿À·ù: PGP ÇϺΠÇÁ·Î¼¼½º¸¦ »ý¼ºÇÒ ¼ö ¾øÀ½! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3328,51 +4060,22 @@ msgstr ""
 "[-- PGP Ãâ·Â ³¡ --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP ¸ÞÀÏ ½ÃÀÛ --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP °ø°³ ¿­¼è ºÎºÐ ½ÃÀÛ --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP ¼­¸í ¸ÞÀÏ ½ÃÀÛ --]\n"
-"\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- PGP ¸ÞÀÏ ³¡ --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP °ø°³ ¿­¼è ºÎºÐ ³¡--]\n"
-
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- PGP ¼­¸í ¸ÞÀÏ ³¡ --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "¸ÞÀÏÀ» º¹»çÇÒ ¼ö ¾øÀ½"
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- ¿À·ù: PGP ¸ÞÀÏÀÇ ½ÃÀÛÀ» ãÀ» ¼ö ¾øÀ½! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "PGP ¼­¸í È®Àο¡ ¼º°øÇÔ."
 
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "³»ºÎ ¿À·ù. <roessler@does-not-exist.org>¿¡°Ô ¾Ë·ÁÁֽʽÿä."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3380,71 +4083,37 @@ msgstr ""
 "[-- Error: PGP ÇϺΠÇÁ·Î¼¼½º¸¦ »ý¼ºÇÒ ¼ö ¾øÀ½! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- ¿À·ù: À߸ø ¸¸µé¾îÁø PGP/MIME Çü½ÄÀÇ ¸ÞÀÏ! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- ¿À·ù: Àӽà ÆÄÀÏÀ» ¸¸µé ¼ö°¡ ¾øÀ½! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- ¾Æ·¡ÀÇ ÀÚ·á´Â PGP/MIME ¾Ïȣȭ µÇ¾úÀ½ --]\n"
-"\n"
-
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- PGP/MIME ¾Ïȣȭ ÀÚ·á ³¡ --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "Çص¶ ½ÇÆÐ."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "PGP ÇϺΠÇÁ·Î¼¼½º¸¦ ¿­ ¼ö ¾øÀ½!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "keyID = \"%s\"¸¦ %s¿¡ »ç¿ëÇÒ±î¿ä?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "%sÀÇ keyID ÀÔ·Â: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "PGP¸¦ ½ÇÇàÇÏÁö ¸øÇÔ"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "PGP ¾Ïȣȭ(e), ¼­¸í(s), »ç¿ë ¼­¸í(a), µÑ ´Ù(b), (i)nline, Ãë¼Ò(f)? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1499
+#: pgp.c:1543
 #, fuzzy
 msgid "esabifc"
 msgstr "esabif"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "»ç¿ë ¼­¸í: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "PGP ¿­¼è °¡Á®¿À´Â Áß..."
@@ -3453,16 +4122,6 @@ msgstr "PGP 
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "¸ðµç Å°°¡ ¸¸±â/Ãë¼Ò/»ç¿ë ºÒ°¡ ÀÔ´Ï´Ù."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "¼±Åà  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "¿­¼è È®ÀÎ  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3477,40 +4136,6 @@ msgstr "PGP Å°
 msgid "Can't open /dev/null"
 msgstr "/dev/null¸¦ ¿­ ¼ö ¾øÀ½"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Àӽà ÆÄÀÏÀ» ¸¸µé ¼ö ¾øÀ½"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "¿­¼è ID: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "ÀÌ Å°´Â »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù: ¸¸±â/»ç¿ëÁßÁö/Ãë¼ÒµÊ."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "ÀÌ Å°´Â ¸¸±â/»ç¿ëÁßÁö/Ãë¼ÒµÊ."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "IDÀÇ ÀÎÁõÀÚ°¡ Á¤ÀǵÇÁö ¾ÊÀ½."
-
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "ÀÌ ID´Â È®½ÇÇÏÁö ¾ÊÀ½."
-
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "ÀÌ ID´Â ½Å¿ëµµ°¡ ³·À½"
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s ÀÌ Å°¸¦ Á¤¸»·Î »ç¿ëÀ» ÇÏ°Ú½À´Ï±î?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "¿­¼è ID ¸¦ ÀÔ·ÂÇϽʽÿä: "
@@ -3524,11 +4149,6 @@ msgstr "PGP
 msgid "PGP Key %s."
 msgstr "PGP Å° %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "\"%s\"¿Í ÀÏÄ¡ÇÏ´Â Å°¸¦ ã´Â Áß..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3586,7 +4206,7 @@ msgstr "
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d - %d ¸ÞÀÏ ÀÐÀ½]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "¼­¹ö¿Í ¿¬°áÀÌ ²÷¾îÁü!"
 
@@ -3616,15 +4236,15 @@ msgstr "
 msgid "Error connecting to server: %s"
 msgstr "%s ¼­¹ö¿ÍÀÇ ¿¬°á ¿À·ù"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "POP ¼­¹ö¿ÍÀÇ ¿¬°áÀ» ´Ý´ÂÁß..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "¸ÞÀÏ À妽º¸¦ È®ÀÎÁß..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "¿¬°áÀÌ ²÷¾îÁü. POP ¼­¹ö¿Í ´Ù½Ã ¿¬°á ÇÒ±î¿ä?"
 
@@ -3995,35 +4615,35 @@ msgstr "
 msgid "Sending in background."
 msgstr "¹é±×¶ó¿îµå·Î º¸³¿."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "ÇÑ°è º¯¼ö ¾øÀ½! [¿À·ù º¸°í ¹Ù¶÷]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s°¡ ´õ ÀÌ»ó Á¸ÀçÄ¡ ¾ÊÀ½!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s´Â ¿Ã¹Ù¸¥ ÆÄÀÏÀÌ ¾Æ´Ô."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "%s¸¦ ¿­ ¼ö ¾øÀ½"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "¸ÞÀÏÀ» º¸³»´Â Áß ¿À·ù %d (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "¹è´Þ ÇÁ·Î¼¼½ºÀÇ Ãâ·Â"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "resent-fromÀ» ÁغñÇÏ´Â µ¿¾È À߸øµÈ IDN %s"
@@ -4138,7 +4758,7 @@ msgstr "OpenSSL 
 msgid "No output from OpenSSL..."
 msgstr "OpenSSLÀ¸·Î ºÎÅÍ Ãâ·ÂÀÌ ¾øÀ½..."
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4146,23 +4766,23 @@ msgstr ""
 "[-- OpenSSL Ãâ·Â ³¡ --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- ¿À·ù: OpenSSL ÇϺΠÇÁ·Î¼¼½º¸¦ »ý¼ºÇÒ ¼ö ¾øÀ½! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- ¾Æ·¡ÀÇ ÀÚ·á´Â S/MIME ¾Ïȣȭ µÇ¾úÀ½ --]\n"
 "\n"
 
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- ¾Æ·¡ÀÇ ÀÚ·á´Â S/MIME ¼­¸í µÇ¾úÀ½ --]\n"
 "\n"
 
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4170,7 +4790,7 @@ msgstr ""
 "\n"
 "[-- S/MIME ¾Ïȣȭ ÀÚ·á ³¡ --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4178,27 +4798,27 @@ msgstr ""
 "\n"
 "[-- S/MIME ¼­¸í ÀÚ·á ³¡ --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr "S/MIME ¾Ïȣȭ(e), ¼­¸í(s), ¹æ½Ä(w), »ç¿ë ¼­¸í(a), µÑ ´Ù(b), Ãë¼Ò(f)? "
 
-#: smime.c:1936
+#: smime.c:1945
 #, fuzzy
 msgid "eswabfc"
 msgstr "eswabf"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, Ãë¼Ò(f)? "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345f"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
@@ -4222,6 +4842,9 @@ msgstr "
 msgid "Parent message is not available."
 msgstr "ºÎ¸ð ¸ÞÀÏÀÌ Á¸ÀçÇÏÁö ¾ÊÀ½."
 
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "ÀÌ ¼­¹ö¿¡ IMAP ¸ÞÀÏÇÔÀ» Ãß°¡ÇÒ ¼ö ¾øÀ½"
+
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "±¸½Ä inline PGP ¸Þ¼¼Áö¸¦ ¸¸µé±î¿ä?"
 
diff --git a/po/lt.po b/po/lt.po
index 6ecc709fd..095516271 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutt 1.3.12i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2000-11-29 21:22+0200\n"
 "Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -16,26 +16,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "%s vartotojo vardas: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s slaptaþodis: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Iðeit"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Trint"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Gràþint"
 
@@ -44,9 +44,9 @@ msgid "Select"
 msgstr "Pasirinkti"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Pagalba"
 
@@ -98,171 +98,171 @@ msgstr "I
 msgid "Alias added."
 msgstr "Aliasas ádëtas."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Negaliu rasti tinkanèio vardo, tæsti?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap kûrimo áraðui reikia %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Klaida vykdant \"%s\"!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Nepavyko atidaryti bylos antraðtëms nuskaityti."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Nepavyko atidaryti bylos antraðtëms iðmesti."
 
-#: attach.c:183
+#: attach.c:184
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "Nepavyko atidaryti bylos antraðtëms nuskaityti."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "Nëra mailcap kûrimo áraðo %s, sukuriu tuðèià bylà."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Mailcap Taisymo áraðui reikia %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Nëra mailcap taisymo áraðo tipui %s"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Neradau tinkamo mailcap áraðo.  Rodau kaip tekstà."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME tipas neapibrëþtas.  Negaliu parodyti priedo."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Negaliu sukurti filtro"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Negaliu sukurti filtro"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Raðymo nesëkmë!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Að neþinau, kaip tai atspausdinti!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Pereiti"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Kaukë"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s nëra katalogas."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Paðto dëþutës [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Uþsakytos [%s], Bylø kaukë: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Katalogas [%s], Bylø kaukë: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Negaliu prisegti katalogo!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Në viena byla netinka bylø kaukei"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Kol kas sukurti gali tik IMAP paðto dëþutes"
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Kol kas sukurti gali tik IMAP paðto dëþutes"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Kol kas iðtrinti gali tik IMAP paðto dëþutes"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Tikrai iðtrinti paðto dëþutæ \"%s\"?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Paðto dëþutë iðtrinta."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "Paðto dëþutë neiðtrinta."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Pereiti á katalogà: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Klaida skaitant katalogà."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Bylø kaukë:"
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Atvirkðèiai rikiuoti pagal (d)atà, (v)ardà, d(y)dá ar (n)erikiuoti?"
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Rikiuoti pagal (d)atà, (v)ardà, d(y)dá ar (n)erikiuoti? "
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "dvyn"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Naujos bylos vardas: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Negaliu þiûrëti katalogo"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Klaida bandant þiûrëti bylà"
 
@@ -330,7 +330,7 @@ msgstr "
 msgid "Verify PGP signature?"
 msgstr "Tikrinti PGP paraðà?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Negaliu sukurti laikinos bylos!"
 
@@ -342,119 +342,119 @@ msgstr "Negaliu sukurti ekrano filtro"
 msgid "Could not copy message"
 msgstr "Negalëjau kopijuoti laiðko"
 
-#: commands.c:186
+#: commands.c:187
 #, fuzzy
 msgid "S/MIME signature successfully verified."
 msgstr "PGP paraðas patikrintas sëkmingai."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr ""
 
-#: commands.c:193
+#: commands.c:194
 #, fuzzy
 msgid "S/MIME signature could NOT be verified."
 msgstr "PGP paraðas NEGALI bûti patikrintas."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "PGP paraðas patikrintas sëkmingai."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "PGP paraðas NEGALI bûti patikrintas."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Komanda: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Nukreipti laiðkà kam: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Nukreipti paþymëtus laiðkus kam: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Klaida nagrinëjant adresà!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Nukreipti laiðkà á %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Nukreipti laiðkus á %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Message not bounced."
 msgstr "Laiðkas nukreiptas."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Messages not bounced."
 msgstr "Laiðkai nukreipti."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Laiðkas nukreiptas."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Laiðkai nukreipti."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 #, fuzzy
 msgid "Can't create filter process"
 msgstr "Negaliu sukurti filtro"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Filtruoti per komandà: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Spausdinimo komanda nebuvo apibrëþta."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Spausdinti laiðkà?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Spausdinti paþymëtus laiðkus?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Laiðkas atspausdintas"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Laiðkai atspausdinti"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "Laiðkas negalëjo bûti atspausdintas"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Laiðkai negalëjo bûti atspausdinti"
 
-#: commands.c:508
+#: commands.c:509
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -462,7 +462,7 @@ msgid ""
 msgstr ""
 "Atv-Rik (d)ata/n(u)o/g(a)uta/(t)ema/(k)am/(g)ija/(n)erik/d(y)dis/(v)ertë?: "
 
-#: commands.c:509
+#: commands.c:510
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
@@ -470,74 +470,74 @@ msgid ""
 msgstr ""
 "Rik (d)ata/n(u)o/g(a)uta/(t)ema/(k)am/(g)ija/(n)erik/d(y)dis/(v)ertë?: "
 
-#: commands.c:510
+#: commands.c:511
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "duatkgnyv"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Shell komanda: "
 
-#: commands.c:709
+#: commands.c:716
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "%s%s á dëþutæ"
 
-#: commands.c:710
+#: commands.c:717
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "%s%s á dëþutæ"
 
-#: commands.c:711
+#: commands.c:718
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "%s%s á dëþutæ"
 
-#: commands.c:712
+#: commands.c:719
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "%s%s á dëþutæ"
 
-#: commands.c:713
+#: commands.c:720
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
 msgstr "%s%s á dëþutæ"
 
-#: commands.c:713
+#: commands.c:720
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
 msgstr "%s%s á dëþutæ"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " paþymëtus"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Kopijuoju á %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr ""
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type pakeistas á %s."
 
-#: commands.c:924
+#: commands.c:941
 #, fuzzy, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Character set pakeistas á %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr ""
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr ""
 
@@ -631,103 +631,686 @@ msgstr ""
 msgid "Attaching selected files..."
 msgstr "Prisegu parinktas bylas..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Negaliu prisegti %s!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Atidaryti dëþutæ, ið kurios prisegti laiðkà"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Nëra laiðkø tame aplanke."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Paþymëk laiðkus, kuriuos nori prisegti!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Negaliu prisegti!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "Perkodavimas keièia tik tekstinius priedus."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "Esamas priedas nebus konvertuotas."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "Esamas priedas bus konvertuotas."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Bloga koduotë."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Iðsaugoti ðio laiðko kopijà?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Pervadinti á:"
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "Negalëjau stat'inti: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Nauja byla:"
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type pavidalas yra rûðis/porûðis"
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Neþinomas Content-Type %s"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "Negaliu sukurti bylos %s"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "Èia turëtø bûti priedas, taèiau jo nepavyko padaryti"
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "Atidëti ðá laiðkà?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "Áraðyti laiðkà á dëþutæ"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Raðau laiðkà á %s ..."
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "Laiðkas áraðytas."
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "klaida pattern'e: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "klaida pattern'e: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "klaida pattern'e: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "klaida pattern'e: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "klaida pattern'e: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "klaida pattern'e: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "klaida pattern'e: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "klaida pattern'e: %s"
+
+#: crypt-gpgme.c:993
+msgid "Warning: One of the keys has been revoked\n"
+msgstr ""
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Serverio sertifikatas paseno"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL nepasiekiamas."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Pirðtø antspaudas: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Klaida siunèiant laiðkà."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Klaida komandinëje eilutëje: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Pasiraðytø duomenø pabaiga --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Klaida: negalëjau sukurti laikinos bylos! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP LAIÐKO PRADÞIA --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP VIEÐO RAKTO BLOKO PRADÞIA --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP PASIRAÐYTO LAIÐKO PRADÞIA --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+#, fuzzy
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- PGP LAIÐKO PABAIGA --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP VIEÐO RAKTO BLOKO PABAIGA --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+#, fuzzy
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- PGP PASIRAÐYTO LAIÐKO PABAIGA --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Klaida: neradau PGP laiðko pradþios! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Klaida: blogai suformuotas PGP/MIME laiðkas! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Klaida: negalëjau sukurti laikinos bylos! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Toliau einantys duomenys yra uþðifruoti su PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Toliau einantys duomenys yra uþðifruoti su PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- PGP/MIME uþðifruotø duomenø pabaiga --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+#, fuzzy
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- PGP/MIME uþðifruotø duomenø pabaiga --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr ""
+"[-- Toliau einantys duomenys yra pasiraðyti --]\n"
+"\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Toliau einantys duomenys yra uþðifruoti su PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Pasiraðytø duomenø pabaiga --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- PGP/MIME uþðifruotø duomenø pabaiga --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Blogas mënuo: %s"
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Blogas mënuo: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Blogas mënuo: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Uþðifruoti"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Sertifikatas iðsaugotas"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Rakto ID: ox%s"
+
+#: crypt-gpgme.c:3099
+msgid "[Revoked]"
+msgstr ""
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Iðeiti  "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Negaliu sukurti laikinos bylos"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Jungiuosi prie %s..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Klaida jungiantis prie IMAP serverio: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Rakto ID: ox%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "Nepavyko pasisveikinti."
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Ðis raktas negali bûti naudojamas: jis pasenæs/uþdraustas/atðauktas."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Iðeiti  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Pasirink  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Tikrinti raktà  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP raktai, tenkinantys \"%s\"."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP raktai, tenkinantys \"%s\"."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "PGP raktai, tenkinantys \"%s\"."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP raktai, tenkinantys \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, fuzzy, c-format
+msgid "%s <%s>."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3594
+#, fuzzy, c-format
+msgid "%s \"%s\"."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Ðis raktas negali bûti naudojamas: jis pasenæs/uþdraustas/atðauktas."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+#, fuzzy
+msgid "ID is expired/disabled/revoked."
+msgstr "Ðis raktas negali bûti naudojamas: jis pasenæs/uþdraustas/atðauktas."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr ""
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+#, fuzzy
+msgid "ID is not valid."
+msgstr "Ðis ID yra nepatikimas."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+#, fuzzy
+msgid "ID is only marginally valid."
+msgstr "Ðis ID yra tik vos vos patikimas."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, fuzzy, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Ar tikrai nori já naudoti?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Ieðkau raktø, tenkinanèiø \"%s\"..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "Naudoti rakto ID = \"%s\", skirtà %s?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Ávesk rakto ID, skirtà %s: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr ""
+"(u)þðifruot, pa(s)iraðyt, pasiraðyt k(a)ip, a(b)u, (l)aiðke, ar (p)amirðti?"
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "ustabp"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr ""
+"(u)þðifruot, pa(s)iraðyt, pasiraðyt k(a)ip, a(b)u, (l)aiðke, ar (p)amirðti?"
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "ustabp"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Pasiraðyti kaip: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Nepavyko atidaryti bylos antraðtëms nuskaityti."
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -744,29 +1327,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "PGP slapta frazë pamirðta."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Kvieèiu PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Laiðkas neiðsiøstas."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
@@ -778,7 +1361,7 @@ msgstr ""
 "[-- Klaida: Neteisinga multipart/signed struktûra! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -787,7 +1370,7 @@ msgstr ""
 "[-- Klaida: Neþinomas multipart/signed protokolas %s! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -797,7 +1380,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
@@ -806,7 +1389,7 @@ msgstr ""
 "[-- Toliau einantys duomenys yra pasiraðyti --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -814,7 +1397,7 @@ msgstr ""
 "[-- Dëmesio: Negaliu rasti jokiø paraðø --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 #, fuzzy
 msgid ""
 "\n"
@@ -823,228 +1406,258 @@ msgstr ""
 "\n"
 "[-- Pasiraðytø duomenø pabaiga --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Kvieèiu PGP..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "taip"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "ne"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Iðeiti ið Mutt?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "neþinoma klaida"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Spausk bet koká klaviðà..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr "('?' parodo sàraðà): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Jokia dëþutë neatidaryta."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Ten nëra laiðkø."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "Dëþutë yra tik skaitoma."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Funkcija neleistina laiðko prisegimo reþime."
 
-#: curs_main.c:55
+#: curs_main.c:56
 #, fuzzy
 msgid "No visible messages."
 msgstr "Nëra naujø laiðkø"
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Negaliu perjungti tik skaitomos dëþutës raðomumo!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Aplanko pakeitimai bus áraðyti iðeinant ið aplanko."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Aplanko pakeitimai nebus áraðyti."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Iðeit"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Saugoti"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Raðyt"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Atsakyt"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Grupei"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Dëþutë buvo iðoriðkai pakeista.  Flagai gali bûti neteisingi."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Naujas paðtas ðioje dëþutëje."
 
-#: curs_main.c:503
+#: curs_main.c:504
 #, fuzzy
 msgid "Mailbox was externally modified."
 msgstr "Dëþutë buvo iðoriðkai pakeista.  Flagai gali bûti neteisingi."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Nëra paþymëtø laiðkø."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 #, fuzzy
 msgid "Nothing to do."
 msgstr "Jungiuosi prie %s..."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Ðokti á laiðkà: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "Argumentas turi bûti laiðko numeris."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Tas laiðkas yra nematomas."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Blogas laiðko numeris."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Iðtrinti laiðkus, tenkinanèius: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "Joks ribojimo pattern'as nëra naudojamas."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Riba: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Riboti iki laiðkø, tenkinanèiø: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Iðeiti ið Mutt?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Paþymëti laiðkus, tenkinanèius: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Sugràþinti laiðkus, tenkinanèius: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Atþymëti laiðkus, tenkinanèius: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Atidaryti dëþutæ tik skaitymo reþimu."
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Atidaryti dëþutæ"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
-#, c-format
-msgid "%s is not a mailbox."
-msgstr "%s nëra paðto dëþutë."
+#: curs_main.c:1081 mx.c:512 mx.c:658
+#, c-format
+msgid "%s is not a mailbox."
+msgstr "%s nëra paðto dëþutë."
+
+#: curs_main.c:1176
+msgid "Exit Mutt without saving?"
+msgstr "Iðeiti ið Mutt neiðsaugojus pakeitimø?"
+
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "Skirstymas gijomis neleidþiamas."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "iðsaugoti ðá laiðkà vëlesniam siuntimui"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
 
-#: curs_main.c:1165
-msgid "Exit Mutt without saving?"
-msgstr "Iðeiti ið Mutt neiðsaugojus pakeitimø?"
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Tu esi ties paskutiniu laiðku."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Nëra iðtrintø laiðkø."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Tu esi ties pirmu laiðku."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "Paieðka perðoko á virðø."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "Paieðka perðoko á apaèià."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Nëra naujø laiðkø"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Nëra neskaitytø laiðkø"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " ðiame apribotame vaizde"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 #, fuzzy
 msgid "Can't change 'important' flag on POP server."
 msgstr "Negaliu taisyti laiðko POP serveryje."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Daugiau gijø nëra."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Tu esi ties pirma gija."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "Skirstymas gijomis neleidþiamas."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "Gijoje yra neskaitytø laiðkø."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "Negaliu taisyti laiðko POP serveryje."
 
@@ -1177,76 +1790,76 @@ msgstr "U
 msgid "Clear flag"
 msgstr "Iðvalyti flagà"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Klaida:  Nepavyko parodyti në vienos Multipart/Alternative dalies! --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Priedas #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Tipas: %s/%s, Koduotë: %s, Dydis: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Automatinë perþiûra su %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Kvieèiu autom. perþiûros komandà: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, fuzzy, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- %s --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Automatinës perþiûros %s klaidos --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Klaida: message/external-body dalis neturi access-type parametro --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Ðis %s/%s priedas "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(dydis %s baitø)"
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "buvo iðtrintas --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- vardas: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, fuzzy, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Ðis %s/%s priedas "
 
-#: handler.c:1696
+#: handler.c:1712
 #, fuzzy
 msgid ""
 "[-- and the indicated external source has --]\n"
@@ -1255,36 +1868,36 @@ msgstr ""
 "[-- Ðis %s/%s priedas neátrauktas, --]\n"
 "[-- o nurodytas iðorinis ðaltinis iðseko. --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 "[-- Ðis %s/%s priedas neátrauktas, --]\n"
 "[-- o nurodytas pasiekimo tipas %s yra nepalaikomas. --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Klaida: multipart/signed neturi protokolo."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Klaida: multipart/encrypted neturi protocol parametro!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Negaliu atidaryti laikinos bylos!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s yra nepalaikomas "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(naudok '%s' ðiai daliai perþiûrëti)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "('view-attachments' turi bûti susietas su klaviðu!)"
 
@@ -1390,48 +2003,48 @@ msgstr "Autentikuojuosi (APOP)..."
 msgid "SASL authentication failed."
 msgstr "SASL autentikacija nepavyko."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr ""
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Gaunu vardø erdves..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Gaunu aplankø sàraðà..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 #, fuzzy
 msgid "No such folder"
 msgstr "%s: nëra tokios spalvos"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Sukurti dëþutæ: "
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 #, fuzzy
 msgid "Mailbox must have a name."
 msgstr "Dëþutë yra nepakeista."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Dëþutë sukurta."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Sukurti dëþutæ: "
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "Nepavyko pasisveikinti."
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "Dëþutë sukurta."
@@ -1444,139 +2057,136 @@ msgstr "Pa
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Mirtina klaida.  Nesutampa laiðkø skaièius!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Uþdarau jungtá su %s..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Ðis IMAP serveris yra senoviðkas. Mutt su juo neveikia."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr ""
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr ""
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Parenku %s..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 #, fuzzy
 msgid "Error opening mailbox"
 msgstr "Klaida raðant á paðto dëþutæ!"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Nepavyko pridurti prie IMAP dëþuèiø ðiame serveryje"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "Sukurti %s?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Paþymiu %d laiðkus iðtrintais..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 #, fuzzy
 msgid "Expunge failed"
 msgstr "Nepavyko pasisveikinti."
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Iðsaugau laiðko bûsenos flagus... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Iðtuðtinu laiðkus ið serverio..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 #, fuzzy
 msgid "CLOSE failed"
 msgstr "Nepavyko pasisveikinti."
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 #, fuzzy
 msgid "Bad mailbox name"
 msgstr "Sukurti dëþutæ: "
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Uþsakau %s..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Atsisakau %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Negaliu paimti antraðèiø ið ðios IMAP serverio versijos."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, fuzzy, c-format
 msgid "Could not create temporary file %s"
 msgstr "Negaliu sukurti laikinos bylos!"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Paimu laiðkø antraðtes... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Paimu laiðkø antraðtes... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Paimu laiðkà..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "Laiðkø indeksas yra neteisingas. Bandyk ið naujo atidaryti dëþutæ."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Nusiunèiu laiðkà..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Kopijuoju %d laiðkus á %s..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Kopijuoju laiðkà %d á %s..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Tæsti?"
 
@@ -1585,124 +2195,124 @@ msgstr "T
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:678
+#: init.c:644
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "paþymëti laiðkus, tenkinanèius pattern'à"
 
-#: init.c:680
+#: init.c:646
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "atþymëti laiðkus, tenkinanèius pattern'à"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias: nëra adreso"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "blogas antraðtës laukas"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: neþinomas rikiavimo metodas"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): klaida regexp'e: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: neþinomas kintamasis"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "negalima vartoti prieðdëlio su reset"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "reikðmë neleistina reset komandoje"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s yra ájungtas"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s yra iðjungtas"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: blogas paðto dëþutës tipas"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: bloga reikðmë"
 
-#: init.c:1589
+#: init.c:1555
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s: neþinomas tipas"
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: neþinomas tipas"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Klaida %s, eilutë %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: klaidos %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: skaitymas nutrauktas, nes %s yra per daug klaidø."
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: klaida %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: per daug argumentø"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: neþinoma komanda"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Klaida komandinëje eilutëje: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "negaliu nustatyti namø katalogo"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "negaliu nustatyti vartotojo vardo"
 
@@ -2165,406 +2775,415 @@ msgid "compose a new mail message"
 msgstr "sukurti naujà laiðkà"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "atidaryti kità aplankà"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "atidaryti kità aplankà tik skaitymo reþimu"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "iðvalyti laiðko bûsenos flagà"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "iðtrinti laiðkus, tenkinanèius pattern'à"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 #, fuzzy
 msgid "force retrieval of mail from IMAP server"
 msgstr "parsiøsti paðtà ið POP serverio"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "parsiøsti paðtà ið POP serverio"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "eiti á pirmà laiðkà"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "eiti á paskutiná laiðkà"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "rodyti tik laiðkus, tenkinanèius pattern'à"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Nukreipti paþymëtus laiðkus kam: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "ðokti á kità naujà laiðkà"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 #, fuzzy
 msgid "jump to the next new or unread message"
 msgstr "ðokti á kità neskaitytà laiðkà"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "ðokti á kità subgijà"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "ðokti á kità gijà"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "eiti á kità neiðtrintà laiðkà"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "ðokti á kità neskaitytà laiðkà"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "ðokti á tëviná laiðkà gijoje"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "ðokti á praeità gijà"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "ðokti á praeità subgijà"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "eiti á praeità neiðtrintà laiðkà"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "ðokti á praeità naujà laiðkà"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 #, fuzzy
 msgid "jump to the previous new or unread message"
 msgstr "ðokti á praeità neskaitytà laiðkà"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "ðokti á praeità neskaitytà laiðkà"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "paþymëti esamà gijà skaityta"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "paþymëti esamà subgijà skaityta"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "uþdëti bûsenos flagà laiðkui"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "iðsaugoti dëþutës pakeitimus"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "paþymëti laiðkus, tenkinanèius pattern'à"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "sugràþinti laiðkus, tenkinanèius pattern'à"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "atþymëti laiðkus, tenkinanèius pattern'à"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "eiti á puslapio vidurá"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "eiti á kità áraðà"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "slinktis viena eilute þemyn"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "eiti á kità puslapá"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "ðokti á laiðko apaèià"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "perjungti cituojamo teksto rodymà"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "praleisti cituojamà tekstà"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "ðokti á laiðko virðø"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "filtruoti laiðkà/priedà per shell komandà"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "eiti á praeità áraðà"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "slinktis viena eilute aukðtyn"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "eiti á praeità puslapá"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "spausdinti esamà áraðà"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "uþklausti iðorinæ programà adresams rasti"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "pridurti naujos uþklausos rezultatus prie esamø"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "iðsaugoti dëþutës pakeitimus ir iðeiti"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "tæsti atidëtà laiðkà"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "iðvalyti ir perpieðti ekranà"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{vidinë}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "iðtrinti esamà dëþutæ (tik IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "atsakyti á laiðkà"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "naudoti esamà laiðkà kaip ðablonà naujam"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "iðsaugoti laiðkà/priedà á bylà"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "ieðkoti reguliarios iðraiðkos"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "ieðkoti reguliarios iðraiðkos atgal"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "ieðkoti kito tinkamo"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "ieðkoti kito tinkamo prieðinga kryptimi"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "perjungti paieðkos pattern'o spalvojimà"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "kviesti komandà subshell'e"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "rikiuoti laiðkus"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "rikiuoti laiðkus atvirkðèia tvarka"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "paþymëti esamà áraðà"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "pritaikyti kità funkcijà paþymëtiems laiðkams"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 #, fuzzy
 msgid "apply next function ONLY to tagged messages"
 msgstr "pritaikyti kità funkcijà paþymëtiems laiðkams"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "paþymëti esamà subgijà"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "paþymëti esamà gijà"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "perjungti laiðko 'naujumo' flagà"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "perjungti, ar dëþutë bus perraðoma"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "perjungti, ar narðyti paðto dëþutes, ar visas bylas"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "eiti á puslapio virðø"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "sugràþinti esamà áraðà"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "sugràþinti visus laiðkus gijoje"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "sugràþinti visus laiðkus subgijoje"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "parodyti Mutt versijos numerá ir datà"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "rodyti priedà naudojant mailcap áraðà, jei reikia"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "rodyti MIME priedus"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr ""
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "parodyti dabar aktyvø ribojimo pattern'à"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "sutraukti/iðskleisti esamà gijà"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "sutraukti/iðskleisti visas gijas"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "prisegti PGP vieðà raktà"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "rodyti PGP parinktis"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "siøsti PGP vieðà raktà"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "patikrinti PGP vieðà raktà"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "þiûrëti rakto vartotojo id"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr ""
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Priimti sukonstruotà grandinæ"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "Pridëti persiuntëjà á grandinæ"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "Áterpti persiuntëjà á grandinæ"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "Paðalinti persiuntëjà ið grandinës"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "Pasirinkti ankstesná elementà grandinëje"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "Pasirinkti tolesná elementà grandinëje"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "pasiøsti praneðimà per mixmaster persiuntëjø grandinæ"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "padaryti iððifruotà kopijà ir iðtrinti"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "padaryti iððifruotà kopijà"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 #, fuzzy
 msgid "wipe passphrase(s) from memory"
 msgstr "uþmirðti PGP slaptà frazæ"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 #, fuzzy
 msgid "extract supported public keys"
 msgstr "iðtraukti PGP vieðus raktus"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 #, fuzzy
 msgid "show S/MIME options"
 msgstr "rodyti PGP parinktis"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr ""
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Baigësi atmintis!"
 
@@ -2593,11 +3212,11 @@ msgstr ""
 #: main.c:61
 #, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2644,25 +3263,64 @@ msgstr ""
 "    kartu su ðia programa; jeigu ne, paraðyk á Free Software\n"
 "    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n"
 
-#: main.c:99
+#: main.c:99
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"vartosena: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <byla> ] [ -m <tipas> ] [ -f "
+"<byla> ]\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <byla> ] [ -F <byla> ] [ -H <byla> ] "
+"[ -i <byla> ] [ -s <tema> ] [ -b <adres> ] [ -c <adres> ] <adres> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <byla> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"parinktys:\n"
+"  -a <byla>\tprisegti bylà prie laiðko\n"
+"  -b <adresas>\tnurodyti blind carbon-copy (BCC) adresà\n"
+"  -c <adresas>\tnurodyti carbon-copy (CC) adresà\n"
+"  -e <komanda>\tnurodyti komandà, kurià ávykdyti po inicializacijos\n"
+"  -f <byla>\tnurodyti, kurià dëþutæ perskaityti\n"
+"  -F <byla>\tnurodyti alternatyvià muttrc bylà\n"
+"  -H <byla>\tnurodyti juodraðèio bylà, ið kurios skaityti antraðtæ\n"
+"  -i <byla>\tnurodyti bylà, kurià Mutt turëtø átraukti á atsakymà\n"
+"  -m <tipas>\tnurodyti áprastà dëþutës tipà\n"
+"  -n\t\tpriverèia Mutt neskaityti sistemos Muttrc\n"
+"  -p\t\ttæsti atidëtà laiðkà\n"
+"  -R\t\tatidaryti dëþutæ tik skaitymo reþime\n"
+"  -s <tema>\tnurodyti temà (turi bûti kabutëse, jei yra tarpø)\n"
+"  -v\t\trodyti versijà ir kompiliavimo apibrëþimus\n"
+"  -x\t\tsimuliuoti mailx siuntimo bûdà\n"
+"  -y\t\tpasirinkti dëþutæ, nurodytà tavo 'mailboxes' sàraðe\n"
+"  -z\t\tiðkart iðeiti, jei dëþutëje nëra laiðkø\n"
+"  -Z\t\tatidaryti pirmà aplankà su naujais laiðkais, iðkart iðeiti, jei "
+"nëra\n"
+"  -h\t\tði pagalbos þinutë"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
 #, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-"<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-"[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-"[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
-"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
-"\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2710,7 +3368,7 @@ msgstr ""
 "nëra\n"
 "  -h\t\tði pagalbos þinutë"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2718,47 +3376,47 @@ msgstr ""
 "\n"
 "Kompiliavimo parinktys:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Klaida inicializuojant terminalà."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Derinimo lygis %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG nebuvo apibrëþtas kompiliavimo metu.  Ignoruoju.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s neegzistuoja. Sukurti jà?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Negaliu sukurti %s: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Nenurodyti jokie gavëjai.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: negaliu prisegti bylos.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Nëra dëþutës su nauju paðtu."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Neapibrëþta në viena paðtà gaunanti dëþutë."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "Dëþutë yra tuðèia."
 
@@ -2775,11 +3433,11 @@ msgstr "D
 msgid "Mailbox was corrupted!"
 msgstr "Dëþutë buvo sugadinta!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Baisi klaida!  Negaliu vël atidaryti dëþutës!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Negaliu uþrakinti dëþutës!"
 
@@ -2787,11 +3445,11 @@ msgstr "Negaliu u
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "sync: mbox pakeista, bet nëra pakeistø laiðkø! (praneðk ðià klaidà)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Raðau laiðkus... %d (%d%%)"
@@ -2799,188 +3457,149 @@ msgstr "Ra
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 #, fuzzy
 msgid "Committing changes..."
 msgstr "Kompiliuoju paieðkos pattern'à..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Áraðyti nepavyko!  Dëþutë dalinai iðsaugota á %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Negaliu vël atidaryti dëþutës!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Vël atidarau dëþutæ..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Ðokti á: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Blogas indekso numeris."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Nëra áraðø."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Tu negali slinkti þemyn daugiau."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Tu negali slinkti aukðtyn daugiau."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Tu esi paskutiniame puslapyje."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Tu esi pirmame puslapyje."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "Rodomas pirmas áraðas."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "Rodomas paskutinis áraðas."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Tu esi ties paskutiniu áraðu."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Tu esi ties pirmu áraðu."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Ieðkoti ko: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Atgal ieðkoti ko: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Jokio paieðkos pattern'o."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Nerasta."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "Nëra paþymëtø áraðø."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "Paieðka ðiam meniu neágyvendinta."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "Ðokinëjimas dialoguose neágyvendintas."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Þymëjimas nepalaikomas."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Skaitau %s... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
-#: muttlib.c:846
-#, fuzzy
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Byla yra katalogas, saugoti joje?"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr ""
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "Byla yra katalogas, saugoti joje?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Byla kataloge: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Byla egzistuoja, (u)þraðyti, (p)ridurti, arba (n)utraukti?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "upn"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Negaliu iðsaugoti laiðko á POP dëþutæ."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s nëra paðto dëþutë!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Pridurti laiðkus prie %s?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, fuzzy, c-format
 msgid "Connection to %s closed"
 msgstr "Jungiuosi prie %s..."
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL nepasiekiamas."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "Nepavyko komanda prieð jungimàsi"
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, fuzzy, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Klaida jungiantis prie IMAP serverio: %s"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "Ieðkau %s..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Negalëjau rasti hosto \"%s\""
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Jungiuosi prie %s..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Negalëjau prisijungti prie %s (%s)."
@@ -3012,7 +3631,8 @@ msgstr ""
 msgid "SSL failed: %s"
 msgstr "Nepavyko pasisveikinti."
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Nepavyko gauti sertifikato ið peer'o"
 
@@ -3021,87 +3641,208 @@ msgstr "Nepavyko gauti sertifikato i
 msgid "SSL connection using %s (%s)"
 msgstr "SSL jungtis, naudojant %s"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Neþinoma"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[negaliu suskaièiuoti]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[bloga data]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "Serverio sertifikatas dar negalioja"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "Serverio sertifikatas paseno"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Ðis sertifikatas priklauso: "
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Ðis sertifikatas buvo iðduotas:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Ðis sertifikatas galioja"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "    nuo %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "    iki %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Pirðtø antspaudas: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "SSL sertifikato patikrinimas"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(a)tmesti, (p)riimti ðákart, (v)isada priimti"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "apv"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(a)tmesti, (p)riimti ðákart"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "ap"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Iðeiti  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Áspëju: Negalëjau iðsaugoti sertifikato"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Sertifikatas iðsaugotas"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "SSL jungtis, naudojant %s"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Sertifikatas iðsaugotas"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Klaida inicializuojant terminalà."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Pirðtø antspaudas: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Pirðtø antspaudas: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Serverio sertifikatas dar negalioja"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Serverio sertifikatas paseno"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Serverio sertifikatas paseno"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "Serverio sertifikatas dar negalioja"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "SSL sertifikato patikrinimas"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Jungiuosi prie %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Klaida jungiantis prie IMAP serverio: %s"
+
+#: muttlib.c:910
+#, fuzzy
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "Byla yra katalogas, saugoti joje?"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr ""
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "Byla yra katalogas, saugoti joje?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Byla kataloge: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Byla egzistuoja, (u)þraðyti, (p)ridurti, arba (n)utraukti?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "upn"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Negaliu iðsaugoti laiðko á POP dëþutæ."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Pridurti laiðkus prie %s?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s nëra paðto dëþutë!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3179,7 +3920,7 @@ msgstr "D
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d palikti, %d perkelti, %d iðtrinti."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d palikti, %d iðtrinti."
@@ -3198,15 +3939,15 @@ msgstr "Naudok 'toggle-write', kad v
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Dëþutë yra padaryta neáraðoma. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "Dëþutë sutikrinta."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Negaliu áraðyti laiðko"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
@@ -3214,48 +3955,48 @@ msgstr ""
 msgid "Not available in this menu."
 msgstr "Neprieinama ðiame meniu."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "PraPsl"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "KitPsl"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Priedai"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Kitas"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Rodoma laiðko apaèia."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Rodomas laiðko virðus."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Atvirkðèia paieðka: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Paieðka: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "Ðiuo metu rodoma pagalba."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "Cituojamo teksto nebëra."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Nëra daugiau necituojamo teksto uþ cituojamo."
 
@@ -3322,27 +4063,27 @@ msgstr "tu
 msgid "error: unknown op %d (report this error)."
 msgstr "klaida: neþinoma operacija %d (praneðkite ðià klaidà)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Kompiliuoju paieðkos pattern'à..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Vykdau komandà tinkantiems laiðkams..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "Jokie laiðkai netenkina kriterijaus."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "Paieðka pasiekë apaèià nieko neradusi"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "Paieðka pasiekë virðø nieko neradusi"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Paieðka pertraukta."
 
@@ -3354,11 +4095,11 @@ msgstr "
 msgid "PGP passphrase forgotten."
 msgstr "PGP slapta frazë pamirðta."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Klaida: negaliu sukurti PGP subproceso! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3366,58 +4107,23 @@ msgstr ""
 "[-- PGP iðvesties pabaiga --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP LAIÐKO PRADÞIA --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP VIEÐO RAKTO BLOKO PRADÞIA --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP PASIRAÐYTO LAIÐKO PRADÞIA --]\n"
-"\n"
-
-#: pgp.c:423
+#: pgp.c:387 pgp.c:951
 #, fuzzy
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- PGP LAIÐKO PABAIGA --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP VIEÐO RAKTO BLOKO PABAIGA --]\n"
+msgid "Could not decrypt PGP message"
+msgstr "Negalëjau kopijuoti laiðko"
 
-#: pgp.c:427
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
 #, fuzzy
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- PGP PASIRAÐYTO LAIÐKO PABAIGA --]\n"
-
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Klaida: neradau PGP laiðko pradþios! --]\n"
-"\n"
+msgid "PGP message successfully decrypted."
+msgstr "PGP paraðas patikrintas sëkmingai."
 
-#: pgp.c:704
+#: pgp.c:723
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Vidinë klaida. Praneðk <roessler@does-not-exist.org>."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3425,75 +4131,38 @@ msgstr ""
 "[-- Klaida: negalëjau sukurti PGP subproceso! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Klaida: blogai suformuotas PGP/MIME laiðkas! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Klaida: negalëjau sukurti laikinos bylos! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- Toliau einantys duomenys yra uþðifruoti su PGP/MIME --]\n"
-"\n"
-
-#: pgp.c:915
+#: pgp.c:828
 #, fuzzy
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr ""
-"\n"
-"[-- PGP/MIME uþðifruotø duomenø pabaiga --]\n"
+msgid "Decryption failed"
+msgstr "Nepavyko pasisveikinti."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "Negaliu atidaryti PGP vaikinio proceso!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "Naudoti rakto ID = \"%s\", skirtà %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Ávesk rakto ID, skirtà %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "Negaliu kviesti PGP"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr ""
 "(u)þðifruot, pa(s)iraðyt, pasiraðyt k(a)ip, a(b)u, (l)aiðke, ar (p)amirðti?"
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1499
+#: pgp.c:1543
 #, fuzzy
 msgid "esabifc"
 msgstr "usablp"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Pasiraðyti kaip: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "Paimu PGP raktà..."
@@ -3503,16 +4172,6 @@ msgstr "Paimu PGP rakt
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Ðis raktas negali bûti naudojamas: jis pasenæs/uþdraustas/atðauktas."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Pasirink  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Tikrinti raktà  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3527,43 +4186,6 @@ msgstr "PGP raktai, tenkinantys \"%s\"."
 msgid "Can't open /dev/null"
 msgstr "Negaliu atidaryti /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Negaliu sukurti laikinos bylos"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Rakto ID: ox%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Ðis raktas negali bûti naudojamas: jis pasenæs/uþdraustas/atðauktas."
-
-#: pgpkey.c:612
-#, fuzzy
-msgid "ID is expired/disabled/revoked."
-msgstr "Ðis raktas negali bûti naudojamas: jis pasenæs/uþdraustas/atðauktas."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr ""
-
-#: pgpkey.c:619
-#, fuzzy
-msgid "ID is not valid."
-msgstr "Ðis ID yra nepatikimas."
-
-#: pgpkey.c:622
-#, fuzzy
-msgid "ID is only marginally valid."
-msgstr "Ðis ID yra tik vos vos patikimas."
-
-#: pgpkey.c:626
-#, fuzzy, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Ar tikrai nori já naudoti?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Praðau, ávesk rakto ID:"
@@ -3577,11 +4199,6 @@ msgstr "Kvie
 msgid "PGP Key %s."
 msgstr "PGP raktas %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Ieðkau raktø, tenkinanèiø \"%s\"..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3639,7 +4256,7 @@ msgstr "Klaida ra
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d ið %d laiðkø perskaityti]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "Serveris uþdarë jungtá!"
 
@@ -3669,15 +4286,15 @@ msgstr "Negaliu palikti lai
 msgid "Error connecting to server: %s"
 msgstr "Klaida jungiantis prie IMAP serverio: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "Uþdarau jungtá su POP serveriu..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Tikrinu laiðkø indeksus..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Jungtis prarasta. Vël prisijungti prie POP serverio?"
 
@@ -4060,35 +4677,35 @@ msgstr "Lai
 msgid "Sending in background."
 msgstr "Siunèiu fone."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Trûksta boundary parametro! [praneðk ðià klaidà]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s nebeegzistuoja!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
 msgstr "%s nëra paðto dëþutë."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "Negalëjau atidaryti %s"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Klaida siunèiant laiðkà, klaidos kodas %d (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Pristatymo proceso iðvestis"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
@@ -4213,7 +4830,7 @@ msgstr "Negaliu atidaryti PGP vaikinio proceso!"
 msgid "No output from OpenSSL..."
 msgstr ""
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"
@@ -4222,26 +4839,26 @@ msgstr ""
 "[-- PGP iðvesties pabaiga --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 #, fuzzy
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Klaida: negaliu sukurti PGP subproceso! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 #, fuzzy
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- Toliau einantys duomenys yra uþðifruoti su PGP/MIME --]\n"
 "\n"
 
-#: smime.c:1765
+#: smime.c:1767
 #, fuzzy
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- Toliau einantys duomenys yra pasiraðyti --]\n"
 "\n"
 
-#: smime.c:1829
+#: smime.c:1831
 #, fuzzy
 msgid ""
 "\n"
@@ -4250,7 +4867,7 @@ msgstr ""
 "\n"
 "[-- PGP/MIME uþðifruotø duomenø pabaiga --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 #, fuzzy
 msgid ""
 "\n"
@@ -4259,7 +4876,7 @@ msgstr ""
 "\n"
 "[-- Pasiraðytø duomenø pabaiga --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
@@ -4267,21 +4884,21 @@ msgstr ""
 "(u)þðifruot, pa(s)iraðyt, uþðifruo(t) su, pasiraðyt k(a)ip, a(b)u, ar (p)"
 "amirðti?"
 
-#: smime.c:1936
+#: smime.c:1945
 #, fuzzy
 msgid "eswabfc"
 msgstr "ustabp"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr ""
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
@@ -4306,6 +4923,9 @@ msgstr "T
 msgid "Parent message is not available."
 msgstr "Nëra prieinamo tëvinio laiðko."
 
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Nepavyko pridurti prie IMAP dëþuèiø ðiame serveryje"
+
 #, fuzzy
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "Ar sukurti application/pgp laiðkà?"
@@ -4358,9 +4978,6 @@ msgstr "N
 #~ msgid "Copy"
 #~ msgstr "Kopijuoti"
 
-#~ msgid "%s [%s]\n"
-#~ msgstr "%s [%s]\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "[-- End of PGP output --]\n"
diff --git a/po/nl.po b/po/nl.po
index ce94aec21..4c7fc748d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.5.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2005-03-20 15:17+0100\n"
 "Last-Translator: René Clerc <rene@clerc.nl>\n"
 "Language-Team: René Clerc <rene@clerc.nl>\n"
@@ -11,26 +11,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "Gebruikersnaam voor %s: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Wachtwoord voor %s@%s: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Wis"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Herstel"
 
@@ -39,9 +39,9 @@ msgid "Select"
 msgstr "Selecteren"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Hulp"
 
@@ -93,170 +93,170 @@ msgstr "Opslaan als: "
 msgid "Alias added."
 msgstr "Adres toegevoegd."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Naamsjabloon kan niet worden ingevuld, doorgaan?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "\"compose\"-entry in mailcap vereist %%s."
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Fout opgetreden bij het uitvoeren van \"%s\"!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Kan bestand niet openen om header te lezen."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Kan bestand niet openen om header te verwijderen."
 
-#: attach.c:183
+#: attach.c:184
 msgid "Failure to rename file."
 msgstr "Kan bestand niet hernoemen."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "Geen \"compose\"-entry voor %s, een leeg bestand wordt aangemaakt."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "\"edit\"-entry in mailcap vereist %%s."
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Geen \"edit\"-entry voor %s in mailcap."
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Geen geschikte mailcap-entry gevonden.  Weergave als normale tekst."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME type is niet gedefinieerd. Kan bijlage niet weergeven."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Filter kan niet worden aangemaakt."
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Kan filter niet aanmaken"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Fout bij schrijven!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Ik weet niet hoe dit afgedrukt moet worden!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Wijzig directory"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Masker"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s is geen directory."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Mailfolders [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Geselecteerd [%s], Bestandsmasker: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Directory [%s], Bestandsmasker: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Directory kan niet worden getoond!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Geen bestanden waarop het masker past gevonden."
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Alleen IMAP folders kunnen aangemaakt worden"
 
-#: browser.c:880
+#: browser.c:881
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Alleen IMAP folders kunnen hernoemd worden"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Alleen IMAP folders kunnen verwijderd worden"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Mailfolder \"%s\" echt verwijderen?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Mailfolder is verwijderd."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "Mailfolder is niet verwijderd."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Wisselen naar directory: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Fout opgetreden tijdens het analyseren van de directory."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Bestandsmasker: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Achteruit sorteren op (d)atum, bestands(g)rootte, (a)lfabet of (n)iet? "
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Sorteren op (d)atum, bestands(g)rootte, (a)lfabet of helemaal (n)iet?"
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "dagn"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Nieuwe bestandsnaam: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Directory kan niet worden getoond."
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Fout opgetreden tijdens het weergeven van bestand"
 
@@ -323,7 +323,7 @@ msgstr "standaard kleuren niet ondersteund"
 msgid "Verify PGP signature?"
 msgstr "PGP-handtekening controleren?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Tijdelijk bestand kon niet worden aangelegd!"
 
@@ -335,114 +335,114 @@ msgstr "Display filter kan niet worden aangemaakt."
 msgid "Could not copy message"
 msgstr "Bericht kon niet gekopiëerd worden."
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "S/MIME handtekening is correct bevonden."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "S/MIME certificaat eigenaar komt niet overeen met afzender."
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr "Waarschuwing: Een deel van dit bericht is niet ondertekend."
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "S/MIME handtekening kon NIET worden geverifiëerd."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "PGP handtekening is correct bevonden."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "PGP handtekening kon NIET worden geverifiëerd."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Commando: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Bericht doorsturen naar: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Gemarkeerde berichten doorsturen naar: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Ongeldig adres!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "Ongeldig IDN: '%s'"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Bericht doorsturen aan %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Berichten doorsturen aan %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "Bericht niet doorgestuurd."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "Berichten niet doorgestuurd."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Bericht doorgestuurd."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Berichten doorgestuurd."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "Kan filter proces niet aanmaken"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Doorsluizen naar commando: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Er is geen print commando gedefiniëerd."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Bericht afdrukken?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Geselecteerde berichten uitprinten?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Bericht afgedrukt"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Berichten afgedrukt"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "Bericht kon niet worden afgedrukt"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Berichten konden niet worden afgedrukt"
 
-#: commands.c:508
+#: commands.c:509
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
@@ -450,7 +450,7 @@ msgstr ""
 "Omgekeerd (d)atum/(v)an/o(n)tv/(o)nd/(a)an/(t)hread/(u)nsort/(g)r/(s)core/s"
 "(p)am?: "
 
-#: commands.c:509
+#: commands.c:510
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
@@ -458,73 +458,73 @@ msgstr ""
 "Sorteren (d)atum/(v)an/o(n)tv/(o)nd/(a)an/(t)hread/(u)nsort/(g)r/(s)core/s(p)"
 "am?: "
 
-#: commands.c:510
+#: commands.c:511
 msgid "dfrsotuzcp"
 msgstr "dvnoatugsp"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Shell commando: "
 
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Decoderen-opslaan%s in mailfolder"
 
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Decoderen-kopiëren%s naar mailfolder"
 
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Ontsleutelen-opslaan%s in mailfolder"
 
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Ontsleutelen-kopiëren%s naar mailfolder"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Opslaan%s in mailfolder"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Kopiëren%s naar mailfolder"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " gemarkeerd"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Kopieren naar %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Converteren naar %s bij versturen?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type veranderd naar %s."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Karakterset veranderd naar %s; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "niet converteren"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "converteren"
 
@@ -616,102 +616,673 @@ msgstr "Ongeldige IDN in \"%s\": '%s'"
 msgid "Attaching selected files..."
 msgstr "Opgegeven bestanden worden bijgevoegd..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Kan %s niet bijvoegen!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Open mailfolder waaruit een bericht als bijlage toegevoegd wordt"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Geen berichten in deze mailfolder."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Selecteer de berichten die u wilt bijvoegen!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Kan niet bijvoegen!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "Codering wijzigen is alleen van toepassing op bijlagen."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "Deze bijlage zal niet geconverteerd worden."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "Deze bijlage zal geconverteerd worden."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Ongeldige codering."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Een kopie van dit bericht maken?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Hernoemen naar: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Kan %s niet statten: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Nieuw bestand: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type is van de vorm basis/subtype"
 
-#: compose.c:1057
+#: compose.c:1060
+#, c-format
+msgid "Unknown Content-Type %s"
+msgstr "Onbekend Content-Type %s"
+
+#: compose.c:1073
+#, c-format
+msgid "Can't create file %s"
+msgstr "Kan bestand %s niet aanmaken"
+
+#: compose.c:1081
+msgid "What we have here is a failure to make an attachment"
+msgstr "De bijlage kan niet worden aangemaakt"
+
+#: compose.c:1142
+msgid "Postpone this message?"
+msgstr "Bericht uitstellen?"
+
+#: compose.c:1201
+msgid "Write message to mailbox"
+msgstr "Sla bericht op in mailfolder"
+
+#: compose.c:1204
+#, c-format
+msgid "Writing message to %s ..."
+msgstr "Bericht wordt opgeslagen in %s ..."
+
+#: compose.c:1213
+msgid "Message written."
+msgstr "Bericht opgeslagen."
+
+#: compose.c:1225
+msgid "S/MIME already selected. Clear & continue ? "
+msgstr "S/MIME al geselecteerd. Wissen & doorgaan ? "
+
+#: compose.c:1251
+msgid "PGP already selected. Clear & continue ? "
+msgstr "PGP al geselecteerd. Wissen & doorgaan ? "
+
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "Fout in expressie bij: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "Fout in expressie bij: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "Fout in expressie bij: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "Fout in expressie bij: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "Fout in expressie bij: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "Fout in expressie bij: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "Fout in expressie bij: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "Fout in expressie bij: %s"
+
+#: crypt-gpgme.c:993
+#, fuzzy
+msgid "Warning: One of the keys has been revoked\n"
+msgstr "Waarschuwing: Een deel van dit bericht is niet ondertekend."
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Certificaat van de server is verlopen"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL is niet beschikbaar."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Handtekening: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Fout opgetreden tijdens het verzenden van het bericht."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Fout in opdrachtregel: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Einde van ondertekende gegevens --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Fout: Kon geen tijdelijk bestand aanmaken! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- BEGIN PGP BERICHT --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- BEGIN PGP PUBLIC KEY BLOK --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- BEGIN PGP ONDERTEKEND BERICHT --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- EINDE PGP BERICHT --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- EINDE PGP PUBLIC KEY BLOK --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- EINDE PGP ONDERTEKEND BERICHT --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Fout: Kon begin van PGP-bericht niet vinden! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Fout: Foutief PGP/MIME bericht! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Fout: Kon geen tijdelijk bestand aanmaken! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- De volgende gegevens zijn PGP/MIME versleuteld --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- De volgende gegevens zijn PGP/MIME versleuteld --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- Einde van PGP/MIME versleutelde data --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- Einde van PGP/MIME versleutelde data --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr ""
+"[-- De volgende gegevens zijn S/MIME ondertekend --]\n"
+"\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- De volgende gegevens zijn S/MIME versleuteld --]\n"
+"\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Einde van S/MIME ondertekende gegevens --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Einde van S/MIME versleutelde data --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Ongeldig    "
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Ongeldige maand: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Ongeldige maand: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Versleutelen"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Certificaat wordt bewaard"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Sleutel ID: 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "Herroepen    "
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Verlopen    "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Kan tijdelijk bestand niet aanmaken"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Bezig met verbinden met %s..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Fout tijdens verbinden met server: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Sleutel ID: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "Hernoemen mislukt: %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Alle overeenkomende sleutels zijn verlopen/ingetrokken."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Einde "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Selecteer  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Controleer sleutel "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP-sleutels voor \"%s\"."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP-sleutels voor \"%s\"."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "S/MIME certficiaten voor \"%s\"."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP-sleutels voor \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Deze sleutel is onbruikbaar: verlopen/ingetrokken."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "Dit ID is verlopen/uitgeschakeld/ingetrokken."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "Dit ID heeft ongedefiniëerde geldigheid."
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "Dit ID is niet geldig."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "Dit ID is slechts marginaal vertrouwd."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Wilt U deze sleutel gebruiken?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Zoeken naar sleutels voor \"%s\"..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "KeyID = \"%s\" gebruiken voor %s?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
 #, c-format
-msgid "Unknown Content-Type %s"
-msgstr "Onbekend Content-Type %s"
+msgid "Enter keyID for %s: "
+msgstr "KeyID voor %s: "
 
-#: compose.c:1070
-#, c-format
-msgid "Can't create file %s"
-msgstr "Kan bestand %s niet aanmaken"
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
 
-#: compose.c:1078
-msgid "What we have here is a failure to make an attachment"
-msgstr "De bijlage kan niet worden aangemaakt"
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr ""
+"PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eiden, %s, of (g)een? "
 
-#: compose.c:1139
-msgid "Postpone this message?"
-msgstr "Bericht uitstellen?"
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "vomabgg"
 
-#: compose.c:1196
-msgid "Write message to mailbox"
-msgstr "Sla bericht op in mailfolder"
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr ""
+"PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eiden, %s, of (g)een? "
 
-#: compose.c:1199
-#, c-format
-msgid "Writing message to %s ..."
-msgstr "Bericht wordt opgeslagen in %s ..."
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "vomabgg"
 
-#: compose.c:1208
-msgid "Message written."
-msgstr "Bericht opgeslagen."
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Ondertekenen als: "
 
-#: compose.c:1220
-msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME al geselecteerd. Wissen & doorgaan ? "
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
 
-#: compose.c:1246
-msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP al geselecteerd. Wissen & doorgaan ? "
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Kan bestand niet openen om header te lezen."
 
 #: crypt.c:69
 #, c-format
@@ -728,30 +1299,30 @@ msgid "Passphrase(s) forgotten."
 msgstr "Wachtwoord(en) zijn vergeten."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "PGP wordt aangeroepen..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr "Bericht kan niet traditioneel worden verzonden.  PGP/MIME?"
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Bericht niet verstuurd."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 "S/MIME berichten zonder aanwijzingen over inhoud zijn niet ondersteund."
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "PGP sleutels onttrekken...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "S/MIME certificaten onttrekken...\n"
 
@@ -763,7 +1334,7 @@ msgstr ""
 "[-- Fout: Gebroken multipart/signed structuur! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -772,7 +1343,7 @@ msgstr ""
 "[-- Fout: Onbekend multipart/signed protocol: %s! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -782,7 +1353,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -790,7 +1361,7 @@ msgstr ""
 "[-- De volgende gegevens zijn ondertekend --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -798,7 +1369,7 @@ msgstr ""
 "[-- Waarschuwing: kan geen enkele handtekening vinden --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -806,225 +1377,255 @@ msgstr ""
 "\n"
 "[-- Einde van ondertekende gegevens --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "PGP wordt aangeroepen..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "ja"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "nee"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Mutt afsluiten?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "onbekende fout"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Druk een willekeurige toets in..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " ('?' voor een overzicht): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Er is geen mailfolder geopend."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Er zijn geen berichten."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "Mailfolder is schrijfbeveiligd."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Funktie wordt niet ondersteund in deze modus"
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "Geen zichtbare berichten"
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Kan niet schrijven in een scrijfbeveiligde mailfolder!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr ""
 "Wijzigingen zullen worden weggeschreven bij het verlaten van de mailfolder."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Wijzigingen worden niet weggeschreven."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Einde"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Opslaan"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Sturen"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Antw."
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Groep"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Mailfolder is extern veranderd. Markeringen kunnen onjuist zijn."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Nieuwe berichten in deze mailfolder."
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "Mailfolder is extern veranderd."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Geen gemarkeerde berichten."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 msgid "Nothing to do."
 msgstr "Niets te doen."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Ga naar bericht: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "Argument moet een berichtennummer zijn."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Dit bericht is niet zichtbaar."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Ongeldig berichtennummer"
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Wis berichten volgens patroon: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "Er is geen beperkend patroon in werking."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Limiet: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Limiteer berichten volgens patroon: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Mutt afsluiten?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Berichten markeren volgens patroon: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Herstel berichten: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Verwijder markering volgens patroon: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Open mailfolder in schrijfbeveiligde modus"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Open mailfolder"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s is geen mailfolder."
 
-#: curs_main.c:1165
+#: curs_main.c:1176
 msgid "Exit Mutt without saving?"
 msgstr "Mutt verlaten zonder op te slaan?"
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "Het weergeven van threads is niet ingeschakeld."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "sla dit bericht op om later te verzenden"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "U bent bij het laatste bericht."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Alle berichten zijn gewist."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "U bent bij het eerste bericht."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "Zoekopdracht bovenaan begonnen."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "Zoekopdracht onderaan begonnen."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Geen nieuwe berichten"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Geen ongelezen berichten"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " in deze beperkte weergave."
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "Kan markering 'belangrijk' op POP server niet veranderen."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Geen verdere threads."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "U bent al bij de eerste thread."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "Het weergeven van threads is niet ingeschakeld."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "Thread bevat ongelezen berichten"
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "Kan bericht op POP server niet aanpassen."
 
@@ -1157,75 +1758,75 @@ msgstr "Zet markering"
 msgid "Clear flag"
 msgstr "Verwijder markering"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Fout: Kon geen enkel multipart/alternative gedeelte weergeven! --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Bijlage #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Type: %s/%s, Codering: %s, Grootte: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Automatische weergave met %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Commando wordt aangeroepen: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Kan %s niet uitvoeren. --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Foutenuitvoer van %s --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr "[-- Fout: message/external-body heeft geen access-type parameter --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Deze %s/%s bijlage "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(grootte %s bytes) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "werd gewist --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- op %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- naam: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Deze %s/%s bijlage is niet bijgesloten, --]\n"
 
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
@@ -1233,34 +1834,34 @@ msgstr ""
 "[-- en de aangegeven externe bron --]\n"
 "[-- bestaat niet meer. --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- en het access-type %s wordt niet ondersteund --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Fout: multipart/signed zonder protocol-parameter."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Fout: multipart/encrypted zonder protocol-parameter!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Tijdelijk bestand kon niet worden geopend!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s wordt niet ondersteund "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(gebruik '%s' om dit gedeelte weer te geven)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "('view-attachments' moet aan een toets gekoppeld zijn!)"
 
@@ -1367,46 +1968,46 @@ msgstr "Authenticeren (%s)..."
 msgid "SASL authentication failed."
 msgstr "SASL authenticatie geweigerd."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s is een ongeldig IMAP pad"
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Namespace wordt overgehaald..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Mailfolder lijst wordt overgehaald..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "Niet bestaande mailfolder"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Mailfolder aanmaken: "
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "Mailfolder moet een naam hebben."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Mailfolder is aangemaakt."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Mailfolder %s hernoemen naar: "
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, c-format
 msgid "Rename failed: %s"
 msgstr "Hernoemen mislukt: %s"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 msgid "Mailbox renamed."
 msgstr "Mailfolder is hernoemd."
 
@@ -1417,135 +2018,132 @@ msgstr "Mailfolder is gesloten."
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Kritieke fout.  Berichtenteller wijkt af!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Verbinding met %s wordt gesloten..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Mutt kan niet overweg met deze antieke IMAP server."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
-msgstr "Onverwacht antwoord ontvangen van de server: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
+msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "Beveiligde connectie met TLS?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "Kon TLS connectie niet onderhandelen"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "%s wordt uitgekozen..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "Er is een fout opgetreden tijdens het openen van de mailfolder"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "IMAP server laat het toevoegen van berichten niet toe"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "%s aanmaken?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "%d berichten worden gemarkeerd voor verwijdering..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "Verwijderen mislukt"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Berichten-status wordt opgeslagen... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Berichten op de server worden gewist..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE mislukt"
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "CLOSE mislukt"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "Verkeerde mailfolder naam"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Aanmelden voor %s..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Afmelden voor %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Kan berichtenoverzicht niet overhalen van deze IMAP server."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Tijdelijk bestand %s kon niet worden aangemaakt"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Headercache wordt gelezen... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Headers worden opgehaald... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Bericht wordt gelezen..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "De berichtenindex is niet correct. Probeer mailfolder te heropenen."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Bericht wordt verstuurd ..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "%d berichten worden gekopieerd naar %s..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Bericht %d wordt gekopieerd naar %s ..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Doorgaan?"
 
@@ -1554,122 +2152,122 @@ msgstr "Doorgaan?"
 msgid "Bad regexp: %s"
 msgstr "Ongeldige reguliere expressie: %s"
 
-#: init.c:678
+#: init.c:644
 msgid "spam: no matching pattern"
 msgstr "spam: geen overeenkomstig patroon"
 
-#: init.c:680
+#: init.c:646
 msgid "nospam: no matching pattern"
 msgstr "nospam: geen overeenkomstig patroon"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias: Geen adres"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Waarschuwing: Ongeldige IDN '%s' in alias '%s'.\n"
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "my_hdr: Ongeldig veld in berichtenkop"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: onbekende sorteermethode"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): fout in reguliere expressie: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: onbekende variable"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "Prefix is niet toegestaan"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "Toekenning van een waarde is niet toegestaan"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s is gezet"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s is niet gezet"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: Ongeldig mailfolder-type"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: ongeldige waarde"
 
-#: init.c:1589
+#: init.c:1555
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: Onbekend type."
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: onbekend type"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Fout in %s, regel %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: fouten in %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: inlezen gestaakt vanwege te veel fouten in %s"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: fout bij %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: Te veel argumenten"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: onbekend commando"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Fout in opdrachtregel: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "Kan Home-directory niet achterhalen"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "Kan gebruikersnaam niet achterhalen"
 
@@ -2127,398 +2725,407 @@ msgid "compose a new mail message"
 msgstr "maak nieuw bericht aan"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "open een andere mailfolder"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "open een andere mailfolder in read-only mode"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "verwijder een status-vlag"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "verwijder berichten volgens patroon"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "forceer ophalen van mail vanaf IMAP-server"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "haal mail vanaf POP-server"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "spring naar eeste bericht"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "spring naar het laaste bericht"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "geef alleen berichten weer volgens patroon"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Gemarkeerde berichten doorsturen naar: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "spring naar het volgende nieuwe bericht"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "spring naar het volgende nieuwe of ongelezen bericht"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "spring naar de volgende subthread"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "spring naar de volgende thread"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "spring naar het volgende ongewiste bericht"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "spring naar het volgende ongelezen bericht"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "spring naar het vorige bericht in de thread"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "spring naar de vorige thread"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "spring naar de vorige subthread"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "spring naar het volgende ongewiste bericht"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "spring naar het vorige nieuwe bericht"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "spring naar het vorige nieuwe of ongelezen bericht"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "spring naar het vorige ongelezen bericht"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "markeer de huidige thread als gelezen"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "markeer de huidige subthread als gelezen"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "zet een status-vlag in een bericht"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "sla wijzigingen in mailfolder op"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "markeer berichten volgens patroon"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "herstel berichten volgens patroon"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "verwijder markering volgens patroon"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "ga naar het midden van de pagina"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "ga naar het volgende item"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "ga een regel naar beneden"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "ga naar de volgende pagina"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "spring naar het einde van het bericht"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "schakel weergeven van geciteerde tekst aan/uit"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "sla geciteerde tekst over"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "spring naar het begin van het bericht"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "bewerk (pipe) bericht/bijlage met een shell-commando"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "ga naar het vorige item"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "ga een regel omhoog"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "ga naar de vorige pagina"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "druk het huidige item af"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "vraag een extern programma om adressen"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "voeg resultaten van zoekopdracht toe aan huidige resultaten"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "sla wijzigingen in de mailfolder op en verlaat Mutt"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "bewerk een uitgesteld bericht"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "wis scherm en bouw scherm opnieuw op"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "(intern)"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 msgid "rename the current mailbox (IMAP only)"
 msgstr "hernoem de huidige mailfolder (alleen met IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "beantwoord een bericht"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "gebruik het huidige bericht als template voor een nieuw bericht"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "sla bericht/bijlage op in een bestand"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "zoek naar een reguliere expressie"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "zoek achteruit naar een reguliere expressie"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "zoek volgende match"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "zoek achteruit naar volgende match"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "schakel inkleuren van zoekpatronen in/uit"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "roep een commando in een shell aan"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "sorteer berichten"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "sorteer berichten in omgekeerde volgorde"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "markeer huidig item"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "voer volgende functie uit op gemarkeerde berichten"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 msgid "apply next function ONLY to tagged messages"
 msgstr "voer volgende functie ALLEEN uit op gemarkeerde berichten"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "markeer de huidige subthread"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "markeer de huidige thread"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "zet/wis de 'nieuw'-markering van een bericht"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "schakel het opslaan van wijzigingen aan/uit"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "kies tussen doorlopen van mailfolders/alle bestanden"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "spring naar het begin van de pagina"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "verwijder wismarkering van huidig item"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "verwijder wismarkering van alle berichten in thread"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "verwijder wismarkering van alle berichten in subtread"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "geef de datum en het versienummer van Mutt weer"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "geef bijlage weer, zo nodig via mailcap"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "geef MIME-bijlagen weer"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "toon de code voor een toets"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "geef het momenteel actieve limietpatroon weer"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "comprimeer/expandeer huidige thread"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "comprimeer/expandeer alle threads"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "voeg een PGP publieke sleutel toe"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "geef PGP-opties weer"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "mail een PGP publieke sleutel"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "controleer een PGP publieke sleutel"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "geef User-ID van een sleutel weer"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "controleer klassieke pgp"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Accepteer de gemaakte lijst"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "Voeg een remailer toe aan het einde van de lijst"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "Voeg een remailer toe in de lijst"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "Verwijder een remailer van de lijst"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "Kies het vorige item uit de lijst"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "Kies het volgende item uit de lijst"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "verstuur het bericht via een \"mixmaster remailer\" lijst"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "maak een gedecodeerde kopie en wis"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "maak een gedecodeerde kopie"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "verwijder wachtwoord(en) uit geheugen"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "extraheer ondersteunde publieke sleutels"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "geef S/MIME-opties weer"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr "Integer overflow -- kan geen geheugen alloceren!"
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Onvoldoende geheugen!"
 
@@ -2543,12 +3150,13 @@ msgstr ""
 "onder bepaalde voorwaarden;  type `mutt -vv' voor meer informatie.\n"
 
 #: main.c:61
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2596,6 +3204,7 @@ msgstr ""
 "USA.\n"
 
 #: main.c:99
+#, fuzzy
 msgid ""
 "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
@@ -2603,6 +3212,7 @@ msgid ""
 "[...]\n"
 "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
 "       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
 "[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
@@ -2613,6 +3223,51 @@ msgid ""
 "  -a <file>\tattach a file to the message\n"
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"gebruik: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"  -A <alias>\tgebruik een afkorting\n"
+"  -a <file>\tvoeg een bestand bij het bericht\n"
+"  -b <address>\tspecificeer een blind carbon-copy (BCC) adres\n"
+"  -c <address>\tspecificeer een carbon-copy (CC) adres\n"
+"  -e <opdracht>\tspecificeer een uit te voeren opdracht na initialisatie\n"
+"  -f <file>\tspecificeer de te lezen mailfolder\n"
+"  -F <file>\tspecificeer een alternatieve muttrc\n"
+"  -H <file>\tspecificeer een bestand om de headers uit te lezen\n"
+"  -i <file>\tspecificeer een bestand dat Mutt moet bijsluiten in het "
+"bericht\n"
+"  -m <type>\tspecificeer een standaard mailfolder type\n"
+"  -n\t\tzorgt dat Mutt de systeem Muttrc niet inleest\n"
+"  -p\t\troept een uitgesteld bericht op\n"
+"  -Q <variabele>\tvraagt de waarde van een configuratievariabele op\n"
+"  -R\t\topent de mailfolder met alleen-lezen rechten\n"
+"  -s <ond>\tspecificeer een onderwerp (tussen aanhalingstekens i.g.v. "
+"spaties)\n"
+"  -v\t\ttoont het versienummer en opties tijdens het compileren\n"
+"  -x\t\tsimuleert de mailx verzendmodus\n"
+"  -y\t\tselecteert een mailfolder gespecificeerd in de `mailboxes' lijst\n"
+"  -z\t\tbeëindigt meteen als er geen berichten in de mailfolder staan\n"
+"  -Z\t\topent de eerste mailfolder met nieuwe berichten, eindigt indien "
+"geen\n"
+"  -h\t\tdit hulp bericht"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
+#, fuzzy
+msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2667,7 +3322,7 @@ msgstr ""
 "geen\n"
 "  -h\t\tdit hulp bericht"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2675,47 +3330,47 @@ msgstr ""
 "\n"
 "Opties tijdens compileren:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Kan terminal niet initialiseren."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Debug informatie level %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG optie niet beschikbaar: deze wordt genegeerd.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s bestaat niet. Aanmaken?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Kan bestand %s niet aanmaken: %s"
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Geen ontvangers opgegeven.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: kan bestand niet bijvoegen.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Geen mailfolder met nieuwe berichten."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Geen mailfolders opgegeven."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "Mailfolder is leeg."
 
@@ -2732,11 +3387,11 @@ msgstr "Mailfolder is beschadigd!"
 msgid "Mailbox was corrupted!"
 msgstr "Mailfolder was beschadigd!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Fatale fout! Kon mailfolder niet opnieuw openen!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Kan mailfolder niet claimen!"
 
@@ -2744,11 +3399,11 @@ msgstr "Kan mailfolder niet claimen!"
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "sync: mbox is gewijzigd, maar geen gewijzigde berichten gevonden!"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Berichten worden opgeslagen ... %d (%d%%)"
@@ -2756,186 +3411,148 @@ msgstr "Berichten worden opgeslagen ... %d (%d%%)"
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "Wijzigingen doorvoeren..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Opslaan mislukt! Deel-mailfolder opgeslagen als %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Kan mailfolder niet opnieuw openen!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Mailfolder wordt heropend.."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Ga naar: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Ongeldig Indexnummer."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Geen items"
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "U kunt niet verder naar beneden gaan."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "U kunt niet verder naar boven gaan."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "U bent op de laatste pagina."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "U bent op de eerste pagina."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "Het eerste item wordt weergegeven."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "Het laatste item wordt weergegeven."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "U bent op het laatste item."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "U bent op het eerste item."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Zoek naar: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Zoek achteruit naar: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Geen zoekpatroon."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Niet gevonden."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "Geen geselecteerde items."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "In dit menu kan niet worden gezocht."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "Verspringen is niet mogelijk in menu."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Markeren is niet ondersteund."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Bezig met het lezen van %s... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): kan bestandstijd niet zetten"
 
-#: muttlib.c:846
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Bestand is een directory, daarin opslaan? [(j)a, (n)ee, (a)llen]"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr "jna"
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "Bestand is een directory, daarin opslaan?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Bestandsnaam in directory: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Bestand bestaat, (o)verschrijven, (t)oevoegen, (a)nnuleren?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "ota"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Kan het bericht niet opslaan in de POP mailfolder."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s is geen mailfolder!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Bericht aan %s toevoegen?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "Verbinding met %s beëindigd"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL is niet beschikbaar."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "Preconnect commando is mislukt."
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Verbinding met %s mislukt (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "Ongeldige IDN \"%s\"."
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "%s aan het opzoeken..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Kan adres van server \"%s\" niet achterhalen"
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Bezig met verbinden met %s..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Kan niet verbinden met %s (%s)."
@@ -2967,7 +3584,8 @@ msgstr "I/O fout"
 msgid "SSL failed: %s"
 msgstr "SSL mislukt: %s"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Kan server certificaat niet verkrijgen"
 
@@ -2976,87 +3594,207 @@ msgstr "Kan server certificaat niet verkrijgen"
 msgid "SSL connection using %s (%s)"
 msgstr "SSL verbinding via %s (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Onbekende fout"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[kan niet berekend worden]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[ongeldige datum]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "Certificaat van de server is nog niet geldig"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "Certificaat van de server is verlopen"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Dit certificaat behoort aan:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Dit certificaat is uitgegeven door:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Dit certificaat is geldig"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "    van %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "      tot %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Handtekening: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "SSL certificaat controle"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(w)eigeren, (e)enmalig toelaten, (a)ltijd toelaten"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "wea"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(w)eigeren, (e)enmalig toelaten"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "we"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Einde "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Waarschuwing: certificaat kan niet bewaard worden"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Certificaat wordt bewaard"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "SSL verbinding via %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Certificaat wordt bewaard"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Kan terminal niet initialiseren."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Handtekening: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Handtekening: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Certificaat van de server is nog niet geldig"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Certificaat van de server is verlopen"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Certificaat van de server is verlopen"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "Certificaat van de server is nog niet geldig"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "SSL certificaat controle"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Bezig met verbinden met %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Verbinding met %s mislukt (%s)"
+
+#: muttlib.c:910
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "Bestand is een directory, daarin opslaan? [(j)a, (n)ee, (a)llen]"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr "jna"
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "Bestand is een directory, daarin opslaan?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Bestandsnaam in directory: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Bestand bestaat, (o)verschrijven, (t)oevoegen, (a)nnuleren?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "ota"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Kan het bericht niet opslaan in de POP mailfolder."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Bericht aan %s toevoegen?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s is geen mailfolder!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3134,7 +3872,7 @@ msgstr "Mailfolder is niet veranderd."
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d bewaard, %d verschoven, %d gewist."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d bewaard, %d gewist."
@@ -3153,15 +3891,15 @@ msgstr "Gebruik 'toggle-write' om schrijven mogelijk te maken!"
 msgid "Mailbox is marked unwritable. %s"
 msgstr "De mailfolder is als schrijfbeveiligd gemarkeerd. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "Mailfolder is gecontroleerd."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Kan bericht niet wegschrijven"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr "Integer overflow -- kan geen geheugen alloceren!"
 
@@ -3169,48 +3907,48 @@ msgstr "Integer overflow -- kan geen geheugen alloceren!"
 msgid "Not available in this menu."
 msgstr "Optie niet beschikbaar in dit menu."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "Vorig.P"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "Volg.P"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Bijlagen tonen"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Volgend ber."
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Einde van bericht is weergegeven."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Begin van bericht is weergegeven."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Achteruit zoeken: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Zoeken: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "Hulp wordt al weergegeven."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "Geen verdere geciteerde text."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Geen verdere eigen text na geciteerde text."
 
@@ -3277,27 +4015,27 @@ msgstr "Leeg patroon"
 msgid "error: unknown op %d (report this error)."
 msgstr "fout: onbekende operatie %d (interne fout)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Bezig met het compileren van patroon..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Commando wordt uitgevoerd..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "Geen berichten voldeden aan de criteria."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "Zoeken heeft einde bereikt zonder iets te vinden"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "Zoeken heeft begin bereikt zonder iets te vinden"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Zoeken onderbroken."
 
@@ -3309,11 +4047,11 @@ msgstr "Geef PGP-wachtwoord in:"
 msgid "PGP passphrase forgotten."
 msgstr "PGP-wachtwoord is vergeten."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Fout: Kan geen PGP-proces starten! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3321,51 +4059,22 @@ msgstr ""
 "[-- Einde van PGP uitvoer --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- BEGIN PGP BERICHT --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- BEGIN PGP PUBLIC KEY BLOK --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- BEGIN PGP ONDERTEKEND BERICHT --]\n"
-"\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- EINDE PGP BERICHT --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- EINDE PGP PUBLIC KEY BLOK --]\n"
-
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- EINDE PGP ONDERTEKEND BERICHT --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "Bericht kon niet gekopiëerd worden."
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Fout: Kon begin van PGP-bericht niet vinden! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "PGP handtekening is correct bevonden."
 
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Interne fout.  Informeer <roessler@does-not-exist.org>."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3373,71 +4082,37 @@ msgstr ""
 "[-- Fout: Kon PGP-subproces niet starten! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Fout: Foutief PGP/MIME bericht! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Fout: Kon geen tijdelijk bestand aanmaken! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- De volgende gegevens zijn PGP/MIME versleuteld --]\n"
-"\n"
-
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Einde van PGP/MIME versleutelde data --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "Ontsleuteling mislukt."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "Kan PGP-Subproces niet starten!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "KeyID = \"%s\" gebruiken voor %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "KeyID voor %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "Kan PGP niet aanroepen"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr ""
 "PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eiden, %s, of (g)een? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr "PGP/M(i)ME"
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr "trad(i)tioneel"
 
-#: pgp.c:1499
+#: pgp.c:1543
 msgid "esabifc"
 msgstr "voabigg"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Ondertekenen als: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "PGP sleutel wordt gelezen..."
@@ -3446,16 +4121,6 @@ msgstr "PGP sleutel wordt gelezen..."
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Alle overeenkomende sleutels zijn verlopen/ingetrokken."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Selecteer  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Controleer sleutel "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3470,40 +4135,6 @@ msgstr "PGP-sleutels voor \"%s\"."
 msgid "Can't open /dev/null"
 msgstr "Kan /dev/null niet openen"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Kan tijdelijk bestand niet aanmaken"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Sleutel ID: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Deze sleutel is onbruikbaar: verlopen/ingetrokken."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "Dit ID is verlopen/uitgeschakeld/ingetrokken."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "Dit ID heeft ongedefiniëerde geldigheid."
-
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "Dit ID is niet geldig."
-
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "Dit ID is slechts marginaal vertrouwd."
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Wilt U deze sleutel gebruiken?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Geef Key-ID in: "
@@ -3517,11 +4148,6 @@ msgstr "PGP wordt aangeroepen..."
 msgid "PGP Key %s."
 msgstr "PGP-key %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Zoeken naar sleutels voor \"%s\"..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3579,7 +4205,7 @@ msgstr "Er is een fout opgetreden tijdens het wegschrijven van de mailfolder!"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d van de %d berichten gelezen]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "Server heeft verbinding gesloten!"
 
@@ -3609,15 +4235,15 @@ msgstr "Niet in staat berichten op de server achter te laten."
 msgid "Error connecting to server: %s"
 msgstr "Fout tijdens verbinden met server: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "Verbinding met POP-server wordt gesloten.."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Berichten index wordt geverifiëerd..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Verbinging verbroken. Opnieuw verbinden met POP server?"
 
@@ -3988,35 +4614,35 @@ msgstr "Bericht verstuurd."
 msgid "Sending in background."
 msgstr "Bericht wordt op de achtergrond verstuurd."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Geen 'boundary parameter' gevonden! [meldt deze fout!]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s bestaat niet meer!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s is geen normaal bestand."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "Kan %s niet openen."
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Fout %d opgetreden tijdens versturen van bericht: %s"
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Uitvoer van het afleverings proces"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "Ongeldige IDN %s tijdens maken resent-from header."
@@ -4132,7 +4758,7 @@ msgstr "Kan OpenSSL subproces niet starten!"
 msgid "No output from OpenSSL..."
 msgstr "Geen uitvoer van OpenSSL..."
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4140,23 +4766,23 @@ msgstr ""
 "[-- Einde van OpenSSL uitvoer --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Fout: Kan geen OpenSSL subproces starten! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- De volgende gegevens zijn S/MIME versleuteld --]\n"
 "\n"
 
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- De volgende gegevens zijn S/MIME ondertekend --]\n"
 "\n"
 
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4164,7 +4790,7 @@ msgstr ""
 "\n"
 "[-- Einde van S/MIME versleutelde data --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4172,26 +4798,26 @@ msgstr ""
 "\n"
 "[-- Einde van S/MIME ondertekende gegevens --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
 "S/MIME (v)ersleutel, (o)ndert, versl. (m)et, ondert (a)ls, (b)eiden, (g)een? "
 
-#: smime.c:1936
+#: smime.c:1945
 msgid "eswabfc"
 msgstr "vomabgg"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, of (g)een? "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345g"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr "Kan niet ondertekenen: Geen sleutel. Gebruik Ondertekenen Als."
 
@@ -4215,5 +4841,11 @@ msgstr "Vorig bericht niet zichtbaar in gelimiteerd overzicht."
 msgid "Parent message is not available."
 msgstr "Vorig bericht is niet beschikbaar."
 
+#~ msgid "Unexpected response received from server: %s"
+#~ msgstr "Onverwacht antwoord ontvangen van de server: %s"
+
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "IMAP server laat het toevoegen van berichten niet toe"
+
 #~ msgid "unspecified protocol error"
 #~ msgstr "algemene protocolfout"
diff --git a/po/pl.po b/po/pl.po
index 5fa1a3010..acfbe9d48 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutt-1.5.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-15 13:41+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2005-02-15\n"
 "Last-Translator: Pawe³ Dziekoñski <dzieko@pwr.wroc.pl>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -16,26 +16,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "Nazwa konta na %s: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Has³o dla %s@%s: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Wyj¶cie"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Usuñ"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Odtwórz"
 
@@ -44,9 +44,9 @@ msgid "Select"
 msgstr "Wybierz"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Pomoc"
 
@@ -98,165 +98,170 @@ msgstr "Zapisz do pliku: "
 msgid "Alias added."
 msgstr "Alias dodany."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Nie pasuj±cy szablon nazwy, kontynuowaæ?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Pole \"compose\" w pliku 'mailcap' wymaga %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "B³±d uruchomienia \"%s\"!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "B³±d otwarcia pliku podczas interpretacji nag³ówków."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "B³±d podczas próby otwarcia pliku w celu eliminacji nag³ówków."
 
-#: attach.c:183
+#: attach.c:184
 msgid "Failure to rename file."
 msgstr "Zmiana nazwy pliku nie powiod³a siê."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "Brak pola \"compose\" dla %s w pliku 'mailcap', utworzono pusty plik."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Pole \"Edit\" w pliku 'mailcap' wymaga %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Brak pola \"Edit\" dla %s w pliku 'mailcap'"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Brak odpowiedniego wpisu w 'mailcap'. Wy¶wietlony jako tekst."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Typ MIME nie zosta³ zdefiniowany. Nie mo¿na wy¶wietliæ za³±cznika."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Nie mo¿na utworzyæ filtru"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Nie mo¿na utworzyæ filtra"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "B³±d zapisu!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Nie wiem jak to wydrukowaæ!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Zmieñ katalog"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Wzorzec"
 
-#: browser.c:381 browser.c:968
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s nie jest katalogiem."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Skrzynki [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Zapisane [%s], wzorzec nazw plików: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Katalog [%s], wzorzec nazw plików: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Za³±cznikiem nie mo¿e zostaæ katalog!"
 
-#: browser.c:655 browser.c:1035 browser.c:1132
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "¯aden plik nie pasuje do wzorca"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Tworzenie skrzynek jest obs³ugiwane tylko dla skrzynek IMAP"
 
-#: browser.c:880
+#: browser.c:881
+#, fuzzy
+msgid "Rename is only supported for IMAP mailboxes"
+msgstr "Tworzenie skrzynek jest obs³ugiwane tylko dla skrzynek IMAP"
+
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Usuwanie skrzynek jest obs³ugiwane tylko dla skrzynek IMAP"
 
-#: browser.c:888
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Naprawdê usun±æ skrzynkê \"%s\"?"
 
-#: browser.c:902
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Skrzynka zosta³a usuniêta."
 
-#: browser.c:908
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "Skrzynka nie zosta³a usuniêta."
 
-#: browser.c:927
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Zmieñ katalog na: "
 
-#: browser.c:956 browser.c:1028
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "B³±d przegl±dania katalogu."
 
-#: browser.c:979
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Wzorzec nazw plików: "
 
-#: browser.c:1051
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Sortowanie odwrotne wg (d)aty, (a)lfabetu, (w)ielko¶ci, ¿ad(n)e?"
 
-#: browser.c:1052
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Sortowanie wg (d)aty, (a)lfabetu, (w)ielko¶ci, ¿ad(n)e?"
 
-#: browser.c:1053
+#: browser.c:1075
 msgid "dazn"
 msgstr "dawn"
 
-#: browser.c:1119
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Nazwa nowego pliku: "
 
-#: browser.c:1150
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Nie mo¿na przegl±daæ tego katalogu"
 
-#: browser.c:1167
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "B³±d podczas próby przegl±dania pliku"
 
@@ -323,7 +328,7 @@ msgstr "domy
 msgid "Verify PGP signature?"
 msgstr "Weryfikowaæ podpis PGP?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Nie mo¿na utworzyæ pliku tymczasowego!"
 
@@ -335,188 +340,195 @@ msgstr "Nie mo
 msgid "Could not copy message"
 msgstr "Nie mo¿na skopiowaæ listu"
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "Podpis S/MIME zosta³ pomy¶lnie zweryfikowany."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "W³a¶ciciel certyfikatu nie odpowiada nadawcy."
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr "Ostrze¿enie: fragment tej wiadomo¶ci nie zosta³ podpisany."
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "Podpis S/MIME NIE mo¿e zostaæ zweryfikowany."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "Podpis PGP zosta³ pomy¶lnie zweryfikowany."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "Podpis PGP NIE mo¿e zostaæ zweryfikowany."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Wprowad¼ polecenie: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Wy¶lij kopiê listu do: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Wy¶lij kopie zaznaczonych listów do: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "B³±d interpretacji adresu!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "B³êdny IDN: '%s'"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Wy¶lij kopiê listu do %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Wy¶lij kopie listów do %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "Kopia nie zosta³a wys³ana."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "Kopie nie zosta³y wys³ane."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Kopia zosta³a wys³ana."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Kopie zosta³y wys³ane."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "Nie mo¿na utworzyæ procesu filtru"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Wy¶lij przez potok do polecenia: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Polecenie drukowania nie zosta³o skonfigurowane."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Wydrukowaæ list?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Wydrukowaæ zaznaczone listy?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "List zosta³ wydrukowany"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Listy zosta³y wydrukowane"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "List nie zosta³ wydrukowany "
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Listy nie zosta³y wydrukowane"
 
-#: commands.c:508
-msgid "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)am?: "
-msgstr "Odwr-Sort (d)ata/(a)ut/o(t)rzym/t(e)m/d(o)/(w)±t/(b)ez/ro(z)m/wa(g)a/(s)pam?: "
-
 #: commands.c:509
-msgid "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)am?: "
-msgstr "Sortuj (d)ata/(a)ut/o(t)rzym/t(e)mat/d(o)/(w)±t/(b)ez/ro(z)m/wa(g)a/(s)pam?: "
+msgid ""
+"Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
+"(p)am?: "
+msgstr ""
+"Odwr-Sort (d)ata/(a)ut/o(t)rzym/t(e)m/d(o)/(w)±t/(b)ez/ro(z)m/wa(g)a/(s)"
+"pam?: "
 
 #: commands.c:510
+msgid ""
+"Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
+"am?: "
+msgstr ""
+"Sortuj (d)ata/(a)ut/o(t)rzym/t(e)mat/d(o)/(w)±t/(b)ez/ro(z)m/wa(g)a/(s)pam?: "
+
+#: commands.c:511
 msgid "dfrsotuzcp"
 msgstr "dateowbzgs"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Polecenie pow³oki: "
 
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Dekoduj-zapisz%s do skrzynki"
 
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Dekoduj-kopiuj%s do skrzynki"
 
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Rozszyfruj-zapisz%s do skrzynki"
 
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Rozszyfruj-kopiuj%s do skrzynki"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Zapisz%s do skrzynki"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Kopiuj%s do skrzynki"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " zaznaczone"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Kopiowanie do %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Przekonwertowaæ do %s przy wysy³aniu?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Typ \"Content-Type\" zmieniono na %s."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Zestaw znaków zosta³ zmieniony na %s; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "bez konwersji"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "konwertowanie"
 
@@ -608,103 +620,668 @@ msgstr "B
 msgid "Attaching selected files..."
 msgstr "Do³±czanie wybranych listów..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Nie mo¿na do³±czyæ %s!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Otwórz skrzynkê w celu do³±czenia listu"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Brak listów w tej skrzynce."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Zaznacz listy do do³±czenia!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Nie mo¿na do³±czyæ!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "Tylko tekstowe za³±czniki mo¿na przekodowaæ."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "Bie¿±cy za³acznik nie zostanie przekonwertowany."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "Bie¿±cy za³acznik zostanie przekonwertowany."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "B³êdne kodowanie."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Zapisaæ kopiê tego listu?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Zmieñ nazwê na: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Nie mo¿na ustaliæ stanu (stat) %s: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Nowy plik: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Typ \"Content-Type\" musi byæ w postaci podstawowy/po¶ledni"
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Nieznany typ \"Content-Type\" %s"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "Nie mo¿na utworzyæ %s"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "Mamy tu b³±d tworzenia za³±cznika"
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "Zachowaæ ten list do pó¼niejszej obróbki i ewentualnej wysy³ki?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "Zapisz list do skrzynki"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Zapisywanie listu do %s ..."
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "List zosta³ zapisany."
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "Wybrano ju¿ S/MIME. Anulowaæ wybór S/MIME i kontynuowaæ? "
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr "Wybrano ju¿ PGP. Anulowaæ wybór PGP i kontynuowaæ? "
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "b³±d we wzorcu: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "b³±d we wzorcu: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "b³±d we wzorcu: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "b³±d we wzorcu: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "b³±d we wzorcu: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "b³±d we wzorcu: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "b³±d we wzorcu: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "b³±d we wzorcu: %s"
+
+#: crypt-gpgme.c:993
+#, fuzzy
+msgid "Warning: One of the keys has been revoked\n"
+msgstr "Ostrze¿enie: fragment tej wiadomo¶ci nie zosta³ podpisany."
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Certyfikat serwera utraci³ wa¿no¶æ"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "Protokó³ SSL nie jest dostêpny."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Odcisk: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "B³±d podczas wysy³ania listu."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "B³±d w poleceniu: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Koniec podpisanych danych --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- B³±d: nie mo¿na utworzyæ pliku tymczasowego! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- POCZ¡TEK LISTU PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- POCZ¡TEK KLUCZA PUBLICZNEGO PGP --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- POCZ¡TEK LISTU PODPISANEGO PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- KONIEC LISTU PGP --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- KONIEC PUBLICZNEGO KLUCZA PGP --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- KONIEC LISTU PODPISANEGO PGP --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- B³±d: nie mo¿na odnale¼æ pocz±tku listu PGP! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- B³±d: uszkodzony list PGP/MIME! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- B³±d: nie mo¿na utworzyæ pliku tymczasowego! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Nastêpuj±ce dane s± zaszyfrowane PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Nastêpuj±ce dane s± zaszyfrowane PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- Koniec danych zaszyfrowanych PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- Koniec danych zaszyfrowanych PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr "[-- Poni¿sze dane s± podpisane S/MIME --]\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr "[-- Nastêpuj±ce dane s± zaszyfrowane S/MIME --]\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Koniec danych podpisanych S/MIME. --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Koniec danych zaszyfrowanych S/MIME. --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "B³êdny   "
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Niew³a¶ciwy miesi±c: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Niew³a¶ciwy miesi±c: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Zaszyfruj"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Certyfikat zosta³ zapisany"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Identyfikator klucza: 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "Wyprowadzony   "
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Wygas³y   "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Nie mo¿na utworzyæ pliku tymczasowego"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "£±czenie z %s..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "B³±d ³±czenia z serwerem: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Identyfikator klucza: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "SSL nie powiod³o siê: %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Wszystkie pasuj±ce klucze wygas³y, zosta³y wy³±czone lub wyprowadzone."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Wyj¶cie  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Wybór  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Sprawd¼ klucz  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "Klucze PGP dla \"%s\"."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "Klucze PGP dla \"%s\"."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "Certyfikat S/MIME dla \"%s\"."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "Klucze PGP dla \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Nie mo¿na u¿yæ tego klucza: wygas³, zosta³ wy³±czony lub wyprowadzony."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "Identyfikator wygas³, zosta³ wy³±czony lub wyprowadzony."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "Poziom wa¿no¶ci tego identyfikatora nie zosta³ okre¶lony."
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "Nieprawid³owy identyfikator."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "Ten identyfikator jest tylko czê¶ciowo wa¿ny."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Czy naprawdê chcesz u¿yæ tego klucza?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Wyszukiwanie odpowiednich kluczy dla \"%s\"..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "U¿yæ klucza numer \"%s\" dla %s?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Wprowad¼ numer klucza dla %s: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, %s , b(e)z PGP? "
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "zpmjoa"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, %s , b(e)z PGP? "
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "zpmjoa"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Podpisz jako: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "B³±d otwarcia pliku podczas interpretacji nag³ówków."
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -720,277 +1297,331 @@ msgid "Passphrase(s) forgotten."
 msgstr "Has³o(a) zosta³o(y) zapomniane."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Wywo³ywanie PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr "Nie mo¿na wys³aæ listu w trybie inline. Zastosowaæ PGP/MIME?"
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "List nie zosta³ wys³any."
 
-#: crypt.c:395
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "Listy S/MIME bez wskazówek co do zawarto¶ci nie s± obs³ugiwane."
 
-#: crypt.c:614 crypt.c:658
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "Próba skopiowania kluczy PGP...\n"
 
-#: crypt.c:638 crypt.c:678
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Próba skopiowania kluczy S/MIME...\n"
 
-#: crypt.c:799
-msgid "[-- Error: Inconsistent multipart/signed structure! --]\n\n"
-msgstr "[-- B³±d: Niespójna struktura multipart/signed ! --]\n\n"
+#: crypt.c:802
+msgid ""
+"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"\n"
+msgstr ""
+"[-- B³±d: Niespójna struktura multipart/signed ! --]\n"
+"\n"
 
-#: crypt.c:821
+#: crypt.c:823
 #, c-format
-msgid "[-- Error: Unknown multipart/signed protocol %s! --]\n\n"
-msgstr "[-- B³±d: Nieznany protokó³ multipart/signed %s! --]\n\n"
+msgid ""
+"[-- Error: Unknown multipart/signed protocol %s! --]\n"
+"\n"
+msgstr ""
+"[-- B³±d: Nieznany protokó³ multipart/signed %s! --]\n"
+"\n"
 
-#: crypt.c:861
+#: crypt.c:862
 #, c-format
-msgid "[-- Warning: We can't verify %s/%s signatures. --]\n\n"
-msgstr "[-- Ostrze¿enie: nie mo¿na zweryfikowaæ podpisów %s/%s --]\n\n"
+msgid ""
+"[-- Warning: We can't verify %s/%s signatures. --]\n"
+"\n"
+msgstr ""
+"[-- Ostrze¿enie: nie mo¿na zweryfikowaæ podpisów %s/%s --]\n"
+"\n"
 
 #. Now display the signed body
-#: crypt.c:873
-msgid "[-- The following data is signed --]\n\n"
-msgstr "[-- Poni¿sze dane s± podpisane --]\n\n"
+#: crypt.c:874
+msgid ""
+"[-- The following data is signed --]\n"
+"\n"
+msgstr ""
+"[-- Poni¿sze dane s± podpisane --]\n"
+"\n"
 
-#: crypt.c:879
-msgid "[-- Warning: Can't find any signatures. --]\n\n"
-msgstr "[-- Ostrze¿enie: Nie znaleziono ¿adnych podpisów. --]\n\n"
+#: crypt.c:880
+msgid ""
+"[-- Warning: Can't find any signatures. --]\n"
+"\n"
+msgstr ""
+"[-- Ostrze¿enie: Nie znaleziono ¿adnych podpisów. --]\n"
+"\n"
+
+#: crypt.c:886
+msgid ""
+"\n"
+"[-- End of signed data --]\n"
+msgstr ""
+"\n"
+"[-- Koniec podpisanych danych --]\n"
+
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
 
-#: crypt.c:885
-msgid "\n[-- End of signed data --]\n"
-msgstr "\n[-- Koniec podpisanych danych --]\n"
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Wywo³ywanie PGP..."
 
-#: curs_lib.c:190
+#: curs_lib.c:188
 msgid "yes"
 msgstr "tak"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "nie"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Wyj¶æ z Mutta?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "nieznany b³±d"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Naci¶nij dowolny klawisz by kontynuowaæ..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " (przyci¶niêcie '?' wy¶wietla listê): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Nie otwarto ¿adnej skrzynki."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Brak listów."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "Skrzynka jest tylko do odczytu."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Funkcja niedostêpna w trybie za³±czania"
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "Brak widocznych listów."
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Nie mo¿na zapisaæ do skrzynki oznaczonej jako 'tylko do odczytu'!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Zmiany zostan± naniesione niezw³ocznie po wyj¶ciu ze skrzynki."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Zmiany w skrzynce nie zostan± naniesione."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Wyjd¼"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Zapisz"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Wy¶lij"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Grupie"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Skrzynka zosta³a zmodyfikowana z zewn±trz. Flagi mog± byæ nieaktualne."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Uwaga - w bie¿±cej skrzynce pojawi³a siê nowa poczta!"
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "Skrzynka zosta³a zmodyfikowana z zewn±trz."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Brak zaznaczonych listów."
 
-#: curs_main.c:657 menu.c:901
+#: curs_main.c:662 menu.c:915
 msgid "Nothing to do."
 msgstr "Brak akcji do wykonania."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Skocz do listu: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "Jako argument wymagany jest numer listu."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Ten list nie jest widoczny."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "B³êdny numer listu."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Usuñ listy pasuj±ce do wzorca: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "Wzorzec ograniczaj±cy nie zosta³ okre¶lony."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Ograniczenie: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Ogranicz do pasuj±cych listów: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Wyj¶æ z Mutta?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Zaznacz pasuj±ce listy: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Odtwórz pasuj±ce listy: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Odznacz pasuj±ce listy: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Otwórz skrzynkê tylko do odczytu"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Otwórz skrzynkê"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s nie jest skrzynk±."
 
-#: curs_main.c:1165
+#: curs_main.c:1176
 msgid "Exit Mutt without saving?"
 msgstr "Wyj¶æ z Mutta bez zapisywania zmian?"
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "W±tkowanie nie zosta³o w³±czone."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "zapisz list aby wys³aæ go pó¼niej"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "To jest ostatni list."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Brak odtworzonych listów."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "To jest pierwszy list."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "Kontynuacja poszukiwania od pocz±tku."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "Kontynuacja poszukiwania od koñca."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Brak nowych listów"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Przeczytano ju¿ wszystkie listy"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " w trybie ograniczonego przegl±dania"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "Nie mo¿na zmieniæ flagi 'wa¿ne' na serwerze POP."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Nie ma wiêcej w±tków."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "To pierwszy w±tek."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "W±tkowanie nie zosta³o w³±czone."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "W±tek zawiera nieprzeczytane listy."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "Nie mo¿na edytowaæ listów na serwerze POP."
 
@@ -999,8 +1630,44 @@ msgstr "Nie mo
 #. * declared "static" (sigh)
 #.
 #: edit.c:41
-msgid "~~\t\tinsert a line begining with a single ~\n~b users\tadd users to the Bcc: field\n~c users\tadd users to the Cc: field\n~f messages\tinclude messages\n~F messages\tsame as ~f, except also include headers\n~h\t\tedit the message header\n~m messages\tinclude and quote messages\n~M messages\tsame as ~m, except include headers\n~p\t\tprint the message\n~q\t\twrite file and quit editor\n~r file\t\tread a file into the editor\n~t users\tadd users to the To: field\n~u\t\trecall the previous line\n~v\t\tedit message with the $visual editor\n~w file\t\twrite message to file\n~x\t\tabort changes and quit editor\n~?\t\tthis message\n.\t\ton a line by itself ends input\n"
-msgstr "~~\t\twstaw liniê zaczynaj±c± siê pojedyñczym ~\n~b u¿ytkownicy\tdodaj u¿ytkowników do pola BCC:\n~c u¿ytkownicy\tdodaj u¿ytkowników do pola Cc:\n~f listy\tdo³±cz listy\n~F listy\tto samo co ~f ale do³±cz te¿ nag³ówki\n~h\t\tedytuj nag³ówki\n~m listy\tdodaj i komentuj listy\n~M listy\tto samo co ~m ale do³±cz te¿ nag³ówki\n~p\t\tdrukuj list\n~q\t\tzapisz plik i wyjd¼ z edytora\n~r plik\t\twczytaj plik do edytora\n~t u¿ytkownicy\tdodaj u¿ytkowników do pola To:\n~u\t\todtwórz poprzedni± liniê\n~v\t\tedytuj list edytorem $visual\n~w plik\t\tzapisz list do pliku\n~x\t\tporzuæ zmiany i wyjd¼ z edytora\n~?\t\tten list\n.\t\tstoj±c sama w linii koñczy wpisywanie\n"
+msgid ""
+"~~\t\tinsert a line begining with a single ~\n"
+"~b users\tadd users to the Bcc: field\n"
+"~c users\tadd users to the Cc: field\n"
+"~f messages\tinclude messages\n"
+"~F messages\tsame as ~f, except also include headers\n"
+"~h\t\tedit the message header\n"
+"~m messages\tinclude and quote messages\n"
+"~M messages\tsame as ~m, except include headers\n"
+"~p\t\tprint the message\n"
+"~q\t\twrite file and quit editor\n"
+"~r file\t\tread a file into the editor\n"
+"~t users\tadd users to the To: field\n"
+"~u\t\trecall the previous line\n"
+"~v\t\tedit message with the $visual editor\n"
+"~w file\t\twrite message to file\n"
+"~x\t\tabort changes and quit editor\n"
+"~?\t\tthis message\n"
+".\t\ton a line by itself ends input\n"
+msgstr ""
+"~~\t\twstaw liniê zaczynaj±c± siê pojedyñczym ~\n"
+"~b u¿ytkownicy\tdodaj u¿ytkowników do pola BCC:\n"
+"~c u¿ytkownicy\tdodaj u¿ytkowników do pola Cc:\n"
+"~f listy\tdo³±cz listy\n"
+"~F listy\tto samo co ~f ale do³±cz te¿ nag³ówki\n"
+"~h\t\tedytuj nag³ówki\n"
+"~m listy\tdodaj i komentuj listy\n"
+"~M listy\tto samo co ~m ale do³±cz te¿ nag³ówki\n"
+"~p\t\tdrukuj list\n"
+"~q\t\tzapisz plik i wyjd¼ z edytora\n"
+"~r plik\t\twczytaj plik do edytora\n"
+"~t u¿ytkownicy\tdodaj u¿ytkowników do pola To:\n"
+"~u\t\todtwórz poprzedni± liniê\n"
+"~v\t\tedytuj list edytorem $visual\n"
+"~w plik\t\tzapisz list do pliku\n"
+"~x\t\tporzuæ zmiany i wyjd¼ z edytora\n"
+"~?\t\tten list\n"
+".\t\tstoj±c sama w linii koñczy wpisywanie\n"
 
 #: edit.c:186
 #, c-format
@@ -1087,105 +1754,112 @@ msgstr "Ustaw flag
 msgid "Clear flag"
 msgstr "Wyczy¶æ flagê"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
-msgstr "[--B³±d: Nie mo¿na wy¶wietliæ ¿adnego z fragmentów Multipart/Alternative! --]\n"
+msgstr ""
+"[--B³±d: Nie mo¿na wy¶wietliæ ¿adnego z fragmentów Multipart/Alternative! "
+"--]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Za³±cznik #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Typ: %s/%s, Kodowanie: %s, Wielko¶æ: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Podgl±d za pomoc± %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Wywo³ywanie polecenia podgl±du: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Nie mo¿na uruchomiæ %s. --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Komunikaty b³êdów %s --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
-msgstr "[-- B³±d: message/external-body nie ma ustawionego rodzaju dostêpu --]\n"
+msgstr ""
+"[-- B³±d: message/external-body nie ma ustawionego rodzaju dostêpu --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Ten za³±cznik typu %s/%s "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(o wielko¶ci %s bajtów) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "zosta³ usuniêty --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- na %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- nazwa: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Ten za³±cznik typu %s/%s nie jest zawarty, --]\n"
 
-#: handler.c:1696
-msgid "[-- and the indicated external source has --]\n[-- expired. --]\n"
-msgstr "[-- a podane ¼ród³o zewnêtrzne jest --]\n[-- nieaktualne. --]\n"
+#: handler.c:1712
+msgid ""
+"[-- and the indicated external source has --]\n"
+"[-- expired. --]\n"
+msgstr ""
+"[-- a podane ¼ród³o zewnêtrzne jest --]\n"
+"[-- nieaktualne. --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- a podany typ dostêpu %s nie jest obs³ugiwany --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "B³±d: multipart/signed nie ma protoko³u."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "B³±d: multipart/encrypted nie ma parametru protoko³u!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Nie mo¿na otworzyæ pliku tymczasowego!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- typ %s/%s nie jest obs³ugiwany "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(u¿yj '%s' do ogl±dania tego fragmentu)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(przypisz 'view-attachments' do klawisza!)"
 
@@ -1203,12 +1877,24 @@ msgid "<UNKNOWN>"
 msgstr "<NIEZNANY>"
 
 #: help.c:336
-msgid "\nGeneric bindings:\n\n"
-msgstr "\nStandardowe przypisania klawiszy:\n\n"
+msgid ""
+"\n"
+"Generic bindings:\n"
+"\n"
+msgstr ""
+"\n"
+"Standardowe przypisania klawiszy:\n"
+"\n"
 
 #: help.c:340
-msgid "\nUnbound functions:\n\n"
-msgstr "\nNie przypisane klawiszom funkcje:\n\n"
+msgid ""
+"\n"
+"Unbound functions:\n"
+"\n"
+msgstr ""
+"\n"
+"Nie przypisane klawiszom funkcje:\n"
+"\n"
 
 #: help.c:348
 #, c-format
@@ -1216,6 +1902,7 @@ msgid "Help for %s"
 msgstr "Pomoc dla menu %s"
 
 #: hook.c:246
+#, c-format
 msgid "unhook: Can't do unhook * from within a hook."
 msgstr "unhook: Nie mo¿na wykonaæ \"unhook *\" wewn±trz innego polecenia hook."
 
@@ -1279,35 +1966,50 @@ msgstr "Uwierzytelnianie (%s)..."
 msgid "SASL authentication failed."
 msgstr "Uwierzytelnianie SASL nie powiod³o siê."
 
-#: imap/browse.c:68 imap/imap.c:542
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s jest b³êdn± ¶cie¿k± IMAP"
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Pobieranie przestrzeni nazw..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Pobieranie listy skrzynek..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "Brak skrzynki"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Nazwa skrzynki: "
 
-#: imap/browse.c:286
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "Skrzynka musi zostaæ nazwana."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Skrzynka zosta³a utworzona."
 
+#: imap/browse.c:332
+#, fuzzy, c-format
+msgid "Rename mailbox %s to: "
+msgstr "Nazwa skrzynki: "
+
+#: imap/browse.c:345
+#, fuzzy, c-format
+msgid "Rename failed: %s"
+msgstr "SSL nie powiod³o siê: %s"
+
+#: imap/browse.c:350
+#, fuzzy
+msgid "Mailbox renamed."
+msgstr "Skrzynka zosta³a utworzona."
+
 #: imap/command.c:294
 msgid "Mailbox closed"
 msgstr "Skrzynka zosta³a zamkniêta"
@@ -1315,135 +2017,132 @@ msgstr "Skrzynka zosta
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "B³±d krytyczny. Niezidentyfikowana ilo¶æ listów!"
 
-#: imap/imap.c:151
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Zamykanie po³±czenia do %s..."
 
-#: imap/imap.c:311
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Zbyt stara wersja serwera IMAP. Praca z tym serwerem nie jest mo¿liwa."
 
-#: imap/imap.c:402
-#, c-format
-msgid "Unexpected response received from server: %s"
-msgstr "Otrzymano nieoczekiwan± odpowied¼ od serwera: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
+msgstr ""
 
-#: imap/imap.c:422 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "Po³±czyæ u¿ywaj±c TLS?"
 
-#: imap/imap.c:435 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "Po³±czenie TSL nie zosta³o wynegocjowane"
 
-#: imap/imap.c:573
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Wybieranie %s..."
 
-#: imap/imap.c:709
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "B³±d otwarcia skrzynki"
 
-#. STATUS not supported
-#: imap/imap.c:763
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Nie mo¿na dopisaæ do skrzynek IMAP na tym serwerze"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:772 imap/message.c:720 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "Utworzyæ %s?"
 
-#: imap/imap.c:958 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Zaznaczanie %d listów jako skasowanych..."
 
-#: imap/imap.c:967
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "Skasowanie nie powiod³o siê"
 
-#: imap/imap.c:982
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Zapisywanie stanu flag listów... [%d/%d]"
 
-#: imap/imap.c:1066
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Kasowanie listów na serwerze... "
 
-#: imap/imap.c:1071
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: skasowanie nie powiod³o siê"
 
-#: imap/imap.c:1105
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "Polecenie CLOSE nie powiod³o siê"
 
-#: imap/imap.c:1348
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "B³êdna nazwa skrzynki"
 
-#: imap/imap.c:1360
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Subskrybowanie %s..."
 
-#: imap/imap.c:1362
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Odsubskrybowanie %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Nie mo¿na pobraæ nag³ówków z serwera IMAP w tej wersji."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Nie mo¿na utworzyæ pliku tymczasowego %s"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Szacowanie bufora... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Pobieranie nag³ówków listów... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Pobieranie listu..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "B³êdny indeks listów. Spróbuj ponownie otworzyæ skrzynkê."
 
-#: imap/message.c:586
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "£adowanie listu ..."
 
-#: imap/message.c:696
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Kopiowanie %d listów do %s..."
 
-#: imap/message.c:700
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Kopiowanie listu %d do %s..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Kontynuowaæ?"
 
@@ -1452,120 +2151,122 @@ msgstr "Kontynuowa
 msgid "Bad regexp: %s"
 msgstr "B³±d w wyra¿eniu regularnym: %s"
 
-#: init.c:678
+#: init.c:644
 msgid "spam: no matching pattern"
 msgstr "Spam: brak pasuj±cego wzorca"
 
-#: init.c:680
+#: init.c:646
 msgid "nospam: no matching pattern"
 msgstr "NieSpam: brak pasuj±cego wzorca"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias: brak adresu"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Ostrze¿enie: b³êdny IDN '%s' w aliasie '%s'.\n"
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "nieprawid³owy nag³ówek"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: nieznana metoda sortowania"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): b³±d w wyra¿eniu regularnym: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: nieznana zmienna"
 
-#: init.c:1243
+#: init.c:1209
+#, c-format
 msgid "prefix is illegal with reset"
 msgstr "reset: nieprawid³owy prefiks"
 
-#: init.c:1249
+#: init.c:1215
+#, c-format
 msgid "value is illegal with reset"
 msgstr "reset: nieprawid³owa warto¶æ"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s ustawiony"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s nie jest ustawiony"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: nieprawid³owy typ skrzynki"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: nieprawid³owa warto¶æ"
 
-#: init.c:1589
+#: init.c:1555
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: nieznany typ"
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: nieprawid³owy typ"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "B³±d w %s, linia %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: b³êdy w %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: wczytywanie zaniechane z powodu zbyt wielu b³êdów w %s"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: b³êdy w %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: zbyt wiele argumentów"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: nieznane polecenie"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "B³±d w poleceniu: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "nie mo¿na ustaliæ po³o¿enia katalogu domowego"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "nie mo¿na ustaliæ nazwy u¿ytkownika"
 
@@ -1680,7 +2381,8 @@ msgstr "odsubskrybuj bie
 
 #: keymap_alldefs.h:17
 msgid "toggle view all/subscribed mailboxes (IMAP only)"
-msgstr "zmieñ tryb przegl±dania skrzynek: wszystkie/zasubskrybowane (tylko IMAP)"
+msgstr ""
+"zmieñ tryb przegl±dania skrzynek: wszystkie/zasubskrybowane (tylko IMAP)"
 
 #: keymap_alldefs.h:18
 msgid "list mailboxes with new mail"
@@ -2023,458 +2725,653 @@ msgid "compose a new mail message"
 msgstr "zredaguj nowy list"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "otwórz inn± skrzynkê"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "otwórz inn± skrzynkê w trybie tylko do odczytu"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "usuñ flagê ze statusem wiadomo¶ci"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "usuñ listy pasuj±ce do wzorca"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "wymusz± pobranie poczty z serwera IMAP"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "pobierz pocztê z serwera POP"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "przejd¼ do pierwszego listu"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "przejd¼ do ostatniego listu"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "poka¿ tylko listy pasuj±ce do wzorca"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Wy¶lij kopie zaznaczonych listów do: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "przejd¼ do nastêpnego nowego listu"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "przejd¼ do nastêpnego nowego lub nie przeczytanego listu"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "przejd¼ do nastêpnego podw±tku"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "przejd¼ do nastêpnego w±tku"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "przejd¼ do nastêpnego nieusuniêtego listu"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "przejd¼ do nastêpnego nieprzeczytanego listu"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "przejd¼ na pocz±tek w±tku"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "przejd¼ do poprzedniego w±tku"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "przejd¼ do poprzedniego podw±tku"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "przejd¼ do poprzedniego nieusuniêtego listu"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "przejd¼ do poprzedniego nowego listu"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "przejd¼ do poprzedniego nowego lub nie przeczytanego listu"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "przejd¼ do poprzedniego nieprzeczytanego listu"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "zaznacz obecny w±tek jako przeczytany"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "zaznacz obecny podw±tek jako przeczytany"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "ustaw flagê statusu listu"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "zapisz zmiany do skrzynki"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "zaznacz listy pasuj±ce do wzorca"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "odtwórz listy pasuj±ce do wzorca"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "odznacz listy pasuj±ce do wzorca"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "przejd¼ do po³owy strony"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "przejd¼ do nastêpnej pozycji"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "przewiñ w dó³ o liniê"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "przejd¼ do nastêpnej strony"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "przejd¼ na koniec listu"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "ustala sposób pokazywania zaznaczonego tekstu"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "przeskocz poza zaznaczony fragment tekstu"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "przejd¼ na pocz±tek listu"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "przekieruj list/za³±cznik do polecenia pow³oki"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "przejd¼ do poprzedniej pozycji"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "przewiñ w górê o liniê"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "przejd¼ do poprzedniej strony"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "wydrukuj obecn± pozycjê"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "zapytaj zewnêtrzny program o adres"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "dodaj rezultaty nowych poszukiwañ do obecnych"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "zapisz zmiany do skrzynki i opu¶æ program pocztowy"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "wywo³aj od³o¿ony list"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "wyczy¶æ i od¶wie¿ ekran"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{wewnêtrzne}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
+#, fuzzy
+msgid "rename the current mailbox (IMAP only)"
+msgstr "usuñ bie¿±c± skrzynkê (tylko IMAP)"
+
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "odpowiedz na list"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "u¿yj bie¿±cego listu jako wzorca dla nowych wiadomo¶ci"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "zapisz list/za³±cznik do pliku"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "szukaj wyra¿enia regularnego"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "szukaj wstecz wyra¿enia regularnego"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "szukaj nastêpnego pozytywnego rezultatu"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "szukaj wstecz nastêpnego pozytywnego rezultatu"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "ustala czy szukana fraza ma byæ zaznaczona kolorem"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "wywo³aj polecenie w podpow³oce"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "uszereguj listy"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "uszereguj listy w odwrotnej kolejno¶ci"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "zaznacz bie¿±c± pozycjê"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "wykonaj nastêpne polecenie na zaznaczonych listach"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:167
 msgid "apply next function ONLY to tagged messages"
 msgstr "wykonaj nastêpne polecenie TYLKO na zaznaczonych listach"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "zaznacz bie¿±cy podw±tek"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "zaznacz bie¿±cy w±tek"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "ustaw flagê listu na 'nowy'"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "ustala czy skrzynka bêdzie ponownie zapisana"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "ustala czy przegl±daæ skrzynki czy wszystkie pliki"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "przejd¼ na pocz±tek strony"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "odtwórz bie¿±c± pozycjê listy"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "odtwórz wszystkie listy z tego w±tku"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "odtwórz wszystkie listy z tego podw±tku"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "poka¿ wersjê i datê programu pocztowego Mutt"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "poka¿ za³±cznik u¿ywaj±c, je¶li to niezbêdne, pliku 'mailcap'"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "poka¿ za³±czniki MIME"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "wy¶wietl kod wprowadzonego znaku"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "poka¿ bie¿±cy wzorzec ograniczaj±cy"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "zwiñ/rozwiñ bie¿±cy w±tek"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "zwiñ/rozwiñ wszystkie w±tki"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "do³±cz w³asny klucz publiczny PGP"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "poka¿ opcje PGP"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "wy¶lij w³asny klucz publiczny PGP"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "zweryfikuj klucz publiczny PGP"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "obejrzyj identyfikator u¿ytkownika klucza"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "u¿yj starej wersji pgp"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Potwierd¼ skonstruowany ³añcuch"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "Dodaj remailera do ³añcucha"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "Wprowadz remailera do ³añcucha"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "Usuñ remailera z ³añcucha"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "Wybierz poprzedni element ³añcucha"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "Wybierz nastepny element ³añcucha"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "przeslij list przez ³añcuch anonimowych remailerów typu mixmaster"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "utwórz rozszyfrowana± kopiê i usuñ orygina³"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "utwórz rozszyfrowan± kopiê"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "wyma¿ has³o z pamiêci operacyjnej"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "kopiuj klucze publiczne"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "poka¿ opcje S/MIME"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr "Przepe³nienie zmiennej ca³kowitej - nie mo¿na zaalokowaæ pamiêci!"
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Brak pamiêci!"
 
 #: main.c:51
-msgid "To contact the developers, please mail to <mutt-dev@mutt.org>.\nTo report a bug, please use the flea(1) utility.\n"
-msgstr "Aby powiadomiæ autorów, proszê pisaæ na <mutt-dev@mutt.org>.\nAby zg³osiæ b³±d u¿yj programu flea(1).\n"
+msgid ""
+"To contact the developers, please mail to <mutt-dev@mutt.org>.\n"
+"To report a bug, please use the flea(1) utility.\n"
+msgstr ""
+"Aby powiadomiæ autorów, proszê pisaæ na <mutt-dev@mutt.org>.\n"
+"Aby zg³osiæ b³±d u¿yj programu flea(1).\n"
 
 #: main.c:55
-msgid "Copyright (C) 1996-2002 Michael R. Elkins and others.\nMutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\nMutt is free software, and you are welcome to redistribute it\nunder certain conditions; type `mutt -vv' for details.\n"
-msgstr "Copyright (C) 1996-2002 Michael R. Elkins i inni.\nProgram nie jest objêty ¯ADN¡ gwarancj±; szczegó³y poznasz pisz±c 'mutt -vv'.\nMutt jest darmowym oprogramowaniem, jeste¶ jak najbardziej uprawniony do\njego redystrybucji pod pewnymi warunkami, szczegó³y poznasz pisz±c 'mutt -vv'.\n"
+msgid ""
+"Copyright (C) 1996-2002 Michael R. Elkins and others.\n"
+"Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n"
+"Mutt is free software, and you are welcome to redistribute it\n"
+"under certain conditions; type `mutt -vv' for details.\n"
+msgstr ""
+"Copyright (C) 1996-2002 Michael R. Elkins i inni.\n"
+"Program nie jest objêty ¯ADN¡ gwarancj±; szczegó³y poznasz pisz±c 'mutt -"
+"vv'.\n"
+"Mutt jest darmowym oprogramowaniem, jeste¶ jak najbardziej uprawniony do\n"
+"jego redystrybucji pod pewnymi warunkami, szczegó³y poznasz pisz±c 'mutt -"
+"vv'.\n"
 
 #: main.c:61
-msgid "Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\nCopyright (C) 1996-2002 Brandon Long <blong@fiction.net>\nCopyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\nCopyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\nCopyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\nCopyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\nCopyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n\nLots of others not mentioned here contributed lots of code,\nfixes, and suggestions.\n\n    This program is free software; you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation; either version 2 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program; if not, write to the Free Software\n    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
-msgstr "Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\nCopyright (C) 1996-2002 Brandon Long <blong@fiction.net>\nCopyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\nCopyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\nCopyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\nCopyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\nCopyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n\nWielu innych twórców, nie wspomnianych tutaj,\nwnios³o wiele nowego kodu, poprawek i sugestii.\n\n   Ten program jest darmowy; mo¿esz rozprowadzaæ go i/lub modyfikowaæ\n   zachowuj±c warunki Powszechnej Licencji Publicznej GNU (General Public\n   Licence), opublikowanej przez Free Software Foundation, w wersji 2\n   lub wy¿szej.\n\n   Program ten jest rozprowadzany w nadziei, ¿e bêdzie przydatny,\n   ale BEZ ¯ADNYCH GWARANCJI, wyra¿onych wprost lub domy¶lnie nawet,\n   w tym gwarancji mo¿liwo¶ci SPRZEDA¯Y i PRZYDATNO¦CI DO KONKRETNYCH CELÓW.\n   Szczegó³y znajdziesz w Powszechnej Licencji Publicznej GNU.\n\n   W dokumentacji tego programu powinna znajdowaæ siê kopia Powszechnej\n   Licencji Publicznej GNU. Je¶li tak nie jest, napisz do Free Software\n   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n"
+#, fuzzy
+msgid ""
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
+"Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
+"\n"
+"Lots of others not mentioned here contributed lots of code,\n"
+"fixes, and suggestions.\n"
+"\n"
+"    This program is free software; you can redistribute it and/or modify\n"
+"    it under the terms of the GNU General Public License as published by\n"
+"    the Free Software Foundation; either version 2 of the License, or\n"
+"    (at your option) any later version.\n"
+"\n"
+"    This program is distributed in the hope that it will be useful,\n"
+"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"    GNU General Public License for more details.\n"
+"\n"
+"    You should have received a copy of the GNU General Public License\n"
+"    along with this program; if not, write to the Free Software\n"
+"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+msgstr ""
+"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
+"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
+"Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
+"\n"
+"Wielu innych twórców, nie wspomnianych tutaj,\n"
+"wnios³o wiele nowego kodu, poprawek i sugestii.\n"
+"\n"
+"   Ten program jest darmowy; mo¿esz rozprowadzaæ go i/lub modyfikowaæ\n"
+"   zachowuj±c warunki Powszechnej Licencji Publicznej GNU (General Public\n"
+"   Licence), opublikowanej przez Free Software Foundation, w wersji 2\n"
+"   lub wy¿szej.\n"
+"\n"
+"   Program ten jest rozprowadzany w nadziei, ¿e bêdzie przydatny,\n"
+"   ale BEZ ¯ADNYCH GWARANCJI, wyra¿onych wprost lub domy¶lnie nawet,\n"
+"   w tym gwarancji mo¿liwo¶ci SPRZEDA¯Y i PRZYDATNO¦CI DO KONKRETNYCH "
+"CELÓW.\n"
+"   Szczegó³y znajdziesz w Powszechnej Licencji Publicznej GNU.\n"
+"\n"
+"   W dokumentacji tego programu powinna znajdowaæ siê kopia Powszechnej\n"
+"   Licencji Publicznej GNU. Je¶li tak nie jest, napisz do Free Software\n"
+"   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n"
 
 #: main.c:99
-msgid "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> ]\n       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] [...]\n       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] [...]\n       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n       mutt -v[v]\n\noptions:\n  -A <alias>\texpand the given alias\n  -a <file>\tattach a file to the message\n  -b <address>\tspecify a blind carbon-copy (BCC) address\n  -c <address>\tspecify a carbon-copy (CC) address\n  -e <command>\tspecify a command to be executed after initialization\n  -f <file>\tspecify which mailbox to read\n  -F <file>\tspecify an alternate muttrc file\n  -H <file>\tspecify a draft file to read header and body from\n  -i <file>\tspecify a file which Mutt should include in the body\n  -m <type>\tspecify a default mailbox type\n  -n\t\tcauses Mutt not to read the system Muttrc\n  -p\t\trecall a postponed message\n  -Q <variable>\tquery a configuration variable\n  -R\t\topen mailbox in read-only mode\n  -s <subj>\tspecify a subject (must be in quotes if it has spaces)\n  -v\t\tshow version and compile-time definitions\n  -x\t\tsimulate the mailx send mode\n  -y\t\tselect a mailbox specified in your `mailboxes' list\n  -z\t\texit immediately if there are no messages in the mailbox\n  -Z\t\topen the first folder with new message, exit immediately if none\n  -h\t\tthis help message"
-msgstr "u¿ycie: mutt [ -nRyzZ ] [ -e <polec> ] [ -F <plik> ] [ -m <typ> ] [ -f <plik> ]\n        mutt [ -nR ] [ -e <polec> ] [ -F <plik> ] -Q <pytanie> [ -Q <pytanie> ] [...]\n        mutt [ -nR ] [ -e <polec> ] [ -F <plik> ] -A <alias> [ -A <alias> ] [...]\n        mutt [ -nx ] [ -e <polec> ] [ -F <plik> ] [ -a <plik> ] [ -H <plik> ] [ -i <plik> ] [ -s <tytu³> ] [ -b <adres> ] [ -c <adres> ] <adres> [ ... ]\n        mutt [ -n ]  [ -e <polec> ] [ -F <plik> ] -p\n        mutt -v[v]\n\nopcje:\n  -A <alias>\tu¿yj aliasu\n  -a <plik>\tdo³±cz plik do listu\n  -b <adres>\tpodaj adres blind carbon-copy (BCC)\n  -c <adres>\tpodaj adres carbon-copy (CC)\n  -e <polec>\tpodaj polecenie do wykonania po inicjalizacji\n  -f <plik>\totwórz najpierw t± skrzynkê\n  -F <plik>\tu¿yj alternatywnego pliku muttrc\n  -H <plik>\twczytaj szablon nag³ówków i tre¶ci listu z pliku\n  -i <plik>\twstaw ten plik w odpowiedzi\n  -m <typ>\tpodaj typ skrzynki\n  -n\t\tnie czytaj systemowego Muttrc\n  -p\t\tponownie edytuj zarzucony list\n  -Q <zmienna>\tpodaj warto¶æ zmiennej konfiguracyjnej\n  -R\t\totwórz skrzynkê w trybie tylko do odczytu\n  -s <tytu³>\tpodaj tytu³ (musi byæ w apostrofach, je¶li zawiera spacje)\n  -v\t\tpoka¿ wersjê i wkompilowane parametry\n  -x\t\tsymuluj zachowanie mailx\n  -y\t\twybierz skrzynkê podan± w twojej li¶cie `mailboxes'\n  -z\t\twyjd¼ natychmiast je¶li brak nowych listów w skrzynce\n  -Z\t\totwórz pierwsz± skrzynkê z nowym listem i wyjd¼ je¶li brak nowych\n  -h\t\tten tekst"
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"u¿ycie: mutt [ -nRyzZ ] [ -e <polec> ] [ -F <plik> ] [ -m <typ> ] [ -f "
+"<plik> ]\n"
+"        mutt [ -nR ] [ -e <polec> ] [ -F <plik> ] -Q <pytanie> [ -Q "
+"<pytanie> ] [...]\n"
+"        mutt [ -nR ] [ -e <polec> ] [ -F <plik> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"        mutt [ -nx ] [ -e <polec> ] [ -F <plik> ] [ -a <plik> ] [ -H "
+"<plik> ] [ -i <plik> ] [ -s <tytu³> ] [ -b <adres> ] [ -c <adres> ] <adres> "
+"[ ... ]\n"
+"        mutt [ -n ]  [ -e <polec> ] [ -F <plik> ] -p\n"
+"        mutt -v[v]\n"
+"\n"
+"opcje:\n"
+"  -A <alias>\tu¿yj aliasu\n"
+"  -a <plik>\tdo³±cz plik do listu\n"
+"  -b <adres>\tpodaj adres blind carbon-copy (BCC)\n"
+"  -c <adres>\tpodaj adres carbon-copy (CC)\n"
+"  -e <polec>\tpodaj polecenie do wykonania po inicjalizacji\n"
+"  -f <plik>\totwórz najpierw t± skrzynkê\n"
+"  -F <plik>\tu¿yj alternatywnego pliku muttrc\n"
+"  -H <plik>\twczytaj szablon nag³ówków i tre¶ci listu z pliku\n"
+"  -i <plik>\twstaw ten plik w odpowiedzi\n"
+"  -m <typ>\tpodaj typ skrzynki\n"
+"  -n\t\tnie czytaj systemowego Muttrc\n"
+"  -p\t\tponownie edytuj zarzucony list\n"
+"  -Q <zmienna>\tpodaj warto¶æ zmiennej konfiguracyjnej\n"
+"  -R\t\totwórz skrzynkê w trybie tylko do odczytu\n"
+"  -s <tytu³>\tpodaj tytu³ (musi byæ w apostrofach, je¶li zawiera spacje)\n"
+"  -v\t\tpoka¿ wersjê i wkompilowane parametry\n"
+"  -x\t\tsymuluj zachowanie mailx\n"
+"  -y\t\twybierz skrzynkê podan± w twojej li¶cie `mailboxes'\n"
+"  -z\t\twyjd¼ natychmiast je¶li brak nowych listów w skrzynce\n"
+"  -Z\t\totwórz pierwsz± skrzynkê z nowym listem i wyjd¼ je¶li brak nowych\n"
+"  -h\t\tten tekst"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
 
-#: main.c:167
-msgid "\nCompile options:"
-msgstr "\nParametry kompilacji:"
+#: main.c:117
+#, fuzzy
+msgid ""
+"  -e <command>\tspecify a command to be executed after initialization\n"
+"  -f <file>\tspecify which mailbox to read\n"
+"  -F <file>\tspecify an alternate muttrc file\n"
+"  -H <file>\tspecify a draft file to read header and body from\n"
+"  -i <file>\tspecify a file which Mutt should include in the body\n"
+"  -m <type>\tspecify a default mailbox type\n"
+"  -n\t\tcauses Mutt not to read the system Muttrc\n"
+"  -p\t\trecall a postponed message\n"
+"  -Q <variable>\tquery a configuration variable\n"
+"  -R\t\topen mailbox in read-only mode\n"
+"  -s <subj>\tspecify a subject (must be in quotes if it has spaces)\n"
+"  -v\t\tshow version and compile-time definitions\n"
+"  -x\t\tsimulate the mailx send mode\n"
+"  -y\t\tselect a mailbox specified in your `mailboxes' list\n"
+"  -z\t\texit immediately if there are no messages in the mailbox\n"
+"  -Z\t\topen the first folder with new message, exit immediately if none\n"
+"  -h\t\tthis help message"
+msgstr ""
+"u¿ycie: mutt [ -nRyzZ ] [ -e <polec> ] [ -F <plik> ] [ -m <typ> ] [ -f "
+"<plik> ]\n"
+"        mutt [ -nR ] [ -e <polec> ] [ -F <plik> ] -Q <pytanie> [ -Q "
+"<pytanie> ] [...]\n"
+"        mutt [ -nR ] [ -e <polec> ] [ -F <plik> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"        mutt [ -nx ] [ -e <polec> ] [ -F <plik> ] [ -a <plik> ] [ -H "
+"<plik> ] [ -i <plik> ] [ -s <tytu³> ] [ -b <adres> ] [ -c <adres> ] <adres> "
+"[ ... ]\n"
+"        mutt [ -n ]  [ -e <polec> ] [ -F <plik> ] -p\n"
+"        mutt -v[v]\n"
+"\n"
+"opcje:\n"
+"  -A <alias>\tu¿yj aliasu\n"
+"  -a <plik>\tdo³±cz plik do listu\n"
+"  -b <adres>\tpodaj adres blind carbon-copy (BCC)\n"
+"  -c <adres>\tpodaj adres carbon-copy (CC)\n"
+"  -e <polec>\tpodaj polecenie do wykonania po inicjalizacji\n"
+"  -f <plik>\totwórz najpierw t± skrzynkê\n"
+"  -F <plik>\tu¿yj alternatywnego pliku muttrc\n"
+"  -H <plik>\twczytaj szablon nag³ówków i tre¶ci listu z pliku\n"
+"  -i <plik>\twstaw ten plik w odpowiedzi\n"
+"  -m <typ>\tpodaj typ skrzynki\n"
+"  -n\t\tnie czytaj systemowego Muttrc\n"
+"  -p\t\tponownie edytuj zarzucony list\n"
+"  -Q <zmienna>\tpodaj warto¶æ zmiennej konfiguracyjnej\n"
+"  -R\t\totwórz skrzynkê w trybie tylko do odczytu\n"
+"  -s <tytu³>\tpodaj tytu³ (musi byæ w apostrofach, je¶li zawiera spacje)\n"
+"  -v\t\tpoka¿ wersjê i wkompilowane parametry\n"
+"  -x\t\tsymuluj zachowanie mailx\n"
+"  -y\t\twybierz skrzynkê podan± w twojej li¶cie `mailboxes'\n"
+"  -z\t\twyjd¼ natychmiast je¶li brak nowych listów w skrzynce\n"
+"  -Z\t\totwórz pierwsz± skrzynkê z nowym listem i wyjd¼ je¶li brak nowych\n"
+"  -h\t\tten tekst"
+
+#: main.c:173
+msgid ""
+"\n"
+"Compile options:"
+msgstr ""
+"\n"
+"Parametry kompilacji:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "B³±d inicjalizacji terminala."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Diagnostyka b³êdów na poziomie %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "Diagnostyka b³êdów nie zosta³a wkompilowane. Zignorowano.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s nie istnieje. Utworzyæ?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Nie mo¿na utworzyæ %s: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Nie wskazano adresatów listu.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: nie mo¿na do³±czyæ pliku.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Brak skrzynki z now± poczt±."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Nie zdefiniowano po³o¿enia skrzynek z now± poczt±."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "Skrzynka pocztowa jest pusta."
 
@@ -2491,11 +3388,11 @@ msgstr "Skrzynka jest uszkodzona!"
 msgid "Mailbox was corrupted!"
 msgstr "Skrzynka pocztowa zosta³a uszkodzona!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "B³±d! Nie mo¿na ponownie otworzyæ skrzynki!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Nie mo¿na zablokowaæ skrzynki pocztowej!"
 
@@ -2503,11 +3400,13 @@ msgstr "Nie mo
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
-msgstr "sync: skrzynka zmodyfikowana, ale ¿aden z listów nie zosta³ zmieniony! (zg³o¶ ten b³±d)"
+msgstr ""
+"sync: skrzynka zmodyfikowana, ale ¿aden z listów nie zosta³ zmieniony! "
+"(zg³o¶ ten b³±d)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Zapisywanie listów... %d (%d%%)"
@@ -2515,186 +3414,148 @@ msgstr "Zapisywanie list
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "Wprowadzanie zmian..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Zapis niemo¿liwy! Zapisano czê¶æ skrzynki do %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Nie mo¿na ponownie otworzyæ skrzynki pocztowej!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Ponowne otwieranie skrzynki..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Przeskocz do: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Niew³a¶ciwy numer indeksu."
 
-#: menu.c:429 menu.c:447 menu.c:483 menu.c:526 menu.c:542 menu.c:553
-#: menu.c:564 menu.c:606 menu.c:617 menu.c:630 menu.c:643 menu.c:1038
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Brak pozycji."
 
-#: menu.c:444
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Nie mo¿na ni¿ej przewin±æ."
 
-#: menu.c:460
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Nie mo¿na wy¿ej przewin±æ."
 
-#: menu.c:480
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "To jest ostatnia strona."
 
-#: menu.c:504
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "To jest pierwsza strona."
 
-#: menu.c:583
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "Pokazana jest pierwsza pozycja."
 
-#: menu.c:603
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "Pokazana jest ostatnia pozycja."
 
-#: menu.c:654
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "To jest ostatnia pozycja."
 
-#: menu.c:665
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "To jest pierwsza pozycja."
 
-#: menu.c:725 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Szukaj frazy: "
 
-#: menu.c:726 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Szukaj frazy w przeciwnym kierunku: "
 
-#: menu.c:736 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Nie ustalono wzorca poszukiwañ."
 
-#: menu.c:766 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Nic nie znaleziono."
 
-#: menu.c:890
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "Brak zaznaczonych pozycji listy."
 
-#: menu.c:995
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "Poszukiwanie nie jest mo¿liwe w tym menu."
 
-#: menu.c:1000
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "Przeskakiwanie nie jest mo¿liwe w oknach dialogowych."
 
-#: menu.c:1041
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Zaznaczanie nie jest obs³ugiwane."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Czytanie %s... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): nie mo¿na nadaæ plikowi daty"
 
-#: muttlib.c:846
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Ten plik jest katalogim, zapisaæ w nim? [(t)ak, (n)ie, (w)szystkie]"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr "tnw"
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "Ten plik jest katalogim, zapisaæ w nim?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Plik w katalogu: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Plik istnieje: (n)adpisaæ, (d)o³±czyæ czy (a)nulowaæ?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "nda"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Nie mo¿na zapisaæ listu w skrzynce POP."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s nie jest skrzynk±!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Dopisaæ listy do %s?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "Po³±czenie z %s zosta³o zakoñczone"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "Protokó³ SSL nie jest dostêpny."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "Polecenie 'preconnect' nie powiod³o siê."
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "B³±d komunikacji z %s (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "B³êdny IDN \"%s\"."
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "Wyszukiwanie %s..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Host \"%s\" nie zosta³ znaleziony"
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "£±czenie z %s..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Po³±czenie z %s (%s) nie zosta³o ustanowione."
@@ -2726,7 +3587,8 @@ msgstr "B
 msgid "SSL failed: %s"
 msgstr "SSL nie powiod³o siê: %s"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Nie mo¿na pobraæ certyfikatu z docelowego hosta"
 
@@ -2735,85 +3597,207 @@ msgstr "Nie mo
 msgid "SSL connection using %s (%s)"
 msgstr "Po³±czenie SSL przy u¿yciu %s (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
+#, c-format
 msgid "[unable to calculate]"
 msgstr "[niemo¿liwe do wyznaczenia]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[b³êdna data]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "Certyfikat serwera nie uzyska³ jeszcze wa¿no¶ci"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "Certyfikat serwera utraci³ wa¿no¶æ"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Ten certyfikat nale¿y do:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Ten certyfikat zosta³ wydany przez:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
+#, c-format
 msgid "This certificate is valid"
 msgstr "Ten certyfikat jest wa¿ny"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   od %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     do %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Odcisk: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "sprawdzanie certyfikatu SSL"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(o)drzuæ, zaakceptuj (r)az, (a)kceptuj zawsze"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "ora"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(o)drzuæ, zaakceptuj (r)az"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "or"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Wyj¶cie  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Ostrze¿enie: Nie mo¿na zapisaæ certyfikatu"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Certyfikat zosta³ zapisany"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "Po³±czenie SSL przy u¿yciu %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Certyfikat zosta³ zapisany"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "B³±d inicjalizacji terminala."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Odcisk: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Odcisk: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Certyfikat serwera nie uzyska³ jeszcze wa¿no¶ci"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Certyfikat serwera utraci³ wa¿no¶æ"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Certyfikat serwera utraci³ wa¿no¶æ"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "Certyfikat serwera nie uzyska³ jeszcze wa¿no¶ci"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "sprawdzanie certyfikatu SSL"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "£±czenie z %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "B³±d komunikacji z %s (%s)"
+
+#: muttlib.c:910
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "Ten plik jest katalogim, zapisaæ w nim? [(t)ak, (n)ie, (w)szystkie]"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr "tnw"
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "Ten plik jest katalogim, zapisaæ w nim?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Plik w katalogu: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Plik istnieje: (n)adpisaæ, (d)o³±czyæ czy (a)nulowaæ?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "nda"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Nie mo¿na zapisaæ listu w skrzynce POP."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Dopisaæ listy do %s?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s nie jest skrzynk±!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -2891,7 +3875,7 @@ msgstr "Skrzynka pozosta
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d zapisano, %d przeniesiono, %d usuniêto."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d zapisano, %d usuniêto."
@@ -2910,15 +3894,15 @@ msgstr "U
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Skrzynka jest oznaczona jako niezapisywalna. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "Zmiany w skrzynce naniesiono."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Nie mo¿na zapisaæ listu"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr "Przepe³nienie zmiennej ca³kowitej - nie mo¿na zaalokowaæ pamiêci."
 
@@ -2926,48 +3910,48 @@ msgstr "Przepe
 msgid "Not available in this menu."
 msgstr "Nie ma takiego polecenia w tym menu."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "PoprzStr"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "NastStr"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Zobacz za³."
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Nastêpny"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Pokazany jest koniec listu."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Pokazany jest pocz±tek listu."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Szukaj w przeciwnym kierunku: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Szukaj: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "Pomoc jest w³a¶nie wy¶wietlana."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "Nie ma wiêcej cytowanego tekstu."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Brak tekstu za cytowanym fragmentem."
 
@@ -3016,6 +4000,7 @@ msgid "%c: not supported in this mode"
 msgstr "%c: nie obs³ugiwane w tym trybie"
 
 #: pattern.c:807
+#, c-format
 msgid "missing parameter"
 msgstr "brakuj±cy parametr"
 
@@ -3033,27 +4018,27 @@ msgstr "pusty wzorzec"
 msgid "error: unknown op %d (report this error)."
 msgstr "b³±d: nieznany op %d (zg³o¶ ten b³±d)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Kompilacja wzorca poszukiwañ..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Wykonywanie polecenia na pasuj±cych do wzorca listach..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "¯aden z listów nie spe³nia kryteriów."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "Poszukiwanie dotar³o do koñca bez znalezienia frazy"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "Poszukiwanie dotar³o do pocz±tku bez znalezienia frazy"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Przeszukiwanie przerwano."
 
@@ -3065,106 +4050,71 @@ msgstr "Wprowad
 msgid "PGP passphrase forgotten."
 msgstr "Has³o PGP zosta³o zapomniane."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- B³±d: nie mo¿na utworzyæ podprocesu PGP! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
-msgid "[-- End of PGP output --]\n\n"
-msgstr "[-- Koniec komunikatów PGP --]\n\n"
-
-#: pgp.c:394
-msgid "[-- BEGIN PGP MESSAGE --]\n\n"
-msgstr "[-- POCZ¡TEK LISTU PGP --]\n\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- POCZ¡TEK KLUCZA PUBLICZNEGO PGP --]\n"
-
-#: pgp.c:398
-msgid "[-- BEGIN PGP SIGNED MESSAGE --]\n\n"
-msgstr "[-- POCZ¡TEK LISTU PODPISANEGO PGP --]\n\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- KONIEC LISTU PGP --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- KONIEC PUBLICZNEGO KLUCZA PGP --]\n"
+#: pgp.c:379 pgp.c:615 pgp.c:819
+msgid ""
+"[-- End of PGP output --]\n"
+"\n"
+msgstr ""
+"[-- Koniec komunikatów PGP --]\n"
+"\n"
 
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- KONIEC LISTU PODPISANEGO PGP --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "Nie mo¿na skopiowaæ listu"
 
-#: pgp.c:454
-msgid "[-- Error: could not find beginning of PGP message! --]\n\n"
-msgstr "[-- B³±d: nie mo¿na odnale¼æ pocz±tku listu PGP! --]\n\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "Podpis PGP zosta³ pomy¶lnie zweryfikowany."
 
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "B³±d wewnêtrzny. Zg³o¶ go pod adres <roessler@does-not-exist.org>."
 
-#: pgp.c:764
-msgid "[-- Error: could not create a PGP subprocess! --]\n\n"
-msgstr "[-- B³±d: nie mo¿na utworzyæ podprocesu PGP! --]\n\n"
-
-#: pgp.c:873
-msgid "[-- Error: malformed PGP/MIME message! --]\n\n"
-msgstr "[-- B³±d: uszkodzony list PGP/MIME! --]\n\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- B³±d: nie mo¿na utworzyæ pliku tymczasowego! --]\n"
-
-#: pgp.c:895
-msgid "[-- The following data is PGP/MIME encrypted --]\n\n"
-msgstr "[-- Nastêpuj±ce dane s± zaszyfrowane PGP/MIME --]\n\n"
+#: pgp.c:784
+msgid ""
+"[-- Error: could not create a PGP subprocess! --]\n"
+"\n"
+msgstr ""
+"[-- B³±d: nie mo¿na utworzyæ podprocesu PGP! --]\n"
+"\n"
 
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Koniec danych zaszyfrowanych PGP/MIME --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "Odszyfrowanie nie powiod³o siê."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "Nie mo¿na otworzyæ podprocesu PGP!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "U¿yæ klucza numer \"%s\" dla %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Wprowad¼ numer klucza dla %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "Nie mo¿na wywo³aæ PGP"
 
-#: pgp.c:1491
+#: pgp.c:1540
 #, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, %s , b(e)z PGP? "
 
-#: pgp.c:1492
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr "PGP/M(i)ME"
 
-#: pgp.c:1492
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr "(i)nline"
 
-#: pgp.c:1494
+#: pgp.c:1543
 msgid "esabifc"
 msgstr "zsabife"
 
-#. sign (a)s
-#: pgp.c:1509 smime.c:1981
-msgid "Sign as: "
-msgstr "Podpisz jako: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "Sprowadzam klucz PGP..."
@@ -3173,16 +4123,6 @@ msgstr "Sprowadzam klucz PGP..."
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Wszystkie pasuj±ce klucze wygas³y, zosta³y wy³±czone lub wyprowadzone."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Wybór  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Sprawd¼ klucz  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3197,40 +4137,6 @@ msgstr "Klucze PGP dla \"%s\"."
 msgid "Can't open /dev/null"
 msgstr "Nie mo¿na otworzyæ /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Nie mo¿na utworzyæ pliku tymczasowego"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Identyfikator klucza: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Nie mo¿na u¿yæ tego klucza: wygas³, zosta³ wy³±czony lub wyprowadzony."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "Identyfikator wygas³, zosta³ wy³±czony lub wyprowadzony."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "Poziom wa¿no¶ci tego identyfikatora nie zosta³ okre¶lony."
-
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "Nieprawid³owy identyfikator."
-
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "Ten identyfikator jest tylko czê¶ciowo wa¿ny."
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Czy naprawdê chcesz u¿yæ tego klucza?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Podaj identyfikator klucza: "
@@ -3244,12 +4150,8 @@ msgstr "Wywo
 msgid "PGP Key %s."
 msgstr "Klucz PGP %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Wyszukiwanie odpowiednich kluczy dla \"%s\"..."
-
 #: pop.c:90 pop_lib.c:201
+#, c-format
 msgid "Command TOP is not supported by server."
 msgstr "Polecenie TOP nie jest obs³ugiwane przez serwer."
 
@@ -3258,6 +4160,7 @@ msgid "Can't write header to temporary file!"
 msgstr "Nie mo¿na zapisaæ nag³ówka do pliku tymczasowego!"
 
 #: pop.c:198 pop_lib.c:203
+#, c-format
 msgid "Command UIDL is not supported by server."
 msgstr "Polecenie UIDL nie jest obs³ugiwane przez serwer."
 
@@ -3304,7 +4207,7 @@ msgstr "B
 msgid "%s [%d of %d messages read]"
 msgstr "%s [przeczytano %d spo¶ród %d listów]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "Serwer zamkn±³ po³±czenie!"
 
@@ -3321,6 +4224,7 @@ msgid "APOP authentication failed."
 msgstr "Uwierzytelnianie APOP nie powiod³o siê."
 
 #: pop_auth.c:268
+#, c-format
 msgid "Command USER is not supported by server."
 msgstr "Polecenie USER nie jest obs³ugiwane przez serwer."
 
@@ -3333,15 +4237,15 @@ msgstr "Nie mo
 msgid "Error connecting to server: %s"
 msgstr "B³±d ³±czenia z serwerem: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "Zamykanie po³±czenia z serwerem POP..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Sprawdzanie indeksów listów..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Po³±czenie z serwerem POP zosta³o zerwane. Po³±czyæ ponownie?"
 
@@ -3390,6 +4294,7 @@ msgid "Query command not defined."
 msgstr "Pytanie nie zosta³o okre¶lone."
 
 #: query.c:290
+#, c-format
 msgid "Query"
 msgstr "Pytanie"
 
@@ -3496,7 +4401,8 @@ msgstr "Przes
 
 #: recvcmd.c:462
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
-msgstr "Nie mo¿na zdekodowaæ zaznaczonych za³. Przes³aæ pozosta³e dalej (MIME)?"
+msgstr ""
+"Nie mo¿na zdekodowaæ zaznaczonych za³. Przes³aæ pozosta³e dalej (MIME)?"
 
 #: recvcmd.c:587
 msgid "Forward MIME encapsulated?"
@@ -3517,7 +4423,8 @@ msgstr "Nie znaleziono list pocztowych!"
 
 #: recvcmd.c:824
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
-msgstr "Nie mo¿na zdekodowaæ wszystkich wybranych za³. Za³±czyæ (MIME) pozosta³e?"
+msgstr ""
+"Nie mo¿na zdekodowaæ wszystkich wybranych za³. Za³±czyæ (MIME) pozosta³e?"
 
 #: remailer.c:484
 msgid "Append"
@@ -3570,7 +4477,8 @@ msgid "Mixmaster doesn't accept Cc or Bcc headers."
 msgstr "Mixmaster nie akceptuje nag³ówków Cc i Bcc."
 
 #: remailer.c:738
-msgid "Please set the hostname variable to a proper value when using mixmaster!"
+msgid ""
+"Please set the hostname variable to a proper value when using mixmaster!"
 msgstr "Ustaw poprawn± warto¶æ hostname je¶li chcesz u¿ywaæ mixmastera!"
 
 #: remailer.c:772
@@ -3709,35 +4617,35 @@ msgstr "Poczta zosta
 msgid "Sending in background."
 msgstr "Wysy³anie w tle."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Brak parametru granicznego! (zg³o¶ ten b³±d)"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s ju¿ nie istnieje!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s nie jest zwyk³ym plikiem."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "Nie mo¿na otworzyæ %s"
 
-#: sendlib.c:2057
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "B³±d podczas wysy³ania listu, proces potomny zwróci³ %d (%s)."
 
-#: sendlib.c:2063
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Wynik procesu dostarczania"
 
-#: sendlib.c:2267
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "B³êdny IDN %s w trakcie przygotowywania resent-from."
@@ -3816,7 +4724,9 @@ msgstr "U
 #: smime.c:637
 #, c-format
 msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
-msgstr "Ostrze¿enie: nie oke¶lono poziomu zaufania dla %s (dow. klawisz by kontynuowaæ)."
+msgstr ""
+"Ostrze¿enie: nie oke¶lono poziomu zaufania dla %s (dow. klawisz by "
+"kontynuowaæ)."
 
 #: smime.c:796
 #, c-format
@@ -3852,47 +4762,62 @@ msgstr "B
 msgid "No output from OpenSSL..."
 msgstr "Brak wyników dzia³ania OpenSSL..."
 
-#: smime.c:1636 smime.c:1758
-msgid "[-- End of OpenSSL output --]\n\n"
-msgstr "[-- Koniec komunikatów OpenSSL --]\n\n"
+#: smime.c:1636 smime.c:1760
+msgid ""
+"[-- End of OpenSSL output --]\n"
+"\n"
+msgstr ""
+"[-- Koniec komunikatów OpenSSL --]\n"
+"\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- B³±d: nie mo¿na utworzyæ podprocesu OpenSSL! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- Nastêpuj±ce dane s± zaszyfrowane S/MIME --]\n"
 
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- Poni¿sze dane s± podpisane S/MIME --]\n"
 
-#: smime.c:1829
-msgid "\n[-- End of S/MIME encrypted data. --]\n"
-msgstr "\n[-- Koniec danych zaszyfrowanych S/MIME. --]\n"
-
 #: smime.c:1831
-msgid "\n[-- End of S/MIME signed data. --]\n"
-msgstr "\n[-- Koniec danych podpisanych S/MIME. --]\n"
+msgid ""
+"\n"
+"[-- End of S/MIME encrypted data. --]\n"
+msgstr ""
+"\n"
+"[-- Koniec danych zaszyfrowanych S/MIME. --]\n"
+
+#: smime.c:1833
+msgid ""
+"\n"
+"[-- End of S/MIME signed data. --]\n"
+msgstr ""
+"\n"
+"[-- Koniec danych podpisanych S/MIME. --]\n"
 
-#: smime.c:1935
-msgid "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
-msgstr "S/MIME: (z)aszyfruj, (p)odpisz, (m)etoda, podp. (j)ako, (o)ba, (a)nuluj?"
+#: smime.c:1944
+msgid ""
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
+msgstr ""
+"S/MIME: (z)aszyfruj, (p)odpisz, (m)etoda, podp. (j)ako, (o)ba, (a)nuluj?"
 
-#: smime.c:1936
+#: smime.c:1945
 msgid "eswabfc"
 msgstr "zpmjoa"
 
-#: smime.c:1945
-msgid "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
+#: smime.c:1954
+msgid ""
+"1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, (a)nuluj? "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345a"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr "Nie mo¿na podpisaæ - nie podano klucza. U¿yj Podpisz jako."
 
@@ -3910,9 +4835,15 @@ msgstr "(brak skrzynki)"
 
 #: thread.c:1089
 msgid "Parent message is not visible in this limited view."
-msgstr "Pierwszy list w±tku nie jest widoczny w trybie ograniczonego przegl±dania."
+msgstr ""
+"Pierwszy list w±tku nie jest widoczny w trybie ograniczonego przegl±dania."
 
 #: thread.c:1095
 msgid "Parent message is not available."
 msgstr "Pierwszy list tego w±tku nie jest dostêpny."
 
+#~ msgid "Unexpected response received from server: %s"
+#~ msgstr "Otrzymano nieoczekiwan± odpowied¼ od serwera: %s"
+
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Nie mo¿na dopisaæ do skrzynek IMAP na tym serwerze"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4db072904..e4fec944f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.5i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2000-03-05 01:14-0300\n"
 "Last-Translator: Marcus Brito <marcus@visaotec.com.br>\n"
 "Language-Team: LIE-BR (http://lie-br.conectiva.com.br)\n"
@@ -11,26 +11,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding:\n"
 
-#: account.c:148
+#: account.c:154
 #, fuzzy, c-format
 msgid "Username at %s: "
 msgstr "Renomear para: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Senha para %s@%s: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Sair"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Apagar"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Restaurar"
 
@@ -39,9 +39,9 @@ msgid "Select"
 msgstr "Escolher"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Ajuda"
 
@@ -93,173 +93,173 @@ msgstr "Salvar em arquivo:"
 msgid "Alias added."
 msgstr "Apelido adicionado."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Não pude casar o nome, continuo?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Entrada de composição no mailcap requer %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Erro ao executar \"%s\"!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Erro ao abrir o arquivo para interpretar os cabeçalhos."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Erro ao abrir o arquivo para retirar cabeçalhos."
 
-#: attach.c:183
+#: attach.c:184
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "Erro ao abrir o arquivo para interpretar os cabeçalhos."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr ""
 "Nenhuma entrada de composição no mailcap para %s, criando entrada vazia."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Entrada de edição no mailcap requer %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Nenhuma entrada de edição no mailcap para %s"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Nenhuma entrada no mailcap de acordo encontrada. Exibindo como texto."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Tipo MIME não definido. Não é possível visualizar o anexo."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Não é possível criar o filtro."
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Não foi possível criar um filtro"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Erro de gravação!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Eu não sei como imprimir isto!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Diretório"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Máscara"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s não é um diretório."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Caixas [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "[%s] assinada, Máscara de arquivos: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Diretório [%s], Máscara de arquivos: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Não é possível anexar um diretório"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Nenhum arquivo casa com a máscara"
 
-#: browser.c:860
+#: browser.c:861
 #, fuzzy
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "A remoção só é possível para caixar IMAP"
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "A remoção só é possível para caixar IMAP"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "A remoção só é possível para caixar IMAP"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Deseja mesmo remover a caixa \"%s\"?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Caixa de correio removida."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "Caixa de correio não removida."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Mudar para: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Erro ao examinar diretório."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Máscara de arquivos: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Ordem inversa por (d)ata, (a)lfa, (t)amanho ou (n)ão ordenar? "
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Ordenar por (d)ata, (a)lfa, (t)amanho ou (n)ão ordenar? "
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "datn"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Nome do novo arquivo: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Não é possível visualizar um diretório"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Erro ao tentar exibir arquivo"
 
@@ -327,7 +327,7 @@ msgstr "cores pr
 msgid "Verify PGP signature?"
 msgstr "Verificar assinatura de PGP?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Não foi possível criar um arquivo temporário!"
 
@@ -341,123 +341,123 @@ msgstr "N
 msgid "Could not copy message"
 msgstr "Não foi possível enviar a mensagem."
 
-#: commands.c:186
+#: commands.c:187
 #, fuzzy
 msgid "S/MIME signature successfully verified."
 msgstr "Assinatura PGP verificada com sucesso."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr ""
 
-#: commands.c:193
+#: commands.c:194
 #, fuzzy
 msgid "S/MIME signature could NOT be verified."
 msgstr "Assinatura PGP verificada com sucesso."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "Assinatura PGP verificada com sucesso."
 
-#: commands.c:204
+#: commands.c:205
 #, fuzzy
 msgid "PGP signature could NOT be verified."
 msgstr "Assinatura PGP verificada com sucesso."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Comando: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Repetir mensagem para: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Repetir mensagens marcadas para: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Erro ao interpretar endereço!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Repetir mensagem para %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Repetir mensagens para %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Message not bounced."
 msgstr "Mensagem repetida."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Messages not bounced."
 msgstr "Mensagens repetidas."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Mensagem repetida."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Mensagens repetidas."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 #, fuzzy
 msgid "Can't create filter process"
 msgstr "Não foi possível criar um filtro"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Passar por cano ao comando: "
 
-#: commands.c:482
+#: commands.c:483
 #, fuzzy
 msgid "No printing command has been defined."
 msgstr "Nenhuma caixa de mensagem para recebimento definida."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Imprimir mensagem?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Imprimir mensagens marcadas?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Mensagem impressa"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Mensagens impressas"
 
-#: commands.c:498
+#: commands.c:499
 #, fuzzy
 msgid "Message could not be printed"
 msgstr "Mensagem impressa"
 
-#: commands.c:499
+#: commands.c:500
 #, fuzzy
 msgid "Messages could not be printed"
 msgstr "Mensagens impressas"
 
-#: commands.c:508
+#: commands.c:509
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -465,7 +465,7 @@ msgid ""
 msgstr ""
 "Ordem-Rev (d)ata/(f)rm/(r)eceb/(a)sst/(p)ara/dis(c)/de(s)ord/(t)am/r(e)fs?: "
 
-#: commands.c:509
+#: commands.c:510
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
@@ -473,74 +473,74 @@ msgid ""
 msgstr ""
 "Ordem (d)ata/(f)rm/(r)eceb/(a)sst/(p)ara/dis(c)/de(s)ord/(t)am/r(e)fs?: "
 
-#: commands.c:510
+#: commands.c:511
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dfrapcste"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Comando do shell: "
 
-#: commands.c:709
+#: commands.c:716
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "%s%s para caixa de mensagens"
 
-#: commands.c:710
+#: commands.c:717
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "%s%s para caixa de mensagens"
 
-#: commands.c:711
+#: commands.c:718
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "%s%s para caixa de mensagens"
 
-#: commands.c:712
+#: commands.c:719
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "%s%s para caixa de mensagens"
 
-#: commands.c:713
+#: commands.c:720
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
 msgstr "%s%s para caixa de mensagens"
 
-#: commands.c:713
+#: commands.c:720
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
 msgstr "%s%s para caixa de mensagens"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " marcada"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Copiando para %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr ""
 
-#: commands.c:919
+#: commands.c:936
 #, fuzzy, c-format
 msgid "Content-Type changed to %s."
 msgstr "Conectando a %s..."
 
-#: commands.c:924
+#: commands.c:941
 #, fuzzy, c-format
 msgid "Character set changed to %s; %s."
 msgstr "O conjunto de caracteres %s é desconhecido."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr ""
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr ""
 
@@ -634,103 +634,685 @@ msgstr ""
 msgid "Attaching selected files..."
 msgstr "Anexando os arquivos escolhidos..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Não foi possível anexar %s!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Abrir caixa para anexar mensagem de"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Nenhuma mensagem naquela pasta."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Marque as mensagens que você quer anexar!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Não foi possível anexar!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "A gravação só afeta os anexos de texto."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "O anexo atual não será convertido."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "O anexo atual será convertido"
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Codificação inválida"
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Salvar uma cópia desta mensagem?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Renomear para: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "Impossível consultar: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Novo arquivo: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type é da forma base/sub"
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Content-Type %s desconhecido"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "Não é possível criar o arquivo %s"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "O que temos aqui é uma falha ao criar um anexo"
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "Adiar esta mensagem?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "Gravar mensagem na caixa"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Gravando mensagem em %s..."
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "Mensgem gravada."
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "erro no padrão em: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "erro no padrão em: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "erro no padrão em: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "erro no padrão em: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "erro no padrão em: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "erro no padrão em: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "erro no padrão em: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "erro no padrão em: %s"
+
+#: crypt-gpgme.c:993
+msgid "Warning: One of the keys has been revoked\n"
+msgstr ""
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Este certificado foi emitido por:"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "A mensagem pai não está disponível."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Impressão digital: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Erro ao enviar mensagem."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Erro na linha de comando: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Fim dos dados assinados --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Erro: fim de arquivo inesperado! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- INÍCIO DE MENSAGEM DO PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- INÍCIO DE BLOCO DE CHAVE PÚBLICA DO PGP --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- INÍCIO DE MENSAGEM ASSINADA POR PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+#, fuzzy
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- FIM DE MENSAGEM DO PGP --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- FIM DE BLOCO DE CHAVE PÚBLICA DO PGP --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+#, fuzzy
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- FIM DE MENSAGEM ASSINADA POR PGP --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Erro: não foi possível encontrar o início da mensagem do PGP! --]\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Erro: mensagem PGP/MIME mal formada! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Erro: não foi possível criar um arquivo temporário! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Os dados a seguir estão encriptados com PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Os dados a seguir estão encriptados com PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Fim dos dados encriptados com PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+#, fuzzy
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Fim dos dados encriptados com PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr ""
+"[-- Os dados a seguir estão assinados --]\n"
+"\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Os dados a seguir estão encriptados com PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Fim dos dados assinados --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Fim dos dados encriptados com PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Mês inválido: %s"
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Mês inválido: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Mês inválido: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Encriptar"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Certificado salvo"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Key ID: 0x%s"
+
+#: crypt-gpgme.c:3099
+msgid "[Revoked]"
+msgstr ""
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Sair  "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Não foi possível criar um arquivo temporário"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Conectando a %s..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Conectando a %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Key ID: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "Login falhou."
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Esta chave não pode ser usada: expirada/desabilitada/revogada."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Sair  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Escolher  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Verificar chave  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "Chaves do PGP que casam com \"%s\"."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "Chaves do PGP que casam com \"%s\"."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "Chaves do PGP que casam com \"%s\"."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "Chaves do PGP que casam com \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, fuzzy, c-format
+msgid "%s <%s>."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3594
+#, fuzzy, c-format
+msgid "%s \"%s\"."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Esta chave não pode ser usada: expirada/desabilitada/revogada."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+#, fuzzy
+msgid "ID is expired/disabled/revoked."
+msgstr "Esta chave não pode ser usada: expirada/desabilitada/revogada."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr ""
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+#, fuzzy
+msgid "ID is not valid."
+msgstr "Este ID não é de confiança."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+#, fuzzy
+msgid "ID is only marginally valid."
+msgstr "Este ID é de baixa confiança."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, fuzzy, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Você realmente quer usá-lo?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Procurando por chaves que casam com \"%s\"..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "Usar keyID = \"%s\" para %s?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Entre a keyID para %s: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr ""
+"(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, em l(i)nha, ou es(q)uece? "
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "esncaq"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr ""
+"(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, em l(i)nha, ou es(q)uece? "
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "esncaq"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Assinar como: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Erro ao abrir o arquivo para interpretar os cabeçalhos."
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -747,29 +1329,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "Senha do PGP esquecida."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Executando PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Mensagem não enviada."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
@@ -781,7 +1363,7 @@ msgstr ""
 "[-- Erro: Estrutura multipart/signed inconsistente! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -790,7 +1372,7 @@ msgstr ""
 "[-- Erro: Protocolo multipart/signed %s desconhecido! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -800,7 +1382,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
@@ -809,7 +1391,7 @@ msgstr ""
 "[-- Os dados a seguir estão assinados --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -817,7 +1399,7 @@ msgstr ""
 "[-- Aviso: Não foi possível encontrar nenhuma assinatura. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 #, fuzzy
 msgid ""
 "\n"
@@ -826,228 +1408,258 @@ msgstr ""
 "\n"
 "[-- Fim dos dados assinados --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Executando PGP..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "sim"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "não"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Sair do Mutt?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Pressione qualquer tecla para continuar..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " ('?' para uma lista): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Nenhuma caixa aberta."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Não há mensagens."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "Esta caixa é somente para leitura."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Função não permitida no modo anexar-mensagem."
 
-#: curs_main.c:55
+#: curs_main.c:56
 #, fuzzy
 msgid "No visible messages."
 msgstr "Nenhuma mensagem nova"
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Não é possível ativar escrita em uma caixa somente para leitura!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Mudanças na pasta serão escritas na saída."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Mudanças na pasta não serão escritas"
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Sair"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Salvar"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Msg"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Responder"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Grupo"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "A caixa foi modificada externamente. As marcas podem estar erradas."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Novas mensagens nesta caixa."
 
-#: curs_main.c:503
+#: curs_main.c:504
 #, fuzzy
 msgid "Mailbox was externally modified."
 msgstr "A caixa foi modificada externamente. As marcas podem estar erradas."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Nenhuma mensagem marcada."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 #, fuzzy
 msgid "Nothing to do."
 msgstr "Conectando a %s..."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Pular para mensagem: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "O argumento deve ser um número de mensagem."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Aquela mensagem não está visível."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Número de mensagem inválido."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Apagar mensagens que casem com: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "Nenhum padrão limitante está em efeito."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Limitar: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Limitar a mensagens que casem com: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Sair do Mutt?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Marcar mensagens que casem com: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Restaurar mensagens que casem com: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Desmarcar mensagens que casem com: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Abrir caixa somente para leitura"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Abrir caixa de correio"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
-#, c-format
-msgid "%s is not a mailbox."
-msgstr "%s não é uma caixa de correio."
+#: curs_main.c:1081 mx.c:512 mx.c:658
+#, c-format
+msgid "%s is not a mailbox."
+msgstr "%s não é uma caixa de correio."
+
+#: curs_main.c:1176
+msgid "Exit Mutt without saving?"
+msgstr "Sair do Mutt sem salvar alterações?"
+
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "Separar discussões não está ativado."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "salva esta mensagem para ser enviada depois"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
 
-#: curs_main.c:1165
-msgid "Exit Mutt without saving?"
-msgstr "Sair do Mutt sem salvar alterações?"
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Você está na última mensagem."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Nenhuma mensagem não removida."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Você está na primeira mensagem."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "A pesquisa voltou ao início."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "A pesquisa passou para o final."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Nenhuma mensagem nova"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Nenhuma mensagem não lida"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " nesta visão limitada"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 #, fuzzy
 msgid "Can't change 'important' flag on POP server."
 msgstr "Apagando mensagens do servidor..."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Nenhuma discussão restante."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Você está na primeira discussão."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "Separar discussões não está ativado."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "A discussão contém mensagens não lidas."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 #, fuzzy
 msgid "Can't edit message on POP server."
 msgstr "Apagando mensagens do servidor..."
@@ -1180,77 +1792,77 @@ msgstr "Atribui marca"
 msgid "Clear flag"
 msgstr "Limpa marca"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Erro: Não foi possível exibir nenhuma parte de Multipart/Aternative! "
 "--]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Anexo No.%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Tipo: %s/%s, Codificação: %s, Tamanho: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Autovisualizar usando %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Executando comando de autovisualização: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, fuzzy, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- em %s --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Saída de erro da autovisualização de %s --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Erro: message/external-body não tem nenhum parâmetro access-type --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Este anexo %s/%s "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(tamanho %s bytes) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "foi apagado --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- em %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, fuzzy, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- em %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, fuzzy, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Este anexo %s/%s "
 
-#: handler.c:1696
+#: handler.c:1712
 #, fuzzy
 msgid ""
 "[-- and the indicated external source has --]\n"
@@ -1259,36 +1871,36 @@ msgstr ""
 "[-- Este anexo %s/%s não está includído, e --]\n"
 "[-- a fonte externa indicada já expirou.   --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 "[-- Este anexo %s/%s não está incluído, e o --]\n"
 "[-- tipo de acesso %s não é aceito.         --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Erro: multipart/signed não tem protocolo."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Erro: multipart/encrypted não tem nenhum parâmetro de protocolo!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Não foi possível abrir o arquivo temporário!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s não é aceito "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(use '%s' para ver esta parte)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "('view-attachments' precisa estar associado a uma tecla!)"
 
@@ -1399,50 +2011,50 @@ msgstr "Autenticando (CRAM-MD5)..."
 msgid "SASL authentication failed."
 msgstr "Autenticação GSSAPI falhou."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr ""
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Obtendo espaços de nomenclatura..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Obtendo lista de pastas..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 #, fuzzy
 msgid "No such folder"
 msgstr "%s: não existe tal cor"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 #, fuzzy
 msgid "Create mailbox: "
 msgstr "Abrir caixa de correio"
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 #, fuzzy
 msgid "Mailbox must have a name."
 msgstr "A caixa de mensagens não sofreu mudanças"
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 #, fuzzy
 msgid "Mailbox created."
 msgstr "Caixa de correio removida."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Abrir caixa de correio"
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "Login falhou."
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "Caixa de correio removida."
@@ -1455,139 +2067,137 @@ msgstr "Caixa de correio removida."
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Erro fatal. O número de mensagens está fora de sincronia!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, fuzzy, c-format
 msgid "Closing connection to %s..."
 msgstr "Fechando a conexão com o servidor IMAP..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Este servidor IMAP é pré-histórico. Mutt não funciona com ele."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr ""
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr ""
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+#, fuzzy
+msgid "Encrypted connection unavailable"
+msgstr "Chave de Sessão Encriptada"
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Selecionando %s..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 #, fuzzy
 msgid "Error opening mailbox"
 msgstr "Erro ao gravar a caixa!"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Não é possível anexar a caixas IMAP neste servidor"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "Criar %s?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Marcando %d mensagens como removidas..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 #, fuzzy
 msgid "Expunge failed"
 msgstr "Login falhou."
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Salvando marcas de estado das mensagens... [%d de %d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Apagando mensagens do servidor..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 #, fuzzy
 msgid "CLOSE failed"
 msgstr "Login falhou."
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 #, fuzzy
 msgid "Bad mailbox name"
 msgstr "Abrir caixa de correio"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Assinando %s..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Cancelando assinatura de %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Não foi possível obter cabeçalhos da versão deste servidor IMAP."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, fuzzy, c-format
 msgid "Could not create temporary file %s"
 msgstr "Não foi possível criar um arquivo temporário!"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Obtendo cabeçalhos das mensagens... [%d de %d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Obtendo cabeçalhos das mensagens... [%d de %d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Obtendo mensagem..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Enviando mensagem ..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Copiando %d mensagens para %s..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Copiando mensagem %d para %s..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Continuar?"
 
@@ -1596,124 +2206,124 @@ msgstr "Continuar?"
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:678
+#: init.c:644
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "marca mensagens que casem com um padrão"
 
-#: init.c:680
+#: init.c:646
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "desmarca mensagens que casem com um padrão"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "apelido: sem endereço"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "campo de cabeçalho inválido"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: método de ordenação desconhecido"
 
-#: init.c:1169
+#: init.c:1135
 #, fuzzy, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default: erro na expressão regular: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: variável desconhecida"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "prefixo é ilegal com reset"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "valor é ilegal com reset"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s está atribuída"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s não está atribuída"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: tipo de caixa inválido"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: valor inválido"
 
-#: init.c:1589
+#: init.c:1555
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s: tipo inválido"
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: tipo inválido"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Erro em %s, linha %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: erros em %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr ""
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: erro em %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: muitos argumentos"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: comando desconhecido"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Erro na linha de comando: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "não foi possível determinar o diretório do usuário"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "não foi possível determinar o nome do usuário"
 
@@ -2180,406 +2790,415 @@ msgid "compose a new mail message"
 msgstr "compõe uma nova mensagem eletrônica"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "abre uma pasta diferente"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "abre uma pasta diferente somente para leitura"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "retira uma marca de estado de uma mensagem"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "apaga mensagens que casem com um padrão"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 #, fuzzy
 msgid "force retrieval of mail from IMAP server"
 msgstr "obtém mensagens do servidor POP"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "obtém mensagens do servidor POP"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "anda até a primeira mensagem"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "anda até a última mensagem"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "mostra somente mensagens que casem com um padrão"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Repetir mensagens marcadas para: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "pula para a próxima mensagem nova"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 #, fuzzy
 msgid "jump to the next new or unread message"
 msgstr "pula para a próxima mensagem não lida"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "pula para a próxima sub-discussão"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "pula para a próxima discussão"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "anda até a próxima mensagem não apagada"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "pula para a próxima mensagem não lida"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "pula para a mensagem pai na discussão"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "pula para a discussão anterior"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "pula para a sub-discussão anterior"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "anda até a mensagem não apagada anterior"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "pula para a mensagem nova anterior"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 #, fuzzy
 msgid "jump to the previous new or unread message"
 msgstr "pula para a mensagem não lida anterior"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "pula para a mensagem não lida anterior"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "marca a discussão atual como lida"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "marca a sub-discussão atual como lida"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "atribui uma marca de estado em uma mensagem"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "salva as mudanças à caixa"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "marca mensagens que casem com um padrão"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "restaura mensagens que casem com um padrão"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "desmarca mensagens que casem com um padrão"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "anda até o meio da página"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "anda até a próxima entrada"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "desce uma linha"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "anda até a próxima página"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "pula para o fim da mensagem"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "troca entre mostrar texto citado ou não"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "pula para depois do texto citado"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "volta para o início da mensagem"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "passa a mensagem/anexo para um comando do shell através de um cano"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "anda até a entrada anterior"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "sobe uma linha"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "anda até a página anterior"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "imprime a entrada atual"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "executa uma busca por um endereço através de um programa externo"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "anexa os resultados da nova busca aos resultados atuais"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "salva mudanças à caixa e sai"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "edita uma mensagem adiada"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "limpa e redesenha a tela"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{interno}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "apaga a caixa de correio atual (só para IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "responde a uma mensagem"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "usa a mensagem atual como modelo para uma nova mensagem"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "salva mensagem/anexo em um arquivo"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "procura por uma expressão regular"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "procura de trás para a frente por uma expressão regular"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "procura pelo próximo resultado"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "procura pelo próximo resultado na direção oposta"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "troca entre mostrar cores nos padrões de busca ou não"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "executa um comando em um subshell"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "ordena mensagens"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "ordena mensagens em ordem reversa"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "marca a entrada atual"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "aplica a próxima função às mensagens marcadas"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 #, fuzzy
 msgid "apply next function ONLY to tagged messages"
 msgstr "aplica a próxima função às mensagens marcadas"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "marca a sub-discussão atual"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "marca a discussão atual"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "troca a marca 'nova' de uma mensagem"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "troca entre reescrever a caixa ou não"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "troca entre pesquisar em caixas ou em todos os arquivos"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "anda até o topo da página"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "restaura a entrada atual"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "restaura todas as mensagens na discussão"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "restaura todas as mensagens na sub-discussão"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "mostra o número e a data da versão do Mutt"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "vê anexo usando sua entrada no mailcap se necessário"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "mostra anexos MIME"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr ""
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "mostra o padrão limitante atualmente ativado"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "abre/fecha a discussão atual"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "abre/fecha todas as discussões"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "anexa uma chave pública do PGP"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "mostra as opções do PGP"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "envia uma chave pública do PGP"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "verifica uma chave pública do PGP"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "vê a identificação de usuário da chave"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr ""
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Aceita a sequência construída"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "Anexa um reenviador à sequência"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "Insere um reenviador à sequência"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "Remove um reenviador da sequência"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "Seleciona o elemento anterior da sequência"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "Seleciona o próximo elemento da sequência"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "envia a mensagem através de uma sequência de reenviadores mixmaster"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "cria cópia desencriptada e apaga"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "cria cópia desencriptada"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 #, fuzzy
 msgid "wipe passphrase(s) from memory"
 msgstr "retira a senha do PGP da memória"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 #, fuzzy
 msgid "extract supported public keys"
 msgstr "extrai chaves públicas do PGP"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 #, fuzzy
 msgid "show S/MIME options"
 msgstr "mostra as opções do PGP"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr ""
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Acabou a memória!"
 
@@ -2612,11 +3231,11 @@ msgstr ""
 #: main.c:61
 #, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2665,25 +3284,63 @@ msgstr ""
 "    com este programa; caso contrário, escreva para Free Software\n"
 "    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02138, USA.\n"
 
-#: main.c:99
+#: main.c:99
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"uso: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <arq> ] [ -m <tipo> ] [ -f <arq> ]\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <arq> ] [ -F <arq> ] [ -H <arq> ] [ -i "
+"<arq> ] [ -s <asst> ] [ -b <end> ] [ -c <end> ] <end> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <arq> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"opções:\n"
+"  -a <arquivo>\tanexa um arquivo à mensagem\n"
+"  -b <endereço>\tespecifica um endereço de cópia escondica (BCC)\n"
+"  -c <endereço>\tespecifica um endereço de cópia (CC)\n"
+"  -e <comando>\tespecifica um comando a ser executado depois a "
+"inicialização\n"
+"  -f <arquivo>\tespecifica qual caixa de mensagens abrir\n"
+"  -F <arquivo>\tespecifica um arquivo muttrc alternativo\n"
+"  -H <arquivo>\tespecifica um rascunho de onde ler cabeçalhos\n"
+"  -i <arquivo>\tespecifica um arquivo que o Mutt deve incluir na resposta\n"
+"  -m <tipo>\tespecifica o tipo padrão de caixa de mensagens\n"
+"  -n\t\tfaz com que o Mutt não leia o Muttrc do sistema\n"
+"  -p\t\tedita uma mensagem adiada\n"
+"  -R\t\tabre a caixa de mensagens em modo de somente leitura\n"
+"  -s <assunto>\tespecifica um assunto (entre aspas se tiver espaços)\n"
+"  -v\t\tmostra a versão e definições de compilação\n"
+"  -x\t\tsimula o modo de envio do mailx\n"
+"  -y\t\tescolhe uma caixa na sua lista `mailboxes'\n"
+"  -z\t\tsai imediatamente se não houverem mensagens na caixa\n"
+"  -Z\t\tabre a primeira pasta com novas mensagens, sai se não houver\n"
+"  -h\t\testa mensagem de ajuda"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
 #, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-"<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-"[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-"[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
-"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
-"\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2730,7 +3387,7 @@ msgstr ""
 "  -Z\t\tabre a primeira pasta com novas mensagens, sai se não houver\n"
 "  -h\t\testa mensagem de ajuda"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2738,47 +3395,47 @@ msgstr ""
 "\n"
 "Opções de compilação:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Erro ao inicializar terminal."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Depurando no nível %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG não foi definido durante a compilação. Ignorado.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s não existe. Devo criá-lo?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Não é possível criar %s: %s"
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Nenhum destinatário foi especificado.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: não foi possível anexar o arquivo.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Nenhuma caixa com novas mensagens."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Nenhuma caixa de mensagem para recebimento definida."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "A caixa de mensagens está vazia."
 
@@ -2795,11 +3452,11 @@ msgstr "A caixa de mensagens est
 msgid "Mailbox was corrupted!"
 msgstr "A caixa de mensagens foi corrompida!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Erro fatal! Não foi posssível reabrir a caixa de mensagens!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Não foi possível travar a caixa de mensagens!"
 
@@ -2807,13 +3464,13 @@ msgstr "N
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: mbox modificada, mas nenhuma mensagem modificada! (relate este "
 "problema)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Gravando mensagens... %d(%d%%)"
@@ -2821,190 +3478,150 @@ msgstr "Gravando mensagens... %d(%d%%)"
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 #, fuzzy
 msgid "Committing changes..."
 msgstr "Compilando padrão de busca..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Erro de gravação! Caixa parcial salva em %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Não foi possível reabrir a caixa de mensagens!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Reabrindo caixa de mensagens..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Pular para: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Número de índice inválido."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Nenhuma entrada."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Você não pode mais descer."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Você não pode mais subir"
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Você está na última página."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Você está na primeira página"
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "A primeira entrada está sendo mostrada."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "A última entrada está sendo mostrada."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Você está na última entrada."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Você está na primeira entrada."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Procurar por: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Procurar de trás para frente por: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Nenhum padrão de procura."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Não encontrado."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "Nenhuma entrada marcada."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "A busca não está implementada neste menu."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "O pulo não está implementado em diálogos."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Não é possível marcar."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Lendo %s... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
-#: muttlib.c:846
-#, fuzzy
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "O arquivo é um diretório, salvar lá?"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr ""
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "O arquivo é um diretório, salvar lá?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Arquivo no diretório: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Arquivo existe, (s)obrescreve, (a)nexa ou (c)ancela?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "sac"
-
-#: muttlib.c:1199
-#, fuzzy
-msgid "Can't save message to POP mailbox."
-msgstr "Gravar mensagem na caixa"
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s não é uma caixa de mensagens!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Anexa mensagens a %s?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, fuzzy, c-format
 msgid "Connection to %s closed"
 msgstr "Conectando a %s..."
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr ""
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 #, fuzzy
 msgid "Preconnect command failed."
 msgstr "comando de pré-conexão falhou"
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, fuzzy, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Conectando a %s"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, fuzzy, c-format
 msgid "Looking up %s..."
 msgstr "Copiando para %s..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, fuzzy, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Não foi possível encontrar o endereço do servidor %s."
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Conectando a %s..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, fuzzy, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Não foi possível abrir %s"
@@ -3036,7 +3653,8 @@ msgstr ""
 msgid "SSL failed: %s"
 msgstr "Login falhou."
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Não foi possível obter o certificado do servidor remoto"
 
@@ -3045,89 +3663,210 @@ msgstr "N
 msgid "SSL connection using %s (%s)"
 msgstr "Conexão SSL usando %s"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[impossível calcular]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 #, fuzzy
 msgid "[invalid date]"
 msgstr "%s: valor inválido"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr ""
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 #, fuzzy
 msgid "Server certificate has expired"
 msgstr "Este certificado foi emitido por:"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Este certificado pertence a:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Este certificado foi emitido por:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, fuzzy, c-format
 msgid "This certificate is valid"
 msgstr "Este certificado foi emitido por:"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr ""
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr ""
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Impressão digital: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "Verificação de certificado SSL"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)ejeitar, (a)ceitar uma vez, aceitar (s)empre"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "ras"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)ejeitar, (a)ceitar uma vez"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "ra"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Sair  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Aviso: Não foi possível salvar o certificado"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Certificado salvo"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "Conexão SSL usando %s"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Certificado salvo"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Erro ao inicializar terminal."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Impressão digital: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Impressão digital: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Este certificado foi emitido por:"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Este certificado foi emitido por:"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Este certificado foi emitido por:"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "Verificação de certificado SSL"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Conectando a %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Conectando a %s"
+
+#: muttlib.c:910
+#, fuzzy
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "O arquivo é um diretório, salvar lá?"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr ""
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "O arquivo é um diretório, salvar lá?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Arquivo no diretório: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Arquivo existe, (s)obrescreve, (a)nexa ou (c)ancela?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "sac"
+
+#: muttlib.c:1263
+#, fuzzy
+msgid "Can't save message to POP mailbox."
+msgstr "Gravar mensagem na caixa"
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Anexa mensagens a %s?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s não é uma caixa de mensagens!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3205,7 +3944,7 @@ msgstr "A caixa de mensagens n
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d mantidas, %d movidas, %d apagadas."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d mantidas, %d apagadas."
@@ -3224,16 +3963,16 @@ msgstr "Use 'toggle-write' para reabilitar a grava
 msgid "Mailbox is marked unwritable. %s"
 msgstr "A caixa está marcada como não gravável. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 #, fuzzy
 msgid "Mailbox checkpointed."
 msgstr "Caixa de correio removida."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Não foi possível gravar a mensagem"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
@@ -3241,48 +3980,48 @@ msgstr ""
 msgid "Not available in this menu."
 msgstr "Não disponível neste menu."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "PagAnt"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "ProxPag"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Ver Anexo"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Prox"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "O fim da mensagem está sendo mostrado."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "O início da mensagem está sendo mostrado."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Busca reversa: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Busca: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "A ajuda está sendo mostrada."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "Não há mais texto citado."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Não há mais texto não-citado após o texto citado."
 
@@ -3349,27 +4088,27 @@ msgstr "padr
 msgid "error: unknown op %d (report this error)."
 msgstr "erro: operação %d desconhecida (relate este erro)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Compilando padrão de busca..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Executando comando nas mensagens que casam..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "Nenhuma mensagem casa com o critério"
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "A busca chegou ao fim sem encontrar um resultado"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "A busca chegou ao início sem encontrar um resultado"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Busca interrompida."
 
@@ -3381,11 +4120,11 @@ msgstr "Entre a senha do PGP:"
 msgid "PGP passphrase forgotten."
 msgstr "Senha do PGP esquecida."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Erro: não foi possível criar o subprocesso do PGP! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3393,57 +4132,23 @@ msgstr ""
 "[-- Fim da saída do PGP --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- INÍCIO DE MENSAGEM DO PGP --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- INÍCIO DE BLOCO DE CHAVE PÚBLICA DO PGP --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- INÍCIO DE MENSAGEM ASSINADA POR PGP --]\n"
-"\n"
-
-#: pgp.c:423
+#: pgp.c:387 pgp.c:951
 #, fuzzy
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- FIM DE MENSAGEM DO PGP --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- FIM DE BLOCO DE CHAVE PÚBLICA DO PGP --]\n"
+msgid "Could not decrypt PGP message"
+msgstr "Não foi possível enviar a mensagem."
 
-#: pgp.c:427
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
 #, fuzzy
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- FIM DE MENSAGEM ASSINADA POR PGP --]\n"
-
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Erro: não foi possível encontrar o início da mensagem do PGP! --]\n"
+msgid "PGP message successfully decrypted."
+msgstr "Assinatura PGP verificada com sucesso."
 
-#: pgp.c:704
+#: pgp.c:723
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Erro interno. Informe <roessler@does-not-exist.org>."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3451,75 +4156,38 @@ msgstr ""
 "[-- Erro: não foi possível criar um subprocesso para o PGP! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Erro: mensagem PGP/MIME mal formada! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Erro: não foi possível criar um arquivo temporário! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- Os dados a seguir estão encriptados com PGP/MIME --]\n"
-"\n"
-
-#: pgp.c:915
+#: pgp.c:828
 #, fuzzy
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr ""
-"\n"
-"[-- Fim dos dados encriptados com PGP/MIME --]\n"
+msgid "Decryption failed"
+msgstr "Login falhou."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "Não foi possível abrir o subprocesso do PGP!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "Usar keyID = \"%s\" para %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Entre a keyID para %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "Não foi possível executar o PGP"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr ""
 "(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, em l(i)nha, ou es(q)uece? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1499
+#: pgp.c:1543
 #, fuzzy
 msgid "esabifc"
 msgstr "escaiq"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Assinar como: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "Obtendo chave PGP..."
@@ -3529,16 +4197,6 @@ msgstr "Obtendo chave PGP..."
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Esta chave não pode ser usada: expirada/desabilitada/revogada."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Escolher  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Verificar chave  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3553,43 +4211,6 @@ msgstr "Chaves do PGP que casam com \"%s\"."
 msgid "Can't open /dev/null"
 msgstr "Não foi possível abrir /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Não foi possível criar um arquivo temporário"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Key ID: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Esta chave não pode ser usada: expirada/desabilitada/revogada."
-
-#: pgpkey.c:612
-#, fuzzy
-msgid "ID is expired/disabled/revoked."
-msgstr "Esta chave não pode ser usada: expirada/desabilitada/revogada."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr ""
-
-#: pgpkey.c:619
-#, fuzzy
-msgid "ID is not valid."
-msgstr "Este ID não é de confiança."
-
-#: pgpkey.c:622
-#, fuzzy
-msgid "ID is only marginally valid."
-msgstr "Este ID é de baixa confiança."
-
-#: pgpkey.c:626
-#, fuzzy, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Você realmente quer usá-lo?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Por favor entre o key ID: "
@@ -3603,11 +4224,6 @@ msgstr "Executando PGP..."
 msgid "PGP Key %s."
 msgstr "Chave do PGP %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Procurando por chaves que casam com \"%s\"..."
-
 #: pop.c:90 pop_lib.c:201
 #, fuzzy, c-format
 msgid "Command TOP is not supported by server."
@@ -3670,7 +4286,7 @@ msgstr "Erro ao gravar a caixa!"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d de %d mensagens lidas]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "O servidor fechou a conexão!"
 
@@ -3704,17 +4320,17 @@ msgstr "Apagando mensagens do servidor..."
 msgid "Error connecting to server: %s"
 msgstr "Conectando a %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 #, fuzzy
 msgid "Closing connection to POP server..."
 msgstr "Fechando a conexão com o servidor IMAP..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 #, fuzzy
 msgid "Verifying message indexes..."
 msgstr "Gravando mensagem em %s..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 #, fuzzy
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Fechando a conexão com o servidor IMAP..."
@@ -4103,35 +4719,35 @@ msgstr "Mensagem enviada."
 msgid "Sending in background."
 msgstr "Enviando em segundo plano."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Nenhum parâmetro de fronteira encontrado! [relate este erro]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s não mais existe!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
 msgstr "%s não é uma caixa de correio."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "Não foi possível abrir %s"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Erro ao enviar a mensagem, processo filho saiu com código %d"
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Saída do processo de entrega"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
@@ -4256,7 +4872,7 @@ msgstr "N
 msgid "No output from OpenSSL..."
 msgstr ""
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"
@@ -4265,26 +4881,26 @@ msgstr ""
 "[-- Fim da saída do PGP --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 #, fuzzy
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Erro: não foi possível criar o subprocesso do PGP! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 #, fuzzy
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- Os dados a seguir estão encriptados com PGP/MIME --]\n"
 "\n"
 
-#: smime.c:1765
+#: smime.c:1767
 #, fuzzy
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- Os dados a seguir estão assinados --]\n"
 "\n"
 
-#: smime.c:1829
+#: smime.c:1831
 #, fuzzy
 msgid ""
 "\n"
@@ -4293,7 +4909,7 @@ msgstr ""
 "\n"
 "[-- Fim dos dados encriptados com PGP/MIME --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 #, fuzzy
 msgid ""
 "\n"
@@ -4302,28 +4918,28 @@ msgstr ""
 "\n"
 "[-- Fim dos dados assinados --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
 "(e)ncripa, a(s)sina, e(n)cripa com, assina (c)omo, (a)mbos, ou es(q)uece? "
 
-#: smime.c:1936
+#: smime.c:1945
 #, fuzzy
 msgid "eswabfc"
 msgstr "esncaq"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr ""
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
@@ -4349,6 +4965,9 @@ msgstr "A mensagem pai n
 msgid "Parent message is not available."
 msgstr "A mensagem pai não está disponível."
 
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Não é possível anexar a caixas IMAP neste servidor"
+
 #, fuzzy
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "Criar uma mensagem application/pgp?"
@@ -4401,9 +5020,6 @@ msgstr "A mensagem pai n
 #~ msgid "Copy"
 #~ msgstr "Copiar"
 
-#~ msgid "%s [%s]\n"
-#~ msgstr "%s [%s]\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "[-- End of PGP output --]\n"
@@ -4499,9 +5115,6 @@ msgstr "A mensagem pai n
 #~ msgid "Skipping CRAM-MD5 authentication."
 #~ msgstr "Pulando a autenticação CRAM-MD5."
 
-#~ msgid "[-- Error: unexpected end of file! --]\n"
-#~ msgstr "[-- Erro: fim de arquivo inesperado! --]\n"
-
 #~ msgid "Sending APPEND command ..."
 #~ msgstr "Enviando o comando APPEND..."
 
@@ -4597,9 +5210,6 @@ msgstr "A mensagem pai n
 #~ msgid "reserved"
 #~ msgstr "reservado"
 
-#~ msgid "Encrypted Session Key"
-#~ msgstr "Chave de Sessão Encriptada"
-
 #~ msgid "Signature Packet"
 #~ msgstr "Pacote de Assinatura"
 
diff --git a/po/ru.po b/po/ru.po
index 0cf831b78..d0c763ac4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutt-1.5.9i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2005-03-13 19:49+0200\n"
 "Last-Translator: mutt-ru@woe.spb.ru\n"
 "Language-Team: RUSSIAN <mutt-ru@woe.spb.ru>\n"
@@ -20,26 +20,26 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "éÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ %s: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "ðÁÒÏÌØ ÄÌÑ %s@%s: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "÷ÙÈÏÄ"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "õÄÁÌÉÔØ"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ"
 
@@ -48,9 +48,9 @@ msgid "Select"
 msgstr "÷ÙÂÒÁÔØ"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "ðÏÍÏÝØ"
 
@@ -102,171 +102,171 @@ msgstr "
 msgid "Alias added."
 msgstr "ðÓÅ×ÄÏÎÉÍ ÓÏÚÄÁÎ."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "îÅ ÕÄÁÌÏÓØ ÒÁÚÏÂÒÁÔØ ÉÍÑ. ðÒÏÄÏÌÖÉÔØ?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "õËÁÚÁÎÎÙÊ × mailcap ÓÐÏÓÏÂ ÓÏÚÄÁÎÉÑ ÔÒÅÂÕÅÔ ÎÁÌÉÞÉÑ ÐÁÒÁÍÅÔÒÁ %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "ïÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ \"%s\"!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ÆÁÊÌ ÄÌÑ ÒÁÚÂÏÒÁ ÚÁÇÏÌÏ×ËÏ×."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ÆÁÊÌ ÄÌÑ ÕÄÁÌÅÎÉÑ ÚÁÇÏÌÏ×ËÏ×."
 
-#: attach.c:183
+#: attach.c:184
 msgid "Failure to rename file."
 msgstr "îÅ ÕÄÁÌÏÓØ ÐÅÒÅÉÍÅÎÏ×ÁÔØ ÆÁÊÌ."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "÷ mailcap ÎÅ ÏÐÒÅÄÅÌÅÎ ÓÐÏÓÏÂ ÓÏÚÄÁÎÉÑ ÄÌÑ %s; ÓÏÚÄÁÎ ÐÕÓÔÏÊ ÆÁÊÌ."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr ""
 "õËÁÚÁÎÎÙÊ × mailcap ÓÐÏÓÏ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÔÒÅÂÕÅÔ ÎÁÌÉÞÉÑ ÐÁÒÁÍÅÔÒÁ %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "÷ mailcap ÎÅ ÏÐÒÅÄÅÌÅÎ ÓÐÏÓÏ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÄÌÑ %s"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "ðÏÄÈÏÄÑÝÁÑ ÚÁÐÉÓØ × mailcap ÎÅ ÎÁÊÄÅÎÁ; ÐÒÏÓÍÏÔÒ ËÁË ÔÅËÓÔÁ."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME-ÔÉÐ ÎÅ ÏÐÒÅÄÅÌÅÎ.  îÅ×ÏÚÍÏÖÎÏ ÐÒÏÓÍÏÔÒÅÔØ ×ÌÏÖÅÎÉÅ."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÆÉÌØÔÒ"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÆÉÌØÔÒ"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "îÅÉÚ×ÅÓÔÎÏ, ËÁË ÜÔÏ ÐÅÞÁÔÁÔØ!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "ðÅÒÅÊÔÉ ×: "
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "íÁÓËÁ"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "ðÏÞÔÏ×ÙÅ ÑÝÉËÉ [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "ðÏÄËÌÀÞÅÎÉÅ [%s], ÍÁÓËÁ ÆÁÊÌÁ: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "ëÁÔÁÌÏÇ [%s], ÍÁÓËÁ ÆÁÊÌÁ: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "÷ÌÏÖÅÎÉÅ ËÁÔÁÌÏÇÏ× ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "îÅÔ ÆÁÊÌÏ×, ÕÄÏ×ÌÅÔ×ÏÒÑÀÝÉÈ ÄÁÎÎÏÊ ÍÁÓËÅ"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "óÏÚÄÁÎÉÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ ÄÌÑ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× ÎÁ IMAP-ÓÅÒ×ÅÒÁÈ"
 
-#: browser.c:880
+#: browser.c:881
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr ""
 "ðÅÒÅÉÍÅÎÏ×ÁÎÉÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ ÄÌÑ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× ÎÁ IMAP-ÓÅÒ×ÅÒÁÈ"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "õÄÁÌÅÎÉÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ ÄÌÑ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× ÎÁ IMAP-ÓÅÒ×ÅÒÁÈ"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "õÄÁÌÉÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË \"%s\"?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÕÄÁÌÅÎ."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÎÅ ÕÄÁÌÅÎ."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "ðÅÒÅÊÔÉ ×: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "ïÛÉÂËÁ ÐÒÏÓÍÏÔÒÁ ËÁÔÁÌÏÇÁ."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "íÁÓËÁ ÆÁÊÌÁ: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "ïÂÒÁÔÎÙÊ ÐÏÒÑÄÏË ÐÏ (d)ÄÁÔÅ, (a)ÉÍÅÎÉ, (z)ÒÁÚÍÅÒÕ ÉÌÉ (n)ÏÔÓÕÔÓÔ×ÕÅÔ?"
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "õÐÏÒÑÄÏÞÉÔØ ÐÏ (d)ÄÁÔÅ, (a)ÉÍÅÎÉ, (z)ÒÁÚÍÅÒÕ ÉÌÉ (n)ÏÔÓÕÔÓÔ×ÕÅÔ?"
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "dazn"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "îÏ×ÏÅ ÉÍÑ ÆÁÊÌÁ: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "îÅ ÕÄÁÌÏÓØ ÐÒÏÓÍÏÔÒÅÔØ ËÁÔÁÌÏÇ"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "ïÛÉÂËÁ ÐÒÉ ÐÏÐÙÔËÅ ÐÒÏÓÍÏÔÒÁ ÆÁÊÌÁ"
 
@@ -333,7 +333,7 @@ msgstr "
 msgid "Verify PGP signature?"
 msgstr "ðÒÏ×ÅÒÉÔØ PGP-ÐÏÄÐÉÓØ?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ!"
 
@@ -345,114 +345,114 @@ msgstr "
 msgid "Could not copy message"
 msgstr "îÅ ÕÄÁÌÏÓØ ÓËÏÐÉÒÏ×ÁÔØ ÓÏÏÂÝÅÎÉÅ"
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "S/MIME-ÐÏÄÐÉÓØ ÐÒÏ×ÅÒÅÎÁ."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "ïÔÐÒÁ×ÉÔÅÌØ ÓÏÏÂÝÅÎÉÑ ÎÅ Ñ×ÌÑÅÔÓÑ ×ÌÁÄÅÌØÃÅÍ S/MIME-ÓÅÒÔÉÆÉËÁÔÁ."
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÞÁÓÔØ ÜÔÏÇÏ ÓÏÏÂÝÅÎÉÑ ÎÅ ÐÏÄÐÉÓÁÎÁ."
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "S/MIME-ÐÏÄÐÉÓØ ÐÒÏ×ÅÒÉÔØ îå ÕÄÁÌÏÓØ."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "PGP-ÐÏÄÐÉÓØ ÐÒÏ×ÅÒÅÎÁ."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "PGP-ÐÏÄÐÉÓØ ÐÒÏ×ÅÒÉÔØ îå ÕÄÁÌÏÓØ."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "ëÏÍÁÎÄÁ: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÑ: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "ïÛÉÂËÁ ÒÁÚÂÏÒÁ ÁÄÒÅÓÁ!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "îÅËÏÒÒÅËÔÎÙÊ IDN: '%s'"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÑ %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "óÏÏÂÝÅÎÉÅ ÎÅ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÏ."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "óÏÏÂÝÅÎÉÑ ÎÅ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÙ."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "óÏÏÂÝÅÎÉÅ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÏ."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "óÏÏÂÝÅÎÉÑ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÙ."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÐÒÏÃÅÓÓ ÆÉÌØÔÒÁ"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "ðÅÒÅÄÁÔØ ÐÒÏÇÒÁÍÍÅ: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "ëÏÍÁÎÄÁ ÄÌÑ ÐÅÞÁÔÉ ÎÅ ÏÐÒÅÄÅÌÅÎÁ."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "îÁÐÅÞÁÔÁÔØ ÓÏÏÂÝÅÎÉÅ?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "îÁÐÅÞÁÔÁÔØ ÏÔÍÅÞÅÎÎÙÅ ÓÏÏÂÝÅÎÉÑ?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "óÏÏÂÝÅÎÉÅ ÎÁÐÅÞÁÔÁÎÏ"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "óÏÏÂÝÅÎÉÑ ÎÁÐÅÞÁÔÁÎÙ"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "îÅ ÕÄÁÌÏÓØ ÎÁÐÅÞÁÔÁÔØ ÓÏÏÂÝÅÎÉÅ"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "îÅ ÕÄÁÌÏÓØ ÎÁÐÅÞÁÔÁÔØ ÓÏÏÂÝÅÎÉÑ"
 
-#: commands.c:508
+#: commands.c:509
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
@@ -460,7 +460,7 @@ msgstr ""
 "ïÂÒ.ÐÏÒ.:(d)ÄÁÔÁ/(f)ÏÔ/(r)ÐÏÌÕÞ/(s)ÔÅÍÁ/(o)ËÏÍÕ/(t)ÄÉÓË/(u)ÂÅÚ/(z)ÒÁÚÍ/(c)"
 "ËÏÎÔ/(p)ÓÐÁÍ?"
 
-#: commands.c:509
+#: commands.c:510
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
@@ -468,73 +468,73 @@ msgstr ""
 "ðÏÒÑÄÏË:(d)ÄÁÔÁ/(f)ÏÔ/(r)ÐÏÌÕÞ/(s)ÔÅÍÁ/(o)ËÏÍÕ/(t)ÄÉÓË/(u)ÂÅÚ/(z)ÒÁÚÍ/(c)"
 "ËÏÎÔ/(p)ÓÐÁÍ?"
 
-#: commands.c:510
+#: commands.c:511
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzcp"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "ðÒÏÇÒÁÍÍÁ: "
 
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "äÅËÏÄÉÒÏ×ÁÔØ É ÓÏÈÒÁÎÉÔØ%s × ÐÏÞÔÏ×ÙÊ ÑÝÉË"
 
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "äÅËÏÄÉÒÏ×ÁÔØ É ËÏÐÉÒÏ×ÁÔØ%s × ÐÏÞÔÏ×ÙÊ ÑÝÉË"
 
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "òÁÓÛÉÆÒÏ×ÁÔØ É ÓÏÈÒÁÎÉÔØ%s × ÐÏÞÔÏ×ÙÊ ÑÝÉË"
 
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "òÁÓÛÉÆÒÏ×ÁÔØ É ËÏÐÉÒÏ×ÁÔØ%s × ÐÏÞÔÏ×ÙÊ ÑÝÉË"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "óÏÈÒÁÎÉÔØ%s × ÐÏÞÔÏ×ÙÊ ÑÝÉË"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "ëÏÐÉÒÏ×ÁÔØ%s × ÐÏÞÔÏ×ÙÊ ÑÝÉË"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " ÐÏÍÅÞÅÎÎÏÅ"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "ëÏÐÉÒÕÅÔÓÑ × %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "ðÅÒÅËÏÄÉÒÏ×ÁÔØ × %s ÐÒÉ ÏÔÐÒÁ×ËÅ?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "úÎÁÞÅÎÉÅ Content-Type ÉÚÍÅÎÅÎÏ ÎÁ %s."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "õÓÔÁÎÏ×ÌÅÎÁ ÎÏ×ÁÑ ËÏÄÉÒÏ×ËÁ: %s; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "ÎÅ ÐÅÒÅËÏÄÉÒÏ×ÁÔØ"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "ÐÅÒÅËÏÄÉÒÏ×ÁÔØ"
 
@@ -626,102 +626,668 @@ msgstr "
 msgid "Attaching selected files..."
 msgstr "÷ËÌÁÄÙ×ÁÀÔÓÑ ÐÏÍÅÞÅÎÎÙÅ ÆÁÊÌÙ..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "îÅ ÕÄÁÌÏÓØ ×ÌÏÖÉÔØ %s!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "÷ÌÏÖÉÔØ ÓÏÏÂÝÅÎÉÅ ÉÚ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "÷ ÜÔÏÍ ÐÏÞÔÏ×ÏÍ ÑÝÉËÅ/ÆÁÊÌÅ ÎÅÔ ÓÏÏÂÝÅÎÉÊ."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "ðÏÍÅÔØÔÅ ÓÏÏÂÝÅÎÉÑ, ËÏÔÏÒÙÅ ×Ù ÈÏÔÉÔÅ ×ÌÏÖÉÔØ!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÌÏÖÅÎÉÅ!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "ðÅÒÅËÏÄÉÒÏ×ÁÎÉÅ ÄÏÐÕÓÔÉÍÏ ÔÏÌØËÏ ÄÌÑ ÔÅËÓÔÏ×ÙÈ ×ÌÏÖÅÎÉÊ."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "ôÅËÕÝÅÅ ×ÌÏÖÅÎÉÅ ÎÅ ÂÕÄÅÔ ÐÅÒÅËÏÄÉÒÏ×ÁÎÏ."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "ôÅËÕÝÅÅ ×ÌÏÖÅÎÉÅ ÂÕÄÅÔ ÐÅÒÅËÏÄÉÒÏ×ÁÎÏ."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "îÅ×ÅÒÎÁÑ ËÏÄÉÒÏ×ËÁ."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "óÏÈÒÁÎÉÔØ ËÏÐÉÀ ÜÔÏÇÏ ÓÏÏÂÝÅÎÉÑ?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ ×: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï %s: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "îÏ×ÙÊ ÆÁÊÌ: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "ðÏÌÅ Content-Type ÄÏÌÖÎÏ ÉÍÅÔØ ×ÉÄ ÔÉÐ/ÐÏÄÔÉÐ"
 
-#: compose.c:1057
+#: compose.c:1060
+#, c-format
+msgid "Unknown Content-Type %s"
+msgstr "îÅÉÚ×ÅÓÔÎÏÅ ÚÎÁÞÅÎÉÅ ÐÏÌÑ Content-Type: %s"
+
+#: compose.c:1073
+#, c-format
+msgid "Can't create file %s"
+msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÆÁÊÌ %s"
+
+#: compose.c:1081
+msgid "What we have here is a failure to make an attachment"
+msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÌÏÖÅÎÉÅ"
+
+#: compose.c:1142
+msgid "Postpone this message?"
+msgstr "ïÔÌÏÖÉÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ?"
+
+#: compose.c:1201
+msgid "Write message to mailbox"
+msgstr "úÁÐÉÓÁÔØ ÓÏÏÂÝÅÎÉÅ × ÐÏÞÔÏ×ÙÊ ÑÝÉË"
+
+#: compose.c:1204
+#, c-format
+msgid "Writing message to %s ..."
+msgstr "óÏÏÂÝÅÎÉÅ ÚÁÐÉÓÙ×ÁÅÔÓÑ × %s..."
+
+#: compose.c:1213
+msgid "Message written."
+msgstr "óÏÏÂÝÅÎÉÅ ÚÁÐÉÓÁÎÏ."
+
+#: compose.c:1225
+msgid "S/MIME already selected. Clear & continue ? "
+msgstr "S/MIME ÕÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ. ïÞÉÓÔÉÔØ É ÐÒÏÄÏÌÖÉÔØ? "
+
+#: compose.c:1251
+msgid "PGP already selected. Clear & continue ? "
+msgstr "PGP ÕÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ. ïÞÉÓÔÉÔØ É ÐÒÏÄÏÌÖÉÔØ? "
+
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+
+#: crypt-gpgme.c:993
+#, fuzzy
+msgid "Warning: One of the keys has been revoked\n"
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÞÁÓÔØ ÜÔÏÇÏ ÓÏÏÂÝÅÎÉÑ ÎÅ ÐÏÄÐÉÓÁÎÁ."
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "óÒÏË ÄÅÊÓÔ×ÉÑ ÓÅÒÔÉÆÉËÁÔÁ ÉÓÔÅË"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL-ÐÒÏÔÏËÏÌ ÎÅÄÏÓÔÕÐÅÎ."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "ïÔÐÅÞÁÔÏË ÐÁÌØÃÁ: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "ïÛÉÂËÁ ÏÔÐÒÁ×ËÉ ÓÏÏÂÝÅÎÉÑ."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "ïÛÉÂËÁ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- ëÏÎÅà ÐÏÄÐÉÓÁÎÎÙÈ ÄÁÎÎÙÈ --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- ïÛÉÂËÁ: ÎÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- îÁÞÁÌÏ PGP-ÓÏÏÂÝÅÎÉÑ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- îÁÞÁÌÏ ÂÌÏËÁ ÏÔËÒÙÔÏÇÏ PGP-ËÌÀÞÁ --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- îÁÞÁÌÏ ÓÏÏÂÝÅÎÉÑ, ÐÏÄÐÉÓÁÎÎÏÇÏ PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- ëÏÎÅà PGP-ÓÏÏÂÝÅÎÉÑ --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- ëÏÎÅà ÂÌÏËÁ ÏÔËÒÙÔÏÇÏ PGP-ËÌÀÞÁ --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- ëÏÎÅà ÓÏÏÂÝÅÎÉÑ, ÐÏÄÐÉÓÁÎÎÏÇÏ PGP --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- ïÛÉÂËÁ: ÎÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ ÎÁÞÁÌÏ PGP-ÓÏÏÂÝÅÎÉÑ! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- ïÛÉÂËÁ: ÆÏÒÍÁÔ ÓÏÏÂÝÅÎÉÑ ÎÅ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÓÔÁÎÄÁÒÔÕ PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- ïÛÉÂËÁ: ÎÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- îÁÞÁÌÏ ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- îÁÞÁÌÏ ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- ëÏÎÅà ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- ëÏÎÅà ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr "[-- îÁÞÁÌÏ ÄÁÎÎÙÈ, ÐÏÄÐÉÓÁÎÎÙÈ × ÆÏÒÍÁÔÅ S/MIME --]\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr "[-- îÁÞÁÌÏ ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ S/MIME --]\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- ëÏÎÅà ÄÁÎÎÙÈ, ÐÏÄÐÉÓÁÎÎÙÈ × ÆÏÒÍÁÔÅ S/MIME --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- ëÏÎÅà ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ S/MIME --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "îÅÐÒÁ×ÉÌØÎÙÊ "
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "îÅ×ÅÒÎÏÅ ÎÁÚ×ÁÎÉÅ ÍÅÓÑÃÁ: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "îÅ×ÅÒÎÏÅ ÎÁÚ×ÁÎÉÅ ÍÅÓÑÃÁ: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "úÁÛÉÆÒÏ×ÁÔØ"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "óÅÒÔÉÆÉËÁÔ ÓÏÈÒÁÎÅÎ"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "éÄÅÎÔÉÆÉËÁÔÏÒ ËÌÀÞÁ: 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "ïÔÏÚ×ÁÎÎÙÊ   "
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "ðÒÏÓÒÏÞÅÎÎÙÊ "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÓÏÅÄÉÎÅÎÉÅ Ó %s..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "ïÛÉÂËÁ ÐÒÉ ÕÓÔÁÎÏ×ÌÅÎÉÉ ÓÏÅÄÉÎÅÎÉÑ: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "éÄÅÎÔÉÆÉËÁÔÏÒ ËÌÀÞÁ: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "îÅ ÕÄÁÌÏÓØ ÐÅÒÅÉÍÅÎÏ×ÁÔØ: %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr ""
+"÷ÓÅ ÐÏÄÈÏÄÑÝÉÅ ËÌÀÞÉ ÐÏÍÅÞÅÎÙ ËÁË ÐÒÏÓÒÏÞÅÎÎÙÅ, ÏÔÏÚ×ÁÎÎÙÅ ÉÌÉ ÚÁÐÒÅÝ£ÎÎÙÅ."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "÷ÙÈÏÄ "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "÷ÙÂÒÁÔØ "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "ôÅÓÔ ËÌÀÞÁ "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP-ËÌÀÞÉ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ \"%s\"."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP-ËÌÀÞÉ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ \"%s\"."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "S/MIME-ÓÅÒÔÉÆÉËÁÔÙ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ \"%s\"."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP-ËÌÀÞÉ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "üÔÏÔ ËÌÀÞ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ: ÐÒÏÓÒÏÞÅÎ, ÚÁÐÒÅÝÅÎ ÉÌÉ ÏÔÏÚ×ÁÎ."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "ID ÐÒÏÓÒÏÞÅÎ, ÚÁÐÒÅÝÅÎ ÉÌÉ ÏÔÏÚ×ÁÎ."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "óÔÅÐÅÎØ ÄÏ×ÅÒÉÑ ÄÌÑ ID ÎÅ ÏÐÒÅÄÅÌÅÎÁ."
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "ID ÎÅÄÅÊÓÔ×ÉÔÅÌÅÎ."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "ID ÄÅÊÓÔ×ÉÔÅÌÅÎ ÔÏÌØËÏ ÞÁÓÔÉÞÎÏ."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s éÓÐÏÌØÚÏ×ÁÔØ ÜÔÏÔ ËÌÀÞ?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "ðÏÉÓË ËÌÀÞÅÊ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÈ \"%s\"..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
 #, c-format
-msgid "Unknown Content-Type %s"
-msgstr "îÅÉÚ×ÅÓÔÎÏÅ ÚÎÁÞÅÎÉÅ ÐÏÌÑ Content-Type: %s"
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "éÓÐÏÌØÚÏ×ÁÔØ ËÌÀÞ \"%s\" ÄÌÑ %s?"
 
-#: compose.c:1070
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
 #, c-format
-msgid "Can't create file %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÆÁÊÌ %s"
+msgid "Enter keyID for %s: "
+msgstr "÷×ÅÄÉÔÅ ÉÄÅÎÔÉÆÉËÁÔÏÒ ËÌÀÞÁ ÄÌÑ %s: "
 
-#: compose.c:1078
-msgid "What we have here is a failure to make an attachment"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÌÏÖÅÎÉÅ"
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
 
-#: compose.c:1139
-msgid "Postpone this message?"
-msgstr "ïÔÌÏÖÉÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ?"
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr "PGP (e)ÛÉÆÒ, (s)ÐÏÄÐÉÓØ, (a)ÐÏÄÐÉÓØ ËÁË, (b)ÏÂÁ, %s, (c)ÏÔËÁÚÁÔØÓÑ? "
 
-#: compose.c:1196
-msgid "Write message to mailbox"
-msgstr "úÁÐÉÓÁÔØ ÓÏÏÂÝÅÎÉÅ × ÐÏÞÔÏ×ÙÊ ÑÝÉË"
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "eswabfc"
 
-#: compose.c:1199
-#, c-format
-msgid "Writing message to %s ..."
-msgstr "óÏÏÂÝÅÎÉÅ ÚÁÐÉÓÙ×ÁÅÔÓÑ × %s..."
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr "PGP (e)ÛÉÆÒ, (s)ÐÏÄÐÉÓØ, (a)ÐÏÄÐÉÓØ ËÁË, (b)ÏÂÁ, %s, (c)ÏÔËÁÚÁÔØÓÑ? "
 
-#: compose.c:1208
-msgid "Message written."
-msgstr "óÏÏÂÝÅÎÉÅ ÚÁÐÉÓÁÎÏ."
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "eswabfc"
 
-#: compose.c:1220
-msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME ÕÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ. ïÞÉÓÔÉÔØ É ÐÒÏÄÏÌÖÉÔØ? "
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "ðÏÄÐÉÓÁÔØ ËÁË: "
 
-#: compose.c:1246
-msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP ÕÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ. ïÞÉÓÔÉÔØ É ÐÒÏÄÏÌÖÉÔØ? "
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ÆÁÊÌ ÄÌÑ ÒÁÚÂÏÒÁ ÚÁÇÏÌÏ×ËÏ×."
 
 #: crypt.c:69
 #, c-format
@@ -738,31 +1304,31 @@ msgid "Passphrase(s) forgotten."
 msgstr "æÒÁÚÙ-ÐÁÒÏÌÉ ÕÄÁÌÅÎÙ ÉÚ ÐÁÍÑÔÉ."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "úÁÐÕÓËÁÅÔÓÑ ÐÒÏÇÒÁÍÍÁ PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 "îÅ ÕÄÁÌÏÓØ ÏÔÐÒÁ×ÉÔØ PGP-ÓÏÏÂÝÅÎÉÅ × ÔÅËÓÔÏ×ÏÍ ÆÏÒÍÁÔÅ. éÓÐÏÌØÚÏ×ÁÔØ PGP/"
 "MIME?"
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "ðÉÓØÍÏ ÎÅ ÏÔÐÒÁ×ÌÅÎÏ."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "S/MIME-ÓÏÏÂÝÅÎÉÑ ÂÅÚ ÕËÁÚÁÎÉÑ ÔÉÐÁ ÓÏÄÅÒÖÉÍÏÇÏ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ."
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "ðÏÐÙÔËÁ ÉÚ×ÌÅÞØ PGP ËÌÀÞÉ...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "ðÏÐÙÔËÁ ÉÚ×ÌÅÞØ S/MIME ÓÅÒÔÉÆÉËÁÔÙ...\n"
 
@@ -774,7 +1340,7 @@ msgstr ""
 "[-- ïÛÉÂËÁ: ÎÁÒÕÛÅÎÁ ÓÔÒÕËÔÕÒÁ multipart/signed-ÓÏÏÂÝÅÎÉÑ! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -783,7 +1349,7 @@ msgstr ""
 "[-- ïÛÉÂËÁ: ÎÅÉÚ×ÅÓÔÎÙÊ multipart/signed ÐÒÏÔÏËÏÌ %s! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -793,7 +1359,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -801,7 +1367,7 @@ msgstr ""
 "[-- îÁÞÁÌÏ ÐÏÄÐÉÓÁÎÎÙÈ ÄÁÎÎÙÈ --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -809,7 +1375,7 @@ msgstr ""
 "[-- ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ ÎÁÊÄÅÎÏ ÎÉ ÏÄÎÏÊ ÐÏÄÐÉÓÉ. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -817,225 +1383,255 @@ msgstr ""
 "\n"
 "[-- ëÏÎÅà ÐÏÄÐÉÓÁÎÎÙÈ ÄÁÎÎÙÈ --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "úÁÐÕÓËÁÅÔÓÑ ÐÒÏÇÒÁÍÍÁ PGP..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "ÄÁ"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "ÎÅÔ"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "úÁ×ÅÒÛÉÔØ ÒÁÂÏÔÕ Ó Mutt?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "þÔÏÂÙ ÐÒÏÄÏÌÖÉÔØ, ÎÁÖÍÉÔÅ ÌÀÂÕÀ ËÌÁ×ÉÛÕ..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " ('?' -- ÓÐÉÓÏË): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "îÅÔ ÏÔËÒÙÔÏÇÏ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "óÏÏÂÝÅÎÉÊ ÎÅÔ."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÎÅÍÏÄÉÆÉÃÉÒÕÅÍ."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "÷ ÒÅÖÉÍÅ \"×ÌÏÖÉÔØ ÓÏÏÂÝÅÎÉÅ\" ÆÕÎËÃÉÑ ÎÅÄÏÓÔÕÐÎÁ."
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "îÅÔ ×ÉÄÉÍÙÈ ÓÏÏÂÝÅÎÉÊ."
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "îÅ ÍÏÇÕ ÒÁÚÒÅÛÉÔØ ÚÁÐÉÓØ × ÐÏÞÔÏ×ÙÊ ÑÝÉË, ÏÔËÒÙÔÙÊ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "éÚÍÅÎÅÎÉÑ × ÓÏÓÔÏÑÎÉÅ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ ÂÕÄÕÔ ×ÎÅÓÅÎÙ ÐÒÉ ÅÇÏ ÚÁËÒÙÔÉÉ."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "éÚÍÅÎÅÎÉÑ × ÓÏÓÔÏÑÎÉÅ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ ÎÅ ÂÕÄÕÔ ×ÎÅÓÅÎÙ."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "÷ÙÈÏÄ"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "óÏÈÒÁÎÉÔØ"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "óÏÚÄÁÔØ"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "ïÔ×ÅÔÉÔØ"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "÷ÓÅÍ"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
 "ñÝÉË ÂÙÌ ÉÚÍÅÎÅÎ ×ÎÅÛÎÅÊ ÐÒÏÇÒÁÍÍÏÊ.  úÎÁÞÅÎÉÑ ÆÌÁÇÏ× ÍÏÇÕÔ ÂÙÔØ ÎÅËÏÒÒÅËÔÎÙ."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "îÏ×ÁÑ ÐÏÞÔÁ × ÜÔÏÍ ÑÝÉËÅ."
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "ñÝÉË ÂÙÌ ÉÚÍÅÎÅÎ ×ÎÅÛÎÅÊ ÐÒÏÇÒÁÍÍÏÊ."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "îÅÔ ÏÔÍÅÞÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 msgid "Nothing to do."
 msgstr "îÅÔ ÐÏÍÅÞÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "ðÅÒÅÊÔÉ Ë ÓÏÏÂÝÅÎÉÀ: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "áÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÎÏÍÅÒÏÍ ÓÏÏÂÝÅÎÉÑ."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "üÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ×ÉÄÉÍÏ."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "îÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÓÏÏÂÝÅÎÉÑ."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "õÄÁÌÉÔØ ÓÏÏÂÝÅÎÉÑ ÐÏ ÏÂÒÁÚÃÕ: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "ûÁÂÌÏÎ ÏÇÒÁÎÉÞÅÎÉÑ ÓÐÉÓËÁ ÏÔÓÕÔÓÔ×ÕÅÔ."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "ûÁÂÌÏÎ ÏÇÒÁÎÉÞÅÎÉÑ: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "ïÇÒÁÎÉÞÉÔØÓÑ ÓÏÏÂÝÅÎÉÑÍÉ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÍÉ: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "÷ÙÊÔÉ ÉÚ Mutt?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "ðÏÍÅÔÉÔØ ÓÏÏÂÝÅÎÉÑ ÐÏ ÏÂÒÁÚÃÕ: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ ÓÏÏÂÝÅÎÉÑ ÐÏ ÏÂÒÁÚÃÕ: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "óÎÑÔØ ÐÏÍÅÔËÕ Ó ÓÏÏÂÝÅÎÉÊ ÐÏ ÏÂÒÁÚÃÕ: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "ïÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "ïÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÞÔÏ×ÙÍ ÑÝÉËÏÍ."
 
-#: curs_main.c:1165
+#: curs_main.c:1176
 msgid "Exit Mutt without saving?"
 msgstr "÷ÙÊÔÉ ÉÚ Mutt ÂÅÚ ÓÏÈÒÁÎÅÎÉÑ ÉÚÍÅÎÅÎÉÊ?"
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "çÒÕÐÐÉÒÏ×ËÁ ÐÏ ÄÉÓËÕÓÓÉÑÍ ÎÅ ×ËÌÀÞÅÎÁ."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "ÓÏÈÒÁÎÉÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÄÌÑ ÏÔÐÒÁ×ËÉ ÐÏÚÄÎÅÅ"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "üÔÏ ÐÏÓÌÅÄÎÅÅ ÓÏÏÂÝÅÎÉÅ."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "îÅÔ ×ÏÓÓÔÁÎÏ×ÌÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "üÔÏ ÐÅÒ×ÏÅ ÓÏÏÂÝÅÎÉÅ."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "äÏÓÔÉÇÎÕÔ ËÏÎÅÃ; ÐÒÏÄÏÌÖÁÅÍ ÐÏÉÓË Ó ÎÁÞÁÌÁ."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "äÏÓÔÉÇÎÕÔÏ ÎÁÞÁÌÏ; ÐÒÏÄÏÌÖÁÅÍ ÐÏÉÓË Ó ËÏÎÃÁ."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "îÅÔ ÎÏ×ÙÈ ÓÏÏÂÝÅÎÉÊ"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "îÅÔ ÎÅÐÒÏÞÉÔÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " ÐÒÉ ÐÒÏÓÍÏÔÒÅ Ó ÏÇÒÁÎÉÞÅÎÉÅÍ"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "éÚÍÅÎÅÎÉÅ ÆÌÁÇÁ '×ÁÖÎÏÅ' ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ POP-ÓÅÒ×ÅÒÏÍ."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "îÅÔ ÂÏÌØÛÅ ÄÉÓËÕÓÓÉÊ."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "üÔÏ ÐÅÒ×ÁÑ ÄÉÓËÕÓÓÉÑ"
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "çÒÕÐÐÉÒÏ×ËÁ ÐÏ ÄÉÓËÕÓÓÉÑÍ ÎÅ ×ËÌÀÞÅÎÁ."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "÷ ÄÉÓËÕÓÓÉÉ ÐÒÉÓÕÔÓÔ×ÕÀÔ ÎÅÐÒÏÞÉÔÁÎÎÙÅ ÓÏÏÂÝÅÎÉÑ."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÓÏÏÂÝÅÎÉÊ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ POP-ÓÅÒ×ÅÒÏÍ."
 
@@ -1168,77 +1764,77 @@ msgstr "
 msgid "Clear flag"
 msgstr "óÂÒÏÓÉÔØ ÆÌÁÇ"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- ïÛÉÂËÁ: ÎÅ ÕÄÁÌÏÓØ ÐÏËÁÚÁÔØ ÎÉ ÏÄÎÕ ÉÚ ÞÁÓÔÅÊ Multipart/Alternative! "
 "--]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- ÷ÌÏÖÅÎÉÅ #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- ôÉÐ: %s/%s, ËÏÄÉÒÏ×ËÁ: %s, ÒÁÚÍÅÒ: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- á×ÔÏÐÒÏÓÍÏÔÒ; ÉÓÐÏÌØÚÕÅÔÓÑ %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "úÁÐÕÓËÁÅÔÓÑ ÐÒÏÇÒÁÍÍÁ Á×ÔÏÐÒÏÓÍÏÔÒÁ: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- îÅ ÕÄÁÌÏÓØ ×ÙÐÏÌÎÉÔØ %s. --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- á×ÔÏÐÒÏÓÍÏÔÒ ÓÔÁÎÄÁÒÔÎÏÇÏ ÐÏÔÏËÁ ÏÛÉÂÏË %s --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- ïÛÉÂËÁ: ÔÉÐ message/external ÔÒÅÂÕÅÔ ÎÁÌÉÞÉÅ ÐÁÒÁÍÅÔÒÁ access-type --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- üÔÏ ×ÌÏÖÅÎÉÅ ÔÉÐÁ %s/%s "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(ÒÁÚÍÅÒ %s ÂÁÊÔÏ×) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "ÂÙÌÏ ÕÄÁÌÅÎÏ --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- ÉÍÑ: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- üÔÏ ×ÌÏÖÅÎÉÅ ÔÉÐÁ %s/%s ÎÅ ÂÙÌÏ ×ËÌÀÞÅÎÏ --]\n"
 
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
@@ -1246,34 +1842,34 @@ msgstr ""
 "[-- × ÓÏÏÂÝÅÎÉÅ, É ÂÏÌÅÅ ÎÅ ÓÏÄÅÒÖÉÔÓÑ × ÕËÁÚÁÎÎÏÍ --]\n"
 "[-- ×ÎÅÛÎÅÍ ÉÓÔÏÞÎÉËÅ. --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- × ÓÏÏÂÝÅÎÉÅ, É ÚÎÁÞÅÎÉÅ access-type %s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "ïÛÉÂËÁ: ÔÉÐ multipart/signed ÔÒÅÂÕÅÔ ÎÁÌÉÞÉÑ ÐÁÒÁÍÅÔÒÁ protocol."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "ïÛÉÂËÁ: ÔÉÐ multipart/encrypted ÔÒÅÂÕÅÔ ÎÁÌÉÞÉÑ ÐÁÒÁÍÅÔÒÁ protocol!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- ÔÉÐ %s/%s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(ÉÓÐÏÌØÚÕÊÔÅ '%s' ÄÌÑ ÐÒÏÓÍÏÔÒÁ ÜÔÏÊ ÞÁÓÔÉ)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(ÆÕÎËÃÉÑ 'view-attachments' ÎÅ ÎÁÚÎÁÞÅÎÁ ÎÉ ÏÄÎÏÊ ËÌÁ×ÉÛÅ!)"
 
@@ -1380,46 +1976,46 @@ msgstr "
 msgid "SASL authentication failed."
 msgstr "ïÛÉÂËÁ SASL-ÁÕÔÅÎÔÉÆÉËÁÃÉÉ."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "îÅ×ÅÒÎÏ ÕËÁÚÁÎÏ ÉÍÑ IMAP-ÑÝÉËÁ: %s"
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "ðÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÐÒÏÓÔÒÁÎÓÔ× ÉÍÅÎ..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "ðÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ×..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "îÅÔ ÔÁËÏÇÏ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "óÏÚÄÁÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË: "
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÄÏÌÖÅÎ ÉÍÅÔØ ÉÍÑ."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÓÏÚÄÁÎ."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, c-format
 msgid "Rename mailbox %s to: "
 msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË %s ×: "
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, c-format
 msgid "Rename failed: %s"
 msgstr "îÅ ÕÄÁÌÏÓØ ÐÅÒÅÉÍÅÎÏ×ÁÔØ: %s"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 msgid "Mailbox renamed."
 msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÐÅÒÅÉÍÅÎÏ×ÁÎ."
 
@@ -1430,140 +2026,137 @@ msgstr "
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "ëÒÉÔÉÞÅÓËÁÑ ÏÛÉÂËÁ.  óÂÏÊ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ÓÞÅÔÞÉËÁ ÓÏÏÂÝÅÎÉÊ!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "úÁËÒÙÔÉÅ ÓÏÅÄÉÎÅÎÉÑ Ó ÓÅÒ×ÅÒÏÍ %s..."
 
 # "mutt ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ×ÅÒÓÉÀ ÐÒÏÔÏËÏÌÁ, ÉÓÐÏÌØÚÕÅÍÙÊ ÎÁ ÜÔÏÍ ÓÅÒ×ÅÒÅ"
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr ""
 "üÔÏÔ IMAP-ÓÅÒ×ÅÒ ÉÓÐÏÌØÚÕÅÔ ÕÓÔÁÒÅ×ÛÉÊ ÐÒÏÔÏËÏÌ. Mutt ÎÅ ÓÍÏÖÅÔ ÒÁÂÏÔÁÔØ Ó "
 "ÎÉÍ."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
-msgstr "ðÏÌÕÞÅÎ ÎÅÐÒÅÄ×ÉÄÅÎÎÙÊ ÏÔ×ÅÔ Ó ÓÅÒ×ÅÒÁ: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
+msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÂÅÚÏÐÁÓÎÏÅ TLS-ÓÏÅÄÉÎÅÎÉÅ?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "îÅ ÕÄÁÌÏÓØ ÕÓÔÁÎÏ×ÉÔØ TLS-ÓÏÅÄÉÎÅÎÉÅ"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "÷ÙÂÉÒÁÅÔÓÑ %s..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "îÅ ÕÄÁÌÏÓØ ÄÏÂÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ × IMAP-ÑÝÉË ÎÁ ÜÔÏÍ ÓÅÒ×ÅÒÅ!"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "óÏÚÄÁÔØ %s?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "%d ÓÏÏÂÝÅÎÉÊ ÐÏÍÅÞÁÀÔÓÑ ËÁË ÕÄÁÌÅÎÎÙÅ..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "îÅ ÕÄÁÌÏÓØ ÏÞÉÓÔÉÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "óÏÈÒÁÎÅÎÉÅ ÆÌÁÇÏ× ÓÏÓÔÏÑÎÉÑ ÓÏÏÂÝÅÎÉÊ... [%d ÉÚ %d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "õÄÁÌÅÎÉÅ ÓÏÏÂÝÅÎÉÊ Ó ÓÅÒ×ÅÒÁ..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ËÏÍÁÎÄÙ EXPUNGE"
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "ïÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ËÏÍÁÎÄÙ CLOSE"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "ðÏÄËÌÀÞÅÎÉÅ Ë %s..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "ïÔËÌÀÞÅÎÉÅ ÏÔ %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "ðÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÚÁÇÏÌÏ×ËÏ× ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÜÔÉÍ IMAP-ÓÅÒ×ÅÒÏÍ."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ %s"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "úÁÇÒÕÚËÁ ËÜÛÁ... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "ðÏÌÕÞÅÎÉÅ ÚÁÇÏÌÏ×ËÏ× ÓÏÏÂÝÅÎÉÊ... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "ðÏÌÕÞÅÎÉÅ ÓÏÏÂÝÅÎÉÑ..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 "îÕÍÅÒÁÃÉÑ ÓÏÏÂÝÅÎÉÊ ÉÚÍÅÎÉÌÁÓØ. ôÒÅÂÕÅÔÓÑ ÐÏ×ÔÏÒÎÏ ÏÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË."
 
 # ÉÌÉ "ÎÁ ÓÅÒ×ÅÒ" ÕÂÒÁÔØ??
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "óÏÏÂÝÅÎÉÅ ÚÁÇÒÕÖÁÅÔÓÑ ÎÁ ÓÅÒ×ÅÒ..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "%d ÓÏÏÂÝÅÎÉÊ ËÏÐÉÒÕÀÔÓÑ × %s..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "óÏÏÂÝÅÎÉÅ %d ËÏÐÉÒÕÅÔÓÑ × %s..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "ðÒÏÄÏÌÖÉÔØ?"
 
@@ -1572,122 +2165,122 @@ msgstr "
 msgid "Bad regexp: %s"
 msgstr "îÅËÏÒÒÅËÔÎÏÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ: %s"
 
-#: init.c:678
+#: init.c:644
 msgid "spam: no matching pattern"
 msgstr "ÓÐÁÍ: ÏÂÒÁÚÅÃ ÎÅ ÎÁÊÄÅÎ"
 
-#: init.c:680
+#: init.c:646
 msgid "nospam: no matching pattern"
 msgstr "ÎÅ ÓÐÁÍ: ÏÂÒÁÚÅÃ ÎÅ ÎÁÊÄÅÎ"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "ÐÓÅ×ÄÏÎÉÍ: ÏÔÓÕÔÓÔ×ÕÅÔ ÁÄÒÅÓ"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅËÏÒÒÅËÔÎÙÊ IDN '%s' × ÐÓÅ×ÄÏÎÉÍÅ '%s'.\n"
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÐÏÌÅ × ÚÁÇÏÌÏ×ËÅ"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ÍÅÔÏÄ ÓÏÒÔÉÒÏ×ËÉ"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): ÏÛÉÂËÁ × ÒÅÇÕÌÑÒÎÏÍ ×ÙÒÁÖÅÎÉÉ: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÁÑ ÐÅÒÅÍÅÎÎÁÑ"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "ÐÒÅÆÉËÓ ÎÅÄÏÐÕÓÔÉÍ ÐÒÉ ÓÂÒÏÓÅ ÚÎÁÞÅÎÉÊ"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "ÚÎÁÞÅÎÉÅ ÎÅÄÏÐÕÓÔÉÍÏ ÐÒÉ ÓÂÒÏÓÅ ÚÎÁÞÅÎÉÊ"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s: ÚÎÁÞÅÎÉÅ ÕÓÔÁÎÏ×ÌÅÎÏ"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s: ÚÎÁÞÅÎÉÅ ÎÅ ÏÐÒÅÄÅÌÅÎÏ"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ÔÉÐ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ"
 
-#: init.c:1589
+#: init.c:1555
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ."
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "ïÛÉÂËÁ × %s: ÓÔÒÏËÁ %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: ÏÛÉÂËÉ × %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: ÞÔÅÎÉÅ ÐÒÅÒ×ÁÎÏ ÉÚ-ÚÁ ÂÏÌØÛÏÇÏ ËÏÌÉÞÅÓÔ×Á ÏÛÉÂÏË × %s"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: ÏÛÉÂËÁ × %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: ÓÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "ïÛÉÂËÁ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "ÎÅ ÕÄÁÌÏÓØ ÏÐÒÅÄÅÌÉÔØ ÄÏÍÁÛÎÉÊ ËÁÔÁÌÏÇ"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "ÎÅ ÕÄÁÌÏÓØ ÏÐÒÅÄÅÌÉÔØ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
@@ -2148,400 +2741,409 @@ msgid "compose a new mail message"
 msgstr "ÓÏÚÄÁÔØ ÎÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "ÏÔËÒÙÔØ ÄÒÕÇÏÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË/ÆÁÊÌ"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "ÏÔËÒÙÔØ ÄÒÕÇÏÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË/ÆÁÊÌ × ÒÅÖÉÍÅ \"ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ\""
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "ÓÂÒÏÓÉÔØ Õ ÓÏÏÂÝÅÎÉÑ ÆÌÁÇ ÓÏÓÔÏÑÎÉÑ"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "ÕÄÁÌÉÔØ ÓÏÏÂÝÅÎÉÑ ÐÏ ÏÂÒÁÚÃÕ"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "ÚÁÂÒÁÔØ ÐÏÞÔÕ Ó IMAP-ÓÅÒ×ÅÒÁ"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "ÚÁÂÒÁÔØ ÐÏÞÔÕ Ó POP-ÓÅÒ×ÅÒÁ"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "ÐÅÒ×ÏÅ ÓÏÏÂÝÅÎÉÅ"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "ÐÏÓÌÅÄÎÅÅ ÓÏÏÂÝÅÎÉÅ"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "ÐÏËÁÚÙ×ÁÔØ ÔÏÌØËÏ ÓÏÏÂÝÅÎÉÑ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ÏÂÒÁÚÃÕ"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÑ: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "ÓÌÅÄÕÀÝÅÅ ÎÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "ÓÌÅÄÕÀÝÅÅ ÎÏ×ÏÅ ÉÌÉ ÎÅÐÒÏÞÉÔÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "ÓÌÅÄÕÀÝÁÑ ÐÏÄÄÉÓËÕÓÓÉÑ"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "ÓÌÅÄÕÀÝÁÑ ÄÉÓËÕÓÓÉÑ"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "ÓÌÅÄÕÀÝÅÅ ÎÅÕÄÁÌÅÎÎÏÅ ÓÏÏÂÝÅÎÉÅ"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "ÓÌÅÄÕÀÝÅÅ ÎÅÐÒÏÞÉÔÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "ÐÅÒÅÊÔÉ Ë ÒÏÄÉÔÅÌØÓËÏÍÕ ÓÏÏÂÝÅÎÉÀ ÄÉÓËÕÓÓÉÉ"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "ÐÒÅÄÙÄÕÝÁÑ ÄÉÓËÕÓÓÉÑ"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "ÐÒÅÄÙÄÕÝÁÑ ÐÏÄÄÉÓËÕÓÓÉÑ"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "ÐÒÅÄÙÄÕÝÅÅ ÎÅÕÄÁÌÅÎÎÏÅ ÓÏÏÂÝÅÎÉÅ"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "ÐÒÅÄÙÄÕÝÅÅ ÎÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "ÐÒÅÄÙÄÕÝÅÅ ÎÏ×ÏÅ ÉÌÉ ÎÅÐÒÏÞÉÔÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "ÐÒÅÄÙÄÕÝÅÅ ÎÅÐÒÏÞÉÔÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "ÐÏÍÅÔÉÔØ ÔÅËÕÝÕÀ ÄÉÓËÕÓÓÉÀ ËÁË ÐÒÏÞÉÔÁÎÎÕÀ"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "ÐÏÍÅÔÉÔØ ÔÅËÕÝÕÀ ÐÏÄÄÉÓËÕÓÓÉÀ ËÁË ÐÒÏÞÉÔÁÎÎÕÀ"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "ÕÓÔÁÎÏ×ÉÔØ ÆÌÁÇ ÓÏÓÔÏÑÎÉÑ ÄÌÑ ÓÏÏÂÝÅÎÉÑ"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "ÓÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "ÐÏÍÅÔÉÔØ ÓÏÏÂÝÅÎÉÑ ÐÏ ÏÂÒÁÚÃÕ"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "×ÏÓÓÔÁÎÏ×ÉÔØ ÓÏÏÂÝÅÎÉÑ ÐÏ ÏÂÒÁÚÃÕ"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "ÓÎÑÔØ ÐÏÍÅÔËÕ Ó ÓÏÏÂÝÅÎÉÊ ÐÏ ÏÂÒÁÚÃÕ"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "ÓÅÒÅÄÉÎÁ ÓÔÒÁÎÉÃÙ"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "ÓÌÅÄÕÀÝÁÑ ÚÁÐÉÓØ"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "×ÎÉÚ ÎÁ ÏÄÎÕ ÓÔÒÏËÕ"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "ÓÌÅÄÕÀÝÁÑ ÓÔÒÁÎÉÃÁ"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "ËÏÎÅÃ ÓÏÏÂÝÅÎÉÑ"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "ÒÁÚÒÅÛÉÔØ/ÚÁÐÒÅÔÉÔØ ÏÔÏÂÒÁÖÅÎÉÅ ÃÉÔÉÒÕÅÍÏÇÏ ÔÅËÓÔÁ"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "ÐÒÏÐÕÓÔÉÔØ ÃÉÔÉÒÕÅÍÙÊ ÔÅËÓÔ"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "× ÎÁÞÁÌÏ ÓÏÏÂÝÅÎÉÑ"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "ÐÅÒÅÄÁÔØ ÓÏÏÂÝÅÎÉÅ/×ÌÏÖÅÎÉÅ ×ÎÅÛÎÅÊ ÐÒÏÇÒÁÍÍÅ"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "ÐÒÅÄÙÄÕÝÁÑ ÚÁÐÉÓØ"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "××ÅÒÈ ÎÁ ÏÄÎÕ ÓÔÒÏËÕ"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "ÐÒÅÄÙÄÕÝÁÑ ÓÔÒÁÎÉÃÁ"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "ÎÁÐÅÞÁÔÁÔØ ÔÅËÕÝÕÀ ÚÁÐÉÓØ"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "ÚÁÐÒÏÓÉÔØ ÁÄÒÅÓÁ Õ ×ÎÅÛÎÅÊ ÐÒÏÇÒÁÍÍÙ"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "ÄÏÂÁ×ÉÔØ ÒÅÚÕÌØÔÁÔÙ ÎÏ×ÏÇÏ ÚÁÐÒÏÓÁ Ë ÔÅËÕÝÉÍ ÒÅÚÕÌØÔÁÔÁÍ"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "ÓÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ É ×ÙÊÔÉ"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "ÐÒÏÄÏÌÖÉÔØ ÏÔÌÏÖÅÎÎÏÅ ÓÏÏÂÝÅÎÉÅ"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "ÏÞÉÓÔÉÔØ É ÐÅÒÅÒÉÓÏ×ÁÔØ ÜËÒÁÎ"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{×ÎÕÔÒÅÎÎÉÊ}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 msgid "rename the current mailbox (IMAP only)"
 msgstr "ÐÅÒÅÉÍÅÎÏ×ÁÔØ ÔÅËÕÝÉÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË (ÔÏÌØËÏ IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "ÏÔ×ÅÔÉÔØ ÎÁ ÓÏÏÂÝÅÎÉÅ"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ÔÅËÕÝÅÅ ÓÏÏÂÝÅÎÉÅ × ËÁÞÅÓÔ×Å ÛÁÂÌÏÎÁ ÄÌÑ ÎÏ×ÏÇÏ"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "ÓÏÈÒÁÎÉÔØ ÓÏÏÂÝÅÎÉÅ/×ÌÏÖÅÎÉÅ × ÆÁÊÌ"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "ÐÏÉÓË ÐÏ ÏÂÒÁÚÃÕ"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "ÏÂÒÁÔÎÙÊ ÐÏÉÓË ÐÏ ÏÂÒÁÚÃÕ"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "ÐÏÉÓË ÓÌÅÄÕÀÝÅÇÏ ÓÏ×ÐÁÄÅÎÉÑ"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "ÐÏÉÓË ÐÒÅÄÙÄÕÝÅÇÏ ÓÏ×ÐÁÄÅÎÉÑ"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "ÕÓÔÁÎÏ×ÉÔØ/ÓÂÒÏÓÉÔØ ÒÅÖÉÍ ×ÙÄÅÌÅÎÉÑ ÏÂÒÁÚÃÁ Ã×ÅÔÏÍ"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "ÚÁÐÕÓÔÉÔØ ×ÎÅÛÎÀÀ ÐÒÏÇÒÁÍÍÕ"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "ÓÏÒÔÉÒÏ×ÁÔØ ÓÏÏÂÝÅÎÉÑ"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "ÓÏÒÔÉÒÏ×ÁÔØ ÓÏÏÂÝÅÎÉÑ × ÏÂÒÁÔÎÏÍ ÐÏÒÑÄËÅ"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "ÐÏÍÅÔÉÔØ ÔÅËÕÝÕÀ ÚÁÐÉÓØ"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "ÐÒÉÍÅÎÉÔØ ÓÌÅÄÕÀÝÕÀ ÆÕÎËÃÉÀ Ë ÐÏÍÅÞÅÎÎÙÍ ÓÏÏÂÝÅÎÉÑÍ"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 msgid "apply next function ONLY to tagged messages"
 msgstr "×ÙÐÏÌÎÉÔØ ÏÐÅÒÁÃÉÀ ôïìøëï ÄÌÑ ÐÏÍÅÞÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "ÐÏÍÅÔÉÔØ ÔÅËÕÝÕÀ ÐÏÄÄÉÓËÕÓÓÉÀ"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "ÐÏÍÅÔÉÔØ ÔÅËÕÝÕÀ ÄÉÓËÕÓÓÉÀ"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "ÕÓÔÁÎÏ×ÉÔØ/ÓÂÒÏÓÉÔØ ÆÌÁÇ 'ÎÏ×ÏÅ' ÄÌÑ ÓÏÏÂÝÅÎÉÑ"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "ÒÁÚÒÅÛÉÔØ/ÚÁÐÒÅÔÉÔØ ÐÅÒÅÚÁÐÉÓØ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr ""
 "ÐÅÒÅËÌÀÞÉÔØÓÑ ÍÅÖÄÕ ÒÅÖÉÍÁÍÉ ÐÒÏÓÍÏÔÒÁ ×ÓÅÈ ÆÁÊÌÏ× É ÐÒÏÓÍÏÔÒÁ ÐÏÞÔÏ×ÙÈ "
 "ÑÝÉËÏ×"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "ÎÁÞÁÌÏ ÓÔÒÁÎÉÃÙ"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "×ÏÓÓÔÁÎÏ×ÉÔØ ÔÅËÕÝÕÀ ÚÁÐÉÓØ"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "×ÏÓÓÔÁÎÏ×ÉÔØ ×ÓÅ ÓÏÏÂÝÅÎÉÑ × ÄÉÓËÕÓÓÉÉ"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "×ÏÓÓÔÁÎÏ×ÉÔØ ×ÓÅ ÓÏÏÂÝÅÎÉÑ × ÐÏÄÄÉÓËÕÓÓÉÉ"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "×Ù×ÅÓÔÉ ÎÏÍÅÒ ×ÅÒÓÉÉ Mutt É ÄÁÔÕ"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "ÐÒÏÓÍÏÔÒÅÔØ ×ÌÏÖÅÎÉÅ, ÉÓÐÏÌØÚÕÑ ÐÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ mailcap"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "ÐÏËÁÚÁÔØ ×ÌÏÖÅÎÉÑ"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "ÐÏËÁÚÁÔØ ËÏÄ ÎÁÖÁÔÏÊ ËÌÁ×ÉÛÉ"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "ÐÏËÁÚÁÔØ ÔÅËÕÝÉÊ ÛÁÂÌÏÎ ÏÇÒÁÎÉÞÅÎÉÑ"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "Ó×ÅÒÎÕÔØ/ÒÁÚ×ÅÒÎÕÔØ ÔÅËÕÝÕÀ ÄÉÓËÕÓÓÉÀ"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "Ó×ÅÒÎÕÔØ/ÒÁÚ×ÅÒÎÕÔØ ×ÓÅ ÄÉÓËÕÓÓÉÉ"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "×ÌÏÖÉÔØ ÏÔËÒÙÔÙÊ PGP-ËÌÀÞ"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "×Ù×ÅÓÔÉ ÐÁÒÁÍÅÔÒÙ PGP"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "ÏÔÐÒÁ×ÉÔØ ÏÔËÒÙÔÙÊ PGP-ËÌÀÞ"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "ÐÒÏ×ÅÒÉÔØ ÏÔËÒÙÔÙÊ PGP-ËÌÀÞ"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "ÐÏËÁÚÁÔØ ÉÄÅÎÔÉÆÉËÁÔÏÒ ×ÌÁÄÅÌØÃÁ ËÌÀÞÁ"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "ÐÒÏ×ÅÒÉÔØ PGP-ÓÏÏÂÝÅÎÉÅ × ÔÅËÓÔÏ×ÏÍ ÆÏÒÍÁÔÅ"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÓÏÚÄÁÎÎÕÀ ÃÅÐÏÞËÕ"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "äÏÂÁ×ÉÔØ remailer × ÃÅÐÏÞËÕ"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "÷ÓÔÁ×ÉÔØ remailer × ÃÅÐÏÞËÕ"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "õÄÁÌÉÔØ remailer ÉÚ ÃÅÐÏÞËÉ"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "÷ÙÂÒÁÔØ ÐÒÅÄÙÄÕÝÉÊ ÜÌÅÍÅÎÔ × ÃÅÐÏÞËÅ"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "÷ÙÂÒÁÔØ ÓÌÅÄÕÀÝÉÊ ÜÌÅÍÅÎÔ × ÃÅÐÏÞËÅ"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "ÐÏÓÌÁÔØ ÓÏÏÂÝÅÎÉÅ ÞÅÒÅÚ ÃÅÐÏÞËÕ remailer"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "ÓÏÚÄÁÔØ ÒÁÓÛÉÆÒÏ×ÁÎÎÕÀ ËÏÐÉÀ É ÕÄÁÌÉÔØ ÏÒÉÇÉÎÁÌ"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "ÓÏÚÄÁÔØ ÒÁÓÛÉÆÒÏ×ÁÎÎÕÀ ËÏÐÉÀ"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "ÕÄÁÌÉÔØ ÆÒÁÚÙ-ÐÁÒÏÌÉ ÉÚ ÐÁÍÑÔÉ"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "ÉÚ×ÌÅÞØ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÏÔËÒÙÔÙÅ ËÌÀÞÉ"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "×Ù×ÅÓÔÉ ÐÁÒÁÍÅÔÒÙ S/MIME"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr "ðÅÒÅÐÏÌÎÅÎÉÅ -- ÎÅ ÕÄÁÌÏÓØ ×ÙÄÅÌÉÔØ ÐÁÍÑÔØ!"
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "îÅÈ×ÁÔËÁ ÐÁÍÑÔÉ!"
 
@@ -2568,12 +3170,13 @@ msgstr ""
 "ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ××ÅÄÉÔÅ `mutt -vv'.\n"
 
 #: main.c:61
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2620,6 +3223,7 @@ msgstr ""
 "   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n"
 
 #: main.c:99
+#, fuzzy
 msgid ""
 "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
@@ -2627,6 +3231,7 @@ msgid ""
 "[...]\n"
 "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
 "       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
 "[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
@@ -2637,6 +3242,52 @@ msgid ""
 "  -a <file>\tattach a file to the message\n"
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"ÚÁÐÕÓË: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"ÐÁÒÁÍÅÔÒÙ:\n"
+"  -A <alias>\tÒÁÓËÒÙÔØ ÄÁÎÎÙÊ ÐÓÅ×ÄÏÎÉÍ\n"
+"  -a <file>\t×ÌÏÖÉÔØ ÆÁÊÌ × ÓÏÏÂÝÅÎÉÅ\n"
+"  -b <address>\tÕËÁÚÁÔØ blind carbon-copy (BCC) ÁÄÒÅÓ\n"
+"  -c <address>\tÕËÁÚÁÔØ carbon-copy (CC) ÁÄÒÅÓ\n"
+"  -e <command>\tÕËÁÚÁÔØ ËÏÍÁÎÄÕ, ËÏÔÏÒÁÑ ÂÕÄÅÔ ×ÙÐÏÌÎÅÎÁ ÐÏÓÌÅ "
+"ÉÎÉÃÉÁÌÉÚÁÃÉÉ\n"
+"  -f <file>\tÕËÁÚÁÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË ÄÌÑ ÒÁÂÏÔÙ\n"
+"  -F <file>\tÕËÁÚÁÔØ ÁÌØÔÅÒÎÁÔÉ×ÎÙÊ muttrc\n"
+"  -H <file>\tÕËÁÚÁÔØ ÆÁÊÌ, ÓÏÄÅÒÖÁÝÉÊ ÛÁÂÌÏÎ ÚÁÇÏÌÏ×ËÁ É ÔÅÌÁ ÐÉÓØÍÁ\n"
+"  -i <file>\tÕËÁÚÁÔØ ÆÁÊÌ ÄÌÑ ×ÓÔÁ×ËÉ × ÔÅÌÏ ÐÉÓØÍÁ\n"
+"  -m <ÔÉÐ>\tÕËÁÚÁÔØ ÔÉÐ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ ÐÏ ÕÍÏÌÞÁÎÉÀ\n"
+"  -n\t\tÚÁÐÒÅÔÉÔØ ÞÔÅÎÉÅ ÓÉÓÔÅÍÎÏÇÏ Muttrc\n"
+"  -p\t\tÐÒÏÄÏÌÖÉÔØ ÏÔÌÏÖÅÎÎÏÅ ÓÏÏÂÝÅÎÉÅ\n"
+"  -Q <ÉÍÑ>\t×Ù×ÅÓÔÉ ÚÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÉ\n"
+"  -R\t\tÏÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË × ÒÅÖÉÍÅ \"ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ\"\n"
+"  -s <ÔÅÍÁ>\tÕËÁÚÁÔØ ÔÅÍÕ ÓÏÏÂÝÅÎÉÑ (ÄÏÌÖÎÁ ÂÙÔØ × ËÁ×ÙÞËÁÈ, ÅÓÌÉ "
+"ÐÒÉÓÕÔÓÔ×ÕÀÔ ÐÒÏÂÅÌÙ)\n"
+"  -v\t\t×Ù×ÅÓÔÉ ÎÏÍÅÒ ×ÅÒÓÉÉ É ÐÁÒÁÍÅÔÒÙ ËÏÍÐÉÌÑÃÉÉ\n"
+"  -x\t\tÜÍÕÌÉÒÏ×ÁÔØ ÒÅÖÉÍ ÐÏÓÙÌËÉ ËÏÍÁÎÄÙ mailx\n"
+"  -y\t\t×ÙÂÒÁÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË ÉÚ ÓÐÉÓËÁ `mailboxes'\n"
+"  -z\t\t×ÙÊÔÉ ÎÅÍÅÄÌÅÎÎÏ ÅÓÌÉ × ÐÏÞÔÏ×ÏÍ ÑÝÉËÅ ÏÔÓÕÔÓÔ×ÕÅÔ ÎÏ×ÁÑ ÐÏÞÔÁ\n"
+"  -Z\t\tÏÔËÒÙÔØ ÐÅÒ×ÙÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË Ó ÎÏ×ÏÊ ÐÏÞÔÏÊ, ×ÙÊÔÉ ÎÅÍÅÄÌÅÎÎÏ ÅÓÌÉ "
+"ÔÁËÏ×ÁÑ ÏÔÓÕÔÓÔ×ÕÅÔ\n"
+"  -h\t\tÔÅËÓÔ ÜÔÏÊ ÐÏÄÓËÁÚËÉ"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
+#, fuzzy
+msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2692,7 +3343,7 @@ msgstr ""
 "ÔÁËÏ×ÁÑ ÏÔÓÕÔÓÔ×ÕÅÔ\n"
 "  -h\t\tÔÅËÓÔ ÜÔÏÊ ÐÏÄÓËÁÚËÉ"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2700,47 +3351,47 @@ msgstr ""
 "\n"
 "ðÁÒÁÍÅÔÒÙ ËÏÍÐÉÌÑÃÉÉ:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÔÅÒÍÉÎÁÌÁ."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "ïÔÌÁÄËÁ ÎÁ ÕÒÏ×ÎÅ %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "óÉÍ×ÏÌ DEBUG ÎÅ ÂÙÌ ÏÐÒÅÄÅÌÅÎ ÐÒÉ ËÏÍÐÉÌÑÃÉÉ.  éÇÎÏÒÉÒÕÅÔÓÑ.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "ëÁÔÁÌÏÇ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ.  óÏÚÄÁÔØ?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ %s: %s"
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "áÄÒÅÓÁÔÙ ÎÅ ÕËÁÚÁÎÙ.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: ÎÅ ÕÄÁÌÏÓØ ×ÌÏÖÉÔØ ÆÁÊÌ.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "îÅÔ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× Ó ÎÏ×ÏÊ ÐÏÞÔÏÊ."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "îÅ ÏÐÒÅÄÅÌÅÎÏ ÎÉ ÏÄÎÏÇÏ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ ÓÏ ×ÈÏÄÑÝÉÍÉ ÐÉÓØÍÁÍÉ."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÐÕÓÔ."
 
@@ -2757,11 +3408,11 @@ msgstr "
 msgid "Mailbox was corrupted!"
 msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÂÙÌ ÐÏ×ÒÅÖÄÅÎ!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "ëÒÉÔÉÞÅÓËÁÑ ÏÛÉÂËÁ!  îÅ ÕÄÁÌÏÓØ ÚÁÎÏ×Ï ÏÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "îÅ ÕÄÁÌÏÓØ ÚÁÂÌÏËÉÒÏ×ÁÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË!"
 
@@ -2769,11 +3420,11 @@ msgstr "
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "sync: ÐÏÞÔÏ×ÙÊ ÑÝÉË ÉÚÍÅÎÅÎ, ÎÏ ÉÚÍÅÎÅÎÎÙÅ ÓÏÏÂÝÅÎÉÑ ÏÔÓÕÔÓÔ×ÕÀÔ!"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "úÁÐÉÓØ... %d (%d%%)"
@@ -2781,186 +3432,148 @@ msgstr "
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "óÏÈÒÁÎÅÎÉÅ ÉÚÍÅÎÅÎÉÊ..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "úÁÐÉÓØ ÎÅ ÕÄÁÌÁÓØ!  îÅÐÏÌÎÙÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË ÓÏÈÒÁÎÅÎ × %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "îÅ ÕÄÁÌÏÓØ ÚÁÎÏ×Ï ÏÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "ðÏ×ÔÏÒÎÏÅ ÏÔËÒÙÔÉÅ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "ðÅÒÅÊÔÉ Ë: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "îÅ×ÅÒÎÙÊ ÉÎÄÅËÓ."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "úÁÐÉÓÉ ÏÔÓÕÔÓÔ×ÕÀÔ."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "äÁÌØÎÅÊÛÁÑ ÐÒÏËÒÕÔËÁ ÎÅ×ÏÚÍÏÖÎÁ."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "äÁÌØÎÅÊÛÁÑ ÐÒÏËÒÕÔËÁ ÎÅ×ÏÚÍÏÖÎÁ."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "÷Ù ÕÖÅ ÎÁ ÐÏÓÌÅÄÎÅÊ ÓÔÒÁÎÉÃÅ."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "÷Ù ÕÖÅ ÎÁ ÐÅÒ×ÏÊ ÓÔÒÁÎÉÃÅ."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "ðÅÒ×ÁÑ ÚÁÐÉÓØ ÕÖÅ ÎÁ ÜËÒÁÎÅ."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "ðÏÓÌÅÄÎÑÑ ÚÁÐÉÓØ ÕÖÅ ÎÁ ÜËÒÁÎÅ."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "÷Ù ÕÖÅ ÎÁ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "÷Ù ÕÖÅ ÎÁ ÐÅÒ×ÏÊ ÚÁÐÉÓÉ."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "ðÏÉÓË: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "ïÂÒÁÔÎÙÊ ÐÏÉÓË: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "îÅÔ ÏÂÒÁÚÃÁ ÐÏÉÓËÁ."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "îÅ ÎÁÊÄÅÎÏ."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "îÅÔ ÏÔÍÅÞÅÎÎÙÈ ÚÁÐÉÓÅÊ."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "÷ ÜÔÏÍ ÍÅÎÀ ÐÏÉÓË ÎÅ ÒÅÁÌÉÚÏ×ÁÎ."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "äÌÑ ÄÉÁÌÏÇÏ× ÐÅÒÅÈÏÄ ÐÏ ÎÏÍÅÒÕ ÓÏÏÂÝÅÎÉÑ ÎÅ ÒÅÁÌÉÚÏ×ÁÎ."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "÷ÏÚÍÏÖÎÏÓÔØ ÐÏÍÅÔËÉ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "þÉÔÁÅÔÓÑ %s... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): ÎÅ ÕÄÁÌÏÓØ ÕÓÔÁÎÏ×ÉÔØ ×ÒÅÍÑ ÆÁÊÌÁ"
 
-#: muttlib.c:846
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "õËÁÚÁÎÎÙÊ ÆÁÊÌ -- ÜÔÏ ËÁÔÁÌÏÇ. óÏÈÒÁÎÉÔØ × ÎÅÍ?[(y)ÄÁ, (n)ÎÅÔ, (a)×ÓÅ]"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr "yna"
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "õËÁÚÁÎÎÙÊ ÆÁÊÌ -- ÜÔÏ ËÁÔÁÌÏÇ. óÏÈÒÁÎÉÔØ × ÎÅÍ?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "éÍÑ ÆÁÊÌÁ × ËÁÔÁÌÏÇÅ: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "æÁÊÌ ÓÕÝÅÓÔ×ÕÅÔ, (o)ÐÅÒÅÐÉÓÁÔØ, (a)ÄÏÂÁ×ÉÔØ, (Ó)ÏÔËÁÚ?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "oac"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "úÁÐÉÓØ ÓÏÏÂÝÅÎÉÊ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ POP-ÓÅÒ×ÅÒÏÍ."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÞÔÏ×ÙÍ ÑÝÉËÏÍ!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "äÏÂÁ×ÉÔØ ÓÏÏÂÝÅÎÉÑ Ë %s?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "óÏÅÄÉÎÅÎÉÅ Ó %s ÚÁËÒÙÔÏ"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL-ÐÒÏÔÏËÏÌ ÎÅÄÏÓÔÕÐÅÎ."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "ëÏÍÁÎÄÁ, ÐÒÅÄÛÅÓÔ×ÕÀÝÁÑ ÓÏÅÄÉÎÅÎÉÀ, ÚÁ×ÅÒÛÉÌÁÓØ Ó ÏÛÉÂËÏÊ."
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "ïÛÉÂËÁ ÐÒÉ ×ÚÁÉÍÏÄÅÊÓÔ×ÉÉ Ó %s (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "îÅËÏÒÒÅËÔÎÙÊ IDN \"%s\"."
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "ïÐÒÅÄÅÌÑÅÔÓÑ ÁÄÒÅÓ ÓÅÒ×ÅÒÁ %s..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "îÅ ÕÄÁÌÏÓØ ÏÐÒÅÄÅÌÉÔØ ÁÄÒÅÓ ÓÅÒ×ÅÒÁ \"%s\""
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÓÏÅÄÉÎÅÎÉÅ Ó %s..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "îÅ ÕÄÁÌÏÓØ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ Ó %s (%s)."
@@ -2992,7 +3605,8 @@ msgstr "
 msgid "SSL failed: %s"
 msgstr "îÅ ÕÄÁÌÏÓØ ÕÓÔÁÎÏ×ÉÔØ SSL-ÓÏÅÄÉÎÅÎÉÅ: %s"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÌÕÞÉÔØ ÓÅÒÔÉÆÉËÁÔ ÓÅÒ×ÅÒÁ"
 
@@ -3001,87 +3615,207 @@ msgstr "
 msgid "SSL connection using %s (%s)"
 msgstr "SSL-ÓÏÅÄÉÎÅÎÉÅ ÕÓÔÁÎÏ×ÌÅÎÏ; ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ %s (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "îÅÉÚ×ÅÓÔÎÏ"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[ÏÛÉÂËÁ ×ÙÞÉÓÌÅÎÉÊ]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[ÎÅÄÏÐÕÓÔÉÍÁÑ ÄÁÔÁ]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "óÅÒÔÉÆÉËÁÔ ×ÓÅ ÅÝÅ ÎÅÄÅÊÓÔ×ÉÔÅÌÅÎ"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "óÒÏË ÄÅÊÓÔ×ÉÑ ÓÅÒÔÉÆÉËÁÔÁ ÉÓÔÅË"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "äÁÎÎÙÊ ÓÅÒÔÉÆÉËÁÔ ÐÒÉÎÁÄÌÅÖÉÔ:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "äÁÎÎÙÊ ÓÅÒÔÉÆÉËÁÔ ÂÙÌ ×ÙÄÁÎ:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "äÁÎÎÙÊ ÓÅÒÔÉÆÉËÁÔ ÄÅÊÓÔ×ÉÔÅÌÅÎ"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   Ó %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     ÐÏ %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "ïÔÐÅÞÁÔÏË ÐÁÌØÃÁ: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "ðÒÏ×ÅÒËÁ SSL-ÓÅÒÔÉÆÉËÁÔÁ"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)ÏÔ×ÅÒÇÎÕÔØ, (o)ÐÒÉÎÑÔØ, (a)ÐÒÉÎÑÔØ É ÓÏÈÒÁÎÉÔØ"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "roa"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)ÏÔ×ÅÒÇÎÕÔØ, (o)ÐÒÉÎÑÔØ"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "ro"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "÷ÙÈÏÄ "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ ÕÄÁÌÏÓØ ÓÏÈÒÁÎÉÔØ ÓÅÒÔÉÆÉËÁÔ"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "óÅÒÔÉÆÉËÁÔ ÓÏÈÒÁÎÅÎ"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "SSL-ÓÏÅÄÉÎÅÎÉÅ ÕÓÔÁÎÏ×ÌÅÎÏ; ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "óÅÒÔÉÆÉËÁÔ ÓÏÈÒÁÎÅÎ"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÔÅÒÍÉÎÁÌÁ."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "ïÔÐÅÞÁÔÏË ÐÁÌØÃÁ: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "ïÔÐÅÞÁÔÏË ÐÁÌØÃÁ: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "óÅÒÔÉÆÉËÁÔ ×ÓÅ ÅÝÅ ÎÅÄÅÊÓÔ×ÉÔÅÌÅÎ"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "óÒÏË ÄÅÊÓÔ×ÉÑ ÓÅÒÔÉÆÉËÁÔÁ ÉÓÔÅË"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "óÒÏË ÄÅÊÓÔ×ÉÑ ÓÅÒÔÉÆÉËÁÔÁ ÉÓÔÅË"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "óÅÒÔÉÆÉËÁÔ ×ÓÅ ÅÝÅ ÎÅÄÅÊÓÔ×ÉÔÅÌÅÎ"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "ðÒÏ×ÅÒËÁ SSL-ÓÅÒÔÉÆÉËÁÔÁ"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÓÏÅÄÉÎÅÎÉÅ Ó %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "ïÛÉÂËÁ ÐÒÉ ×ÚÁÉÍÏÄÅÊÓÔ×ÉÉ Ó %s (%s)"
+
+#: muttlib.c:910
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "õËÁÚÁÎÎÙÊ ÆÁÊÌ -- ÜÔÏ ËÁÔÁÌÏÇ. óÏÈÒÁÎÉÔØ × ÎÅÍ?[(y)ÄÁ, (n)ÎÅÔ, (a)×ÓÅ]"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr "yna"
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "õËÁÚÁÎÎÙÊ ÆÁÊÌ -- ÜÔÏ ËÁÔÁÌÏÇ. óÏÈÒÁÎÉÔØ × ÎÅÍ?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "éÍÑ ÆÁÊÌÁ × ËÁÔÁÌÏÇÅ: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "æÁÊÌ ÓÕÝÅÓÔ×ÕÅÔ, (o)ÐÅÒÅÐÉÓÁÔØ, (a)ÄÏÂÁ×ÉÔØ, (Ó)ÏÔËÁÚ?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "oac"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "úÁÐÉÓØ ÓÏÏÂÝÅÎÉÊ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ POP-ÓÅÒ×ÅÒÏÍ."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "äÏÂÁ×ÉÔØ ÓÏÏÂÝÅÎÉÑ Ë %s?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÞÔÏ×ÙÍ ÑÝÉËÏÍ!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3159,7 +3893,7 @@ msgstr "
 msgid "%d kept, %d moved, %d deleted."
 msgstr "ïÓÔÁ×ÌÅÎÏ: %d, ÐÅÒÅÍÅÝÅÎÏ: %d, ÕÄÁÌÅÎÏ: %d."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "ïÓÔÁ×ÌÅÎÏ: %d, ÕÄÁÌÅÎÏ: %d."
@@ -3178,15 +3912,15 @@ msgstr "
 msgid "Mailbox is marked unwritable. %s"
 msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÓÔÁÌ ÄÏÓÔÕÐÅÎ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÏÂÎÏ×ÌÅÎ."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÓÏÏÂÝÅÎÉÑ"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr "ðÅÒÅÐÏÌÎÅÎÉÅ -- ÎÅ ÕÄÁÌÏÓØ ×ÙÄÅÌÉÔØ ÐÁÍÑÔØ."
 
@@ -3194,48 +3928,48 @@ msgstr "
 msgid "Not available in this menu."
 msgstr "÷ ÜÔÏÍ ÍÅÎÀ ÎÅÄÏÓÔÕÐÎÏ."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "îÁÚÁÄ"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "÷ÐÅÒÅÄ"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "÷ÌÏÖÅÎÉÑ"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "óÌÅÄÕÀÝÉÊ"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "ðÏÓÌÅÄÎÑÑ ÓÔÒÏËÁ ÓÏÏÂÝÅÎÉÑ ÕÖÅ ÎÁ ÜËÒÁÎÅ."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "ðÅÒ×ÁÑ ÓÔÒÏËÁ ÓÏÏÂÝÅÎÉÑ ÕÖÅ ÎÁ ÜËÒÁÎÅ."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "ïÂÒÁÔÎÙÊ ÐÏÉÓË: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "ðÏÉÓË: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "ðÏÄÓËÁÚËÁ ÕÖÅ ÐÅÒÅÄ ×ÁÍÉ."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "îÅÔ ÂÏÌØÛÅ ÃÉÔÉÒÕÅÍÏÇÏ ÔÅËÓÔÁ."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "úÁ ÃÉÔÉÒÕÅÍÙÍ ÔÅËÓÔÏÍ ÂÏÌØÛÅ ÎÅÔ ÏÓÎÏ×ÎÏÇÏ ÔÅËÓÔÁ."
 
@@ -3302,27 +4036,27 @@ msgstr "
 msgid "error: unknown op %d (report this error)."
 msgstr "ÏÛÉÂËÁ: ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÅÒÁÃÉÑ %d (ÓÏÏÂÝÉÔÅ Ï ÜÔÏÊ ÏÛÉÂËÅ)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "ïÂÒÁÚÅà ÐÏÉÓËÁ ËÏÍÐÉÌÉÒÕÅÔÓÑ..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "éÓÐÏÌÎÑÅÔÓÑ ËÏÍÁÎÄÁ ÄÌÑ ÐÏÄÈÏÄÑÝÉÈ ÓÏÏÂÝÅÎÉÊ..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "îÉ ÏÄÎÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÐÏÄÈÏÄÉÔ ÐÏÄ ËÒÉÔÅÒÉÊ."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "ðÏÉÓË ÄÏÛÅÌ ÄÏ ËÏÎÃÁ, ÎÅ ÎÁÊÄÑ ÎÉÞÅÇÏ ÐÏÄÈÏÄÑÝÅÇÏ"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "ðÏÉÓË ÄÏÛÅÌ ÄÏ ÎÁÞÁÌÁ, ÎÅ ÎÁÊÄÑ ÎÉÞÅÇÏ ÐÏÄÈÏÄÑÝÅÇÏ"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "ðÏÉÓË ÐÒÅÒ×ÁÎ."
 
@@ -3334,11 +4068,11 @@ msgstr "
 msgid "PGP passphrase forgotten."
 msgstr "PGP ÆÒÁÚÁ-ÐÁÒÏÌØ ÕÄÁÌÅÎÁ ÉÚ ÐÁÍÑÔÉ."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- ïÛÉÂËÁ: ÎÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ PGP-ÐÏÄÐÒÏÃÅÓÓ! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3346,52 +4080,23 @@ msgstr ""
 "[-- ëÏÎÅà ×Ù×ÏÄÁ ÐÒÏÇÒÁÍÍÙ PGP --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- îÁÞÁÌÏ PGP-ÓÏÏÂÝÅÎÉÑ --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- îÁÞÁÌÏ ÂÌÏËÁ ÏÔËÒÙÔÏÇÏ PGP-ËÌÀÞÁ --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- îÁÞÁÌÏ ÓÏÏÂÝÅÎÉÑ, ÐÏÄÐÉÓÁÎÎÏÇÏ PGP --]\n"
-"\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- ëÏÎÅà PGP-ÓÏÏÂÝÅÎÉÑ --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- ëÏÎÅà ÂÌÏËÁ ÏÔËÒÙÔÏÇÏ PGP-ËÌÀÞÁ --]\n"
-
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- ëÏÎÅà ÓÏÏÂÝÅÎÉÑ, ÐÏÄÐÉÓÁÎÎÏÇÏ PGP --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "îÅ ÕÄÁÌÏÓØ ÓËÏÐÉÒÏ×ÁÔØ ÓÏÏÂÝÅÎÉÅ"
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- ïÛÉÂËÁ: ÎÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ ÎÁÞÁÌÏ PGP-ÓÏÏÂÝÅÎÉÑ! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "PGP-ÐÏÄÐÉÓØ ÐÒÏ×ÅÒÅÎÁ."
 
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr ""
 "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ. óÏÏÂÝÉÔÅ Ï ÎÅÊ ÐÏ ÁÄÒÅÓÕ <roessler@does-not-exist.org>."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3399,70 +4104,36 @@ msgstr ""
 "[-- ïÛÉÂËÁ: ÎÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ PGP-ÐÏÄÐÒÏÃÅÓÓ! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- ïÛÉÂËÁ: ÆÏÒÍÁÔ ÓÏÏÂÝÅÎÉÑ ÎÅ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÓÔÁÎÄÁÒÔÕ PGP/MIME --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- ïÛÉÂËÁ: ÎÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- îÁÞÁÌÏ ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ PGP/MIME --]\n"
-"\n"
-
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- ëÏÎÅà ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ PGP/MIME --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "òÁÓÛÉÆÒÏ×ÁÔØ ÎÅ ÕÄÁÌÁÓØ."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ PGP-ÐÏÄÐÒÏÃÅÓÓ!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ ËÌÀÞ \"%s\" ÄÌÑ %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "÷×ÅÄÉÔÅ ÉÄÅÎÔÉÆÉËÁÔÏÒ ËÌÀÞÁ ÄÌÑ %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "îÅ ÕÄÁÌÏÓØ ÚÁÐÕÓÔÉÔØ ÐÒÏÇÒÁÍÍÕ PGP"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "PGP (e)ÛÉÆÒ, (s)ÐÏÄÐÉÓØ, (a)ÐÏÄÐÉÓØ ËÁË, (b)ÏÂÁ, %s, (c)ÏÔËÁÚÁÔØÓÑ? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr "PGP/M(i)ME"
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr "(i)PGP/ÔÅËÓÔ"
 
-#: pgp.c:1499
+#: pgp.c:1543
 msgid "esabifc"
 msgstr "esabifc"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "ðÏÄÐÉÓÁÔØ ËÁË: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "ðÏÌÕÞÅÎÉÅ PGP-ËÌÀÞÁ..."
@@ -3472,16 +4143,6 @@ msgid "All matching keys are expired, revoked, or disabled."
 msgstr ""
 "÷ÓÅ ÐÏÄÈÏÄÑÝÉÅ ËÌÀÞÉ ÐÏÍÅÞÅÎÙ ËÁË ÐÒÏÓÒÏÞÅÎÎÙÅ, ÏÔÏÚ×ÁÎÎÙÅ ÉÌÉ ÚÁÐÒÅÝ£ÎÎÙÅ."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "÷ÙÂÒÁÔØ "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "ôÅÓÔ ËÌÀÞÁ "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3496,40 +4157,6 @@ msgstr "PGP-
 msgid "Can't open /dev/null"
 msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "éÄÅÎÔÉÆÉËÁÔÏÒ ËÌÀÞÁ: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "üÔÏÔ ËÌÀÞ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ: ÐÒÏÓÒÏÞÅÎ, ÚÁÐÒÅÝÅÎ ÉÌÉ ÏÔÏÚ×ÁÎ."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "ID ÐÒÏÓÒÏÞÅÎ, ÚÁÐÒÅÝÅÎ ÉÌÉ ÏÔÏÚ×ÁÎ."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "óÔÅÐÅÎØ ÄÏ×ÅÒÉÑ ÄÌÑ ID ÎÅ ÏÐÒÅÄÅÌÅÎÁ."
-
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "ID ÎÅÄÅÊÓÔ×ÉÔÅÌÅÎ."
-
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "ID ÄÅÊÓÔ×ÉÔÅÌÅÎ ÔÏÌØËÏ ÞÁÓÔÉÞÎÏ."
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s éÓÐÏÌØÚÏ×ÁÔØ ÜÔÏÔ ËÌÀÞ?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "÷×ÅÄÉÔÅ, ÐÏÖÁÌÕÊÓÔÁ, ÉÄÅÎÔÉÆÉËÁÔÏÒ ËÌÀÞÁ: "
@@ -3543,11 +4170,6 @@ msgstr "
 msgid "PGP Key %s."
 msgstr "PGP-ËÌÀÞ %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "ðÏÉÓË ËÌÀÞÅÊ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÈ \"%s\"..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3605,7 +4227,7 @@ msgstr "
 msgid "%s [%d of %d messages read]"
 msgstr "%s [ÓÏÏÂÝÅÎÉÊ ÐÒÏÞÉÔÁÎÏ: %d ÉÚ %d]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "óÅÒ×ÅÒ ÚÁËÒÙÌ ÓÏÅÄÉÎÅÎÉÅ!"
 
@@ -3635,15 +4257,15 @@ msgstr "
 msgid "Error connecting to server: %s"
 msgstr "ïÛÉÂËÁ ÐÒÉ ÕÓÔÁÎÏ×ÌÅÎÉÉ ÓÏÅÄÉÎÅÎÉÑ: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "úÁËÒÙÔÉÅ ÓÏÅÄÉÎÅÎÉÑ Ó POP-ÓÅÒ×ÅÒÏÍ..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "ðÒÏ×ÅÒËÁ ÎÏÍÅÒÏ× ÓÏÏÂÝÅÎÉÊ..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "óÏÅÄÉÎÅÎÉÅ ÐÏÔÅÒÑÎÏ. õÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ ÐÏ×ÔÏÒÎÏ?"
 
@@ -4015,35 +4637,35 @@ msgstr "
 msgid "Sending in background."
 msgstr "óÏÏÂÝÅÎÉÅ ÏÔÐÒÁ×ÌÑÅÔÓÑ × ÆÏÎÏ×ÏÍ ÒÅÖÉÍÅ."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "ðÁÒÁÍÅÔÒ boundary ÎÅ ÎÁÊÄÅÎ! (óÏÏÂÝÉÔÅ Ï ÜÔÏÊ ÏÛÉÂËÅ)"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s ÂÏÌØÛÅ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÆÁÊÌÏÍ."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ %s"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "óÏÏÂÝÅÎÉÅ ÏÔÐÒÁ×ÉÔØ ÎÅ ÕÄÁÌÏÓØ, ÐÒÏÃÅÓÓ-ÐÏÔÏÍÏË ×ÅÒÎÕÌ %d (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "òÅÚÕÌØÔÁÔ ÒÁÂÏÔÙ ÐÒÏÇÒÁÍÍÙ ÄÏÓÔÁ×ËÉ ÐÏÞÔÙ"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "îÅËÏÒÒÅËÔÎÙÊ IDN %s ÐÒÉ ÐÏÄÇÏÔÏ×ËÅ Resent-From."
@@ -4158,7 +4780,7 @@ msgstr "
 msgid "No output from OpenSSL..."
 msgstr "îÅÔ ×Ù×ÏÄÁ ÏÔ ÐÒÏÇÒÁÍÍÙ OpenSSL..."
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4166,19 +4788,19 @@ msgstr ""
 "[-- ëÏÎÅà ×Ù×ÏÄÁ ÐÒÏÇÒÁÍÍÙ OpenSSL --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- ïÛÉÂËÁ: ÎÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ OpenSSL-ÐÏÄÐÒÏÃÅÓÓ! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- îÁÞÁÌÏ ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ S/MIME --]\n"
 
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- îÁÞÁÌÏ ÄÁÎÎÙÈ, ÐÏÄÐÉÓÁÎÎÙÈ × ÆÏÒÍÁÔÅ S/MIME --]\n"
 
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4186,7 +4808,7 @@ msgstr ""
 "\n"
 "[-- ëÏÎÅà ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ S/MIME --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4194,27 +4816,27 @@ msgstr ""
 "\n"
 "[-- ëÏÎÅà ÄÁÎÎÙÈ, ÐÏÄÐÉÓÁÎÎÙÈ × ÆÏÒÍÁÔÅ S/MIME --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
 "S/MIME (e)ÛÉÆÒ, (s)ÐÏÄÐÉÓØ, (w)ÛÉÆÒ ËÁË, (a)ÐÏÄÐÉÓØ ËÁË, (b)ÏÂÁ, (c)ÏÔËÁÚ? "
 
-#: smime.c:1936
+#: smime.c:1945
 msgid "eswabfc"
 msgstr "eswabfc"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, (f)ÏÔËÁÚÁÔØÓÑ? "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345f"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÄÐÉÓÁÔØ: ÎÅ ÕËÁÚÁÎ ËÌÀÞ. éÓÐÏÌØÚÕÊÔÅ \"ÐÏÄÐÉÓÁÔØ ËÁË\"."
 
@@ -4237,3 +4859,9 @@ msgstr "
 #: thread.c:1095
 msgid "Parent message is not available."
 msgstr "òÏÄÉÔÅÌØÓËÏÅ ÓÏÏÂÝÅÎÉÅ ÎÅÄÏÓÔÕÐÎÏ."
+
+#~ msgid "Unexpected response received from server: %s"
+#~ msgstr "ðÏÌÕÞÅÎ ÎÅÐÒÅÄ×ÉÄÅÎÎÙÊ ÏÔ×ÅÔ Ó ÓÅÒ×ÅÒÁ: %s"
+
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "îÅ ÕÄÁÌÏÓØ ÄÏÂÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ × IMAP-ÑÝÉË ÎÁ ÜÔÏÍ ÓÅÒ×ÅÒÅ!"
diff --git a/po/sk.po b/po/sk.po
index 483f330c3..01ab4355e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.95.6i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 1999-07-29 00:00+0100\n"
 "Last-Translator: Miroslav Vasko <vasko@ies.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -14,26 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: account.c:148
+#: account.c:154
 #, fuzzy, c-format
 msgid "Username at %s: "
 msgstr "Premenova» na: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Heslo pre %s@%s: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Koniec"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Zma¾"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Odma¾"
 
@@ -42,9 +42,9 @@ msgid "Select"
 msgstr "Oznaèi»"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Pomoc"
 
@@ -96,176 +96,176 @@ msgstr "Ulo
 msgid "Alias added."
 msgstr "Pridal som zástupcu."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Nena¹iel som ¹ablónu názvu, pokraèova»?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Zostavovacia polo¾ka mailcap-u vy¾aduje %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, fuzzy, c-format
 msgid "Error running \"%s\"!"
 msgstr "Chyba pri analýze adresy!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Nemo¾no otvori» súbor na analýzu hlavièiek."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Nemo¾no otvori» súbor na odstránenie hlavièiek."
 
-#: attach.c:183
+#: attach.c:184
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "Nemo¾no otvori» súbor na analýzu hlavièiek."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "®iadna zostavovacia polo¾ka mailcap-u pre %s, vytváram prázdny súbor."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Vstupná polo¾ka mailcap-u vy¾aduje %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "®iadna vstupná polo¾ka mailcap-u pre %s"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "®iadna polo¾ka mailcap-u nebola nájdená. Prezerám ako text."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME typ nie je definovaný. Nemo¾no zobrazi» pripojené dáta."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Nemo¾no vytvori» filter."
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Nemo¾no vytvori» filter"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Chyba zápisu!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Neviem, ako vytlaèi» dáta!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Zmena adresára"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Maska"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s nie je adresár."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Schránky [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, fuzzy, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Adresár [%s], maska súboru: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Adresár [%s], maska súboru: %s"
 
-#: browser.c:524
+#: browser.c:525
 #, fuzzy
 msgid "Can't attach a directory!"
 msgstr "Nemo¾no prezera» adresár"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Maske nevyhovujú ¾iadne súbory"
 
-#: browser.c:860
+#: browser.c:861
 #, fuzzy
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Táto operácia nie je podporovaná pre PGP správy."
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Táto operácia nie je podporovaná pre PGP správy."
 
-#: browser.c:901
+#: browser.c:902
 #, fuzzy
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Táto operácia nie je podporovaná pre PGP správy."
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr ""
 
-#: browser.c:923
+#: browser.c:924
 #, fuzzy
 msgid "Mailbox deleted."
 msgstr "Bola zistená sluèka v makre."
 
-#: browser.c:929
+#: browser.c:930
 #, fuzzy
 msgid "Mailbox not deleted."
 msgstr "Po¹ta nebola odoslaná."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Zmeò adresár na: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Chyba pri èítaní adresára."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Maska súborov: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Spätné triedenie podµa (d)átumu, zn(a)kov, (z)-veµkosti, (n)etriedi»? "
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Triedenie podµa (d)átumu, zn(a)kov, (z)-veµkosti, alebo (n)etriedi»? "
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "dazn"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Nové meno súboru: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Nemo¾no prezera» adresár"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Chyba pri prezeraní súboru"
 
@@ -333,7 +333,7 @@ msgstr "
 msgid "Verify PGP signature?"
 msgstr "Overi» PGP podpis?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Nemo¾no vytvori» doèasný súbor!"
 
@@ -347,120 +347,120 @@ msgstr "Nemo
 msgid "Could not copy message"
 msgstr "Nemo¾no posla» správu."
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr ""
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr ""
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr ""
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr ""
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr ""
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Príkaz: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Presmerova» správu do: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Presmerova» oznaèené správy do: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Chyba pri analýze adresy!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Presmerova» správu do %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Presmerova» správy do %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Message not bounced."
 msgstr "Správa bola presmerovaná."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Messages not bounced."
 msgstr "Správy boli presmerované."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Správa bola presmerovaná."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Správy boli presmerované."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 #, fuzzy
 msgid "Can't create filter process"
 msgstr "Nemo¾no vytvori» filter"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Po¹li do rúry príkazu: "
 
-#: commands.c:482
+#: commands.c:483
 #, fuzzy
 msgid "No printing command has been defined."
 msgstr "cykluj medzi schránkami s príchodzími správami"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Vytlaèi» správu?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Vytlaèi» oznaèené správy?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Správa bola vytlaèené"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Správy boli vytlaèené"
 
-#: commands.c:498
+#: commands.c:499
 #, fuzzy
 msgid "Message could not be printed"
 msgstr "Správa bola vytlaèené"
 
-#: commands.c:499
+#: commands.c:500
 #, fuzzy
 msgid "Messages could not be printed"
 msgstr "Správy boli vytlaèené"
 
-#: commands.c:508
+#: commands.c:509
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -469,7 +469,7 @@ msgstr ""
 "Spät.tried.(d)át/(f)-od/p(r)í/(s)-pred/k(o)mu/(t)-re»/(u)-ne/(z)-veµ/(c)-"
 "skóre: "
 
-#: commands.c:509
+#: commands.c:510
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
@@ -477,74 +477,74 @@ msgid ""
 msgstr ""
 "Tried. (d)át/(f)-od/p(r)í/(s)-pred/k(o)mu/(t)-re»/(u)-ne/(z)-veµ/(c)-skó:"
 
-#: commands.c:510
+#: commands.c:511
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzc"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Príkaz shell-u: "
 
-#: commands.c:709
+#: commands.c:716
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "%s%s do schránky"
 
-#: commands.c:710
+#: commands.c:717
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "%s%s do schránky"
 
-#: commands.c:711
+#: commands.c:718
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "%s%s do schránky"
 
-#: commands.c:712
+#: commands.c:719
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "%s%s do schránky"
 
-#: commands.c:713
+#: commands.c:720
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
 msgstr "%s%s do schránky"
 
-#: commands.c:713
+#: commands.c:720
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
 msgstr "%s%s do schránky"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " oznaèené"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Kopírujem do %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr ""
 
-#: commands.c:919
+#: commands.c:936
 #, fuzzy, c-format
 msgid "Content-Type changed to %s."
 msgstr "Spájam sa s %s..."
 
-#: commands.c:924
+#: commands.c:941
 #, fuzzy, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Spájam sa s %s..."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr ""
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr ""
 
@@ -640,103 +640,681 @@ msgstr ""
 msgid "Attaching selected files..."
 msgstr ""
 
-#: compose.c:695
+#: compose.c:696
 #, fuzzy, c-format
 msgid "Unable to attach %s!"
 msgstr "Nemo¾no pripoji»!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Otvor schránku, z ktorej sa bude pridáva» správa"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "V tejto zlo¾ke nie sú správy."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Oznaète správy, ktoré chcete prida»!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Nemo¾no pripoji»!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr ""
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr ""
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr ""
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Neplatné kódovanie."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Ulo¾i» kópiu tejto správy?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Premenova» na: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "Nemo¾no zisti» stav: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Nový súbor: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type je formy základ/pod"
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Neznáme Content-Type %s"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "Nemo¾no vytvori» súbor %s"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "Nemo¾no vytvori» pripojené dáta"
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "Odlo¾i» túto správu?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "Zapísa» správu do schránky"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Zapisujem správu do %s ..."
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "Správa bola zapísaná."
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "chyba vo vzore na: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "chyba vo vzore na: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "chyba vo vzore na: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "chyba vo vzore na: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "chyba vo vzore na: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "chyba vo vzore na: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "chyba vo vzore na: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "chyba vo vzore na: %s"
+
+#: crypt-gpgme.c:993
+msgid "Warning: One of the keys has been revoked\n"
+msgstr ""
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+msgid "Warning: At least one certification key has expired\n"
+msgstr ""
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "Táto správa nie je viditeµná."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+msgid "Fingerprint: "
+msgstr ""
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Chyba pri posielaní správy."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Chyba v príkazovom riadku: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Koniec dát s podpisom PGP/MIME --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Chyba: neoèakávaný koniec súboru! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- ZAÈIATOK SPRÁVY PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- ZAÈIATOK BLOKU VEREJNÉHO K¥ÚÈA PGP --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- ZAÈIATOK SPRÁVY PODPÍSANEJ S PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+#, fuzzy
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- KONIEC SPRÁVY PGP --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- KONIEC BLOKU VEREJNÉHO K¥ÚÈA PGP --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+#, fuzzy
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- KONIEC SPRÁVY PODPÍSANEJ S PGP --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Chyba: nemo¾no nájs» zaèiatok správy PGP! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Chyba: poru¹ení správa PGP/MIME! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Chyba: nemo¾no vytvori» doèasný súbor! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Nasledujúce dáta sú ¹ifrované pomocou PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Nasledujúce dáta sú ¹ifrované pomocou PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Koniec dát ¹ifrovaných pomocou PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+#, fuzzy
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Koniec dát ¹ifrovaných pomocou PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr ""
+"[-- Nasledujúce dáta sú podpísané s PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Nasledujúce dáta sú ¹ifrované pomocou PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Koniec dát s podpisom PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Koniec dát ¹ifrovaných pomocou PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Neplatný mesiac: %s"
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Neplatný mesiac: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Neplatný mesiac: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Za¹ifruj"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+msgid "certification"
+msgstr ""
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "ID kµúèa: 0x%s"
+
+#: crypt-gpgme.c:3099
+msgid "[Revoked]"
+msgstr ""
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Koniec  "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Nemo¾no vytvori» doèasný súbor"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Spájam sa s %s..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Pripájam sa na %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "ID kµúèa: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "Prihlasovanie zlyhalo."
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+msgid "All matching keys are marked expired/revoked."
+msgstr ""
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Koniec  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Oznaèi»  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Skontrolova» kµúè  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "Kµúèe PGP zhodujúce sa "
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "Kµúèe PGP zhodujúce sa "
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "Kµúèe PGP zhodujúce sa "
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "Kµúèe PGP zhodujúce sa "
+
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr ""
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr ""
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr ""
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+#, fuzzy
+msgid "ID is not valid."
+msgstr "Toto ID nie je dôveryhodné."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+#, fuzzy
+msgid "ID is only marginally valid."
+msgstr "Toto ID je dôveryhodné iba nepatrne."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, fuzzy, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Chcete to naozaj pou¾i»?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr ""
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "Pou¾i» ID kµúèa = \"%s\" pre %s?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Zadajte ID kµúèa pre %s: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr ""
+"(e)-¹ifr, (s)-podp, podp (a)ko, o(b)e, (i)nline, alebo (f)-zabudnú» na to? "
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "eswabf"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr ""
+"(e)-¹ifr, (s)-podp, podp (a)ko, o(b)e, (i)nline, alebo (f)-zabudnú» na to? "
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "eswabf"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Podpí¹ ako: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Nemo¾no otvori» súbor na analýzu hlavièiek."
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -753,29 +1331,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "Fráza hesla PGP bola zabudnutá."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Spú¹»am PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Po¹ta nebola odoslaná."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
@@ -786,14 +1364,14 @@ msgid ""
 "\n"
 msgstr "Chyba: multipart/signed nemá protokol."
 
-#: crypt.c:824
+#: crypt.c:823
 #, fuzzy, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr "Chyba: multipart/signed nemá protokol."
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -801,7 +1379,7 @@ msgid ""
 msgstr ""
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
@@ -810,13 +1388,13 @@ msgstr ""
 "[-- Nasledujúce dáta sú podpísané s PGP/MIME --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
 
-#: crypt.c:888
+#: crypt.c:886
 #, fuzzy
 msgid ""
 "\n"
@@ -825,230 +1403,260 @@ msgstr ""
 "\n"
 "[-- Koniec dát s podpisom PGP/MIME --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Spú¹»am PGP..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "y-áno"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "nie"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Opusti» Mutt?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "neznáma chyba"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Stlaète kláves pre pokraèovanie..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " ('?' pre zoznam): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Nie je otvorená ¾iadna schránka."
 
-#: curs_main.c:52
+#: curs_main.c:53
 #, fuzzy
 msgid "There are no messages."
 msgstr "Vlákno obsahuje neèítané správy."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "Schránka je iba na èítanie."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 #, fuzzy
 msgid "Function not permitted in attach-message mode."
 msgstr "%c: nepodporovaný v tomto móde"
 
-#: curs_main.c:55
+#: curs_main.c:56
 #, fuzzy
 msgid "No visible messages."
 msgstr "®iadne nové správy"
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Nemo¾no prepnú» zápis na schránke urèenej iba na èítanie!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Zmeny v zlo¾ke budú zapísané, keï ho opustíte."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Zmeny v zlo¾ke nebudú zapísané."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Koniec"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Ulo¾i»"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Napí¹"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Odpovedz"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Skupina"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Schránka bola zmenená zvonku. Príznaky mô¾u by» nesprávne."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "V tejto schránke je nová po¹ta."
 
-#: curs_main.c:503
+#: curs_main.c:504
 #, fuzzy
 msgid "Mailbox was externally modified."
 msgstr "Schránka bola zmenená zvonku. Príznaky mô¾u by» nesprávne."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "®iadne oznaèené správy."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 #, fuzzy
 msgid "Nothing to do."
 msgstr "Spájam sa s %s..."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Skoèi» na správu: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "Parameter musí by» èíslo správy."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Táto správa nie je viditeµná."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Neplatné èíslo správy."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Zmaza» správy zodpovedajúce: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "®iadny limitovací vzor nie je aktívny."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Limit: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Limituj správy zodpovedajúce: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Ukonèi» Mutt?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Oznaè správy zodpovedajúce: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Odma¾ správy zodpovedajúce: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Odznaè správy zodpovedajúce: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Otvor schránku iba na èítanie"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Otvor schránku"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s nie je schránka"
 
-#: curs_main.c:1165
+#: curs_main.c:1176
 msgid "Exit Mutt without saving?"
 msgstr "Ukonèi» Mutt bey ulo¾enia?"
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "Vláknenie nie je povolené."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "ulo¾i» túto správu a posla» neskôr"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Ste na poslednej správe."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "®iadne odmazané správy."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Ste na prvej správe."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "Vyhµadávanie pokraèuje z vrchu."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "Vyhµadávanie pokraèuje zo spodu."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "®iadne nové správy"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "®iadne neèítané správy"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " v tomto obmedzenom zobrazení"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 #, fuzzy
 msgid "Can't change 'important' flag on POP server."
 msgstr "Vymazávam správy zo serveru..."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "®iadne ïaµ¹ie vlákna."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Ste na prvom vlákne."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "Vláknenie nie je povolené."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "Vlákno obsahuje neèítané správy."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 #, fuzzy
 msgid "Can't edit message on POP server."
 msgstr "Vymazávam správy zo serveru..."
@@ -1184,75 +1792,75 @@ msgstr "Nastavi
 msgid "Clear flag"
 msgstr "Vymaza» príznak"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- Chyba: Nemo¾no zobrazi» ¾iadnu èas» z Multipart/Alternative! --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Príloha #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Typ: %s/%s, Kódovanie: %s, Veµkos»: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Autoprezeranie pou¾itím %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Vyvolávam príkaz na automatické prezeranie: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, fuzzy, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- na %s --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Chyba pri automatickom prezeraní (stderr) %s --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Chyba: message/external-body nemá vyplnený parameter access-type --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Príloha %s/%s "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(veµkos» %s bytov) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "bola zmazaná --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- na %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, fuzzy, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- na %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, fuzzy, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Príloha %s/%s "
 
-#: handler.c:1696
+#: handler.c:1712
 #, fuzzy
 msgid ""
 "[-- and the indicated external source has --]\n"
@@ -1262,36 +1870,36 @@ msgstr ""
 "[-- a oznaèenému externému zdroju --]\n"
 "[-- vypr¹ala platnos». --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 "[-- Príloha %s/%s nie je vlo¾ená v správe, --]\n"
 "[-- a oznaèený typ prístupu %s nie je podporovaný --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Chyba: multipart/signed nemá protokol."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Chyba: multipart/encrypted nemá vyplnený parameter protokolu!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Nemo¾no otvori» doèasný súbor!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s nie je podporovaný "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(pou¾ite '%s' na prezeranie tejto èasti)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(potrebujem 'view-attachments' priradené na klávesu!)"
 
@@ -1398,51 +2006,51 @@ msgstr "Vyber
 msgid "SASL authentication failed."
 msgstr ""
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr ""
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 #, fuzzy
 msgid "Getting namespaces..."
 msgstr "Vyvolávam správu..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr ""
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 #, fuzzy
 msgid "No such folder"
 msgstr "%s: nenájdená farba"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 #, fuzzy
 msgid "Create mailbox: "
 msgstr "Otvor schránku"
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 #, fuzzy
 msgid "Mailbox must have a name."
 msgstr "Schránka nie je zmenená."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 #, fuzzy
 msgid "Mailbox created."
 msgstr "Bola zistená sluèka v makre."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Otvor schránku"
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "Prihlasovanie zlyhalo."
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "Bola zistená sluèka v makre."
@@ -1455,139 +2063,137 @@ msgstr "Bola zisten
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Fatálna chyba. Poèet správ nie je zosynchronizovaný!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, fuzzy, c-format
 msgid "Closing connection to %s..."
 msgstr "Zatváram spojenie s IMAP serverom..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Tento IMAP server je starý. Mutt s ním nevie pracova»."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr ""
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr ""
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+#, fuzzy
+msgid "Encrypted connection unavailable"
+msgstr "Zakódovaný kµúè sedenia"
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Vyberám %s..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 #, fuzzy
 msgid "Error opening mailbox"
 msgstr "Chyba pri zapisovaní do schránky!"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Nemo¾no pridáva» k IMAP schránkam na tomto serveri"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "Vytvori» %s?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, fuzzy, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Èítam %d nových správ (%d bytov)..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 #, fuzzy
 msgid "Expunge failed"
 msgstr "Prihlasovanie zlyhalo."
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Ukladám stavové príznaky správy... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Vymazávam správy zo serveru..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 #, fuzzy
 msgid "CLOSE failed"
 msgstr "Prihlasovanie zlyhalo."
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 #, fuzzy
 msgid "Bad mailbox name"
 msgstr "Otvor schránku"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, fuzzy, c-format
 msgid "Subscribing to %s..."
 msgstr "Kopírujem do %s..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, fuzzy, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Spájam sa s %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Nemo¾no získa» hlavièky z tejto verzie IMAP serveru."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, fuzzy, c-format
 msgid "Could not create temporary file %s"
 msgstr "Nemo¾no vytvori» doèasný súbor!"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Vyvolávam hlavièky správ... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Vyvolávam hlavièky správ... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Vyvolávam správu..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Odsúvam správu ..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, fuzzy, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Presúvam preèítané správy do %s..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, fuzzy, c-format
 msgid "Copying message %d to %s..."
 msgstr "Zapisujem správu do %s ..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 #, fuzzy
 msgid "Continue?"
 msgstr "(pokraèova»)\n"
@@ -1597,124 +2203,124 @@ msgstr "(pokra
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:678
+#: init.c:644
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "oznaèi» správy zodpovedajúce vzoru"
 
-#: init.c:680
+#: init.c:646
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "odznaèi» správy zodpovedajúce vzoru"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "zástupca: ¾iadna adresa"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "neplatná polo¾ka hlavièky"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: neznáma metóda triedenia"
 
-#: init.c:1169
+#: init.c:1135
 #, fuzzy, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default: chyba v regvýr: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: neznáma premenná"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "prefix je neplatný s vynulovaním"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "hodnota je neplatná s vynulovaním"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s je nastavené"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s je nenastavené"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: neplatný typ schránky"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: neplatná hodnota"
 
-#: init.c:1589
+#: init.c:1555
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s: neznáma hodnota"
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: neznáma hodnota"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Chyba v %s, riadok %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "zdroj: chyby v %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr ""
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "zdroj: chyba na %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "zdroj: príli¹ veµa argumentov"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: neznámy príkaz"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Chyba v príkazovom riadku: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "nemo¾no urèi» domáci adresár"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "nemo¾no urèi» meno pou¾ívateµa"
 
@@ -2189,414 +2795,423 @@ msgid "compose a new mail message"
 msgstr "zostavi» novú po¹tovú správu"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "otvori» odli¹nú zlo¾ku"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "otvori» odli¹nú zlo¾ku iba na èítanie"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "vymaza» stavový príznak zo správy"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "zmaza» správy zodpovedajúce vzorke"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 #, fuzzy
 msgid "force retrieval of mail from IMAP server"
 msgstr "vybra» po¹tu z POP serveru"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "vybra» po¹tu z POP serveru"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "presunú» sa na prvú správu"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "presunú» sa na poslednú správu"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "ukáza» iba správy zodpovedajúce vzorke"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Presmerova» oznaèené správy do: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "skoèi» na nasledovnú novú správu"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 #, fuzzy
 msgid "jump to the next new or unread message"
 msgstr "skoèi» na nasledujúcu neèítanú správu"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "skoèi» na ïaµ¹ie podvlákno"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "skoèi» na nasledujúce vlákno"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "presunú» sa na nasledujúcu odmazanú správu"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "skoèi» na nasledujúcu neèítanú správu"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 #, fuzzy
 msgid "jump to parent message in thread"
 msgstr "odmaza» v¹etky správy vo vlákne"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "skoèi» na predchádzajúce vlákno"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "skoèi» na predchádzajúce podvlákno"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 #, fuzzy
 msgid "move to the previous undeleted message"
 msgstr "presunú» sa na nasledujúcu odmazanú správu"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "skoèi» na predchádzajúcu novú správo"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 #, fuzzy
 msgid "jump to the previous new or unread message"
 msgstr "skoèi» na predchádzajúcu neèítanú správu"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "skoèi» na predchádzajúcu neèítanú správu"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "oznaèi» aktuálne vlákno ako èítané"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "oznaèi» aktuálne podvlákno ako èítané"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "nastavi» stavový príznak na správe"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "ulo¾i» zmeny do schránky"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "oznaèi» správy zodpovedajúce vzoru"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "odmaza» správy zodpovedajúce vzoru"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "odznaèi» správy zodpovedajúce vzoru"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "presunú» do stredu stránky"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "presunú» sa na ïaµ¹iu polo¾ku"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "rolova» o riadok dolu"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "presunú» sa na ïaµ¹iu stránku"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "skoèi» na koniec správy"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "prepnú» zobrazovanie citovaného textu"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "preskoèi» za citovaný text"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "skoèi» na zaèiatok správy"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "zre»azi» výstup do príkazu shell-u"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "presunú» sa na predchádzajúcu polo¾ku"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "rolova» o riadok hore"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "presunú» sa na predchádzajúcu stránku"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "tlaèi» aktuálnu polo¾ku"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "opýta» sa externého programu na adresy"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "prida» nové výsledky opýtania k teraj¹ím"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "ulo¾i» zmeny v schránke a ukonèi»"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "vyvola» odlo¾enú správu"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "vymaza» a prekresli» obrazovku"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{interné}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "zmaza» "
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "odpoveda» na správu"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 #, fuzzy
 msgid "use the current message as a template for a new one"
 msgstr "upravi» správu na znovu-odoslanie"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "ulo¾i» správu/prílohu do súboru"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "hµada» podµa regulérneho výrazu"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "hµada» podµa regulérneho výrazu dozadu"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "hµada» ïaµ¹í výskyt"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "hµada» ïaµ¹í výskyt v opaènom smere"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "prepnú» farby hµadaného výrazu"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "vyvola» príkaz v podriadenom shell-e"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "triedi» správy"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "triedi» správy v opaènom poradí"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "oznaèi» aktuálnu polo¾ku"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "pou¾i» ïaµ¹iu funkciu na oznaèené správy"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 #, fuzzy
 msgid "apply next function ONLY to tagged messages"
 msgstr "pou¾i» ïaµ¹iu funkciu na oznaèené správy"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "oznaèi» aktuálne podvlákno"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "oznaèi» akuálne vlákno"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "prepnú» príznak 'nová' na správe"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "prepnú» príznak mo¾nosti prepísania schránky"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "prepnú», èi prezera» schránky alebo v¹etky súbory"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "presunú» sa na zaèiatok stránky"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "odmaza» aktuálnu polo¾ku"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "odmaza» v¹etky správy vo vlákne"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "odmaza» v¹etky správy v podvlákne"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "zobrazi» verziu a dátum vytvorenia Mutt"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "zobrazi» prílohu pou¾ijúc polo¾ku mailcap-u, ak je to nevyhnutné"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "zobrazi» prílohy MIME"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr ""
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "zobrazi» práve aktívny limitovací vzor"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "zabaµ/rozbaµ aktuálne vlákno"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "zabaµ/rozbaµ v¹etky vlákna"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "prida» verejný kµúè PGP"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "zobrazi» mo¾nosti PGP"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "posla» verejný kµúè PGP po¹tou"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "overi» verejný kµúè PGP"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "zobrazi» ID pou¾ívateµa tohoto kµúèu"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr ""
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr ""
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 #, fuzzy
 msgid "Append a remailer to the chain"
 msgstr "zmaza» v¹etky znaky v riadku"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 #, fuzzy
 msgid "Insert a remailer into the chain"
 msgstr "zmaza» v¹etky znaky v riadku"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 #, fuzzy
 msgid "Delete a remailer from the chain"
 msgstr "zmaza» v¹etky znaky v riadku"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 #, fuzzy
 msgid "Select the previous element of the chain"
 msgstr "zmaza» v¹etky znaky v riadku"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 #, fuzzy
 msgid "Select the next element of the chain"
 msgstr "zmaza» v¹etky znaky v riadku"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr ""
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "urobi» de¹ifrovanú kópiu a vymaza»"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "urobi» de¹ifrovanú kópiu"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 #, fuzzy
 msgid "wipe passphrase(s) from memory"
 msgstr "vyma¾ frázu hesla PGP z pamäte"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 #, fuzzy
 msgid "extract supported public keys"
 msgstr "extrahuj verejné kµúèe PGP"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 #, fuzzy
 msgid "show S/MIME options"
 msgstr "zobrazi» mo¾nosti PGP"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr ""
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Nedostatok pamäte!"
 
@@ -2623,11 +3238,11 @@ msgstr ""
 #: main.c:61
 #, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2670,25 +3285,64 @@ msgstr ""
 "    programom; ak nie, napí¹te do Free Software Foundation, Inc.,\n"
 "    59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
 
-#: main.c:99
+#: main.c:99
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"pou¾itie: mutt [ -nRzZ ] [ -e <prík> ] [ -F <súb> ] [ -m <typ> ] [ -f "
+"<súb> ]\n"
+"       mutt [ -nx ] [ -e <prík> ] [ -a <súb> ] [ -F <súb> ] [ -H <súb> ] [ -"
+"i <súb> ] [ -s <predm> ] [ -b <adr> ] [ -c <adr> ] <adr> [ ... ]\n"
+"       mutt [ -n ] [ -e <prík> ] [ -F <súb> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"prepínaèe:\n"
+"  -a <súbor>\tpripoji» súbor do správy\n"
+"  -b <adresa>\tuvies» adresy pre slepé kópie (BCC)\n"
+"  -c <adresa>\tuvies» adresy pre kópie (CC)\n"
+"  -e <príkaz>\tuvies» príkaz, ktorý sa vykoná po inicializácii\n"
+"  -f <súbor>\tuvies», ktorá schránka sa bude èíta»\n"
+"  -F <súbor>\tuvies» alternatívny súbor muttrc\n"
+"  -H <súbor>\tuvies» súbor s návrhom, z ktorého sa preèíta hlavièka\n"
+"  -i <súbor>\tuvies» súbor, ktorý má Mutt vlo¾i» do odpovede\n"
+"  -m <typ>\tuvies» ¹tandardný typ schránky\n"
+"  -n\t\tspôsobuje, ¾e Mutt neèíta systémový súbor Muttrc\n"
+"  -p\t\tvyvola» a odlo¾enú správu\n"
+"  -R\t\totvori» schránku len na èítanie\n"
+"  -s <predm>\tuvies» predmet (musí by» v úvodzovkách, ak obsahuje medzery)\n"
+"  -v\t\tzobrazi» verziu a definície z èasu kompilácie\n"
+"  -x\t\tsimulova» mód posielania typický pre mailx\n"
+"  -y\t\tvybra» schránku uvedenú vo Va¹om zozname 'mailbox'\n"
+"  -z\t\tukonèi» okam¾ite, ak v schránke nie sú ¾iadne správy\n"
+"  -Z\t\totvori» prvú zlo¾ku s novými správami, okam¾ite skonèi», ak ¾iadne "
+"nie sú\n"
+"  -h\t\ttáto pomoc"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
 #, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-"<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-"[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-"[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
-"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
-"\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2736,7 +3390,7 @@ msgstr ""
 "nie sú\n"
 "  -h\t\ttáto pomoc"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2744,48 +3398,48 @@ msgstr ""
 "\n"
 "Nastavenia kompilácie:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Chyba pri inicializácii terminálu."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Ladenie na úrovni %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG nebol definovaný pri kompilácii. Ignorované.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr ""
 
-#: main.c:737
+#: main.c:750
 #, fuzzy, c-format
 msgid "Can't create %s: %s."
 msgstr "Nemo¾no vytvori» súbor %s"
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Neboli uvedení ¾iadni príjemcovia.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: neschopný pripoji» súbor.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "®iadna schránka s novými správami."
 
-#: main.c:897
+#: main.c:910
 #, fuzzy
 msgid "No incoming mailboxes defined."
 msgstr "cykluj medzi schránkami s príchodzími správami"
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "Schránka je prázdna."
 
@@ -2802,11 +3456,11 @@ msgstr "Schr
 msgid "Mailbox was corrupted!"
 msgstr "Schránka bola poru¹ená!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Fatálna chyba! Nemo¾no znovu otvori» schránku!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Nemo¾no uzamknú» schránku!"
 
@@ -2814,12 +3468,12 @@ msgstr "Nemo
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: schránka zmenená, ale ¾iadne zmenené správy! (oznámte túto chybu)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Zapisujem správy... %d (%d%%)"
@@ -2827,190 +3481,150 @@ msgstr "Zapisujem spr
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 #, fuzzy
 msgid "Committing changes..."
 msgstr "Kompilujem vyhµadávací vzor..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Zápis zlyhal! Schránka bola èiastoène ulo¾ená do %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Nemo¾no znovu otvori» schránku!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Znovuotváram schránku..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Skoè do: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Neplatné èíslo indexu."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "®iadne polo¾ky."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Nemô¾te rolova» ïalej dolu."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Nemô¾te rolova» ïalej hore."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Ste na poslednej stránke."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Ste na prvej stránke."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "Je zobrazená prvá polo¾ka."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "Je zobrazená posledná polo¾ka."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Ste na poslednej polo¾ke."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Ste na prvej polo¾ke."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Hµada»: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Hµada» spätne: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "®iadny vzor pre hµadanie."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Nenájdené."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "®iadne oznaèené polo¾ky."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "Hµadanie nie je implementované pre toto menu."
 
-#: menu.c:1005
+#: menu.c:1014
 #, fuzzy
 msgid "Jumping is not implemented for dialogs."
 msgstr "Hµadanie nie je implementované pre toto menu."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Oznaèovanie nie je podporované."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Èítam %s... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
-#: muttlib.c:846
-#, fuzzy
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Súbor je adresár, ulo¾i» v òom?"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr ""
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "Súbor je adresár, ulo¾i» v òom?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Súbor v adresári: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Súbor existuje, (o)-prepísa», prid(a)» alebo (c)-zru¹i»?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "oac"
-
-#: muttlib.c:1199
-#, fuzzy
-msgid "Can't save message to POP mailbox."
-msgstr "Zapísa» správu do schránky"
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s nie je schránka!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Prida» správy do %s?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, fuzzy, c-format
 msgid "Connection to %s closed"
 msgstr "Spájam sa s %s..."
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr ""
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr ""
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, fuzzy, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Pripájam sa na %s"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, fuzzy, c-format
 msgid "Looking up %s..."
 msgstr "Kopírujem do %s..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, fuzzy, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Nemo¾no nájs» adresu pre hostiteµa %s."
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Spájam sa s %s..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, fuzzy, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Nemo¾no otvori» %s"
@@ -3042,7 +3656,8 @@ msgstr ""
 msgid "SSL failed: %s"
 msgstr "Prihlasovanie zlyhalo."
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 #, fuzzy
 msgid "Unable to get certificate from peer"
 msgstr "nemo¾no urèi» domáci adresár"
@@ -3052,90 +3667,206 @@ msgstr "nemo
 msgid "SSL connection using %s (%s)"
 msgstr "Pripájam sa na %s"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 #, fuzzy
 msgid "Unknown"
 msgstr "neznáma chyba"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, fuzzy, c-format
 msgid "[unable to calculate]"
 msgstr "%s: súbor nemo¾no pripoji»"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 #, fuzzy
 msgid "[invalid date]"
 msgstr "%s: neplatná hodnota"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr ""
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr ""
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr ""
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr ""
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr ""
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr ""
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr ""
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr ""
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr ""
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 #, fuzzy
 msgid "roa"
 msgstr "oac"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr ""
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr ""
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Koniec  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr ""
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr ""
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "Pripájam sa na %s"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+msgid "Certificate is not X.509"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Chyba pri inicializácii terminálu."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:727
+#, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:732
+msgid "WARNING: Server certificate is not yet valid"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:737
+msgid "WARNING: Server certificate has expired"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:742
+msgid "WARNING: Server certificate has been revoked"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:755
+msgid "TLS/SSL Certificate check"
+msgstr ""
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Spájam sa s %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Pripájam sa na %s"
+
+#: muttlib.c:910
+#, fuzzy
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "Súbor je adresár, ulo¾i» v òom?"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr ""
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "Súbor je adresár, ulo¾i» v òom?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Súbor v adresári: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Súbor existuje, (o)-prepísa», prid(a)» alebo (c)-zru¹i»?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "oac"
+
+#: muttlib.c:1263
+#, fuzzy
+msgid "Can't save message to POP mailbox."
+msgstr "Zapísa» správu do schránky"
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Prida» správy do %s?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s nie je schránka!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3213,7 +3944,7 @@ msgstr "Schr
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d ostalo, %d presunutých, %d vymazaných."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d ostalo, %d vymazaných."
@@ -3232,17 +3963,17 @@ msgstr "Pou
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Schránka je oznaèená len na èítanie. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 #, fuzzy
 msgid "Mailbox checkpointed."
 msgstr "Bola zistená sluèka v makre."
 
-#: mx.c:1494
+#: mx.c:1499
 #, fuzzy
 msgid "Can't write message"
 msgstr "upravi» správu"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
@@ -3251,48 +3982,48 @@ msgstr ""
 msgid "Not available in this menu."
 msgstr "V tejto schránke je nová po¹ta."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "PredSt"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "Ïaµ¹St"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Pozri prílohu"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Ïaµ¹í"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Spodok správy je zobrazený."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Vrch správy je zobrazený."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Spätné hµadanie: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Hµada»: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "Pomoc sa akurát zobrazuje."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "Nie je ïaµ¹í citovaný text."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "®iadny ïaµ¹í necitovaný text za citátom."
 
@@ -3359,27 +4090,27 @@ msgstr "pr
 msgid "error: unknown op %d (report this error)."
 msgstr "chyba: neznámy operand %d (oznámte túto chybu)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Kompilujem vyhµadávací vzor..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Vykonávam príkaz na nájdených správach..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "®iadne správy nesplnili kritérium."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "Hµadanie narazilo na spodok bez nájdenia zhody"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "Hµadanie narazilo na vrchol bez nájdenia zhody"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Hµadanie bolo preru¹ené."
 
@@ -3391,11 +4122,11 @@ msgstr "Zadajte fr
 msgid "PGP passphrase forgotten."
 msgstr "Fráza hesla PGP bola zabudnutá."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Chyba: nemo¾no vytvori» podproces PGP! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3403,58 +4134,22 @@ msgstr ""
 "[-- Koniec výstupu PGP --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- ZAÈIATOK SPRÁVY PGP --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- ZAÈIATOK BLOKU VEREJNÉHO K¥ÚÈA PGP --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- ZAÈIATOK SPRÁVY PODPÍSANEJ S PGP --]\n"
-"\n"
-
-#: pgp.c:423
-#, fuzzy
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- KONIEC SPRÁVY PGP --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- KONIEC BLOKU VEREJNÉHO K¥ÚÈA PGP --]\n"
-
-#: pgp.c:427
+#: pgp.c:387 pgp.c:951
 #, fuzzy
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- KONIEC SPRÁVY PODPÍSANEJ S PGP --]\n"
+msgid "Could not decrypt PGP message"
+msgstr "Nemo¾no posla» správu."
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+msgid "PGP message successfully decrypted."
 msgstr ""
-"[-- Chyba: nemo¾no nájs» zaèiatok správy PGP! --]\n"
-"\n"
 
-#: pgp.c:704
+#: pgp.c:723
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Interná chyba. Informujte <roessler@does-not-exist.org>."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3462,75 +4157,38 @@ msgstr ""
 "[-- Chyba: nemo¾no vytvori» podproces PGP! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Chyba: poru¹ení správa PGP/MIME! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Chyba: nemo¾no vytvori» doèasný súbor! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- Nasledujúce dáta sú ¹ifrované pomocou PGP/MIME --]\n"
-"\n"
-
-#: pgp.c:915
+#: pgp.c:828
 #, fuzzy
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr ""
-"\n"
-"[-- Koniec dát ¹ifrovaných pomocou PGP/MIME --]\n"
+msgid "Decryption failed"
+msgstr "Prihlasovanie zlyhalo."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "Nemo¾no otvori» podproces PGP!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "Pou¾i» ID kµúèa = \"%s\" pre %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Zadajte ID kµúèa pre %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr ""
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr ""
 "(e)-¹ifr, (s)-podp, podp (a)ko, o(b)e, (i)nline, alebo (f)-zabudnú» na to? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1499
+#: pgp.c:1543
 #, fuzzy
 msgid "esabifc"
 msgstr "esabif"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Podpí¹ ako: "
-
 #: pgpinvoke.c:307
 #, fuzzy
 msgid "Fetching PGP key..."
@@ -3540,16 +4198,6 @@ msgstr "Vyvol
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr ""
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Oznaèi»  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Skontrolova» kµúè  "
-
 #: pgpkey.c:532
 #, fuzzy, c-format
 msgid "PGP keys matching <%s>."
@@ -3564,42 +4212,6 @@ msgstr "K
 msgid "Can't open /dev/null"
 msgstr "Nemo¾no otvori» /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Nemo¾no vytvori» doèasný súbor"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "ID kµúèa: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr ""
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr ""
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr ""
-
-#: pgpkey.c:619
-#, fuzzy
-msgid "ID is not valid."
-msgstr "Toto ID nie je dôveryhodné."
-
-#: pgpkey.c:622
-#, fuzzy
-msgid "ID is only marginally valid."
-msgstr "Toto ID je dôveryhodné iba nepatrne."
-
-#: pgpkey.c:626
-#, fuzzy, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Chcete to naozaj pou¾i»?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Prosím zadajte ID kµúèa: "
@@ -3614,11 +4226,6 @@ msgstr "Sp
 msgid "PGP Key %s."
 msgstr "PGP kµúè 0x%s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr ""
-
 #: pop.c:90 pop_lib.c:201
 #, fuzzy, c-format
 msgid "Command TOP is not supported by server."
@@ -3681,7 +4288,7 @@ msgstr "Chyba pri zapisovan
 msgid "%s [%d of %d messages read]"
 msgstr "%s [preèítaných správ: %d]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "Server uzavrel spojenie!"
 
@@ -3712,17 +4319,17 @@ msgstr "Vymaz
 msgid "Error connecting to server: %s"
 msgstr "Pripájam sa na %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 #, fuzzy
 msgid "Closing connection to POP server..."
 msgstr "Zatváram spojenie s IMAP serverom..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 #, fuzzy
 msgid "Verifying message indexes..."
 msgstr "Zapisujem správu do %s ..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 #, fuzzy
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Zatváram spojenie s IMAP serverom..."
@@ -4112,35 +4719,35 @@ msgstr "Spr
 msgid "Sending in background."
 msgstr ""
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Nenájdený parameter ohranièenia (boundary)! [ohláste túto chybu]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s u¾ viac neexistuje!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
 msgstr "%s nie je schránka"
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "Nemo¾no otvori» %s"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, fuzzy, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Chyba pri posielaní správy, dcérsky proces vrátil %d (%s).\n"
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr ""
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
@@ -4264,7 +4871,7 @@ msgstr "Nemo
 msgid "No output from OpenSSL..."
 msgstr ""
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"
@@ -4273,26 +4880,26 @@ msgstr ""
 "[-- Koniec výstupu PGP --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 #, fuzzy
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Chyba: nemo¾no vytvori» podproces PGP! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 #, fuzzy
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- Nasledujúce dáta sú ¹ifrované pomocou PGP/MIME --]\n"
 "\n"
 
-#: smime.c:1765
+#: smime.c:1767
 #, fuzzy
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- Nasledujúce dáta sú podpísané s PGP/MIME --]\n"
 "\n"
 
-#: smime.c:1829
+#: smime.c:1831
 #, fuzzy
 msgid ""
 "\n"
@@ -4301,7 +4908,7 @@ msgstr ""
 "\n"
 "[-- Koniec dát ¹ifrovaných pomocou PGP/MIME --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 #, fuzzy
 msgid ""
 "\n"
@@ -4310,28 +4917,28 @@ msgstr ""
 "\n"
 "[-- Koniec dát s podpisom PGP/MIME --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
 "(e)-¹ifr, (s)-podp, (w)-¹ifr s, podp (a)ko, o(b)e, alebo (f)-zabudnú» na to? "
 
-#: smime.c:1936
+#: smime.c:1945
 #, fuzzy
 msgid "eswabfc"
 msgstr "eswabf"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr ""
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
@@ -4357,6 +4964,9 @@ msgstr "T
 msgid "Parent message is not available."
 msgstr "Táto správa nie je viditeµná."
 
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Nemo¾no pridáva» k IMAP schránkam na tomto serveri"
+
 #, fuzzy
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "vytvori» zástupcu z odosielateµa správy"
@@ -4493,9 +5103,6 @@ msgstr "T
 #~ msgid "CRAM key for %s@%s: "
 #~ msgstr "Zadajte ID kµúèa pre %s: "
 
-#~ msgid "[-- Error: unexpected end of file! --]\n"
-#~ msgstr "[-- Chyba: neoèakávaný koniec súboru! --]\n"
-
 #~ msgid "Sending APPEND command ..."
 #~ msgstr "Posielam príkaz APPEND..."
 
@@ -4556,9 +5163,6 @@ msgstr "T
 #~ msgid "reserved"
 #~ msgstr "rezervované"
 
-#~ msgid "Encrypted Session Key"
-#~ msgstr "Zakódovaný kµúè sedenia"
-
 #~ msgid "Signature Packet"
 #~ msgstr "Blok podpisu"
 
diff --git a/po/sv.po b/po/sv.po
index f5173f9e4..65231173a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.5.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2005-04-09 16:01+0200\n"
 "Last-Translator: Johan Svedberg <johan@svedberg.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -12,26 +12,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "Användarnamn på %s: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Lösenord för %s@%s: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Avsluta"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Ta bort"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Återställ"
 
@@ -40,9 +40,9 @@ msgid "Select"
 msgstr "Välj"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Hjälp"
 
@@ -94,169 +94,169 @@ msgstr "Spara till fil: "
 msgid "Alias added."
 msgstr "Lade till alias."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "Kan inte para ihop namnmall, fortsätt?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "\"compose\"-posten i mailcap kräver %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Fel uppstod vid körning av \"%s\"!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Misslyckades med att öpppna fil för att tolka huvuden."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Misslyckades med att öppna fil för att ta bort huvuden."
 
-#: attach.c:183
+#: attach.c:184
 msgid "Failure to rename file."
 msgstr "Misslyckades med att döpa om fil."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "Ingen \"compose\"-post i mailcap för %s, skapar tom fil."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "\"edit\"-posten i mailcap kräver %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Ingen \"edit\"-post i mailcap för %s"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Ingen matchande mailcap-post hittades. Visar som text."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME-typ ej definierad. Kan inte visa bilaga."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Kan inte skapa filter"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Kan inte skapa filter"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Fel vid skrivning!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Jag vet inte hur det där ska skrivas ut!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Ändra katalog"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Mask"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s är inte en katalog."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Brevlådor [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Prenumererar på [%s], filmask: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Katalog [%s], filmask: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Kan inte bifoga en katalog!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Inga filer matchar filmasken"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Endast IMAP-brevlådor kan skapas"
 
-#: browser.c:880
+#: browser.c:881
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Endast IMAP-brevlådor kan döpas om"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Endast IMAP-brevlådor kan tas bort"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Ta bort brevlådan \"%s\"?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "Brevlådan har tagits bort."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "Brevlådan togs inte bort."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Ändra katalog till: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Fel vid läsning av katalog."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Filmask: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Sortera omvänt efter (d)atum, (a)lpha, (s)torlek eller i(n)te alls? "
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Sortera efter (d)atum, (a)lpha, (s)torlek eller i(n)te alls? "
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "dasn"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Nytt filnamn: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Kan inte visa en katalog"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Fel vid försök att visa fil"
 
@@ -323,7 +323,7 @@ msgstr "standardf
 msgid "Verify PGP signature?"
 msgstr "Verifiera PGP-signatur?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Kunde inte skapa tillfällig fil!"
 
@@ -335,114 +335,114 @@ msgstr "Kan inte skapa filter f
 msgid "Could not copy message"
 msgstr "Kunde inte kopiera meddelande"
 
-#: commands.c:186
+#: commands.c:187
 msgid "S/MIME signature successfully verified."
 msgstr "S/MIME-signaturen verifierades framgångsrikt."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr "Ägarens S/MIME-certifikat matchar inte avsändarens."
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr "Varning: En del av detta meddelande har inte blivit signerat."
 
-#: commands.c:193
+#: commands.c:194
 msgid "S/MIME signature could NOT be verified."
 msgstr "S/MIME-signaturen kunde INTE verifieras."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "PGP-signaturen verifierades framgångsrikt."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "PGP-signaturen kunde INTE verifieras."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Kommando: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Återsänd meddelandet till: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Återsänd märkta meddelanden till: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Fel vid tolkning av adress!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "Dåligt IDN: \"%s\""
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Återsänd meddelande till %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Återsänd meddelanden till %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Message not bounced."
 msgstr "Meddelande återsändes inte."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 msgid "Messages not bounced."
 msgstr "Meddelanden återsändes inte."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Meddelande återsänt."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Meddelanden återsända."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "Kan inte skapa filterprocess"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Öppna rör till kommando: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Inget utskriftskommando har definierats."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Skriv ut meddelande?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Skriv ut märkta meddelanden?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Meddelande har skrivits ut"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Meddelanden har skrivits ut"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "Meddelandet kunde inte skrivas ut"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Meddelanden kunde inte skrivas ut"
 
-#: commands.c:508
+#: commands.c:509
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
@@ -450,7 +450,7 @@ msgstr ""
 "Omvänt (d)atum/(f)rån/(m)ot./(ä)re./(t)ill/t(r)åd/(o)sor./(s)tor./(p)oäng/sp"
 "(a)m?: "
 
-#: commands.c:509
+#: commands.c:510
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
@@ -458,73 +458,73 @@ msgstr ""
 "Sortera (d)atum/(f)rån/(m)ot./(ä)re./(t)ill/t(r)åd/(o)sor./(s)tor./(p)oäng/sp"
 "(a)m?: "
 
-#: commands.c:510
+#: commands.c:511
 msgid "dfrsotuzcp"
 msgstr "dfmätrospa"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Skalkommando: "
 
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Avkoda-spara%s till brevlåda"
 
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Avkoda-kopiera%s till brevlåda"
 
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Dekryptera-spara%s till brevlåda"
 
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Dekryptera-kopiera%s till brevlåda"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Spara%s till brevlåda"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Kopiera%s till brevlåda"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " märkt"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "Kopierar till %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Konvertera till %s vid sändning?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "\"Content-Type\" ändrade till %s."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Teckenuppsättning ändrad till %s; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "konverterar inte"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "konverterar"
 
@@ -616,102 +616,671 @@ msgstr "D
 msgid "Attaching selected files..."
 msgstr "Bifogar valda filer..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Kunde inte bifoga %s!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Öppna brevlåda att bifoga meddelande från"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Inga meddelanden i den foldern."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Märk de meddelanden du vill bifoga!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Kunde inte bifoga!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "Omkodning påverkar bara textbilagor."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "Den aktiva bilagan kommer inte att bli konverterad."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "Den aktiva bilagan kommer att bli konverterad."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Ogiltig kodning."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Spara en kopia detta meddelande?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Byt namn till: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Kan inte ta status på %s: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Ny fil: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "\"Content-Type\" har formen bas/undertyp"
 
-#: compose.c:1057
+#: compose.c:1060
+#, c-format
+msgid "Unknown Content-Type %s"
+msgstr "Okänd \"Content-Type\" %s"
+
+#: compose.c:1073
+#, c-format
+msgid "Can't create file %s"
+msgstr "Kan inte skapa fil %s"
+
+#: compose.c:1081
+msgid "What we have here is a failure to make an attachment"
+msgstr "Vad vi har här är ett misslyckande att skapa en bilaga."
+
+#: compose.c:1142
+msgid "Postpone this message?"
+msgstr "Skjut upp det här meddelandet?"
+
+#: compose.c:1201
+msgid "Write message to mailbox"
+msgstr "Skriv meddelande till brevlåda"
+
+#: compose.c:1204
+#, c-format
+msgid "Writing message to %s ..."
+msgstr "Skriver meddelande till %s ..."
+
+#: compose.c:1213
+msgid "Message written."
+msgstr "Meddelande skrivet."
+
+#: compose.c:1225
+msgid "S/MIME already selected. Clear & continue ? "
+msgstr "S/MIME redan valt. Rensa och fortsätt? "
+
+#: compose.c:1251
+msgid "PGP already selected. Clear & continue ? "
+msgstr "PGP redan valt. Rensa och fortsätt? "
+
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "fel i mönster vid: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "fel i mönster vid: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "fel i mönster vid: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "fel i mönster vid: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "fel i mönster vid: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "fel i mönster vid: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "fel i mönster vid: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "fel i mönster vid: %s"
+
+#: crypt-gpgme.c:993
+#, fuzzy
+msgid "Warning: One of the keys has been revoked\n"
+msgstr "Varning: En del av detta meddelande har inte blivit signerat."
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Serverertifikat har utgått"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL är otillgängligt."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Fingeravtryck: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Fel vid sändning av meddelande."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Fel i kommandorad: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Slut på signerat data --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Fel: kunde inte skapa tillfällig fil! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP-MEDDELANDE BÖRJAR --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- START PÅ BLOCK MED PUBLIK PGP-NYCKEL --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- START PÅ PGP-SIGNERAT MEDDELANDE --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- PGP-MEDDELANDE SLUTAR --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- SLUT PÅ BLOCK MED PUBLIK PGP-NYCKEL --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- SLUT PÅ PGP-SIGNERAT MEDDELANDE --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Fel: kunde inte hitta början av PGP-meddelande! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Fel: missformat PGP/MIME-meddelande! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Fel: kunde inte skapa tillfällig fil! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Följande data är PGP/MIME-krypterad --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Följande data är PGP/MIME-krypterad --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- Slut på PGP/MIME-krypterad data --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- Slut på PGP/MIME-krypterad data --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr ""
+"[-- Följande data är S/MIME-signerad --]\n"
+"\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Följande data är S/MIME-krypterad --]\n"
+"\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Slut på S/MIME-signerad data. --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- Slut på S/MIME-krypterad data. --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Ogiltig   "
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Ogiltig månad: %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Ogiltig månad: %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Kryptera"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Certifikat sparat"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Nyckel-ID: 0x%s"
+
+#: crypt-gpgme.c:3099
+#, fuzzy
+msgid "[Revoked]"
+msgstr "Återkallad   "
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Utgången   "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Kan inte skapa tillfällig fil"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "Ansluter till %s..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "Fel vid anslutning till server: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Nyckel-ID: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "Kunde ej döpa om: %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Alla matchande nycklar är utgångna, återkallade, eller inaktiverade."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Avsluta "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Välj  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Kontrollera nyckel "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP-nycklar som matchar \"%s\"."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP-nycklar som matchar \"%s\"."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "S/MIME-certifikat som matchar \"%s\"."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP-nycklar som matchar \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Den här nyckeln kan inte användas: utgången/inaktiverad/återkallad."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "ID:t är utgånget/inaktiverat/återkallat."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "ID:t har odefinierad giltighet."
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "ID:t är inte giltigt."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "ID:t är endast marginellt giltigt."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Vill du verkligen använda nyckeln?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
 #, c-format
-msgid "Unknown Content-Type %s"
-msgstr "Okänd \"Content-Type\" %s"
+msgid "Looking for keys matching \"%s\"..."
+msgstr "Söker efter nycklar som matchar \"%s\"..."
 
-#: compose.c:1070
+#: crypt-gpgme.c:4002 pgp.c:1149
 #, c-format
-msgid "Can't create file %s"
-msgstr "Kan inte skapa fil %s"
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "Använd nyckel-ID = \"%s\" för %s?"
 
-#: compose.c:1078
-msgid "What we have here is a failure to make an attachment"
-msgstr "Vad vi har här är ett misslyckande att skapa en bilaga."
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "Ange nyckel-ID för %s: "
 
-#: compose.c:1139
-msgid "Postpone this message?"
-msgstr "Skjut upp det här meddelandet?"
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
 
-#: compose.c:1196
-msgid "Write message to mailbox"
-msgstr "Skriv meddelande till brevlåda"
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr "PGP (k)ryptera, (s)ignera, signera s(o)m, (b)åda %s, eller (r)ensa? "
 
-#: compose.c:1199
-#, c-format
-msgid "Writing message to %s ..."
-msgstr "Skriver meddelande till %s ..."
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "ksmobr"
 
-#: compose.c:1208
-msgid "Message written."
-msgstr "Meddelande skrivet."
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr "PGP (k)ryptera, (s)ignera, signera s(o)m, (b)åda %s, eller (r)ensa? "
 
-#: compose.c:1220
-msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME redan valt. Rensa och fortsätt? "
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "ksmobr"
 
-#: compose.c:1246
-msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP redan valt. Rensa och fortsätt? "
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Signera som: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Misslyckades med att öpppna fil för att tolka huvuden."
 
 #: crypt.c:69
 #, c-format
@@ -728,29 +1297,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "Lösenfrasen glömd."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Startar PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr "Meddelande kan inte skickas infogat. Återgå till att använda PGP/MIME?"
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "Brevet skickades inte."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "S/MIME-meddelanden utan ledtrådar till innehållet stöds ej."
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr "Försöker att extrahera PGP-nycklar...\n"
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Försöker att extrahera S/MIME-certifikat...\n"
 
@@ -762,7 +1331,7 @@ msgstr ""
 "[-- Fel: Inkonsekvent \"multipart/signed\" struktur! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -771,7 +1340,7 @@ msgstr ""
 "[-- Fel: Okänt \"multipart/signed\" protokoll %s! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -781,7 +1350,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -789,7 +1358,7 @@ msgstr ""
 "[-- Följande data är signerat --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -797,7 +1366,7 @@ msgstr ""
 "[-- Varning: Kan inte hitta några signaturer. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -805,224 +1374,254 @@ msgstr ""
 "\n"
 "[-- Slut på signerat data --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Startar PGP..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "ja"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "nej"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Avsluta Mutt?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "okänt fel"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Tryck på valfri tangent för att fortsätta..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " (\"?\" för lista): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Ingen brevlåda är öppen."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Inga meddelanden."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "Brevlådan är skrivskyddad."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Funktionen ej tillåten i \"bifoga-meddelande\"-läge."
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "Inga synliga meddelanden."
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Kan inte växla till skrivläge på en skrivskyddad brevlåda!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Ändringarna i foldern skrivs när foldern lämnas."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Ändringarna i foldern kommer inte att skrivas."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Avsluta"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Spara"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Brev"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Svara"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Grupp"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Brevlådan har ändrats externt. Flaggor kan vara felaktiga."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Nya brev i den här brevlådan."
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "Brevlådan har ändrats externt."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Inga märkta meddelanden."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 msgid "Nothing to do."
 msgstr "Ingenting att göra."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Hoppa till meddelande: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "Parametern måste vara ett meddelandenummer."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Det meddelandet är inte synligt."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Ogiltigt meddelandenummer."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Radera meddelanden som matchar: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "Inget avgränsande mönster är aktivt."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Gräns: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Visa endast meddelanden som matchar: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Avsluta Mutt?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Märk meddelanden som matchar: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Återställ meddelanden som matchar: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Avmarkera meddelanden som matchar: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Öppna brevlåda i skrivskyddat läge"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "Öppna brevlåda"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s är inte en brevlåda."
 
-#: curs_main.c:1165
+#: curs_main.c:1176
 msgid "Exit Mutt without saving?"
 msgstr "Avsluta Mutt utan att spara?"
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "Trådning ej aktiverat."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "spara det här meddelandet för att skicka senare"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Du är på det sista meddelandet."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Inga återställda meddelanden."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Du är på det första meddelandet."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "Sökning fortsatte från början."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "Sökning fortsatte från slutet."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Inga nya meddelanden"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Inga olästa meddelanden"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " i den här begränsade vyn"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "Kan inte ändra \"viktigt\"-flaggan på POP-servern."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Inga fler trådar."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Du är på den första tråden."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "Trådning ej aktiverat."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "Tråden innehåller olästa meddelanden."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "Kan inte redigera meddelande på POP-servern."
 
@@ -1155,75 +1754,75 @@ msgstr "S
 msgid "Clear flag"
 msgstr "Ta bort flagga"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- Fel : Kan inte visa någon del av \"Multipart/Alternative\"! --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Bilaga #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Typ: %s/%s, Kodning: %s, Storlek: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Automatisk visning med %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Kommando för automatisk visning: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Kan inte köra %s. --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Automatisk visning av standardfel gällande %s --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Fel: \"message/external-body\" har ingen åtkomsttypsparameter --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Den här %s/%s bilagan "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(storlek %s byte)"
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "har raderats --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- på %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- namn: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Den här %s/%s bilagan är inte inkluderad, --]\n"
 
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
@@ -1231,34 +1830,34 @@ msgstr ""
 "[-- och den angivna externa källan har --]\n"
 "[-- utgått. --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- och den angivna åtkomsttypen %s stöds inte --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Fel: \"multipart/signed\" har inget protokoll."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Fel: \"multipart/encrypted\" har ingen protokollsparameter!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Kunde inte öppna tillfällig fil!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s stöds inte "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(använd \"%s\" för att visa den här delen)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(\"view-attachments\" måste knytas till tangent!)"
 
@@ -1365,46 +1964,46 @@ msgstr "Verifierar (%s)..."
 msgid "SASL authentication failed."
 msgstr "SASL-verifiering misslyckades."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s är en ogiltig IMAP-sökväg"
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Hämtar namnrymder..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Hämtar folderlista..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "Ingen sådan folder"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Skapa brevlåda: "
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "Brevlådan måste ha ett namn."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Brevlåda skapad."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Döp om brevlådan %s till: "
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, c-format
 msgid "Rename failed: %s"
 msgstr "Kunde ej döpa om: %s"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 msgid "Mailbox renamed."
 msgstr "Brevlåda omdöpt."
 
@@ -1415,135 +2014,132 @@ msgstr "Brevl
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Fatalt fel. Meddelandeantalet är ur synk!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Stänger anslutning till %s..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Den här IMAP-servern är uråldrig. Mutt fungerar inte med den."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
-msgstr "Oväntat svar mottaget från server: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
+msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "Säker anslutning med TLS?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "Kunde inte förhandla fram TLS-anslutning"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Väljer %s..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "Fel vid öppning av brevlåda"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Kunde inte lägga till IMAP-brevlådor på den här servern."
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "Skapa %s?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Märker %d meddelanden som raderade..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "Radering misslyckades"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Sparar statusflaggor för meddelanden... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Raderar meddelanden från server..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE misslyckades"
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "CLOSE misslyckades"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "Dåligt namn på brevlåda"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Prenumererar på %s..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Avslutar prenumeration på %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Kunde inte hämta huvuden från den versionen av IMAP-servern."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Kunde inte skapa tillfällig fil %s"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Utvärderar cache... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Hämtar meddelandehuvuden... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Hämtar meddelande..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "Brevindexet är fel. Försök att öppna brevlådan igen."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Laddar upp meddelande ..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Kopierar %d meddelanden till %s..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Kopierar meddelande %d till %s..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Fortsätt?"
 
@@ -1552,122 +2148,122 @@ msgstr "Forts
 msgid "Bad regexp: %s"
 msgstr "Dåligt reguljärt uttryck: %s"
 
-#: init.c:678
+#: init.c:644
 msgid "spam: no matching pattern"
 msgstr "spam: inget matchande mönster"
 
-#: init.c:680
+#: init.c:646
 msgid "nospam: no matching pattern"
 msgstr "nospam: inget matchande mönster"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias: ingen adress"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Varning: Dåligt IDN \"%s\" i alias \"%s\".\n"
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "ogiltigt huvudfält"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: okänd sorteringsmetod"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): fel i reguljärt uttryck: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: okänd variabel"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "prefix är otillåtet med \"reset\""
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "värde är otillåtet med \"reset\""
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s är satt"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s är inte satt"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: ogiltig typ av brevlåda"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: ogiltigt värde"
 
-#: init.c:1589
+#: init.c:1555
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: Okänd typ."
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: okänd typ"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Fel i %s, rad %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: fel i %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: läsningen avbruten pga för många fel i %s"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: fel vid %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: för många parametrar"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: okänt kommando"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Fel i kommandorad: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "kunde inte avgöra hemkatalog"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "kunde inte avgöra användarnamn"
 
@@ -2125,398 +2721,407 @@ msgid "compose a new mail message"
 msgstr "komponera ett nytt brevmeddelande"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "öppna en annan folder"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "öppna en annan folder i skrivskyddat läge"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "rensa en statusflagga från ett meddelande"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "radera meddelanden som matchar ett mönster"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "tvinga hämtning av brev från IMAP-server"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "hämta brev från POP-server"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "flytta till det första meddelandet"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "flytta till det sista meddelandet"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "visa endast meddelanden som matchar ett mönster"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Återsänd märkta meddelanden till: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "hoppa till nästa nya meddelande"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 msgid "jump to the next new or unread message"
 msgstr "hoppa till nästa nya eller olästa meddelande"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "hoppa till nästa undertråd"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "hoppa till nästa tråd"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "flytta till nästa icke raderade meddelande"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "hoppa till nästa olästa meddelande"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "hoppa till första meddelandet i tråden"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "hoppa till föregående tråd"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "hoppa till föregående undertråd"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "flytta till föregående icke raderade meddelande"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "hoppa till föregående nya meddelande"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 msgid "jump to the previous new or unread message"
 msgstr "hoppa till föregående nya eller olästa meddelande"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "hoppa till föregående olästa meddelande"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "märk den aktuella tråden som läst"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "märk den aktuella undertråden som läst"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "sätt en statusflagga på ett meddelande"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "spara ändringar av brevlåda"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "märk meddelanden som matchar ett mönster"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "återställ meddelanden som matchar ett mönster"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "avmarkera meddelanden som matchar ett mönster"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "flytta till mitten av sidan"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "flytta till nästa post"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "rulla ner en rad"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "flytta till nästa sida"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "hoppa till slutet av meddelandet"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "växla visning av citerad text"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "hoppa över citerad text"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "hoppa till början av meddelandet"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "skicka meddelandet/bilagan genom rör till ett skalkommando"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "flytta till föregående post"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "rulla upp en rad"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "flytta till föregående sida"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "skriv ut den aktuella posten"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "fråga ett externt program efter adresser"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "lägg till nya förfrågningsresultat till aktuellt resultat"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "spara ändringar till brevlåda och avsluta"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "återkalla ett uppskjutet meddelande"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "rensa och rita om skärmen"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{internt}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 msgid "rename the current mailbox (IMAP only)"
 msgstr "döp om den aktuella brevlådan (endast för IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "svara på ett meddelande"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "använd det aktuella meddelande som mall för ett nytt"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "spara meddelande/bilaga till fil"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "sök efter ett reguljärt uttryck"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "sök bakåt efter ett reguljärt uttryck"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "sök efter nästa matchning"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "sök efter nästa matchning i motsatt riktning"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "växla färg på sökmönster"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "starta ett kommando i ett underskal"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "sortera meddelanden"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "sortera meddelanden i omvänd ordning"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "märk den aktuella posten"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "applicera nästa funktion på märkta meddelanden"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 msgid "apply next function ONLY to tagged messages"
 msgstr "applicera nästa funktion ENDAST på märkta meddelanden"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "märk den aktuella undertråden"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "märk den aktuella tråden"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "växla ett meddelandes \"nytt\" flagga"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "växla huruvida brevlådan ska skrivas om"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "växla bläddring över brevlådor eller alla filer"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "flytta till början av sidan"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "återställ den aktuella posten"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "återställ all meddelanden i tråden"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "återställ alla meddelanden i undertråden"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "visa Mutts versionsnummer och datum"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "visa bilaga med \"mailcap\"-posten om nödvändigt"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "visa MIME-bilagor"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr "visa tangentkoden för en tangenttryckning"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "visa aktivt begränsningsmönster"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "komprimera/expandera aktuell tråd"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "komprimera/expandera alla trådar"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "bifoga en publik nyckel (PGP)"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "visa PGP-flaggor"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "skicka en publik nyckel (PGP)"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "verifiera en publik nyckel (PGP)"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "visa nyckelns användaridentitet"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "kolla efter klassisk pgp"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "Godkänn den konstruerade kedjan"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "Lägg till en \"remailer\" till kedjan"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "Infoga en \"remailer\" i kedjan"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "Radera en \"remailer\" från kedjan"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "Välj föregående element i kedjan"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "Välj nästa element i kedjan"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "skicka meddelandet genom en \"mixmaster remailer\" kedja"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "skapa avkrypterad kopia och radera"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "skapa avkrypterad kopia"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 msgid "wipe passphrase(s) from memory"
 msgstr "rensa lösenfras(er) från minnet"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 msgid "extract supported public keys"
 msgstr "extrahera stödda publika nycklar"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 msgid "show S/MIME options"
 msgstr "visa S/MIME-flaggor"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr "Heltalsöverflödning -- kan inte allokera minne!"
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Slut på minne!"
 
@@ -2542,12 +3147,13 @@ msgstr ""
 "under vissa villkor; kör `mutt -vv' för detaljer.\n"
 
 #: main.c:61
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2597,6 +3203,7 @@ msgstr ""
 "USA.\n"
 
 #: main.c:99
+#, fuzzy
 msgid ""
 "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
@@ -2604,6 +3211,7 @@ msgid ""
 "[...]\n"
 "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
 "       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
 "[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
@@ -2614,6 +3222,51 @@ msgid ""
 "  -a <file>\tattach a file to the message\n"
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"usage: mutt [ -nRyzZ ] [ -e <kommando> ] [ -F <fil> ] [ -m <typ> ] [ -f "
+"<fil> ]\n"
+"       mutt [ -nR ] [ -e <kommando> ] [ -F <fil> ] -Q <variabel> [ -Q "
+"<variabel> ] [...]\n"
+"       mutt [ -nR ] [ -e <kommando> ] [ -F <fil> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nx ] [ -e <kommando> ] [ -a <fil> ] [ -F <fil> ] [ -H <fil> ] "
+"[ -i <fil> ] [ -s <ämne> ] [ -b <adress> ] [ -c <adress> ] <adress> [ ... ]\n"
+"       mutt [ -n ] [ -e <kommando> ] [ -F <fil> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpandera det givna aliaset\n"
+"  -a <fil>\tbifoga en fil till meddelandet\n"
+"  -b <adress>\tange en \"blind carbon-copy\" (BCC) adress\n"
+"  -c <adress>\tange en \"carbon-copy\" (CC) adress\n"
+"  -e <kommando>\tange ett kommando som ska köras efter initiering\n"
+"  -f <fil>\tange vilken brevlåda som ska läsas\n"
+"  -F <fil>\tange en alternativ muttrc-fil\n"
+"  -H <fil>\tange en filmall att läsa huvud från\n"
+"  -i <fil>\tange en fil som Mutt ska inkludera i svaret\n"
+"  -m <typ>\tange standardtyp för brevlådan\n"
+"  -n\t\tgör så att Mutt inte läser systemets Muttrc\n"
+"  -p\t\tåterkalla ett uppskjutet meddelande\n"
+"  -Q <variabel>\tundersök värdet på en konfigurationsvariabel\n"
+"  -R\t\töppna brevlåda i skrivskyddat läge\n"
+"  -s <ämne>\tange ett ämne (måste vara inom citationstecken om det "
+"innehåller blanksteg)\n"
+"  -v\t\tvisa version och definitioner vid kompileringen\n"
+"  -x\t\tsimulera mailx's sändläge\n"
+"  -y\t\tvälj en brevlåda specifierad i din \"mailboxes\"-lista\n"
+"  -z\t\tavsluta omedelbart om det inte finns några meddelanden i brevlådan\n"
+"  -Z\t\töppna den första foldern med ett nytt meddelande, avsluta omedelbart "
+"om inget finns\n"
+"  -h\t\tden här hjälptexten"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
+#, fuzzy
+msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2668,7 +3321,7 @@ msgstr ""
 "om inget finns\n"
 "  -h\t\tden här hjälptexten"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2676,47 +3329,47 @@ msgstr ""
 "\n"
 "Kompileringsval:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Fel vid initiering av terminalen."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Avlusning på nivå %d.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG var inte valt vid kompilering. Ignoreras.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s finns inte. Skapa den?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Kan inte skapa %s: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Inga mottagare angivna.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: kunde inte bifoga fil.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Ingen brevlåda med nya brev."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Inga inkommande brevlådor definierade."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "Brevlådan är tom."
 
@@ -2733,11 +3386,11 @@ msgstr "Brevl
 msgid "Mailbox was corrupted!"
 msgstr "Brevlådan blev skadad!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Fatalt fel! Kunde inte öppna brevlådan igen!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Kunde inte låsa brevlåda!"
 
@@ -2745,13 +3398,13 @@ msgstr "Kunde inte l
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: mbox modifierad, men inga modifierade meddelanden! (rapportera det här "
 "felet)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Skriver meddelanden... %d (%d%%)"
@@ -2759,186 +3412,148 @@ msgstr "Skriver meddelanden... %d (%d%%)"
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "Skriver ändringar..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Skrivning misslyckades! Sparade del av brevlåda i %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Kunde inte återöppna brevlåda!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Återöppnar brevlåda..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Hoppa till: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Ogiltigt indexnummer."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Inga poster."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Du kan inte rulla längre ner."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Du kan inte rulla längre upp."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Du är på den sista sidan."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Du är på den första sidan."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "Första posten visas."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "Sista posten visas."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Du är på den sista posten."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Du är på den första posten."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Sök efter: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Sök i omvänd ordning efter: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Inget sökmönster."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Hittades inte."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "Inga märkta poster."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "Sökning är inte implementerad för den här menyn."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "Hoppning är inte implementerad för dialoger."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Märkning stöds inte."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Läser %s... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): kunde inte sätta tid på fil"
 
-#: muttlib.c:846
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Filen är en katalog, spara i den? [(j)a, n(ej), (a)lla]"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr "jna"
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "Filen är en katalog, spara i den?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Fil i katalog: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Filen finns, skriv (ö)ver, (l)ägg till, eller (a)vbryt?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "öla"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Kan inte spara meddelande till POP-brevlåda."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s är inte en brevlåda!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Lägg till meddelanden till %s?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "Anslutning till %s stängd"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL är otillgängligt."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "\"Preconnect\"-kommandot misslyckades."
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Fel uppstod vid förbindelsen till %s (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "Dåligt IDN \"%s\"."
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "Slår upp %s..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Kunde inte hitta värden \"%s\""
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Ansluter till %s..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Kunde inte ansluta till %s (%s)."
@@ -2970,7 +3585,8 @@ msgstr "I/O-fel"
 msgid "SSL failed: %s"
 msgstr "SSL misslyckades: %s"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "Kunde inte hämta certifikat från \"peer\""
 
@@ -2979,87 +3595,207 @@ msgstr "Kunde inte h
 msgid "SSL connection using %s (%s)"
 msgstr "SSL-anslutning använder %s (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Okänd"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[kan inte beräkna]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[ogiltigt datum]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "Servercertifikat är inte giltigt än"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "Serverertifikat har utgått"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Det här certifikatet tillhör:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Det här certifikatet utfärdades av:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Det här certifikatet är giltigt"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   från %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     till %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Fingeravtryck: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "Kontroll av SSL-certifikat"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(f)örkasta, (g)odkänn den här gången, godkänn (v)arje gång"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "fgv"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(f)örkasta, (g)odkänn den här gången"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "fg"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Avsluta "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Varning: kunde inte spara certifikat"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Certifikat sparat"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "SSL-anslutning använder %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Certifikat sparat"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Fel vid initiering av terminalen."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Fingeravtryck: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Fingeravtryck: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Servercertifikat är inte giltigt än"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Serverertifikat har utgått"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Serverertifikat har utgått"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "Servercertifikat är inte giltigt än"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "Kontroll av SSL-certifikat"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "Ansluter till %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "Fel uppstod vid förbindelsen till %s (%s)"
+
+#: muttlib.c:910
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "Filen är en katalog, spara i den? [(j)a, n(ej), (a)lla]"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr "jna"
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "Filen är en katalog, spara i den?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Fil i katalog: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Filen finns, skriv (ö)ver, (l)ägg till, eller (a)vbryt?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "öla"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Kan inte spara meddelande till POP-brevlåda."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Lägg till meddelanden till %s?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s är inte en brevlåda!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3137,7 +3873,7 @@ msgstr "Brevl
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d behölls, %d flyttades, %d raderades."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d behölls, %d raderades."
@@ -3156,15 +3892,15 @@ msgstr "Anv
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Brevlåda är märkt som ej skrivbar. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "Brevlåda är synkroniserad."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Kan inte skriva meddelande"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr "Heltalsöverflödning -- kan inte allokera minne."
 
@@ -3172,48 +3908,48 @@ msgstr "Heltals
 msgid "Not available in this menu."
 msgstr "Inte tillgänglig i den här menyn."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "Föreg. sida"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "Nästa sida"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Visa bilaga"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Nästa"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Slutet av meddelande visas."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Början av meddelande visas."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Sök i omvänd ordning: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Sök: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "Hjälp visas just nu."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "Ingen mer citerad text."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "Ingen mer ociterad text efter citerad text."
 
@@ -3280,27 +4016,27 @@ msgstr "tomt m
 msgid "error: unknown op %d (report this error)."
 msgstr "fel: okänd operation %d (rapportera det här felet)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Kompilerar sökmönster..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "Kör kommando på matchande meddelanden..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "Inga meddelanden matchade kriteriet."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "Sökning nådde slutet utan att hitta träff"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "Sökning nådde början utan att hitta träff"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Sökning avbruten."
 
@@ -3312,11 +4048,11 @@ msgstr "Mata in PGP-l
 msgid "PGP passphrase forgotten."
 msgstr "PGP-lösenfras glömd."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Fel: kunde inte skapa PGP-underprocess! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3324,51 +4060,22 @@ msgstr ""
 "[-- Slut på PGP-utdata --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP-MEDDELANDE BÖRJAR --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- START PÅ BLOCK MED PUBLIK PGP-NYCKEL --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- START PÅ PGP-SIGNERAT MEDDELANDE --]\n"
-"\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- PGP-MEDDELANDE SLUTAR --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- SLUT PÅ BLOCK MED PUBLIK PGP-NYCKEL --]\n"
-
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- SLUT PÅ PGP-SIGNERAT MEDDELANDE --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "Kunde inte kopiera meddelande"
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Fel: kunde inte hitta början av PGP-meddelande! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "PGP-signaturen verifierades framgångsrikt."
 
-#: pgp.c:704
+#: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Internt fel. Informera <roessler@does-not-exist.org>."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3376,70 +4083,36 @@ msgstr ""
 "[-- Fel: kunde inte skapa en PGP-underprocess! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Fel: missformat PGP/MIME-meddelande! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Fel: kunde inte skapa tillfällig fil! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- Följande data är PGP/MIME-krypterad --]\n"
-"\n"
-
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Slut på PGP/MIME-krypterad data --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "Avkryptering misslyckades."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "Kan inte öppna PGP-underprocess!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "Använd nyckel-ID = \"%s\" för %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "Ange nyckel-ID för %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "Kan inte starta PGP"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "PGP (k)ryptera, (s)ignera, signera s(o)m, (b)åda %s, eller (r)ensa? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr "PGP/M(i)ME"
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr "(i)nfogat"
 
-#: pgp.c:1499
+#: pgp.c:1543
 msgid "esabifc"
 msgstr "ksobir"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Signera som: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "Hämtar PGP-nyckel..."
@@ -3448,16 +4121,6 @@ msgstr "H
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Alla matchande nycklar är utgångna, återkallade, eller inaktiverade."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Välj  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Kontrollera nyckel "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3472,40 +4135,6 @@ msgstr "PGP-nycklar som matchar \"%s\"."
 msgid "Can't open /dev/null"
 msgstr "Kan inte öppna /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Kan inte skapa tillfällig fil"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Nyckel-ID: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Den här nyckeln kan inte användas: utgången/inaktiverad/återkallad."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "ID:t är utgånget/inaktiverat/återkallat."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "ID:t har odefinierad giltighet."
-
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "ID:t är inte giltigt."
-
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "ID:t är endast marginellt giltigt."
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Vill du verkligen använda nyckeln?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Var vänlig ange nyckel-ID: "
@@ -3519,11 +4148,6 @@ msgstr "Startar PGP..."
 msgid "PGP Key %s."
 msgstr "PGP-nyckel %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "Söker efter nycklar som matchar \"%s\"..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3581,7 +4205,7 @@ msgstr "Fel vid skrivning av brevl
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d av %d meddelanden lästa]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "Servern stängde förbindelsen!"
 
@@ -3611,15 +4235,15 @@ msgstr "Kunde inte l
 msgid "Error connecting to server: %s"
 msgstr "Fel vid anslutning till server: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "Stänger anslutning till POP-server..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Verifierar meddelandeindex..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Anslutning tappad. Återanslut till POP-server?"
 
@@ -3991,35 +4615,35 @@ msgstr "Brevet skickat."
 msgid "Sending in background."
 msgstr "Skickar i bakgrunden."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Ingen begränsningsparameter hittad! [Rapportera det här felet]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s existerar inte längre!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s är inte en normal fil."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "Kunde inte öppna %s"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Fel vid sändning av meddelande, barn returnerade %d (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Utdata från sändprocessen"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "Dåligt IDN %s vid förberedning av \"resent-from\"."
@@ -4136,7 +4760,7 @@ msgstr "Kan inte 
 msgid "No output from OpenSSL..."
 msgstr "Ingen utdata från OpenSSL..."
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4144,23 +4768,23 @@ msgstr ""
 "[-- Slut på utdata från OpenSSL --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Fel: kunde inte skapa OpenSSL-underprocess! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- Följande data är S/MIME-krypterad --]\n"
 "\n"
 
-#: smime.c:1765
+#: smime.c:1767
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- Följande data är S/MIME-signerad --]\n"
 "\n"
 
-#: smime.c:1829
+#: smime.c:1831
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4168,7 +4792,7 @@ msgstr ""
 "\n"
 "[-- Slut på S/MIME-krypterad data. --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4176,28 +4800,28 @@ msgstr ""
 "\n"
 "[-- Slut på S/MIME-signerad data. --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
 "S/MIME (k)ryptera, (s)ignera, kryptera (m)ed, signera s(o)m, (b)åda, eller "
 "(r)ensa? "
 
-#: smime.c:1936
+#: smime.c:1945
 msgid "eswabfc"
 msgstr "ksmobr"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128 eller (g)löm det? "
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr "12345g"
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr "Kan inte signera: Inget nyckel angiven. Använd signera som."
 
@@ -4220,3 +4844,9 @@ msgstr "F
 #: thread.c:1095
 msgid "Parent message is not available."
 msgstr "Första meddelandet är inte tillgängligt."
+
+#~ msgid "Unexpected response received from server: %s"
+#~ msgstr "Oväntat svar mottaget från server: %s"
+
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Kunde inte lägga till IMAP-brevlådor på den här servern."
diff --git a/po/tr.po b/po/tr.po
index d1e391e2e..3e0b35fab 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutt 1.4i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2001-06-12 12:47+0200\n"
 "Last-Translator: Fatih Demir <kabalak@gtranslator.org>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -14,26 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "%s'deki kullanýcý adý: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s için parola: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "Çýk"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "Sil"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "Kurtar"
 
@@ -42,9 +42,9 @@ msgid "Select"
 msgstr "Seç"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "Yardým"
 
@@ -96,171 +96,171 @@ msgstr "Dosyaya kaydet: "
 msgid "Alias added."
 msgstr "Lakap eklendi."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr ""
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap düzenleme birimi %%s gerektiriyor"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "\"%s\" çalýþtýrýlýrken bir hata oluþtu!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "Dosyayý baþlýklarýný taramak için açamadým."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "Dosyayý baþlýklarýný ayýrmak için açamadým."
 
-#: attach.c:183
+#: attach.c:184
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "Dosyayý baþlýklarýný taramak için açamadým."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "%s için mailcap yazma birimi yok, boþ dosya yaratýlýyor."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Mailcap düzenleme birimi %%s gerektiriyor"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "%s için mailcap düzenleme birimi yok"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Uyan mailcap birimi bulunamadý. Metin olarak gösteriliyor."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME tipi belirlenmemiþ. Eklenti gösterilemiyor."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "Filtrayý yaratamadým"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Filtrayý yaratamadým"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "Yazma hatasý!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "Bunu nasýl yazdýracaðýmý bilinmiyor!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "Dizine geç"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "Maske"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s bir dizin deðil."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "%d eposta kutusu "
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Abone [%s], Dosya maskesi: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Dizin [%s], Dosya maskesi: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "Bir dizini topyekun ekleyenmiyor!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "Dosya maskesine uyan dosya yok"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Yaratma sadece IMAP eposta kutularý için destekleniyor"
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Yaratma sadece IMAP eposta kutularý için destekleniyor"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Silme sadece IMAP eposta kutularý için destekleniyor"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Vallahi mi eposta kutusu \"%s\"'yi sileyim mi?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "eposta kutusu silindi."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "eposta kutusu silinmedi."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "Dizine geç: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "Dizin taranýrken hata oldu."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "Dosya aðý: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "(t)arih, (a)lfabetik,(b)oyuta yada (h)iç mi terse sýralayým?"
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "(t)arih, (a)lfabetik,(b)oyuta yada (h)iç mi sýralayým? "
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "tabh"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "Yeni dosya ismi: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "Bir dizini gösterilmiyor"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "Dosyayý göstermeye uðraþýrken hata oldu"
 
@@ -328,7 +328,7 @@ msgstr "varsay
 msgid "Verify PGP signature?"
 msgstr "PGP imzasý doðrulansýn mý?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "Geçici dosyayý yaratamadým!"
 
@@ -340,118 +340,118 @@ msgstr "G
 msgid "Could not copy message"
 msgstr "Iletiyi kopyalamayadým."
 
-#: commands.c:186
+#: commands.c:187
 #, fuzzy
 msgid "S/MIME signature successfully verified."
 msgstr "PGP imzasý baþarýyla doðrulandý."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr ""
 
-#: commands.c:193
+#: commands.c:194
 #, fuzzy
 msgid "S/MIME signature could NOT be verified."
 msgstr "PGP imzasý doðrulanamadý."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "PGP imzasý baþarýyla doðrulandý."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "PGP imzasý doðrulanamadý."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Komuta: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Iletiyi ilet:"
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "Iþaretli iletileri ilet:"
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "Adresi tararken hata oldu!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Iletiyi %s'e ilet"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Iletileri %s'e ilet"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Message not bounced."
 msgstr "Ileti iletildi."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Messages not bounced."
 msgstr "Iletiler iletildi."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "Ileti iletildi."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "Iletiler iletildi."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "Filtra iþlemi yaratýlamadý"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "Komutaya ver: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "Yazdýrma komutasý belirlenmemiþ."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "Ileti yazdýrýlsýn mý?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "Iþaretli iletiler yazdýrýlsýn mý?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "Ileti yazdýrýldi"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "Iletiler yazdýrýldi"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "Ileti yazdýrýlýmadý"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "Iletiler yazdýrýlýmadý"
 
-#: commands.c:508
+#: commands.c:509
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -460,7 +460,7 @@ msgstr ""
 "Ters sýralama tipi: (t)arih/(g)önderen/(a)lan/(k)onu/gönder(i)len/k(o)num/dü"
 "(z)enmemiþ/(b)oyut/(p)uan: "
 
-#: commands.c:509
+#: commands.c:510
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
@@ -469,74 +469,74 @@ msgstr ""
 "Sýralama tipi: (t)arih/(g)önderen/(a)lan/(k)onu/gönder(i)len/k(o)num/dü(z)"
 "enlenmemiþ/(b)oyut/(p)uan?"
 
-#: commands.c:510
+#: commands.c:511
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "tgakiozbp"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Komuta komutasý: "
 
-#: commands.c:709
+#: commands.c:716
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "eposta kutusuna %s%s"
 
-#: commands.c:710
+#: commands.c:717
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "eposta kutusuna %s%s"
 
-#: commands.c:711
+#: commands.c:718
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "eposta kutusuna %s%s"
 
-#: commands.c:712
+#: commands.c:719
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "eposta kutusuna %s%s"
 
-#: commands.c:713
+#: commands.c:720
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
 msgstr "eposta kutusuna %s%s"
 
-#: commands.c:713
+#: commands.c:720
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
 msgstr "eposta kutusuna %s%s"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " iþaretli "
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "%s'e kopyalanýyor..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Gönderirken %s'ye dönüþtürülsün mü?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Içerik tipi %s iye deðiþtirildi."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Karakter kümesi deðiþtirildi: %s -> %s"
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "dönüþtürülmüyor"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "dönüþtürülüyor"
 
@@ -630,103 +630,686 @@ msgstr ""
 msgid "Attaching selected files..."
 msgstr "Seçili dosyalar ekleniyor..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "%s'yi ekleyemedim!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "Iletiye eklenecek iletiyi seçilecek eposta kutusunu seç"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Bu klasörde ileti yok."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Eklemek istediðin iletiler iþaretlenecektir!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "Eklenemedi!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr ""
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "Geçerli eklenti dönüþtürülmeyecektir."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "Geçerli eklenti dönüþtürülecektir."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "Geçersiz þekillendirme."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "Bu iletinin bir kopyasýný kaydedeyim mi?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "Adýný deðiþtir: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "Stat edemedim : %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "Yeni dosya: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Içerik-tipi temel/altçeþit þeklindedir"
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Bilinmeyen içerik tipi %s"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "Dosya %s yaratýlamadý"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "Eklenti yaparak burada bir hata oluþtu"
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "Iletiyi kaydediyem mi?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "Iletiye eposta kutuma yaz"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Ileti %s iye yazýlýyor..."
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "Ileti yazýldý."
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "tabirde %s'de hata var"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "tabirde %s'de hata var"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "tabirde %s'de hata var"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "tabirde %s'de hata var"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "tabirde %s'de hata var"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "tabirde %s'de hata var"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "tabirde %s'de hata var"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "tabirde %s'de hata var"
+
+#: crypt-gpgme.c:993
+msgid "Warning: One of the keys has been revoked\n"
+msgstr ""
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "Sunucu sertifikasýnýn süresi bitmiþtir"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL eriþilir deðil."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "Parmak izi: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "Iletiyi gönderirken hata oldu."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Komuta satrýnda hata: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Imzalanmýþ bilginin sonu --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- Hata: geçici dosya yaratýlamýyor! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP ILETISI BAÞI --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP RESMI ANAHTAR BÖLÜMÜ BAÞI --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP IMZALANMIÞ ILETI BAÞI --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+#, fuzzy
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- PGP ILETI SONU --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP RESMI ANAHTAR BÖLÜMÜ SONU --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+#, fuzzy
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- PGP IMZALANMIÞ ILETI SONU --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- Hata: PGP iletisinin baþýný bulamadým! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- Hata: Hatalý PGP/MIME iletisi! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- Hata: geçici dosya yaratýlamýyor! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Bu bilgi PGP/MIME ile þifrelenmiþtir --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Bu bilgi PGP/MIME ile þifrelenmiþtir --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- PGP/MIME ile þifrelenmiþ bilgi sonu --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+#, fuzzy
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- PGP/MIME ile þifrelenmiþ bilgi sonu --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr ""
+"[-- Bu bilgi imzalanmýþtýr --]\n"
+"\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- Bu bilgi PGP/MIME ile þifrelenmiþtir --]\n"
+"\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Imzalanmýþ bilginin sonu --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- PGP/MIME ile þifrelenmiþ bilgi sonu --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "Geçersiz ay : %s"
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Geçersiz ay : %s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Geçersiz ay : %s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "Þifrele"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "Sertifika kaydedildi"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Anahtar numara: 0x%s"
+
+#: crypt-gpgme.c:3099
+msgid "[Revoked]"
+msgstr ""
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "Çýk  "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "Geçici dosyayý yaratamadým"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "%s'e baðlanýlýyor..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "%s'e baðlanýlýrken hata oldu"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Anahtar numara: 0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "CLOSE baþarýsýz oldu"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Yekin uyan anahtarlarýn süresi bitti yada geri alýndý."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "Çýk  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Seç  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "Anahtarý kontrol et  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "\"%s\"'e uyan PGP anahtarlarý."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "\"%s\"'e uyan PGP anahtarlarý."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "\"%s\"'e uyan PGP anahtarlarý."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "\"%s\"'e uyan PGP anahtarlarý."
+
+#: crypt-gpgme.c:3592
+#, fuzzy, c-format
+msgid "%s <%s>."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3594
+#, fuzzy, c-format
+msgid "%s \"%s\"."
+msgstr "%s [%s]\n"
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Bu anahtar kullanýlamaz: süresi bitti/kapalý/geriye alýndý."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+#, fuzzy
+msgid "ID is expired/disabled/revoked."
+msgstr "Bu anahtarýn süresi bitti/kapalý/geriye alýndý."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr ""
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+#, fuzzy
+msgid "ID is not valid."
+msgstr "Bu anahtar numarasýna güvenilmiyor."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+#, fuzzy
+msgid "ID is only marginally valid."
+msgstr "Bu anahtar numarasýna çok az güveniliyor."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s Gerçekten bu anahtarý kullanmak ister misiniz?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "\"%s\" tabirine uyan anahtarlar aranýyor..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "%s için anahtar numara = \"%s\" kullanýlsýn mý?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "%s için anahtar numarasýný belirleyin: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr ""
+"þ(i)frele, i(m)zala, (f)arklý imzala, i(k)isi de, (i)nline, yoksa i(p)talmý? "
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "imfkcp"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr ""
+"þ(i)frele, i(m)zala, (f)arklý imzala, i(k)isi de, (i)nline, yoksa i(p)talmý? "
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "imfkcp"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Farklý imzala: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "Dosyayý baþlýklarýný taramak için açamadým."
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -743,29 +1326,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "PGP parolasý unutuldu."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "PGP'yi çaðýrýlýyor..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "eposta gönderilmedi."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
@@ -777,7 +1360,7 @@ msgstr ""
 "[-- Hata: Hatalý multipart/signed þekili! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -786,7 +1369,7 @@ msgstr ""
 "[-- Hata: Bilinmeyen multipart/signed protokolu %s! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -796,7 +1379,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
@@ -805,7 +1388,7 @@ msgstr ""
 "[-- Bu bilgi imzalanmýþtýr --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -813,7 +1396,7 @@ msgstr ""
 "[-- Ikaz: Hiç bir imza bulunmamýþtýr. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 #, fuzzy
 msgid ""
 "\n"
@@ -822,226 +1405,256 @@ msgstr ""
 "\n"
 "[-- Imzalanmýþ bilginin sonu --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "PGP'yi çaðýrýlýyor..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr "evet"
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr "hayýr"
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "Mutt'tan çýkýlsýn mý?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "Devam etmek için bir tuþa bas..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " (sýralama için '?' iye bas): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "Hiç bir eposta kutusu açýk deðil."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Ileti yok."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "eposta kutusu salt-okunur."
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "Iþlev ileti eklentie mödüsünde yasaktýr."
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "Görünebilir ileti yok."
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Salt-okunur bir eposta kutusu yazýlabilir yapýlamaz!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "Klasöre olan deðiþiklikler çýkýþta kaydedilecektir."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "Klasöre olan deðiþiklikler kaydedilmeyecektir."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "Çýk"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "Kaydet"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Gönder"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "Cevap"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "K. Cevap"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Eposta kutusu deðiþtirilmiþ. Bazý iþaretlet hatalý olabilir."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Yeni eposta var!"
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "Eposta kutusu deðiþtirilmiþ."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "Iþaretli ileti yok."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 #, fuzzy
 msgid "Nothing to do."
 msgstr "%s'e baðlanýlýyor..."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Iletiye geç: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "Argüman bir ileti numarasý olmak zorunda."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Bu ileti görünemez."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "Geçersiz ileti numarasý."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "Tabire uyan iletileri sil: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "Sýnýrlandýrma tabiri kullanýmda deðildir."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "Sýnýr : %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "Tabire uyan iletilere sýnýrla: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "Mutt'tan çýkýlsýn mý?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "Tabire uyan iletileri iþaretle: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "Tabire uyan iletileri kurtar: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "Tabire uyan iletilerden iþareti sil: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "Eposta kutusunu salt-okunur aç"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "eposta kutusunu aç"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
-#, c-format
-msgid "%s is not a mailbox."
-msgstr "%s bir eposta kutusu deðildir!"
+#: curs_main.c:1081 mx.c:512 mx.c:658
+#, c-format
+msgid "%s is not a mailbox."
+msgstr "%s bir eposta kutusu deðildir!"
+
+#: curs_main.c:1176
+msgid "Exit Mutt without saving?"
+msgstr "Mutt'tan kaydedilmeden çýkýlsýn mý?"
+
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "Konumlaþtýrma kapalýdýr."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "bu iletiyi sonra göndermek üzere kaydet"
 
-#: curs_main.c:1165
-msgid "Exit Mutt without saving?"
-msgstr "Mutt'tan kaydedilmeden çýkýlsýn mý?"
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "Son iletidesiniz."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "Kurtarýlan ileti yok."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "Ilk iletidesiniz."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "Arama baþa döndü."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "Arama sona ulaþtý."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "Yeni ileti yok"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "Okunmamýþ ileti yok"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " bu sýnýrlandýrýlmýþ bakýþta"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 #, fuzzy
 msgid "Can't change 'important' flag on POP server."
 msgstr "Ileti POP sunucusunda deðiþtirilenemedi."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "Daha fazla konum yok."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "Ilk konumdasýnýz."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "Konumlaþtýrma kapalýdýr."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "Konum okunmamýþ ileti içeriyor."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "Ileti POP sunucusunda deðiþtirilenemedi."
 
@@ -1174,76 +1787,76 @@ msgstr "I
 msgid "Clear flag"
 msgstr "Iþareti temizle"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Hata:  Multipart/Alternative bölümlerinin hiç bir bölümü gösterilemiyor! "
 "--]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Eklenti #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Tip: %s/%s, Þekillendirme: %s, Boyut: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- %s ile gösteriliyor --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Otomatik gösterme komuatasý: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- %s çalýþtýrýlamadý --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- %s ile otomatik gösterme hatasý --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr "[-- Hata: message/external-bods hiç bir eriþim tipi belirlemiyor --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Bu %s/%s eklentisi"
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(boyut %s bayt) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "silinmiþtir --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- %s'de --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- isim: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, fuzzy, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Bu %s/%s eklentisi"
 
-#: handler.c:1696
+#: handler.c:1712
 #, fuzzy
 msgid ""
 "[-- and the indicated external source has --]\n"
@@ -1253,36 +1866,36 @@ msgstr ""
 "[-- ve ima edilen kaynaðýn geçerliliði --]\n"
 "[-- de bitti. --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 "[-- Bu %s/%s eklentisi içerilmiyor, --]\n"
 "[-- ve ima edilen eriþme tipi %s de desteklenmiyor --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "Hata: multipart/signed protokolu yok."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Hata: multipart/encrypted protokol verisi yok!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "Geçici dosyayý açamadým!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s desteklenmiyor "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "('%s' ile bu bölüme bakabilirsiniz)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr ""
 
@@ -1383,47 +1996,47 @@ msgstr "Do
 msgid "SASL authentication failed."
 msgstr "SASL doðrulamasý baþarasýz oldu."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr ""
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Isim yüzeyleri alýnýyor..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "Dizin listesi alýnýyor..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 #, fuzzy
 msgid "No such folder"
 msgstr "%s : böyle bir renk yok"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "Eposta kutusunu yarat:"
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "Her eposta kutusunun ismi olmak zorunda."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "Eposta kutusu yaratýldý."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Eposta kutusunu yarat:"
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "CLOSE baþarýsýz oldu"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "Eposta kutusu yaratýldý."
@@ -1435,138 +2048,135 @@ msgstr "Eposta kutusu kapat
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Aðýr hata. Ileti sayýlarý karýþtý!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Baðlantý %s kapatýlýyor..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Bu IMAP sunucusu çok eski. Mutt bu sunucuyla çalýþmaz."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "TLS ile güvenli baðlanýlsýn mý?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "TLS baðlantýsý kurulamadý"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "%s seçiliyor..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 #, fuzzy
 msgid "Error opening mailbox"
 msgstr "Eposta kutusunu yazarken hata oldu!"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "Bu sunucudaki IMAP eposta kutularýna ileti eklenemiyor"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "%s yaratýlsýn mý?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "%d ileti silinmek için iþaretlenmiþ..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 #, fuzzy
 msgid "Expunge failed"
 msgstr "CLOSE baþarýsýz oldu"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Ileti durum iþaretleri kaydediliyor... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "Iletileri sunucudan sil..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "CLOSE baþarýsýz oldu"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 #, fuzzy
 msgid "Bad mailbox name"
 msgstr "Eposta kutusunu yarat:"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "%s'e abone olunuyor..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "%s'deki abonelik feshediliyor..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Bu IMAP sunucu neslinden baþlýklarý alýnamýyor."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, fuzzy, c-format
 msgid "Could not create temporary file %s"
 msgstr "Geçici dosyayý yaratamadým!"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Ileti baþlýklarýný alýnýyor... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Ileti baþlýklarýný alýnýyor... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "Ileti alýnýyor..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "Ileti sayýsý yanlýþtýr. Eposta kutusu yeniden açilmasý denenebilir."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "Ileti yükleniyor..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "%d ileti %s'e kopyalanýyor..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "%d ileti %s'e kopyalanýyor..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "Devam edilsin mi?"
 
@@ -1575,124 +2185,124 @@ msgstr "Devam edilsin mi?"
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:678
+#: init.c:644
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "tabire uyan iletileri sil"
 
-#: init.c:680
+#: init.c:646
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "tabire uyan iletileri sil"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias: adres yok"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "geçersiz baþlýk birimi"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: bilinmeyen sýralama tipi"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): tabirde hata var: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: bilinmeyen veri"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr ""
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr ""
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s oturtulmuþtur"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s oturtulamamýþtýr"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: geçersiz eposta tipi"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: geçersiz deðer"
 
-#: init.c:1589
+#: init.c:1555
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s: bilinmeyen tip"
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: bilinmeyen tip"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "%s'de hata var, satýr %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: %s'de hatalar var"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: %s'de oluþan çok fazla hatadan dolayý okuma iptal edildi"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: %s'de hata var"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: çok fazla argüman"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: bilinmeyen komuta"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Komuta satrýnda hata: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "baþlangýç dizini belirlenemedi"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "kullanýcý adý belirlenemedi"
 
@@ -2160,415 +2770,424 @@ msgid "compose a new mail message"
 msgstr "yeni bir eposta iletisi yarat"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "baþka bir dizin yarat"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "baþka bir dizini salt okunur aç"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "iletinin durumunu temizle"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "tabire uyan iletileri sil"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "IMAP sunucularýndan eposta alýmýný zorla"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "POP sunucusundan epostalarý al"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "ilk iletiye geç"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "son iletiye geç"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "sadece tabire uyan iletileri göster"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Iþaretli iletileri ilet:"
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "önümüzdeki yeni iletiye geç"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 #, fuzzy
 msgid "jump to the next new or unread message"
 msgstr "önümüzdeki okunmamýþ iletiye geç"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "önümüzdeki alt-konuma geç"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "önümüzdeki konuma geç"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "önümüzdeki silinmemiþ iletiye geç"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "önümüzdeki okunmamýþ iletiye geç"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "konumdaki ana iletiye geç"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "önceki konuma geç"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "önceki alt-konuma geç"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "önceki silinmemiþ iletiye geç"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "önceki yeni iletiye geç"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 #, fuzzy
 msgid "jump to the previous new or unread message"
 msgstr "önceki okunmamýþ iletiye geç"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "önceki okunmamýþ iletiye geç"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "geçerli konumu okunmuþ olarak iþaretle"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "geçerli alt-konumu okunmuþ olarak iþaretle"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "bir iletinin durumunu belirle"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "eposta kutusuna yapýlan deðiþiklikleri kaydet"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 #, fuzzy
 msgid "tag messages matching a pattern"
 msgstr "tabire uyan iletileri sil"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 #, fuzzy
 msgid "undelete messages matching a pattern"
 msgstr "tabire uyan iletileri sil"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 #, fuzzy
 msgid "untag messages matching a pattern"
 msgstr "tabire uyan iletileri sil"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "sayfanýn ortasýna geç"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "önümüzdeki birime geç"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "bir satýr aþaða in"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "önümüzdeki sayfaya geç"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "iletinin sonuna geç"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 #, fuzzy
 msgid "toggle display of quoted text"
 msgstr "Altbölümlerin gösterilmesini aç/kapat"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr ""
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "iletinin baþýna geç"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "ileti/eklentii bir komutaya boru yoluyla filtrala"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "önceki birime geç"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "bir satýr yukarý çýk"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "önceki sayfaya geç"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "geçerli birimi yazdýrt"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "adresler için baþka bir uygulamayý sorgula"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "yeni sorgulama sonuçlarýný geçerli sonuçlara ekle"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "eposta kutusuna yapýlan deðiþiklikleri kaydet ve çýk"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "kenara býrakýlmýþ iletiyi yeniden düzenle"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "ekraný tamizle ve yeniden göster"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{iç kullaným}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "geçerli eposta kutusunu sil (sadece IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "bir iletiye cevap ver"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "geçerli iletiyi yeni bir ileti için örnek olarak kullan"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "iletiyi/eklentiyi dosyaya kaydet"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 #, fuzzy
 msgid "search for a regular expression"
 msgstr "tabirde hata var"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr ""
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "önümüzdeki eþleþimi ara"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "önümüzdeki eþleþimi ters yönden ara"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 #, fuzzy
 msgid "toggle search pattern coloring"
 msgstr "Arama tabiri yok."
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "bir alt-kabukta bir komuta çalýþtýr"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "iletileri sýralandýr"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "iletileri ters sýrala"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "geçerli birimi iþaretle"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 #, fuzzy
 msgid "apply next function to tagged messages"
 msgstr "Iþaretli hýc bir ileti yok."
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 #, fuzzy
 msgid "apply next function ONLY to tagged messages"
 msgstr "Iþaretli hýc bir ileti yok."
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "geçerli alt-konumu iþaretle"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "geçerli konumu iþaretle"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "bir iletinin 'yeni' iþaretini aç/kapat"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "eposta kutusunun yeniden yazýlmasýný aç/kapat"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "sadece eposta kutularýný mý yoksa yekin dosyalarý gezmesini aç/kapat"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "sayfanýn baþýna geç"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "geçerli birimi kurtar"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "konumdaki yekin iletileri kurtar"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "alt-konumdaki yekin iletileri kurtar"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "Mutt sürümünü ve tarihini göster ve çýk"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 #, fuzzy
 msgid "view attachment using mailcap entry if necessary"
 msgstr "eklentiyi mailcap birimi sayesinde düzenle"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "MIME eklentileri göster"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr ""
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 #, fuzzy
 msgid "show currently active limit pattern"
 msgstr "sadece tabire uyan iletileri göster"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "geçerli konumu göster/gizle"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "yekin konumlarý göster/gizle"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "bir PGP resmi anahtarý ekle"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "PGP ayarlarýný göster"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "bir PGP resmi anahtarý gönder"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "bir PGP resmi anahtarý doðrula"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "anahtarýn kullanýcý numarasýný göster"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "klasik pgp için ara"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr ""
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr ""
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr ""
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 #, fuzzy
 msgid "Delete a remailer from the chain"
 msgstr "satýrdaki yekin harfleri sil"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr ""
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr ""
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr ""
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "çözülmüþ kopyasýný yarat ve sil"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "çözülmüþ kopya yarat"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 #, fuzzy
 msgid "wipe passphrase(s) from memory"
 msgstr "PGP parolasý unutuldu."
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 #, fuzzy
 msgid "extract supported public keys"
 msgstr "PGP resmi anahtarlarý çýkar"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 #, fuzzy
 msgid "show S/MIME options"
 msgstr "PGP ayarlarýný göster"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr ""
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "Bellek iflasý ,-)"
 
@@ -2596,11 +3215,11 @@ msgstr ""
 
 #: main.c:61
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2622,25 +3241,63 @@ msgid ""
 "    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
 msgstr ""
 
-#: main.c:99
+#: main.c:99
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"yardým:mutt [ -nRyzZ ] [ -e <komuta> ] [ -F <dosya> ] [ -m <tip> ] [ -f "
+"<dosya ]\n"
+"\tmutt [ -nx ] [ -e <komuta> ] [ -a <dosya> ] [ -F <dosya> ] [ -H <dosya> ] "
+"[-i <dosya> ] [ -s <konu> ] [ -b <adres> ] [ -c <adres> ] <adres> [ ... ]\n"
+"\tmutt [ -n ] [ -e  <komuta> ] [ -F <dosya> ] -p\n"
+"\tmutt -v[v]\n"
+"\n"
+"seçenekler:\n"
+"  -a <dosya>\tiletiye bir dosya ekle\n"
+"  -b <adres>\tbir görünmez kopya adresi (BCC) belirler\n"
+"  -c <adres>\tbir kopya adresi (CC) belirler\n"
+"  -e <komuta>\tbaþlangýçta çalýþtýrýlacak bir komuta belirler\n"
+"  -f <dosya>\tokunacak eposta kutusunu belirler\n"
+"  -F <dosya>\tvarsayýlan muttrc dosyasýna rakip bir dosya belirler\n"
+"  -H <dosya>\tbaþlýðýn okunacak olduðu örnek bir dosya\n"
+"  -i <dosya>\ther cevapta içerilecek bir eklentiyi belirler\n"
+"  -m <tip>\teposta kutularýnýn varsayýlan tipini belirler\n"
+"  -n\t\tMutt'ý sistemdeki Muttrc dosyasýný okumasýndan men eder\n"
+"  -p\t\tbir kaydedilmiþ/býrakýlmýþ iletiyi belirtler\n"
+"  -R\t\teposta kutusunu salt-okunur açar\n"
+"  -s <konu>\tkonuyu belirler\n"
+"  -v\t\tnesil ve denetleme bilgilerini gösterir\n"
+"  -x\t\tmailx gönderme modüsünü taklit et\n"
+"  -y\t\t'mailboxes' listesinde belirtilen bir eposta kutusunu belirler\n"
+"  -z\t\teposta kutusunda ileti yoksa, hemen çýk\n"
+"  -Z\t\tyeni ileti içeren ilk klasörü göster, yeni ileti yoksa hemen çýk\n"
+"  -h\t\tbu yardým iletisini göster"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
 #, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-"<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-"[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-"[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
-"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
-"\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2687,7 +3344,7 @@ msgstr ""
 "  -Z\t\tyeni ileti içeren ilk klasörü göster, yeni ileti yoksa hemen çýk\n"
 "  -h\t\tbu yardým iletisini göster"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2695,47 +3352,47 @@ msgstr ""
 "\n"
 "Denetleme seçenekleri:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "Komutayý baþlatýrken hata oldu."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "%d seviyesinde bilgilendirme iletileri gösteriliyor.\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG (bilgilendir iletileri) derleme sýrasýnda belirlenmemiþ.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s yok. Yaratýlsýn mý?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "%s: %s yaratýlanamadý."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "Alýcýlar belirlenmedi.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: dosya eklenemedi.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "Yeni epostalý eposta kutusu yoktur."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "Gelen kutularý belirlenmedi."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "Eposta kutusu boþtur."
 
@@ -2752,11 +3409,11 @@ msgstr "Eposta kutusu bozuktur!"
 msgid "Mailbox was corrupted!"
 msgstr "Eposta kutusu bozulmuþtur!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Aðýr hata! Eposta kutusunu yeniden açamadým!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "Eposta kutusunu kilitleyemedim!"
 
@@ -2764,11 +3421,11 @@ msgstr "Eposta kutusunu kilitleyemedim!"
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Iletiler yazýlýyor... %d (%%%d)"
@@ -2776,188 +3433,149 @@ msgstr "Iletiler yaz
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 #, fuzzy
 msgid "Committing changes..."
 msgstr "Arama tabiri denetleniyor..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Yazma baþarýsýz oldu! Eposta kutusunun bir bölümü %s'ye yazýlmýþtýr"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "Eposta kutusu yeniden açýlanamadý!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "Eposta kutusu yeniden açýlýyor..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Geç: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "Geçersiz sýralama numarasý."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "Birim yok."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "Daha alta geçmek mümkün deðildir."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "Daga yukarýya geçmek mümkün deðildir."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "Son sayfadasýnýz."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "Ilk sayfadasýnýz."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "Ilk birim gösteriliyor."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "son birim gösteriliyor."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "Son birimdesiniz."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "Ilk birimdesiniz."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "Ara: "
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "Ters ara: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "Arama tabiri yok."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "Bulunmadý."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "Iþaretlenmiþ birim yok."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "Bu mönüde arama þimdilik mümkün deðildir."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "Diyaloklar için hýzlý geçiþ þimdilik mümkün deðildir."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "Iþaretleme desteklenmiyor."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "%s okunuyor... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
-#: muttlib.c:846
-#, fuzzy
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Dosya bir dizin, dizin altýnda kaydedilsin mi?"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr ""
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "Dosya bir dizin, dizin altýnda kaydedilsin mi?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "Dosyayý dizin altýnda kaydet: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Dosya zaten var, ü(s)tüne yaz, (e)kle yoksa i(p)tal mý?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "sep"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "Ileti POP eposta kutusuna kaydedilmiyor."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s bir eposta kutusu deðil!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Iletiler %s'e eklensin mi?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "%s'ye varolan baðlantý kapatýldý"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL eriþilir deðil."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "Önceden baðlanma komutasý baþarýsýz oldu."
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "%s'le konuþurken hata oldu (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "%s aranýyor..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Sunucu \"%s\" bulunamýyor."
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "%s'e baðlanýlýyor..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "%s (%s)'e baðlanýlýnamadý."
@@ -2989,7 +3607,8 @@ msgstr ""
 msgid "SSL failed: %s"
 msgstr "CLOSE baþarýsýz oldu"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 #, fuzzy
 msgid "Unable to get certificate from peer"
 msgstr "baþlangýç dizini belirlenemedi"
@@ -2999,87 +3618,208 @@ msgstr "ba
 msgid "SSL connection using %s (%s)"
 msgstr "%s (%s) kullanarak SSL baðlantýsý kuruluyor"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[hesaplanamýyor]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[geçersiz tarih]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "Sunucu sertifikasý daha geçerli deðildir"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "Sunucu sertifikasýnýn süresi bitmiþtir"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "Sertifikanýn sahibi kuruluþ:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "Sertifikayý veren kuruluþ:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "Bu sertifika geçerlidir"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   %s'den"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     %s'e"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Parmak izi: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "SSL sertifika doðrulamasý"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)ed'et, (s)adece bu defa , (h)erzaman kabul et"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "rsh"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)ed'et, (s)adece bu defalýðýna kabul et"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "rs"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "Çýk  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "Ikaz: Sertifika kaydedilemedi"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "Sertifika kaydedildi"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "%s (%s) kullanarak SSL baðlantýsý kuruluyor"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "Sertifika kaydedildi"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "Komutayý baþlatýrken hata oldu."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "Parmak izi: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "Parmak izi: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "Sunucu sertifikasý daha geçerli deðildir"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "Sunucu sertifikasýnýn süresi bitmiþtir"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "Sunucu sertifikasýnýn süresi bitmiþtir"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "Sunucu sertifikasý daha geçerli deðildir"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "SSL sertifika doðrulamasý"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "%s'e baðlanýlýyor..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "%s'le konuþurken hata oldu (%s)"
+
+#: muttlib.c:910
+#, fuzzy
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "Dosya bir dizin, dizin altýnda kaydedilsin mi?"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr ""
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "Dosya bir dizin, dizin altýnda kaydedilsin mi?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "Dosyayý dizin altýnda kaydet: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Dosya zaten var, ü(s)tüne yaz, (e)kle yoksa i(p)tal mý?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "sep"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "Ileti POP eposta kutusuna kaydedilmiyor."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Iletiler %s'e eklensin mi?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s bir eposta kutusu deðil!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3157,7 +3897,7 @@ msgstr "eposta kutusu de
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d kaldý, %d taþýndý, %d silindi."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d kaldý, %d silindi."
@@ -3176,15 +3916,15 @@ msgstr "'toggle-write' ile yeniden yaz
 msgid "Mailbox is marked unwritable. %s"
 msgstr "eposta kutusu yazýlamayabilir yapýldý. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "Eposta kutusu kontrol edildi."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "Iletiyi yazamadým"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
@@ -3192,49 +3932,49 @@ msgstr ""
 msgid "Not available in this menu."
 msgstr "Bu mönüde yoktur."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "Sa. Geri"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "Sa. Ileri"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "Eklenti göster"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "Ileri"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "Iletinin sonu gösteriliyor."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "Iletinin baþý gösteriliyor."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "Geriye dönük ara: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "Ara: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "Yardým þu an gösteriliyor."
 
-#: pager.c:2110
+#: pager.c:2142
 #, fuzzy
 msgid "No more quoted text."
 msgstr "Daha fazla konum yok."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr ""
 
@@ -3302,28 +4042,28 @@ msgstr "bo
 msgid "error: unknown op %d (report this error)."
 msgstr ""
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "Arama tabiri denetleniyor..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 #, fuzzy
 msgid "Executing command on matching messages..."
 msgstr "Yeni ileti için bakýlýyor..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "Tabire uygun ileti yok."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr ""
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr ""
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "Arama iptal edildi."
 
@@ -3335,11 +4075,11 @@ msgstr "PGP parolas
 msgid "PGP passphrase forgotten."
 msgstr "PGP parolasý unutuldu."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Hata: PGP altiþlemi yaratýlamadý! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3347,58 +4087,23 @@ msgstr ""
 "[-- PGP geri verisi sonu --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP ILETISI BAÞI --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP RESMI ANAHTAR BÖLÜMÜ BAÞI --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP IMZALANMIÞ ILETI BAÞI --]\n"
-"\n"
-
-#: pgp.c:423
+#: pgp.c:387 pgp.c:951
 #, fuzzy
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- PGP ILETI SONU --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP RESMI ANAHTAR BÖLÜMÜ SONU --]\n"
+msgid "Could not decrypt PGP message"
+msgstr "Iletiyi kopyalamayadým."
 
-#: pgp.c:427
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
 #, fuzzy
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- PGP IMZALANMIÞ ILETI SONU --]\n"
-
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- Hata: PGP iletisinin baþýný bulamadým! --]\n"
-"\n"
+msgid "PGP message successfully decrypted."
+msgstr "PGP imzasý baþarýyla doðrulandý."
 
-#: pgp.c:704
+#: pgp.c:723
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Iç hata. Thomas R. <roessler@does-not-exist.org>'ye haber ver."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3406,75 +4111,38 @@ msgstr ""
 "[-- Hata: PGP altiþlemini yaratamadým! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- Hata: Hatalý PGP/MIME iletisi! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Hata: geçici dosya yaratýlamýyor! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- Bu bilgi PGP/MIME ile þifrelenmiþtir --]\n"
-"\n"
-
-#: pgp.c:915
+#: pgp.c:828
 #, fuzzy
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr ""
-"\n"
-"[-- PGP/MIME ile þifrelenmiþ bilgi sonu --]\n"
+msgid "Decryption failed"
+msgstr "Giriþ baþarýsýz oldu."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "PGP altiþlemi açýlamýyor!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "%s için anahtar numara = \"%s\" kullanýlsýn mý?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "%s için anahtar numarasýný belirleyin: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "PGP çalýþtýrýlamýyor"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr ""
 "þ(i)frele, i(m)zala, (f)arklý imzala, i(k)isi de, (i)nline, yoksa i(p)talmý? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1499
+#: pgp.c:1543
 #, fuzzy
 msgid "esabifc"
 msgstr "imfkip"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Farklý imzala: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "PGP anahtarý alýnýyor..."
@@ -3484,16 +4152,6 @@ msgstr "PGP anahtar
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Yekin uyan anahtarlarýn süresi bitti yada geri alýndý."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Seç  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "Anahtarý kontrol et  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3508,43 +4166,6 @@ msgstr "\"%s\"'e uyan PGP anahtarlar
 msgid "Can't open /dev/null"
 msgstr "/dev/null'ý açamadým"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "Geçici dosyayý yaratamadým"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Anahtar numara: 0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Bu anahtar kullanýlamaz: süresi bitti/kapalý/geriye alýndý."
-
-#: pgpkey.c:612
-#, fuzzy
-msgid "ID is expired/disabled/revoked."
-msgstr "Bu anahtarýn süresi bitti/kapalý/geriye alýndý."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr ""
-
-#: pgpkey.c:619
-#, fuzzy
-msgid "ID is not valid."
-msgstr "Bu anahtar numarasýna güvenilmiyor."
-
-#: pgpkey.c:622
-#, fuzzy
-msgid "ID is only marginally valid."
-msgstr "Bu anahtar numarasýna çok az güveniliyor."
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s Gerçekten bu anahtarý kullanmak ister misiniz?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Anahtar numarasýný belirle: "
@@ -3558,11 +4179,6 @@ msgstr "Pgp 
 msgid "PGP Key %s."
 msgstr "PGP anahtarý %s."
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "\"%s\" tabirine uyan anahtarlar aranýyor..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3620,7 +4236,7 @@ msgstr "Eposta kutusunu yazarken hata oldu!"
 msgid "%s [%d of %d messages read]"
 msgstr "%1$s [ %3$d iletiden %2$d ileti okundu]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "Sunucu baðlantýyý kesti!"
 
@@ -3650,15 +4266,15 @@ msgstr "Iletiler sunucuda b
 msgid "Error connecting to server: %s"
 msgstr "%s'e baðlanýlýrken hata oldu"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "POP sunucuya varolan baðlantý kapatýlýyor..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "Ileti sayýsýný doðrula..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Baðlantý kayboldu. Yeniden POP sunucusuna baðlanýlsýn mý?"
 
@@ -4043,35 +4659,35 @@ msgstr "eposta g
 msgid "Sending in background."
 msgstr "Ardalanda gönderiliyor."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "Sýnýrlandýrma verisi bulunamadý! [bu hata rapor edilmesi gerek]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s daha yok!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
 msgstr "%s bir eposta kutusu deðildir!"
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "%s açýlanamadý"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Ileti gönderilirken hata oldu, altiþlem %d ile iptal bitirildi (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Gönderme iþleminin geri verisi"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
@@ -4196,7 +4812,7 @@ msgstr "PGP alti
 msgid "No output from OpenSSL..."
 msgstr ""
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"
@@ -4205,26 +4821,26 @@ msgstr ""
 "[-- PGP geri verisi sonu --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 #, fuzzy
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Hata: PGP altiþlemi yaratýlamadý! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 #, fuzzy
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- Bu bilgi PGP/MIME ile þifrelenmiþtir --]\n"
 "\n"
 
-#: smime.c:1765
+#: smime.c:1767
 #, fuzzy
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- Bu bilgi imzalanmýþtýr --]\n"
 "\n"
 
-#: smime.c:1829
+#: smime.c:1831
 #, fuzzy
 msgid ""
 "\n"
@@ -4233,7 +4849,7 @@ msgstr ""
 "\n"
 "[-- PGP/MIME ile þifrelenmiþ bilgi sonu --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 #, fuzzy
 msgid ""
 "\n"
@@ -4242,7 +4858,7 @@ msgstr ""
 "\n"
 "[-- Imzalanmýþ bilginin sonu --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
@@ -4250,21 +4866,21 @@ msgstr ""
 "þ(i)frele, i(m)zala, (f)arklý imzala, i(k)isi de, mi(c) algoritmini seç "
 "yoksa i(p)talmý? "
 
-#: smime.c:1936
+#: smime.c:1945
 #, fuzzy
 msgid "eswabfc"
 msgstr "imfkcp"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr ""
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
@@ -4289,6 +4905,9 @@ msgstr "S
 msgid "Parent message is not available."
 msgstr "Kök iletisi yok."
 
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "Bu sunucudaki IMAP eposta kutularýna ileti eklenemiyor"
+
 #, fuzzy
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "application/pgp iletisi yaratýlsýn mý?"
@@ -4341,9 +4960,6 @@ msgstr "K
 #~ msgid "Copy"
 #~ msgstr "Kopyala"
 
-#~ msgid "%s [%s]\n"
-#~ msgstr "%s [%s]\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "[-- End of PGP output --]\n"
diff --git a/po/uk.po b/po/uk.po
index 8db3b61de..d868d3106 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,33 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.3.27/1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2002-01-23 15:14+0200\n"
 "Last-Translator: Andrej N. Gritsenko <andrej@lucky.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "ëÏÒÉÓÔÕ×ÁÞ Õ %s: "
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "ðÁÒÏÌØ ÄÌÑ %s@%s: "
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "÷ÉȦÄ"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "÷ÉÄ."
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "÷¦ÄÎ."
 
@@ -41,9 +41,9 @@ msgid "Select"
 msgstr "÷ɦÒ"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "ð¦ÄËÁÚËÁ"
 
@@ -95,171 +95,171 @@ msgstr "
 msgid "Alias added."
 msgstr "ðÓÅ×ÄÏÎ¦Í ÄÏÄÁÎÏ."
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "îÅÍÁ¤ צÄÐÏצÄÎÏÇÏ ¦ÍÅΦ, ÄÁ̦?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "ëÏÍÐÏÎÕ×ÁÎÎÑ, ×ËÁÚÁÎÅ Õ mailcap, ÐÏÔÒÅÂÕ¤ %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ \"%s\"!"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÒÏÚÂÏÒÕ ÚÁÇÏÌÏ×ËÕ."
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÕÒ¦ÚÁÎÎÑ ÚÁÇÏÌÏ×ËÕ."
 
-#: attach.c:183
+#: attach.c:184
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÒÏÚÂÏÒÕ ÚÁÇÏÌÏ×ËÕ."
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "÷ mailcap ÎÅ ×ÉÚÎÁÞÅÎÏ ËÏÍÐÏÎÕ×ÁÎÎÑ %s, ÓÔ×ÏÒÅÎÏ ÐÏÒÏÖÎ¦Ê ÆÁÊÌ."
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "òÅÄÁÇÕ×ÁÎÎÑ, ×ËÁÚÁÎÅ Õ mailcap, ÐÏÔÒÅÂÕ¤ %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "÷ mailcap ÎÅ ×ÉÚÎÁÞÅÎÏ ÒÅÄÁÇÕ×ÁÎÎÑ %s"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "îÅ ÚÎÁÊÄÅÎÏ ×¦ÄÏÍÏÓÔÅÊ Õ mailcap. ðÏËÁÚÁÎÏ ÑË ÔÅËÓÔ."
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "ôÉÐ MIME ÎÅ ×ÉÚÎÁÞÅÎÏ. îÅÍÏÖÌÉ×Ï ÐÏÂÁÞÉÔÉ ÄÏÄÁÔÏË."
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Æ¦ÌØÔÒ"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Æ¦ÌØÔÒ"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "úÂ¦Ê ÚÁÐÉÓÕ!"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "îÅ ÚÎÁÀ, ÑË ÃÅ ÄÒÕËÕ×ÁÔÉ!"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "ëÁÔÁÌÏÇ"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "íÁÓËÁ"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ÎÅ ¤ ËÁÔÁÌÏÇÏÍ."
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "ðÏÛÔÏצ ÓËÒÉÎØËÉ [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "ð¦ÄÐÉÓÁΦ [%s] Ú ÍÁÓËÏÀ: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "ëÁÔÁÌÏÇ [%s] Ú ÍÁÓËÏÀ: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "îÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ ËÁÔÁÌÏÇ!"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "îÅÍÁ¤ ÆÁÊ̦×, ÝÏ ×¦ÄÐÏצÄÁÀÔØ ÍÁÓæ"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "óÔ×ÏÒÅÎÎÑ Ð¦ÄÔÒÉÍÕ¤ÔØÓÑ ÌÉÛÅ ÄÌÑ ÓËÒÉÎØÏË IMAP"
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "óÔ×ÏÒÅÎÎÑ Ð¦ÄÔÒÉÍÕ¤ÔØÓÑ ÌÉÛÅ ÄÌÑ ÓËÒÉÎØÏË IMAP"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "÷ÉÄÁÌÅÎÎÑ Ð¦ÄÔÒÉÍÕ¤ÔØÓÑ ÌÉÛÅ ÄÌÑ ÓËÒÉÎØÏË IMAP"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "÷ÐÅ×ÎÅΦ Õ ×ÉÄÁÌÅÎΦ ÓËÒÉÎØËÉ \"%s\"?"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ×ÉÄÁÌÅÎÏ."
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÎÅ ×ÉÄÁÌÅÎÏ."
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "ðÅÒÅÊÔÉ ÄÏ: "
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "ëÁÔÁÌÏÇ ÎÅ ÓËÁÎÕ¤ÔØÓÑ."
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "íÁÓËÁ: "
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "ú×ÏÒÏÔÎØÏ ÓÏÒÔÕ×ÁÔÉ ÚÁ ÄÁÔÏÀ(d), ̦ÔÅÒÏÀ(a), ÒÏÚͦÒÏÍ(s), ÞÉ Î¦(n)?"
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "óÏÒÔÕ×ÁÔÉ ÚÁ ÄÁÔÏÀ(d), ̦ÔÅÒÏÀ(a), ÒÏÚͦÒÏÍ(s), ÞÉ Î¦(n)?"
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr ""
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "¶Í'Ñ ÎÏ×ÏÇÏ ÆÁÊÌÕ: "
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "îÅÍÏÖÌÉ×Ï ÐÏÂÁÞÉÔÉ ËÁÔÁÌÏÇ"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "îÅÍÏÖÌÉ×Ï ÐÏÂÁÞÉÔÉ ÆÁÊÌ"
 
@@ -327,7 +327,7 @@ msgstr "
 msgid "Verify PGP signature?"
 msgstr "ðÅÒÅצÒÉÔÉ Ð¦ÄÐÉÓ PGP?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "îÅ ×ÉÊÛÌÏ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ!"
 
@@ -339,196 +339,196 @@ msgstr "
 msgid "Could not copy message"
 msgstr "îÅ ×ÉÊÛÌÏ ÓËÏЦÀ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: commands.c:186
+#: commands.c:187
 #, fuzzy
 msgid "S/MIME signature successfully verified."
 msgstr "ð¦ÄÐÉÓ PGP ÐÅÒÅצÒÅÎÏ."
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr ""
 
-#: commands.c:193
+#: commands.c:194
 #, fuzzy
 msgid "S/MIME signature could NOT be verified."
 msgstr "ð¦ÄÐÉÓ PGP ÐÅÒÅצÒÉÔÉ ÎÅÍÏÖÌÉ×Ï."
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "ð¦ÄÐÉÓ PGP ÐÅÒÅצÒÅÎÏ."
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "ð¦ÄÐÉÓ PGP ÐÅÒÅצÒÉÔÉ ÎÅÍÏÖÌÉ×Ï."
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "ëÏÍÁÎÄÁ: "
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "îÁĦÓÌÁÔÉ ËÏЦÀ ÌÉÓÔÁ: "
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "îÁĦÓÌÁÔÉ ËÏЦ§ ×ÉĦÌÅÎÉÈ ÌÉÓÔ¦×: "
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "ðÏÍÉÌËÁ ÒÏÚÂÏÒÕ ÁÄÒÅÓÉ!"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "îÁĦÓÌÁÔÉ ËÏЦÀ ÌÉÓÔÁ %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "îÁĦÓÌÁÔÉ ËÏЦ§ ÌÉÓÔ¦× %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Message not bounced."
 msgstr "ëÏЦÀ ÌÉÓÔÁ ÐÅÒÅÓÌÁÎÏ."
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Messages not bounced."
 msgstr "ëÏЦ§ ÌÉÓÔ¦× ÐÅÒÅÓÌÁÎÏ."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "ëÏЦÀ ÌÉÓÔÁ ÐÅÒÅÓÌÁÎÏ."
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "ëÏЦ§ ÌÉÓÔ¦× ÐÅÒÅÓÌÁÎÏ."
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÐÒÏÃÅÓ Æ¦ÌØÔÒÕ"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "ðÅÒÅÄÁÔÉ ÄÏ ÐÒÏÇÒÁÍÉ: "
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "ëÏÍÁÎÄÕ ÄÌÑ ÄÒÕËÕ ÎÅ ×ÉÚÎÁÞÅÎÏ."
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "äÒÕËÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ?"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "äÒÕËÕ×ÁÔÉ ×ÉĦÌÅΦ ÐÏצÄÏÍÌÅÎÎÑ?"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "ðÏצÄÏÍÌÅÎÎÑ ÎÁÄÒÕËÏ×ÁÎÏ"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "ðÏצÄÏÍÌÅÎÎÑ ÎÁÄÒÕËÏ×ÁÎÏ"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "ðÏצÄÏÍÌÅÎÎÑ ÎÅ ÍÏÖÅ ÂÕÔÉ ÎÁÄÒÕËÏ×ÁÎÏ"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "ðÏצÄÏÍÌÅÎÎÑ ÎÅ ÍÏÖÕÔØ ÂÕÔÉ ÎÁÄÒÕËÏ×ÁΦ"
 
-#: commands.c:508
+#: commands.c:509
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
 
-#: commands.c:509
+#: commands.c:510
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
 
-#: commands.c:510
+#: commands.c:511
 msgid "dfrsotuzcp"
 msgstr ""
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "ëÏÍÁÎÄÁ ÓÉÓÔÅÍÉ: "
 
-#: commands.c:709
+#: commands.c:716
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "òÏÚËÏÄÕ×ÁÔÉ-ÐÅÒÅÎÅÓÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
 
-#: commands.c:710
+#: commands.c:717
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "òÏÚËÏÄÕ×ÁÔÉ-ËÏЦÀ×ÁÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
 
-#: commands.c:711
+#: commands.c:718
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "òÏÚÛÉÆÒÕ×ÁÔÉ-ÐÅÒÅÎÅÓÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
 
-#: commands.c:712
+#: commands.c:719
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "òÏÚÛÉÆÒÕ×ÁÔÉ-ËÏЦÀ×ÁÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "ðÅÒÅÎÅÓÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
 
-#: commands.c:713
+#: commands.c:720
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "ëÏЦÀ×ÁÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " ×ÉĦÌÅΦ"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "ëÏЦÀ×ÁÎÎÑ ÄÏ %s..."
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "ðÅÒÅÔ×ÏÒÉÔÉ ÎÁ %s ÐÒÉ ÎÁÄÓÉÌÁÎΦ?"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "ôÉÐ ÄÏÄÁÔËÕ ÚͦÎÅÎÏ ÎÁ %s."
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "ëÏÄÕ×ÁÎÎÑ ÚͦÎÅÎÏ ÎÁ %s; %s."
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "ÎÅ ÐÅÒÅÔ×ÏÒÅÎÏ"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "ÐÅÒÅÔ×ÏÒÅÎÏ"
 
@@ -622,103 +622,664 @@ msgstr ""
 msgid "Attaching selected files..."
 msgstr "äÏÄÁ×ÁÎÎÑ ×ÉÂÒÁÎÉÈ ÆÁÊ̦×..."
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "îÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ %s!"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "óËÒÉÎØËÁ, Ú ÑËϧ ÄÏÄÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "ãÑ ÓËÒÉÎØËÁ ÚÏ×Ó¦Í ÐÏÒÏÖÎÑ."
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "÷ÉĦ̦ÔØ ÐÏצÄÏÍÌÅÎÎÑ, ÝÏ ÄÏÄÁ¤ÔÅ!"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "îÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ!"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "ðÅÒÅËÏÄÕ×ÁÎÎÑ ÍÏÖÅ ÂÕÔÉ ÚÁÓÔÏÓÏ×ÁÎÅ Ô¦ÌØËÉ ÄÏ ÔÅËÓÔÏ×ÉÈ ÄÏÄÁÔ˦×."
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "ðÏÔÏÞÎÉÊ ÄÏÄÁÔÏË ÎÅ ÂÕÄÅ ÐÅÒÅÔ×ÏÒÅÎÏ."
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "ðÏÔÏÞÎÉÊ ÄÏÄÁÔÏË ÂÕÄÅ ÐÅÒÅÔ×ÏÒÅÎÏ."
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "îÅצÒÎÅ ËÏÄÕ×ÁÎÎÑ."
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "úÂÅÒÅÇÔÉ ËÏЦÀ ÃØÏÇÏ ÐÏצÄÏÍÌÅÎÎÑ?"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ Õ: "
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ÄÁΦ %s: %s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "îÏ×ÉÊ ÆÁÊÌ: "
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type ÐÏ ÆÏÒͦ base/sub"
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "îÅצÄÏÍÉÊ Content-Type %s"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÆÁÊÌ %s"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "îÅ ×ÉÊÛÌÏ ÓÔ×ÏÒÉÔÉ ÄÏÄÁÔÏË"
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "úÁÌÉÛÉÔÉ ÌÉÓÔ ÄÏ ÐÏÄÁÌØÛÏÇÏ ÒÅÄÁÇÕ×ÁÎÎÑ ÔÁ צÄÐÒÁ×ËÉ?"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "úÁÐÉÓÁÔÉ ÌÉÓÔ ÄÏ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "úÁÐÉÓ ÌÉÓÔÁ ÄÏ %s..."
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "ìÉÓÔ ÚÁÐÉÓÁÎÏ."
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+
+#: crypt-gpgme.c:993
+msgid "Warning: One of the keys has been revoked\n"
+msgstr ""
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ×ÉÄÁÌÅÎÏ ÚÁ ÄÁ×ΦÓÔÀ"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "SSL ÎÅÄÏÓÑÖÎÅ."
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "÷¦ÄÂÉÔÏË: %s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "ðÏÍÉÌËÁ ÐÒÉ ×¦ÄÐÒÁ×æ."
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "ðÏÍÉÌËÁ ËÏÍÁÎÄÎÏÇÏ ÒÑÄËÕ: %s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr "[-- ë¦ÎÅÃØ Ð¦ÄÐÉÓÁÎÉÈ ÄÁÎÉÈ --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- ðÏÍÉÌËÁ: ˦ÎÅÃØ ÆÁÊÌÕ ÎÅ ÚÎÁÊÄÅÎÏ! --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- ðÏÞÁÔÏË ÐÏצÄÏÍÌÅÎÎÑ PGP --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- ðÏÞÁÔÏË ÂÌÏËÕ ×¦ÄËÒÉÔÏÇÏ ËÌÀÞÁ PGP --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- ðÏÞÁÔÏË ÐÏצÄÏÍÌÅÎÎÑ Ú PGP ЦÄÐÉÓÏÍ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr "[-- ë¦ÎÅÃØ ÐÏצÄÏÍÌÅÎÎÑ PGP --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- ë¦ÎÅÃØ ÂÌÏËÕ ×¦ÄËÒÉÔÏÇÏ ËÌÀÞÁ PGP --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr "[-- ë¦ÎÅÃØ ÐÏצÄÏÍÌÅÎÎÑ Ú PGP ЦÄÐÉÓÏÍ --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- ðÏÍÉÌËÁ: ÎÅ ×ÉÊÛÌÏ ÚÎÁÊÔÉ ÐÏÞÁÔÏË ÐÏצÄÏÍÌÅÎÎÑ PGP! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- ðÏÍÉÌËÁ: ÎÅÓÆÏÒÍÏ×ÁÎÉÊ ÌÉÓÔ PGP/MIME! --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- ðÏÍÉÌËÁ: ÎÅ ×ÉÊÛÌÏ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ! --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- îÁÓÔÕÐΦ ÄÁΦ ÚÁÛÉÆÒÏ×ÁÎÏ PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- îÁÓÔÕÐΦ ÄÁΦ ÚÁÛÉÆÒÏ×ÁÎÏ PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr "[-- ë¦ÎÅÃØ ÄÁÎÉÈ, ÚÁÛÉÆÒÏ×ÁÎÉÈ PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr "[-- ë¦ÎÅÃØ ÄÁÎÉÈ, ÚÁÛÉÆÒÏ×ÁÎÉÈ PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr ""
+"[-- îÁÓÔÕÐΦ ÄÁΦ ЦÄÐÉÓÁÎÏ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- îÁÓÔÕÐΦ ÄÁΦ ÚÁÛÉÆÒÏ×ÁÎÏ PGP/MIME --]\n"
+"\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr "[-- ë¦ÎÅÃØ Ð¦ÄÐÉÓÁÎÉÈ ÄÁÎÉÈ --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr "[-- ë¦ÎÅÃØ ÄÁÎÉÈ, ÚÁÛÉÆÒÏ×ÁÎÉÈ PGP/MIME --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "í¦ÓÑÃØ '%s' ÎÅ ¦ÓÎÕ¤"
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "í¦ÓÑÃØ '%s' ÎÅ ¦ÓÎÕ¤"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "í¦ÓÑÃØ '%s' ÎÅ ¦ÓÎÕ¤"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "ûÉÆÒÕ×ÁÎÎÑ"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "óÅÒÔÉƦËÁÔ ÚÂÅÒÅÖÅÎÏ"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, c-format
+msgid "Subkey ....: 0x%s"
+msgstr ""
+
+#: crypt-gpgme.c:3099
+msgid "[Revoked]"
+msgstr ""
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "÷ÉÈ¦Ä  "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "ú'¤ÄÎÁÎÎÑ Ú %s..."
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "ðÏÍÉÌËÁ Ú'¤ÄÎÁÎÎÑ Ú ÓÅÒ×ÅÒÏÍ: %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr ""
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "ðÏÍÉÌËÁ SSL: %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "÷Ó¦ צÄÐÏצÄΦ ËÌÀÞ¦ ÄÁ×Φ/ÚÁͦÎÅΦ."
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "÷ÉÈ¦Ä  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "÷ÉÂ¦Ò  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "ðÅÒÅצÒËÁ  "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP ËÌÀÞ¦, ÝÏ ×¦ÄÐÏצÄÁÀÔØ \"%s\"."
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP ËÌÀÞ¦, ÝÏ ×¦ÄÐÏצÄÁÀÔØ \"%s\"."
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "PGP ËÌÀÞ¦, ÝÏ ×¦ÄÐÏצÄÁÀÔØ \"%s\"."
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP ËÌÀÞ¦, ÝÏ ×¦ÄÐÏצÄÁÀÔØ \"%s\"."
+
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "ãÅÊ ËÌÀÞ ÎÅÍÏÖÌÉ×Ï ×ÉËÏÒÉÓÔÁÔÉ: ÄÁ×ΦÊ/×ÉÍËÎÅÎÉÊ/ÚÁͦÎÅÎÉÊ."
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+msgid "ID is expired/disabled/revoked."
+msgstr "ID ÄÁ×ΦÊ/×ÉÍËÎÅÎÉÊ/ÚÁͦÎÅÎÉÊ."
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr "ä¦ÊÓΦÓÔØ ID ÎÅ ×ÉÚÎÁÞÅÎÁ."
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+msgid "ID is not valid."
+msgstr "ID ÎÅĦÊÓÎÉÊ."
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+msgid "ID is only marginally valid."
+msgstr "ID ĦÊÓÎÉÊ ÌÉÛÅ ÞÁÓÔËÏ×Ï."
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s ÷É ÓÐÒÁ×Ħ ÂÁÖÁ¤ÔÅ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ËÌÀÞ?"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "ðÏÛÕË ËÌÀÞ¦×, ÝÏ ×¦ÄÐÏצÄÁÀÔØ \"%s\"..."
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ keyID = \"%s\" ÄÌÑ %s?"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "÷×ÅĦÔØ keyID ÄÌÑ %s: "
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr "ÛÉÆÒ.(e), ЦÄÐ.(s), ЦÄÐ. ÑË(a), ÕÓÅ(b), (i)nline ÞÉ ×¦ÄͦÎÁ(f)? "
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "esabif"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr "ÛÉÆÒ.(e), ЦÄÐ.(s), ЦÄÐ. ÑË(a), ÕÓÅ(b), (i)nline ÞÉ ×¦ÄͦÎÁ(f)? "
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "esabif"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "ð¦ÄÐÉÓ ÑË: "
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÒÏÚÂÏÒÕ ÚÁÇÏÌÏ×ËÕ."
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -735,29 +1296,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "ëÏÄÏ×Õ ÆÒÁÚÕ PGP ÚÁÂÕÔÏ."
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "÷ÉËÌÉË PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "ìÉÓÔ ÎŠצÄÐÒÁ×ÌÅÎÏ."
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
@@ -769,7 +1330,7 @@ msgstr ""
 "[-- ðÏÍÉÌËÁ: ÎÅÓÕͦÓÎÁ ÓÔÒÕËÔÕÒÁ multipart/signed! --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -778,7 +1339,7 @@ msgstr ""
 "[-- ðÏÍÉÌËÁ: ÎÅצÄÏÍÉÊ ÐÒÏÔÏËÏÌ multipart/signed %s! --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -788,7 +1349,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
@@ -797,7 +1358,7 @@ msgstr ""
 "[-- îÁÓÔÕÐΦ ÄÁΦ ЦÄÐÉÓÁÎÏ --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -805,232 +1366,262 @@ msgstr ""
 "[-- ðÏÐÅÒÅÄÖÅÎÎÑ: ÎÅÍÏÖÌÉ×Ï ÚÎÁÊÔÉ ÖÏÄÎÏÇÏ Ð¦ÄÐÉÓÕ. --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 #, fuzzy
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr "[-- ë¦ÎÅÃØ Ð¦ÄÐÉÓÁÎÉÈ ÄÁÎÉÈ --]\n"
 
-#: curs_lib.c:190
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "÷ÉËÌÉË PGP..."
+
+#: curs_lib.c:188
 msgid "yes"
 msgstr ""
 
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr ""
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "ðÏËÉÎÕÔÉ Mutt?"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "ÎÅצÄÏÍÁ ÐÏÍÉÌËÁ"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "îÁÔÉÓΦÔØ ÂÕÄØ-ÑËÕ ËÌÁצÛÕ..."
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " ('?' - ÐÅÒÅ̦Ë): "
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "îÅÍÁ¤ צÄËÒÉÔϧ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ."
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "öÏÄÎÏÇÏ ÐÏצÄÏÍÌÅÎÎÑ ÎÅÍÁ¤."
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "ðÏÛÔÏ×Á ÓËÒÉÎØËÁ צÄËÒÉÔÁ Ô¦ÌØËÉ ÄÌÑ ÞÉÔÁÎÎÑ"
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "æÕÎËæÀ ÎÅ ÄÏÚ×ÏÌÅÎÏ × ÒÅÖÉͦ ÄÏÄÁ×ÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ."
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "öÏÄÎÏÇÏ ÐÏצÄÏÍÌÅÎÎÑ ÎÅ ×ÉÄÎÏ."
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "÷צÍËÎÕÔÉ ÚÁÐÉÓ ÓËÒÉÎØËÉ, ÝÏ Ô¦ÌØËÉ ÄÌÑ ÞÉÔÁÎÎÑ, ÎÅÍÏÖÌÉ×Ï!"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "úͦÎÉ Õ ÓËÒÉÎØæ ÂÕÄÅ ÚÁÐÉÓÁÎÏ ÐÏ ×ÉÈÏÄÕ Ú Îŧ."
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "úͦÎÉ Õ ÓËÒÉÎØæ ÎÅ ÂÕÄÅ ÚÁÐÉÓÁÎÏ."
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "÷ÉÊÔÉ"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "úÂÅÒ."
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "ìÉÓÔ"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "÷¦ÄÐ."
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "÷Ó¦Í"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÚͦÎÉÌÁ ÚÏ×ΦÛÎÑ ÐÒÏÇÒÁÍÁ. æÌÁÇÉ ÍÏÖÕÔØ ÂÕÔÉ ÚͦÎÅΦ."
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "îÏ×Á ÐÏÛÔÁ Õ Ã¦Ê ÐÏÛÔÏ×¦Ê ÓËÒÉÎØæ."
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÚͦÎÉÌÁ ÚÏ×ΦÛÎÑ ÐÒÏÇÒÁÍÁ."
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "öÏÄÎÏÇÏ ÌÉÓÔÁ ÎÅ ×ÉĦÌÅÎÏ."
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 #, fuzzy
 msgid "Nothing to do."
 msgstr "ú'¤ÄÎÁÎÎÑ Ú %s..."
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "ðÅÒÅÊÔÉ ÄÏ ÌÉÓÔÁ: "
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "áÒÇÕÍÅÎÔ ÐÏ×ÉÎÅÎ ÂÕÔÉ ÎÏÍÅÒÏÍ ÌÉÓÔÁ."
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "ãÅÊ ÌÉÓÔ ÎÅ ÍÏÖÎÁ ÐÏÂÁÞÉÔÉ."
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "îÅצÒÎÉÊ ÎÏÍÅÒ ÌÉÓÔÁ."
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "÷ÉÄÁÌÉÔÉ ÌÉÓÔÉ ÚÁ ÛÁÂÌÏÎÏÍ: "
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "îÅ ×ÓÔÁÎÏ×ÌÅÎÏ ÏÂÍÅÖÅÎØ."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "ïÂÍÅÖÅÎÎÑ: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "ïÂÍÅÖÉÔÉÓØ ÐÏצÄÏÍÌÅÎÎÑÍÉ ÚÁ ÛÁÂÌÏÎÏÍ: "
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "÷ÉÊÔÉ Ú Mutt?"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "÷ÉĦÌÉÔÉ ÌÉÓÔÉ ÚÁ ÛÁÂÌÏÎÏÍ: "
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "÷¦ÄÎÏ×ÉÔÉ ÌÉÓÔÉ ÚÁ ÛÁÂÌÏÎÏÍ: "
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "úÎÑÔÉ ×ÉĦÌÅÎÎÑ Ú ÌÉÓÔ¦× ÚÁ ÛÁÂÌÏÎÏÍ: "
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "÷¦ÄËÒÉÔÉ ÓËÒÉÎØËÕ ÌÉÛÅ ÄÌÑ ÞÉÔÁÎÎÑ"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "÷¦ÄËÒÉÔÉ ÓËÒÉÎØËÕ"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s ÎÅ ¤ ÐÏÛÔÏ×ÏÀ ÓËÒÉÎØËÏÀ."
 
-#: curs_main.c:1165
+#: curs_main.c:1176
 msgid "Exit Mutt without saving?"
 msgstr "ðÏËÉÎÕÔÉ Mutt ÂÅÚ ÚÂÅÒÅÖÅÎÎÑ ÚͦÎ?"
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "óÛÉ×ÁÎÎÑ ÎÅÄÏÓÔÕÐÎÅ."
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "ÚÂÅÒÅÇÔÉ ÃÅÊ ÌÉÓÔ, ÁÂÉ ×¦Ä¦ÓÌÁÔÉ Ð¦ÚΦÛÅ"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "ãÅ ÏÓÔÁÎÎ¦Ê ÌÉÓÔ."
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "÷Ó¦ ÌÉÓÔÉ ×ÉÄÁÌÅÎÏ."
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "ãÅ ÐÅÒÛÉÊ ÌÉÓÔ."
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "äÏÓÑÇÎÕÔÏ Ë¦ÎÅÃØ. ðÏÛÕË ÐÅÒÅÎÅÓÅÎÏ ÎÁ ÐÏÞÁÔÏË."
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "äÏÓÑÇÎÕÔÏ ÐÏÞÁÔÏË. ðÏÛÕË ÐÅÒÅÎÅÓÅÎÏ ÎÁ ˦ÎÅÃØ."
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "îÅÍÁ¤ ÎÏ×ÉÈ ÌÉÓÔ¦×"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "îÅÍÁ¤ ÎÅÞÉÔÁÎÉÈ ÌÉÓÔ¦×"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " Õ ÃÉÈ ÍÅÖÁÈ ÏÇÌÑÄÕ"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 msgid "Can't change 'important' flag on POP server."
 msgstr "îÅÍÏÖÌÉ×Ï ÚͦÎÉÔÉ ÆÌÁÇ '×ÁÖÌÉ×Å' ÎÁ POP ÓÅÒ×ÅÒ¦."
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "âÅÓ¦Ä Â¦ÌØÛ ÎÅÍÁ."
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "ãÅ ÐÅÒÛÁ ÂÅÓ¦ÄÁ."
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "óÛÉ×ÁÎÎÑ ÎÅÄÏÓÔÕÐÎÅ."
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "âÅÓ¦ÄÁ ÍÁ¤ ÎÅÞÉÔÁΦ ÌÉÓÔÉ."
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "îÅÍÏÖÌÉ×Ï ÒÅÄÁÇÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÎÁ POP ÓÅÒ×ÅÒ¦."
 
@@ -1163,108 +1754,108 @@ msgstr "
 msgid "Clear flag"
 msgstr "úÎÑÔÉ ÆÌÁÇ"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- ðÏÍÉÌËÁ: ÖÏÄÎÕ ÞÁÓÔÉÎÕ Multipart/Alternative ÎÅ ×ÉÊÛÌÏ ÐÏÂÁÞÉÔÉ! --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- äÏÄÁÔÏË ÎÏÍÅÒ %d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- ôÉÐ: %s/%s, ËÏÄÕ×ÁÎÎÑ: %s, ÒÏÚͦÒ: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- á×ÔÏÐÒÏÇÌÑÄÁÎÎÑ ÚÁ ÄÏÐÏÍÏÇÏÀ %s --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "÷ÉËÌÉË ËÏÍÁÎÄÉ Á×ÔÏÍÁÔÉÞÎÏÇÏ ÐÒÏÇÌÑÄÁÎÎÑ: %s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- îÅÍÏÖÌÉ×Ï ×ÉËÏÎÁÔÉ %s. --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- ðÒÏÇÒÁÍÍÁ ÐÒÏÇÌÑÄÁÎÎÑ %s ÐÏצÄÏÍÉÌÁ ÐÏÍÉÌËÕ --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr "[-- ðÏÍÉÌËÁ: message/external-body ÎÅ ÍÁ¤ ÐÁÒÁÍÅÔÒÕ ÔÉÐÕ ÄÏÓÔÕÐÕ --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- ãÅÊ %s/%s ÄÏÄÁÔÏË "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(ÒÏÚÍ. %s ÂÁÊÔ) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "ÂÕÌÏ ×ÉÄÁÌÅÎÏ --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- ¦Í'Ñ: %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- ãÅÊ %s/%s ÄÏÄÁÔÏË ÎÅ ×ËÌÀÞÅÎÏ, --]\n"
 
-#: handler.c:1696
+#: handler.c:1712
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr "[-- צÄÐÏצÄÎÅ ÚÏ×ΦÛΤ ÄÖÅÒÅÌÏ ×ÉÄÁÌÅÎÏ ÚÁ ÄÁ×ΦÓÔÀ. --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- צÄÐÏצÄÎÉÊ ÔÉÐ ÄÏÓÔÕÐÕ %s ΊЦÄÔÒÉÍÕ¤ÔØÓÑ --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "ðÏÍÉÌËÁ: ÎÅÍÁ¤ ÐÒÏÔÏËÏÌÕ ÄÌÑ multipart/signed."
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "ðÏÍÉÌËÁ: ÎÅÍÁ¤ ÐÁÒÁÍÅÔÒÕ ÐÒÏÔÏËÏÌÕ ÄÌÑ multipart/encrypted!"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ!"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s ΊЦÄÔÒÉÍÕ¤ÔØÓÑ "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(×ÉËÏÒÉÓÔÏ×ÕÊÔÅ '%s' ÄÌÑ Ã¦¤§ ÞÁÓÔÉÎÉ)"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(ÔÒÅÂÁ ÐÒÉÚÎÁÞÉÔÉ ËÌÁצÛÕ ÄÏ 'view-attachments'!)"
 
@@ -1371,46 +1962,46 @@ msgstr "
 msgid "SASL authentication failed."
 msgstr "ðÏÍÉÌËÁ ÁÕÔÅÎÔÉƦËÁæ§ SASL."
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s - ÎÅÐÒÉÐÕÓÔÉÍÉÊ ÛÌÑÈ IMAP"
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "ïÔÒÉÍÁÎÎÑ ÐÒÏÓÔÏÒÕ ¦ÍÅÎ..."
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "ïÔÒÉÍÁÎÎÑ ÐÅÒÅ̦ËÕ ÓËÒÉÎØÏË..."
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 msgid "No such folder"
 msgstr "ôÁËϧ ÓËÒÉÎØËÉ ÎÅÍÁ¤"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "óÔ×ÏÒÉÔÉ ÓËÒÉÎØËÕ: "
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "ðÏÛÔÏ×Á ÓËÒÉÎØËÁ ÍÕÓÉÔØ ÍÁÔÉ ¦Í'Ñ."
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÓÔ×ÏÒÅÎÏ."
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "óÔ×ÏÒÉÔÉ ÓËÒÉÎØËÕ: "
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "ðÏÍÉÌËÁ SSL: %s"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÓÔ×ÏÒÅÎÏ."
@@ -1422,135 +2013,132 @@ msgstr "
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "æÁÔÁÌØÎÁ ÐÏÍÉÌËÁ. ì¦ÞÉÌØÎÉË ÌÉÓÔ¦× ÎÅÍÏÖÌÉ×Ï Ó¦ÎÈÒÏΦÚÕ×ÁÔÉ!"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "úÁËÒÉÔÔÑ Ú'¤ÄÎÁÎÎÑ Ú %s..."
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "ãÅÊ ÓÅÒ×ÅÒ IMAP ÎÁÄÔÏ ÄÁ×ΦÊ. Mutt ÎÅ ÍÏÖÅ ÐÒÁÃÀ×ÁÔÉ Ú ÎÉÍ."
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "ëÏÄÏ×ÁÎÅ Ú'¤ÄÎÁÎÎÑ Ú TLS?"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "îÅ ×ÉÊÛÌÏ ÄÏÍÏ×ÉÔÉÓØ ÐÒÏ TLS Ú'¤ÄÎÁÎÎÑ"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "÷ÉÂ¦Ò %s..."
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "ðÏÍÉÌËÁ צÄËÒÉÔÔÑ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "îÅÍÏÖÌÉ×Ï ÄÏÄÁ×ÁÔÉ ÄÏ ÓËÒÉÎØÏË IMAP ÎÁ ÃØÏÍÕ ÓÅÒ×ÅÒ¦"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "óÔ×ÏÒÉÔÉ %s?"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "íÁÒËÕ×ÁÎÎÑ %d ÎÏ×ÉÈ ÐÏצÄÏÍÌÅÎØ ×ÉÄÁÌÅÎÉÍÉ..."
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "ðÏÍÉÌËÁ ×ÉÄÁÌÅÎÎÑ"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "úÂÅÒÅÖÅÎÎÑ ÆÌÁÇ¦× ÓÔÁÔÕÓÕ ÌÉÓÔÁ... [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "÷ÉÄÁÌÅÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú ÓÅÒ×ÅÒÕ..."
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: ÐÏÍÉÌËÁ EXPUNGE"
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "ðÏÍÉÌËÁ CLOSE"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 msgid "Bad mailbox name"
 msgstr "ðÏÇÁÎÅ ¦Í'Ñ ÄÌÑ ÓËÒÉÎØËÉ"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "ð¦ÄÐÉÓÕ×ÁÎÎÑ ÄÏ %s..."
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "÷¦ÄÐÉÓÕ×ÁÎÎÑ ×¦Ä %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "ú ÓÅÒ×ÅÒÕ IMAP 椧 ×ÅÒÓ¦§ ÏÔÒÉÍÁÔÉ ÚÁÇÏÌÏ×ËÉ ÎÅÍÏÖÌÉ×Ï."
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "îÅ ×ÉÊÛÌÏ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ %s"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "ïÔÒÉÍÁÎÎÑ ÚÁÇÏÌÏ×Ë¦× ÌÉÓÔ¦×... [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "ïÔÒÉÍÁÎÎÑ ÚÁÇÏÌÏ×Ë¦× ÌÉÓÔ¦×... [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "ïÔÒÉÍÁÎÎÑ ÌÉÓÔÁ..."
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "îÅËÏÒÅËÔÎÉÊ ÎÏÍÅÒ ÐÏצÄÏÍÌÅÎÎÑ. óÐÒÏÂÕÊÔŠצÄËÒÉÔÉ ÓËÒÉÎØËÕ ÝÅ ÒÁÚ."
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "÷¦ÄÐÒÁ×ÌÅÎÎÑ ÌÉÓÔÁ..."
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "ëÏЦÀ×ÁÎÎÑ %d ÌÉÓÔ¦× ÄÏ %s..."
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "ëÏЦÀ×ÁÎÎÑ %d ÌÉÓÔÁ ÄÏ %s..."
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "äÁ̦?"
 
@@ -1559,124 +2147,124 @@ msgstr "
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:678
+#: init.c:644
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "×ÉĦÌÉÔÉ ÌÉÓÔÉ, ÝÏ Í¦ÓÔÑÔØ ×ÉÒÁÚ"
 
-#: init.c:680
+#: init.c:646
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "ÚÎÑÔÉ ×ÉĦÌÅÎÎÑ Ú ÌÉÓÔ¦×, ÝÏ Í¦ÓÔÑÔØ ×ÉÒÁÚ"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "alias: ÁÄÒÅÓÉ ÎÅÍÁ¤"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "ÎÅצÒÎÅ ÐÏÌÅ ÚÁÇÏÌÏ×ËÕ"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: ÎÅצÄÏÍÉÊ ÍÅÔÏÄ ÓÏÒÔÕ×ÁÎÎÑ"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): ÐÏÍÉÌËÁ ×ÉÒÁÚÕ: %s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: ÎÅצÄÏÍÁ ÚͦÎÎÁ"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "ÐÒÅƦËÓ ÎÅÐÒÉÐÕÓÔÉÍÉÊ ÄÌÑ ÓËÉÄÁÎÎÑ"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "ÚÎÁÞÅÎÎÑ ÎÅÐÒÉÐÕÓÔÉÍÅ ÄÌÑ ÓËÉÄÁÎÎÑ"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s ×ÓÔÁÎÏ×ÌÅÎÏ"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s ÎÅ ×ÓÔÁÎÏ×ÌÅÎÏ"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: ÎÅצÒÎÉÊ ÔÉÐ ÓËÒÉÎØËÉ"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: ÎÅצÒÎÅ ÚÎÁÞÅÎÎÑ"
 
-#: init.c:1589
+#: init.c:1555
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s: ÎÅצÄÏÍÉÊ ÔÉÐ"
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: ÎÅצÄÏÍÉÊ ÔÉÐ"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "ðÏÍÉÌËÁ × %s, ÒÑÄÏË %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: ÐÏÍÉÌËÉ × %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: ÞÉÔÁÎÎÑ ÚÁ×ÅÒÛÅÎÏ, ÄÕÖÅ ÂÁÇÁÔÏ ÐÏÍÉÌÏË Õ %s"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source: ÐÏÍÉÌËÁ × %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source: ÄÕÖÅ ÂÁÇÁÔÏ ÁÒÇÕÍÅÎÔ¦×"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: ÎÅצÄÏÍÁ ËÏÍÁÎÄÁ"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "ðÏÍÉÌËÁ ËÏÍÁÎÄÎÏÇÏ ÒÑÄËÕ: %s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "ÎÅÍÏÖÌÉ×Ï Ú'ÑÓÕ×ÁÔÉ ÄÏÍÁÛÎ¦Ê ËÁÔÁÌÏÇ"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "ÎÅÍÏÖÌÉ×Ï Ú'ÑÓÕ×ÁÔÉ ¦Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ"
 
@@ -2136,405 +2724,414 @@ msgid "compose a new mail message"
 msgstr "ËÏÍÐÏÎÕ×ÁÔÉ ÎÏ×ÉÊ ÌÉÓÔ"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "צÄËÒÉÔÉ ¦ÎÛÕ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "צÄËÒÉÔÉ ¦ÎÛÕ ÓËÒÉÎØËÕ Ô¦ÌØËÉ ÄÌÑ ÞÉÔÁÎÎÑ"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "ÓËÉÎÕÔÉ ÆÌÁÇ ÓÔÁÔÕÓÕ ÌÉÓÔÁ"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "×ÉÄÁÌÉÔÉ ÌÉÓÔÉ, ÝÏ Í¦ÓÔÑÔØ ×ÉÒÁÚ"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "ÐÒÉÍÕÓÏ×Ï ÏÔÒÉÍÁÔÉ ÐÏÛÔÕ Ú ÓÅÒ×ÅÒÁ IMAP"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "ÏÔÒÉÍÁÔÉ ÐÏÛÔÕ Ú ÓÅÒ×ÅÒÁ POP"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÅÒÛÏÇÏ ÌÉÓÔÁ"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÏÓÔÁÎÎØÏÇÏ ÌÉÓÔÁ"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "ÐÏËÁÚÁÔÉ ÌÉÛÅ ÌÉÓÔÉ, ÝÏ Í¦ÓÔÑÔØ ×ÉÒÁÚ"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "îÁĦÓÌÁÔÉ ËÏЦ§ ×ÉĦÌÅÎÉÈ ÌÉÓÔ¦×: "
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ÎÏ×ÏÇÏ ÌÉÓÔÁ"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 #, fuzzy
 msgid "jump to the next new or unread message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ÎÅÞÉÔÁÎÏÇÏ ÌÉÓÔÁ"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎϧ ЦÄÂÅÓ¦ÄÉ"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎϧ ÂÅÓ¦ÄÉ"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ÎÅ×ÉÄÁÌÅÎÏÇÏ ÌÉÓÔÁ"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ÎÅÞÉÔÁÎÏÇÏ ÌÉÓÔÁ"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ \"ÂÁÔØ˦×ÓØËÏÇÏ\" ÌÉÓÔÁ Õ ÂÅӦĦ"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØϧ ÂÅÓ¦ÄÉ"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØϧ ЦÄÂÅÓ¦ÄÉ"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ÎÅ×ÉÄÁÌÅÎÏÇÏ ÌÉÓÔÁ"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ÎÏ×ÏÇÏ ÌÉÓÔÁ"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 #, fuzzy
 msgid "jump to the previous new or unread message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ÎÅÞÉÔÁÎÏÇÏ ÌÉÓÔÁ"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ÎÅÞÉÔÁÎÏÇÏ ÌÉÓÔÁ"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "צÄͦÔÉÔÉ ÐÏÔÏÞÎÕ ÂÅÓ¦ÄÕ ÑË ÞÉÔÁÎÕ"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "צÄͦÔÉÔÉ ÐÏÔÏÞÎÕ Ð¦ÄÂÅÓ¦ÄÕ ÑË ÞÉÔÁÎÕ"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "×ÓÔÁÎÏ×ÉÔÉ ÆÌÁÇ ÓÔÁÔÕÓÕ ÌÉÓÔÁ"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "ÚÁÐÉÓÁÔÉ ÚͦÎÉ ÄÏ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "×ÉĦÌÉÔÉ ÌÉÓÔÉ, ÝÏ Í¦ÓÔÑÔØ ×ÉÒÁÚ"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "צÄÎÏ×ÉÔÉ ÌÉÓÔÉ, ÝÏ Í¦ÓÔÑÔØ ×ÉÒÁÚ"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "ÚÎÑÔÉ ×ÉĦÌÅÎÎÑ Ú ÌÉÓÔ¦×, ÝÏ Í¦ÓÔÑÔØ ×ÉÒÁÚ"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÓÅÒÅÄÉÎÉ ÓÔÏÒ¦ÎËÉ"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎϧ ÐÏÚÉæ§"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "ÐÒÏÇÏÒÎÕÔÉ ÎÁ ÒÑÄÏË ÄÏÎÉÚÕ"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎϧ ÓÔÏÒ¦ÎËÉ"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ Ë¦ÎÃÑ ÌÉÓÔÁ"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "×ÉÍË./×צÍËÎ. צÄÏÂÒÁÖÅÎÎÑ ÃÉÔÏ×ÁÎÏÇÏ ÔÅËÓÔÕ"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "ÐÒÏÐÕÓÔÉÔÉ ÃÉÔÏ×ÁÎÉÊ ÔÅËÓÔ Ã¦ÌËÏÍ"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÞÁÔËÕ ÌÉÓÔÁ"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "צÄÄÁÔÉ ÌÉÓÔ/ÄÏÄÁÔÏË Õ ËÏÎ×Å¤Ò ËÏÍÁÎĦ shell"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØϧ ÐÏÚÉç§"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "ÐÒÏÇÏÒÎÕÔÉ ÎÁ ÒÑÄÏË ÄÏÇÏÒÉ"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØϧ ÓÔÏÒ¦ÎËÉ"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "ÄÒÕËÕ×ÁÔÉ ÐÏÔÏÞÎÕ ÐÏÚÉæÀ"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "ÚÁÐÉÔ ÚÏ×ΦÛÎØϧ ÐÒÏÇÒÁÍÉ ÐÏ ÁÄÒÅÓÉ"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "ÄÏÄÁÔÉ ÒÅÚÕÌØÔÁÔÉ ÎÏ×ÏÇÏ ÚÁÐÉÔÕ ÄÏ ÐÏÔÏÞÎÉÈ"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "ÚÂÅÒÅÇÔÉ ÚͦÎÉ ÓËÒÉÎØËÉ ÔÁ ×ÉÊÔÉ"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "×ÉËÌÉËÁÔÉ ÚÁÌÉÛÅÎÉÊ ÌÉÓÔ"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "ÏÞÉÓÔÉÔÉ ÔÁ ÐÅÒÅÍÁÌÀ×ÁÔÉ ÅËÒÁÎ"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{×ÎÕÔÒ¦ÛÎÑ}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "×ÉÄÁÌÉÔÉ ÐÏÔÏÞÎÕ ÓËÒÉÎØËÕ (ÌÉÛÅ IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "צÄÐÏצÓÔÉ ÎÁ ÌÉÓÔ"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "×ÚÑÔÉ ÃÅÊ ÌÉÓÔ × ÑËÏÓÔ¦ ÛÁÂÌÏÎÕ ÄÌÑ ÎÏ×ÏÇÏ"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "ÚÂÅÒÅÇÔÉ ÌÉÓÔ/ÄÏÄÁÔÏË Õ ÆÁÊ̦"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "ÐÏÛÕË ×ÉÒÁÚÕ × ÎÁÐÒÑÍËÕ ÕÐÅÒÅÄ"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "ÐÏÛÕË ×ÉÒÁÚÕ × ÎÁÐÒÑÍËÕ ÎÁÚÁÄ"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "ÐÏÛÕË ÎÁÓÔÕÐÎϧ צÄÐÏצÄÎÏÓÔ¦"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "ÐÏÛÕË ÎÁÓÔÕÐÎÏÇÏ × Ú×ÏÒÏÔÎØÏÍÕ ÎÁÐÒÑÍËÕ"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "×ÉÍË./×צÍËÎÕÔÉ ×ÉĦÌÅÎÎÑ ×ÉÒÁÚÕ ÐÏÛÕËÕ"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "×ÉËÌÉËÁÔÉ ËÏÍÁÎÄÕ × shell"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "ÓÏÒÔÕ×ÁÔÉ ÌÉÓÔÉ"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "ÓÏÒÔÕ×ÁÔÉ ÌÉÓÔÉ × Ú×ÏÒÏÔÎØÏÍÕ ÎÁÐÒÑÍËÕ"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "×ÉĦÌÉÔÉ ÐÏÔÏÞÎÕ ÐÏÚÉæÀ"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "×ÉËÏÒÉÓÔÁÔÉ ÎÁÓÔÕÐÎÕ ÆÕÎËæÀ ÄÏ ×ÉĦÌÅÎÏÇÏ"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 #, fuzzy
 msgid "apply next function ONLY to tagged messages"
 msgstr "×ÉËÏÒÉÓÔÁÔÉ ÎÁÓÔÕÐÎÕ ÆÕÎËæÀ ÄÏ ×ÉĦÌÅÎÏÇÏ"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "×ÉĦÌÉÔÉ ÐÏÔÏÞÎÕ Ð¦ÄÂÅÓ¦ÄÕ"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "×ÉĦÌÉÔÉ ÐÏÔÏÞÎÕ ÂÅÓ¦ÄÕ"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "ÚͦÎÉÔÉ ÆÌÁÇ ÎÏ×ÏÇÏ ÌÉÓÔÁ"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "×ÉÍËÎÕÔÉ/×צÍËÎÕÔÉ ÐÅÒÅÚÁÐÉÓÕ×ÁÎÎÑ ÓËÒÉÎØËÉ"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "×ÉÂ¦Ò ÐÒÏÇÌÑÄÁÎÎÑ ÓËÒÉÎØÏË/×Ó¦È ÆÁÊ̦×"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÞÁÔËÕ ÓÔÏÒ¦ÎËÉ"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "צÄÎÏ×ÉÔÉ ÐÏÔÏÞÎÕ ÐÏÚÉæÀ"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "צÄÎÏ×ÉÔÉ ×Ó¦ ÌÉÓÔÉ ÂÅÓ¦ÄÉ"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "צÄÎÏ×ÉÔÉ ×Ó¦ ÌÉÓÔÉ Ð¦ÄÂÅÓ¦ÄÉ"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "ÐÏËÁÚÁÔÉ ×ÅÒÓ¦À ÔÁ ÄÁÔÕ Mutt"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "ÐÒÏÇÌÑÎÕÔÉ ÚÁ ÄÏÐÏÍÏÇÏÀ mailcap ÐÒÉ ÐÏÔÒŦ"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "ÐÏËÁÚÁÔÉ ÄÏÄÁÔËÉ MIME"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr ""
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "ÐÏËÁÚÁÔÉ ÐÏÔÏÞÎÉÊ ×ÉÒÁÚ ÏÂÍÅÖÅÎÎÑ"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "ÚÇÏÒÎÕÔÉ/ÒÏÚÇÏÒÎÕÔÉ ÐÏÔÏÞÎÕ ÂÅÓ¦ÄÕ"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "ÚÇÏÒÎÕÔÉ/ÒÏÚÇÏÒÎÕÔÉ ×Ó¦ ÂÅÓ¦ÄÉ"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "ÐÒɤÄÎÁÔÉ ÚÁÇÁÌØÎÉÊ ËÌÀÞ PGP"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "ÐÏËÁÚÁÔÉ ÐÁÒÁÍÅÔÒÉ PGP"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "צĦÓÌÁÔÉ ÚÁÇÁÌØÎÉÊ ËÌÀÞ PGP"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "ÐÅÒÅצÒÉÔÉ ÚÁÇÁÌØÎÉÊ ËÌÀÞ PGP"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "ÐÏÂÁÞÉÔÉ ¦ÄÅÎԦƦËÁÔÏÒ ËÏÒÉÓÔÕ×ÁÞÁ ËÌÀÞÁ"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "ÐÅÒÅצÒËÁ ÎÁ ËÌÁÓÉÞÎÅ pgp"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "ðÒÉÊÎÑÔÉ ÓËÏÓÔÒÕÊÏ×ÁÎÉÊ ÌÁÎÃÀÖÏË"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "äÏÄÁÔÉ remailer ÄÏ ÌÁÎÃÀÖËÕ"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "÷ÓÔÁ×ÉÔÉ remailer × ÌÁÎÃÀÖÏË"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "÷ÉÄÁÌÉÔÉ remailer Ú ÌÁÎÃÀÖËÕ"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "÷ÉÂÒÁÔÉ ÐÏÐÅÒÅÄÎ¦Ê ÅÌÅÍÅÎÔ ÌÁÎÃÀÖËÕ"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "÷ÉÂÒÁÔÉ ÎÁÓÔÕÐÎÉÊ ÅÌÅÍÅÎÔ ÌÁÎÃÀÖËÕ"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "צĦÓÌÁÔÉ ÌÉÓÔ ÞÅÒÅÚ ÌÁÎËÕ mixmaster remailer"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "ÚÒÏÂÉÔÉ ÒÏÚÛÉÆÒÏ×ÁÎÕ ËÏЦÀ ÔÁ ×ÉÄÁÌÉÔÉ"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "ÚÒÏÂÉÔÉ ÒÏÚÛÉÆÒÏ×ÁÎÕ ËÏЦÀ"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 #, fuzzy
 msgid "wipe passphrase(s) from memory"
 msgstr "ÚÎÉÝÉÔÉ ÐÁÒÏÌØ PGP Õ ÐÁÍ'ÑÔ¦"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 #, fuzzy
 msgid "extract supported public keys"
 msgstr "ÒÏÚÐÁËÕ×ÁÔÉ ÚÁÇÁÌØÎÉÊ ËÌÀÞ PGP"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 #, fuzzy
 msgid "show S/MIME options"
 msgstr "ÐÏËÁÚÁÔÉ ÐÁÒÁÍÅÔÒÉ PGP"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr ""
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "îÅ ×ÉÓÔÁÞÁ¤ ÐÁÍ'ÑÔ¦!"
 
@@ -2556,11 +3153,11 @@ msgstr ""
 
 #: main.c:61
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2582,25 +3179,63 @@ msgid ""
 "    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
 msgstr ""
 
-#: main.c:99
+#: main.c:99
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"×ÉËÏÒÉÓÔÁÎÎÑ: mutt [ -nRyzZ ] [ -e <ËÍÄ> ] [ -F <ÆÁÊÌ> ] [ -m <ÔÉÐ> ] [ -f "
+"<ÆÁÊÌ> ]\n"
+"       mutt [ -nx ] [ -e <ËÍÄ> ] [ -a <ÆÁÊÌ> ] [ -F <ÆÁÊÌ> ] [ -H <ÆÁÊÌ> ] "
+"[ -i <ÆÁÊÌ> ] [ -s <ÔÅÍÁ> ] [ -b <ÁÄÒ> ] [ -c <ÁÄÒ> ] <ÁÄÒ> [ ... ]\n"
+"       mutt [ -n ] [ -e <ËÍÄ> ] [ -F <ÆÁÊÌ> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"ÐÁÒÁÍÅÔÒÉ:\n"
+"  -a <ÆÁÊÌ>\tÐÒɤÄÎÁÔÉ ÆÁÊÌ ÄÏ ÌÉÓÔÁ\n"
+"  -b <ÁÄÒÅÓÉ>\t×ËÁÚÁÔÉ ÁÄÒÅÓÉ ÏÔÒÉÍÕ×ÁÞ¦× ÎÅÐÏͦÔÎÉÈ ËÏÐ¦Ê (Bcc)\n"
+"  -c <ÁÄÒÅÓÉ>\t×ËÁÚÁÔÉ ÁÄÒÅÓÉ ÏÔÒÉÍÕ×ÁÞ¦× ËÏÐ¦Ê (Cc)\n"
+"  -e <ËÏÍÁÎÄÁ>\t×ËÁÚÁÔÉ ËÏÍÁÎÄÕ, ÝÏ §§ ×ÉËÏÎÁÔÉ Ð¦ÓÌÑ ¦Î¦Ã¦Á̦ÚÁæ§\n"
+"  -f <ÆÁÊÌ>\t×ËÁÚÁÔÉ, ÑËÕ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÞÉÔÁÔÉ\n"
+"  -F <ÆÁÊÌ>\t×ËÁÚÁÔÉ ÁÌØÔÅÒÎÁÔÉ×ÎÉÊ ÆÁÊÌ muttrc\n"
+"  -H <ÆÁÊÌ>\t×ËÁÚÁÔÉ ÆÁÊÌ, ÝÏ Í¦ÓÔÉÔØ ÛÁÂÌÏÎ ÚÁÇÏÌÏ×ËÕ\n"
+"  -i <ÆÁÊÌ>\t×ËÁÚÁÔÉ ÆÁÊÌ, ÝÏ ÊÏÇÏ ÔÒÅÂÁ ×ËÌÀÞÉÔÉ Õ ×¦ÄÐÏצÄØ\n"
+"  -m <ÔÉÐ>\t×ËÁÚÁÔÉ ÔÉÐ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ\n"
+"  -n\t\t×ËÁÚÕ¤ Mutt ÎÅ ÞÉÔÁÔÉ ÓÉÓÔÅÍÎÉÊ Muttrc\n"
+"  -p\t\t×ÉËÌÉËÁÔÉ ÚÁÌÉÛÅÎÉÊ ÌÉÓÔ\n"
+"  -R\t\tצÄËÒÉÔÉ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ Ô¦ÌØËÉ ÄÌÑ ÞÉÔÁÎÎÑ\n"
+"  -s <ÔÅÍÁ>\t×ËÁÚÁÔÉ ÔÅÍÕ (× ÐÏÄצÊÎÉÈ ÌÁÐËÁÈ, ÑËÝÏ Í¦ÓÔÉÔØ ÐÒϦÌÉ)\n"
+"  -v\t\tÐÏËÁÚÁÔÉ ×ÅÒÓ¦À ÔÁ ÐÁÒÁÍÅÔÒÉ ËÏÍЦÌÑæ§\n"
+"  -x\t\tÓÉÍÕÌÀ×ÁÔÉ ×¦ÄÐÒÁ×ËÕ mailx\n"
+"  -y\t\t×ÉÂÒÁÔÉ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ Ú-ÐÏÍ¦Ö ×ËÁÚÁÎÉÈ Õ `mailboxes'\n"
+"  -z\t\tÏÄÒÁÚÕ ×ÉÊÔÉ, ÑËÝÏ × ÐÏÛÔÏ×¦Ê ÓËÒÉÎØæ ÎÅÍÁ¤ ÖÏÄÎÏÇÏ ÌÉÓÔÁ\n"
+"  -Z\t\tצÄËÒÉÔÉ ÐÅÒÛÕ ÓËÒÉÎØËÕ Ú ÎÏ×ÉÍ ÌÉÓÔÏÍ, ÑËÝÏ ÎÅÍÁ¤ - ÏÄÒÁÚÕ ×ÉÊÔÉ\n"
+"  -h\t\tÃÑ Ð¦ÄËÁÚËÁ"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
 #, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-"<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-"[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-"[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
-"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
-"\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2647,7 +3282,7 @@ msgstr ""
 "  -Z\t\tצÄËÒÉÔÉ ÐÅÒÛÕ ÓËÒÉÎØËÕ Ú ÎÏ×ÉÍ ÌÉÓÔÏÍ, ÑËÝÏ ÎÅÍÁ¤ - ÏÄÒÁÚÕ ×ÉÊÔÉ\n"
 "  -h\t\tÃÑ Ð¦ÄËÁÚËÁ"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2655,47 +3290,47 @@ msgstr ""
 "\n"
 "ðÁÒÁÍÅÔÒÉ ËÏÍЦÌÑæ§:"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "ðÏÍÉÌËÁ ¦Î¦Ã¦Á̦ÚÁæ§ ÔÅÒͦÎÁÌÕ."
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr ""
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG ÎÅ ×ËÁÚÁÎÏ Ð¦Ä ÞÁÓ ËÏÍЦÌÑæ§. ¶ÇÎÏÒÕ¤ÔØÓÑ.\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s ÎÅ ¦ÓÎÕ¤. óÔ×ÏÒÉÔÉ ÊÏÇÏ?"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ %s: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "ïÔÒÉÍÕ×ÁÞ¦× ÎÅ ×ËÁÚÁÎÏ.\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: ÎÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ ÆÁÊÌ.\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "îÅÍÁ¤ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ Ú ÎÏ×ÏÀ ÐÏÛÔÏÀ."
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "÷ȦÄÎÉÈ ÐÏÛÔÏ×ÉÈ ÓËÒÉÎØÏË ÎÅ ×ËÁÚÁÎÏ."
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "ðÏÛÔÏ×Á ÓËÒÉÎØËÁ ÐÏÒÏÖÎÑ."
 
@@ -2712,11 +3347,11 @@ msgstr "
 msgid "Mailbox was corrupted!"
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÂÕÌÏ Ú¦ÐÓÏ×ÁÎÏ!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "æÁÔÁÌØÎÁ ÐÏÍÉÌËÁ! îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÚÎÏ×Õ!"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "ðÏÛÔÏ×Á ÓËÒÉÎØËÁ ÎÅ ÂÌÏËÕ¤ÔØÓÑ!"
 
@@ -2724,11 +3359,11 @@ msgstr "
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "sync: ÓËÒÉÎØËÕ ÚͦÎÅÎÏ, ÁÌÅ ÎÅÍÁ¤ ÚͦÎÅÎÉÈ ÌÉÓÔ¦×! (ÐÏצÄÏÍØÔÅ ÐÒÏ ÃÅ)"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "úÁÐÉÓ ÌÉÓÔ¦×... %d (%d%%)"
@@ -2736,187 +3371,148 @@ msgstr "
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "÷ÎÅÓÅÎÎÑ ÚͦÎ..."
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "úÂ¦Ê ÚÁÐÉÓÕ! þÁÓÔËÏ×Õ ÓËÒÉÎØËÕ ÚÂÅÒÅÖÅÎÏ Õ %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÚÎÏ×Õ!"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "ðÏ×ÔÏÒΊצÄËÒÉÔÔÑ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ..."
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "ðÅÒÅÊÔÉ ÄÏ: "
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "îÅצÒÎÉÊ ÎÏÍÅÒ ÐÅÒÅ̦ËÕ."
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "öÏÄÎϧ ÐÏÚÉç§."
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "äÁ̦ ÎÉÖÞÅ ÐÒÏËÒÕÞÕ×ÁÔÉ ÎÅ ÍÏÖÎÁ."
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "äÁ̦ ×ÉÝÅ ÐÒÏËÒÕÞÕ×ÁÔÉ ÎÅ ÍÏÖÎÁ."
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "ãÅ ÏÓÔÁÎÎÑ ÓÔÏÒ¦ÎËÁ."
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "ãÅ ÐÅÒÛÁ ÓÔÏÒ¦ÎËÁ."
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "÷É ÂÁÞÉÔÅ ÐÅÒÛÕ ÐÏÚÉæÀ."
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "÷É ÂÁÞÉÔÅ ÏÓÔÁÎÎÀ ÐÏÚÉæÀ."
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "ãÅ ÏÓÔÁÎÎÑ ÐÏÚÉæÑ."
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "ãÅ ÐÅÒÛÁ ÐÏÚÉæÑ."
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "ûÕËÁÔÉ ×ÉÒÁÚ:"
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "ú×ÏÒÏÔÎ¦Ê ÐÏÛÕË ×ÉÒÁÚÕ: "
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "îÅÍÁ¤ ×ÉÒÁÚÕ ÐÏÛÕËÕ."
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "îÅ ÚÎÁÊÄÅÎÏ."
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "öÏÄÎϧ ÐÏÚÉæ§ ÎÅ ×ÉÂÒÁÎÏ."
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "ðÏÛÕË Õ ÃØÏÍÕ ÍÅÎÀ ΊЦÄÔÒÉÍÕ¤ÔØÓÑ."
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "ðÅÒÅÈ¦Ä Õ ÃØÏÍÕ Ä¦ÁÌÏÚ¦ ΊЦÄÒÉÍÕ¤ÔØÓÑ."
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "÷ÉĦÌÅÎÎÑ ÎŠЦÄÔÒÉÍÕ¤ÔØÓÑ."
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "þÉÔÁÎÎÑ %s... %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
-#: muttlib.c:846
-#, fuzzy
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "æÁÊÌ ¤ ËÁÔÁÌÏÇÏÍ, ÚÂÅÒÅÇÔÉ Õ ÎØÏÍÕ?"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr ""
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "æÁÊÌ ¤ ËÁÔÁÌÏÇÏÍ, ÚÂÅÒÅÇÔÉ Õ ÎØÏÍÕ?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "æÁÊÌ Õ ËÁÔÁÌÏÚ¦: "
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "æÁÊÌ ¦ÓÎÕ¤, (o)ÐÅÒÅÐÉÓÁÔÉ, (a)ÄÏÄÁÔÉ ÄÏ ÎØÏÇÏ ÞÉ (c)צÄÍÏ×ÉÔÉ?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr ""
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "îÅÍÏÖÌÉ×Ï ÚÁÐÉÓÁÔÉ ÌÉÓÔ ÄÏ ÓËÒÉÎØËÉ POP."
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s ÎÅ ¤ ÐÏÛÔÏ×ÏÀ ÓËÒÉÎØËÏÀ!"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "äÏÄÁÔÉ ÌÉÓÔÉ ÄÏ %s?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "ú'¤ÄÎÁÎÎÑ Ú %s ÚÁËÒÉÔÏ"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "SSL ÎÅÄÏÓÑÖÎÅ."
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "ðÏÍÉÌËÁ ËÏÍÁÎÄÉ, ÐÏÐÅÒÅÄÎØϧ Ú'¤ÄÎÁÎÎÀ."
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "ðÏÍÉÌËÁ Õ Ú'¤ÄÎÁÎΦ Ú ÓÅÒ×ÅÒÏÍ %s (%s)"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "ðÏÛÕË %s..."
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "îÅ ×ÉÊÛÌÏ ÚÎÁÊÔÉ ÁÄÒÅÓÕ \"%s\"."
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "ú'¤ÄÎÁÎÎÑ Ú %s..."
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "îÅ ×ÉÊÛÌÏ Ú'¤ÄÎÁÔÉÓÑ Ú %s (%s)."
@@ -2948,7 +3544,8 @@ msgstr "
 msgid "SSL failed: %s"
 msgstr "ðÏÍÉÌËÁ SSL: %s"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ÓÅÒÔÉƦËÁÔ"
 
@@ -2957,87 +3554,208 @@ msgstr "
 msgid "SSL connection using %s (%s)"
 msgstr "ú'¤ÄÎÁÎÎÑ SSL Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ %s (%s)"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "îÅצÄÏÍÅ"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[ÎÅÍÏÖÌÉ×Ï ÏÂÞÉÓÌÉÔÉ]"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "[ÐÏÍÉÌËÏ×Á ÄÁÔÁ]"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ÝŠΊĦÊÓÎÉÊ"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ×ÉÄÁÌÅÎÏ ÚÁ ÄÁ×ΦÓÔÀ"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "ãÅÊ ÓÅÒÔÉƦËÁÔ ÎÁÌÅÖÉÔØ:"
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "ãÅÊ ÓÅÒÔÉƦËÁÔ ×ÉÄÁÎÏ:"
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "ãÅÊ ÓÅÒÔÉƦËÁÔ Ä¦ÊÓÎÉÊ"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   ×¦Ä %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     ÄÏ %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "÷¦ÄÂÉÔÏË: %s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "ðÅÒÅצÒËÁ ÓÅÒÔÉƦËÁÔÕ SSL"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)ÎÅ ÐÒÉÊÍÁÔÉ, ÐÒÉÊÎÑÔÉ (o)ÏÄÎÏÒÁÚÏ×Ï ÁÂÏ (a)ÚÁ×ÖÄÉ"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr ""
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)ÎÅ ÐÒÉÊÍÁÔÉ, (o)ÐÒÉÊÎÑÔÉ ÏÄÎÏÒÁÚÏ×Ï"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr ""
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "÷ÉÈ¦Ä  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "ðÏÐÅÒÅÄÖÅÎÎÑ: ÎÅÍÏÖÌÉ×Ï ÚÂÅÒÅÇÔÉ ÓÅÒÔÉƦËÁÔ"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "óÅÒÔÉƦËÁÔ ÚÂÅÒÅÖÅÎÏ"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "ú'¤ÄÎÁÎÎÑ SSL Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ %s (%s)"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "óÅÒÔÉƦËÁÔ ÚÂÅÒÅÖÅÎÏ"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "ðÏÍÉÌËÁ ¦Î¦Ã¦Á̦ÚÁæ§ ÔÅÒͦÎÁÌÕ."
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "÷¦ÄÂÉÔÏË: %s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "÷¦ÄÂÉÔÏË: %s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ÝŠΊĦÊÓÎÉÊ"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ×ÉÄÁÌÅÎÏ ÚÁ ÄÁ×ΦÓÔÀ"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ×ÉÄÁÌÅÎÏ ÚÁ ÄÁ×ΦÓÔÀ"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ÝŠΊĦÊÓÎÉÊ"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "ðÅÒÅצÒËÁ ÓÅÒÔÉƦËÁÔÕ SSL"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "ú'¤ÄÎÁÎÎÑ Ú %s..."
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "ðÏÍÉÌËÁ Õ Ú'¤ÄÎÁÎΦ Ú ÓÅÒ×ÅÒÏÍ %s (%s)"
+
+#: muttlib.c:910
+#, fuzzy
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "æÁÊÌ ¤ ËÁÔÁÌÏÇÏÍ, ÚÂÅÒÅÇÔÉ Õ ÎØÏÍÕ?"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr ""
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "æÁÊÌ ¤ ËÁÔÁÌÏÇÏÍ, ÚÂÅÒÅÇÔÉ Õ ÎØÏÍÕ?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "æÁÊÌ Õ ËÁÔÁÌÏÚ¦: "
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "æÁÊÌ ¦ÓÎÕ¤, (o)ÐÅÒÅÐÉÓÁÔÉ, (a)ÄÏÄÁÔÉ ÄÏ ÎØÏÇÏ ÞÉ (c)צÄÍÏ×ÉÔÉ?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr ""
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "îÅÍÏÖÌÉ×Ï ÚÁÐÉÓÁÔÉ ÌÉÓÔ ÄÏ ÓËÒÉÎØËÉ POP."
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "äÏÄÁÔÉ ÌÉÓÔÉ ÄÏ %s?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s ÎÅ ¤ ÐÏÛÔÏ×ÏÀ ÓËÒÉÎØËÏÀ!"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3115,7 +3833,7 @@ msgstr "
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d ÚÂÅÒÅÖÅÎÏ, %d ÐÅÒÅÎÅÓÅÎÏ, %d ÚÎÉÝÅÎÏ."
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d ÚÂÅÒÅÖÅÎÏ, %d ÚÎÉÝÅÎÏ."
@@ -3134,15 +3852,15 @@ msgstr "
 msgid "Mailbox is marked unwritable. %s"
 msgstr "óËÒÉÎØËÕ ÐÏͦÞÅÎÏ ÎÅÚͦÎÀ×ÁÎÏÀ. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÐÅÒÅצÒÅÎÏ."
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "îÅÍÏÖÌÉ×Ï ÚÁÐÉÓÁÔÉ ÌÉÓÔ"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
@@ -3150,48 +3868,48 @@ msgstr ""
 msgid "Not available in this menu."
 msgstr "îÅÍÏÖÌÉ×Ï Õ ÃØÏÍÕ ÍÅÎÀ."
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "ðÏÐóÔ"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "îÁÓÔóÔ"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "äÏÄÁÔËÉ"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "îÁÓÔ"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "÷É ÂÁÞÉÔŠ˦ÎÅÃØ ÌÉÓÔÁ."
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "÷É ÂÁÞÉÔÅ ÐÏÞÁÔÏË ÌÉÓÔÁ."
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "ú×ÏÒÏÔÎ¦Ê ÐÏÛÕË: "
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "ðÏÛÕË: "
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "ð¦ÄËÁÚËÕ ÚÁÒÁÚ ÐÏËÁÚÁÎÏ."
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "ãÉÔÏ×ÁÎÏÇÏ ÔÅËÓÔÕ Â¦ÌØÛ ÎÅÍÁ¤."
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "ð¦ÓÌÑ ÃÉÔÏ×ÁÎÏÇÏ ÔÅËÓÔÕ Î¦ÞÏÇÏ ÎÅÍÁ¤."
 
@@ -3258,27 +3976,27 @@ msgstr "
 msgid "error: unknown op %d (report this error)."
 msgstr "ÐÏÍÉÌËÁ: ÎÅצÄÏÍÅ op %d (ÐÏצÄÏÍØÔÅ ÃÀ ÐÏÍÉÌËÕ)."
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "ëÏÍЦÌÑÃ¦Ñ ×ÉÒÁÚÕ ÐÏÛÕËÕ..."
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "÷ÉËÏÎÁÎÎÑ ËÏÍÁÎÄÉ ÄÏ ×¦ÄÐÏצÄÎÉÈ ÌÉÓÔ¦×..."
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "ìÉÓÔ¦×, ÝÏ ×¦ÄÐÏצÄÁÀÔØ ËÒÉÔÅÒ¦À, ÎÅ ÚÎÁÊÄÅÎÏ."
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "ðÏÛÕË Ä¦ÊÛÏ× ÄÏ Ë¦ÎÃÑ, ÁÌÅ ÎÅ ÚÎÁÊÄÅÎÏ Î¦ÞÏÇÏ"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "ðÏÛÕË Ä¦ÊÛÏ× ÄÏ ÐÏÞÁÔËÕ, ÁÌÅ ÎÅ ÚÎÁÊÄÅÎÏ Î¦ÞÏÇÏ"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "ðÏÛÕË ÐÅÒÅÒ×ÁÎÏ."
 
@@ -3290,11 +4008,11 @@ msgstr "
 msgid "PGP passphrase forgotten."
 msgstr "ëÏÄÏ×Õ ÆÒÁÚÕ PGP ÚÁÂÕÔÏ."
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- ðÏÍÉÌËÁ: ÎÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Ð¦ÄÐÒÏÃÅÓ PGP! --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3302,52 +4020,23 @@ msgstr ""
 "[-- ë¦ÎÅÃØ ÔÅËÓÔÕ ÎÁ ×ÉÈÏĦ PGP --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- ðÏÞÁÔÏË ÐÏצÄÏÍÌÅÎÎÑ PGP --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- ðÏÞÁÔÏË ÂÌÏËÕ ×¦ÄËÒÉÔÏÇÏ ËÌÀÞÁ PGP --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- ðÏÞÁÔÏË ÐÏצÄÏÍÌÅÎÎÑ Ú PGP ЦÄÐÉÓÏÍ --]\n"
-"\n"
-
-#: pgp.c:423
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- ë¦ÎÅÃØ ÐÏצÄÏÍÌÅÎÎÑ PGP --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- ë¦ÎÅÃØ ÂÌÏËÕ ×¦ÄËÒÉÔÏÇÏ ËÌÀÞÁ PGP --]\n"
-
-#: pgp.c:427
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- ë¦ÎÅÃØ ÐÏצÄÏÍÌÅÎÎÑ Ú PGP ЦÄÐÉÓÏÍ --]\n"
+#: pgp.c:387 pgp.c:951
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "îÅ ×ÉÊÛÌÏ ÓËÏЦÀ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- ðÏÍÉÌËÁ: ÎÅ ×ÉÊÛÌÏ ÚÎÁÊÔÉ ÐÏÞÁÔÏË ÐÏצÄÏÍÌÅÎÎÑ PGP! --]\n"
-"\n"
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "ð¦ÄÐÉÓ PGP ÐÅÒÅצÒÅÎÏ."
 
-#: pgp.c:704
+#: pgp.c:723
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "÷ÎÕÔÒ¦ÛÎÑ ÐÏÍÉÌËÁ. ðÏצÄÏÍØÔÅ <roessler@does-not-exist.org>."
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3355,71 +4044,37 @@ msgstr ""
 "[-- ðÏÍÉÌËÁ: ÎÅ ×ÉÊÛÌÏ ÓÔ×ÏÒÉÔÉ Ð¦ÄÐÒÏÃÅÓ PGP! --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- ðÏÍÉÌËÁ: ÎÅÓÆÏÒÍÏ×ÁÎÉÊ ÌÉÓÔ PGP/MIME! --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- ðÏÍÉÌËÁ: ÎÅ ×ÉÊÛÌÏ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ! --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- îÁÓÔÕÐΦ ÄÁΦ ÚÁÛÉÆÒÏ×ÁÎÏ PGP/MIME --]\n"
-"\n"
-
-#: pgp.c:915
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- ë¦ÎÅÃØ ÄÁÎÉÈ, ÚÁÛÉÆÒÏ×ÁÎÉÈ PGP/MIME --]\n"
+#: pgp.c:828
+#, fuzzy
+msgid "Decryption failed"
+msgstr "ðÏÍÉÌËÁ ÒŤÓÔÒÁæ§."
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ Ð¦ÄÐÒÏÃÅÓÓ PGP!"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ keyID = \"%s\" ÄÌÑ %s?"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "÷×ÅĦÔØ keyID ÄÌÑ %s: "
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "îÅ ×ÉÊÛÌÏ ×ÉËÌÉËÁÔÉ PGP"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "ÛÉÆÒ.(e), ЦÄÐ.(s), ЦÄÐ. ÑË(a), ÕÓÅ(b), (i)nline ÞÉ ×¦ÄͦÎÁ(f)? "
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1499
+#: pgp.c:1543
 #, fuzzy
 msgid "esabifc"
 msgstr "esabif"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "ð¦ÄÐÉÓ ÑË: "
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "ïÔÒÉÍÁÎÎÑ ËÌÀÞÁ PGP..."
@@ -3429,16 +4084,6 @@ msgstr "
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "÷Ó¦ צÄÐÏצÄΦ ËÌÀÞ¦ ÄÁ×Φ/ÚÁͦÎÅΦ."
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "÷ÉÂ¦Ò  "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "ðÅÒÅצÒËÁ  "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3453,40 +4098,6 @@ msgstr "PGP 
 msgid "Can't open /dev/null"
 msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr ""
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "ãÅÊ ËÌÀÞ ÎÅÍÏÖÌÉ×Ï ×ÉËÏÒÉÓÔÁÔÉ: ÄÁ×ΦÊ/×ÉÍËÎÅÎÉÊ/ÚÁͦÎÅÎÉÊ."
-
-#: pgpkey.c:612
-msgid "ID is expired/disabled/revoked."
-msgstr "ID ÄÁ×ΦÊ/×ÉÍËÎÅÎÉÊ/ÚÁͦÎÅÎÉÊ."
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr "ä¦ÊÓΦÓÔØ ID ÎÅ ×ÉÚÎÁÞÅÎÁ."
-
-#: pgpkey.c:619
-msgid "ID is not valid."
-msgstr "ID ÎÅĦÊÓÎÉÊ."
-
-#: pgpkey.c:622
-msgid "ID is only marginally valid."
-msgstr "ID ĦÊÓÎÉÊ ÌÉÛÅ ÞÁÓÔËÏ×Ï."
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s ÷É ÓÐÒÁ×Ħ ÂÁÖÁ¤ÔÅ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ËÌÀÞ?"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "âÕÄØ ÌÁÓËÁ, ××ÅĦÔØ ID ËÌÀÞÁ: "
@@ -3500,11 +4111,6 @@ msgstr "
 msgid "PGP Key %s."
 msgstr ""
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "ðÏÛÕË ËÌÀÞ¦×, ÝÏ ×¦ÄÐÏצÄÁÀÔØ \"%s\"..."
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3562,7 +4168,7 @@ msgstr "
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d Ú %d ÌÉÓÔ¦× ÐÒÏÞÉÔÁÎÏ]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "óÅÒ×ÅÒ ÚÁËÒÉ× Ú'¤ÄÎÁÎÎÑ!"
 
@@ -3592,15 +4198,15 @@ msgstr "
 msgid "Error connecting to server: %s"
 msgstr "ðÏÍÉÌËÁ Ú'¤ÄÎÁÎÎÑ Ú ÓÅÒ×ÅÒÏÍ: %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "úÁËÒÉÔÔÑ Ú'¤ÄÎÁÎÎÑ Ú ÓÅÒ×ÅÒÏÍ POP..."
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "ðÅÒÅצÒËÁ ¦ÎÄÅËÓ¦× ÐÏצÄÏÍÌÅÎØ..."
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "ú'¤ÄÎÁÎÎÑ ÚÁÇÕÂÌÅÎÏ. ÷¦ÄÎÏ×ÉÔÉ Ú×'ÑÚÏË Ú ÓÅÒ×ÅÒÏÍ POP?"
 
@@ -3979,35 +4585,35 @@ msgstr "
 msgid "Sending in background."
 msgstr "æÏÎÏ×Á צÄÐÒÁ×ËÁ."
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "îÅÍÁ¤ ÐÁÒÁÍÅÔÒÕ ÍÅÖ¦! [ÓÐÏצÓÔ¦ÔØ ÐÒÏ ÃÀ ÐÏÍÉÌËÕ]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s ¦ÌØÛÅ ÎÅ ¦ÓÎÕ¤!"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s ÎÅ ¤ Ú×ÉÞÁÊÎÉÍ ÆÁÊÌÏÍ."
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ %s"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "ðÏÍÉÌËÁ צÄÐÒÁ×ËÉ, ËÏÄ ÐÏ×ÅÒÎÅÎÎÑ %d (%s)."
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "÷ÉÈ¦Ä ÐÒÏÃÅÓÕ ÄÏÓÔÁ×ËÉ"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
@@ -4132,7 +4738,7 @@ msgstr "
 msgid "No output from OpenSSL..."
 msgstr ""
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"
@@ -4141,60 +4747,60 @@ msgstr ""
 "[-- ë¦ÎÅÃØ ÔÅËÓÔÕ ÎÁ ×ÉÈÏĦ PGP --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 #, fuzzy
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- ðÏÍÉÌËÁ: ÎÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Ð¦ÄÐÒÏÃÅÓ PGP! --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 #, fuzzy
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- îÁÓÔÕÐΦ ÄÁΦ ÚÁÛÉÆÒÏ×ÁÎÏ PGP/MIME --]\n"
 "\n"
 
-#: smime.c:1765
+#: smime.c:1767
 #, fuzzy
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- îÁÓÔÕÐΦ ÄÁΦ ЦÄÐÉÓÁÎÏ --]\n"
 "\n"
 
-#: smime.c:1829
+#: smime.c:1831
 #, fuzzy
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
 msgstr "[-- ë¦ÎÅÃØ ÄÁÎÉÈ, ÚÁÛÉÆÒÏ×ÁÎÉÈ PGP/MIME --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 #, fuzzy
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
 msgstr "[-- ë¦ÎÅÃØ Ð¦ÄÐÉÓÁÎÉÈ ÄÁÎÉÈ --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr "ÛÉÆÒ.(e), ЦÄÐ.(s), ЦÄÐ. ÑË(a), ÕÓÅ(b) ÞÉ ×¦ÄͦÎÁ(f)? "
 
-#: smime.c:1936
+#: smime.c:1945
 #, fuzzy
 msgid "eswabfc"
 msgstr "esabif"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr ""
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
@@ -4218,6 +4824,9 @@ msgstr "\"
 msgid "Parent message is not available."
 msgstr "\"âÁÔØ˦×ÓØËÉÊ\" ÌÉÓÔ ÎÅ ÍÏÖÎÁ ÐÏÂÁÞÉÔÉ."
 
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "îÅÍÏÖÌÉ×Ï ÄÏÄÁ×ÁÔÉ ÄÏ ÓËÒÉÎØÏË IMAP ÎÁ ÃØÏÍÕ ÓÅÒ×ÅÒ¦"
+
 #, fuzzy
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "óÔ×ÏÒÉÔÉ application/pgp ÌÉÓÔ?"
@@ -4323,9 +4932,6 @@ msgstr "\"
 #~ msgid "Skipping CRAM-MD5 authentication."
 #~ msgstr "áÕÔÅÎÔÉƦËÁæÀ CRAM-MD5 ÐÒÏÐÕÝÅÎÏ."
 
-#~ msgid "[-- Error: unexpected end of file! --]\n"
-#~ msgstr "[-- ðÏÍÉÌËÁ: ˦ÎÅÃØ ÆÁÊÌÕ ÎÅ ÚÎÁÊÄÅÎÏ! --]\n"
-
 #~ msgid "Sending APPEND command ..."
 #~ msgstr "îÁÄÓÉÌÁÎÎÑ ËÏÍÁÎÄÉ APPEND..."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6dd575779..3e11f240d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 1999-12-20 20:41+0800\n"
 "Last-Translator: Anthony Wong <ypwong@debian.org>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -14,26 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, fuzzy, c-format
 msgid "Username at %s: "
 msgstr "¸ü¸ÄÃû³ÆΪ£º"
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s µÄÃÜÂ룺"
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "À뿪"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "ɾ³ý"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "·´É¾³ý"
 
@@ -42,9 +42,9 @@ msgid "Select"
 msgstr "Ñ¡Ôñ"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "°ïÖú"
 
@@ -96,172 +96,172 @@ msgstr "
 msgid "Alias added."
 msgstr "±ðÃûÒѾ­Ôö¼Ó¡£"
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "ÎÞ·¨Æ¥ÅäÃû³ÆÄ£°å£¬¼ÌÐø£¿"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap ±à¼­ÏîÄ¿ÐèÒª %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Ö´ÐÐ \"%s\" ʱ·¢Éú´íÎó£¡"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "´ò¿ªÎļþÀ´·ÖÎöÎļþͷʧ°Ü¡£"
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "´ò¿ªÎļþʱȥ³ýÎļþ±êͷʧ°Ü¡£"
 
-#: attach.c:183
+#: attach.c:184
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "´ò¿ªÎļþÀ´·ÖÎöÎļþͷʧ°Ü¡£"
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "ûÓÐ %s µÄ mailcap ×é³ÉµÇ¼£¬ÕýÔÚ½¨Á¢¿ÕµÄÎļþ¡£"
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "±à¼­ Mailcap ÏîĿʱÐèÒª %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "ûÓÐ %s µÄ mailcap ±à¼­µÇ¼"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "ûÓз¢ÏÖÅäºÏ mailcap µÄµÇ¼¡£½«ÒÔÎÄ×Öµµ·½Ê½ä¯ÀÀ¡£"
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME ÐÎʽδ±»¶¨Òå. ÎÞ·¨ÏÔʾ¸½¼þÄÚÈÝ¡£"
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "ÎÞ·¨½¨Á¢¹ýÂËÆ÷"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "ÎÞ·¨½¨Á¢¹ýÂË"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "дÈëʧ°Ü£¡"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "ÎÒ²»ÖªµÀÒªÈçºÎ´òÓ¡Ëü£¡"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "¸Ä±äĿ¼"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "ÕÚÕÖ"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ²»ÊÇÒ»¸öĿ¼"
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "ÐÅÏä [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "ÒѶ©ÔÄ [%s], ÎļþÕÚÕÖ: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Ŀ¼ [%s], ÎļþÕÚÕÖ: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "ÎÞ·¨¸½´øĿ¼£¡"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "ûÓÐÎļþÓëÎļþÕÚÕÖÏà·û"
 
-#: browser.c:860
+#: browser.c:861
 #, fuzzy
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "ÕæµÄҪɾ³ý \"%s\" ÓÊÏ䣿"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "ÓÊÏäÒÑɾ³ý¡£"
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "ÓÊÏäδ±»É¾³ý¡£"
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "¸Ä±äĿ¼µ½£º"
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "ÎÞ·¨É¨ÃèĿ¼¡£"
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "ÎļþÕÚÕÖ£º"
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "·´ÏòÅÅÐò (d)ÈÕÆÚ, (a)×ÖÔª, (z)´óС »ò (n)²»ÅÅÐò ? "
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "ÒÀÕÕ (d)ÈÕÆÚ (a)×ÖÔª (z)´óС À´ÅÅÐò£¬»ò(n)²»ÅÅÐò ? "
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr ""
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "еµÃû£º"
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "ÎÞ·¨ÏÔʾĿ¼"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "ÎÞ·¨ÊÔÖøÏÔʾÎļþ"
 
@@ -329,7 +329,7 @@ msgstr "
 msgid "Verify PGP signature?"
 msgstr "¼ì²é PGP Ç©Ãû?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
 
@@ -343,123 +343,123 @@ msgstr "
 msgid "Could not copy message"
 msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
 
-#: commands.c:186
+#: commands.c:187
 #, fuzzy
 msgid "S/MIME signature successfully verified."
 msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr ""
 
-#: commands.c:193
+#: commands.c:194
 #, fuzzy
 msgid "S/MIME signature could NOT be verified."
 msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
 
-#: commands.c:204
+#: commands.c:205
 #, fuzzy
 msgid "PGP signature could NOT be verified."
 msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "Ö¸Á"
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "Ö±½Ó´«ËÍÓʼþµ½£º"
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "ÎÞ·¨´«ËÍÒѱê¼ÇµÄÓʼþÖÁ£º"
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "ÎÞ·¨·ÖÎöλַ£¡"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "°ÑÓʼþÖ±½Ó´«ËÍÖÁ %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "°ÑÓʼþÖ±½Ó´«ËÍÖÁ %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Message not bounced."
 msgstr "ÓʼþÒѱ»´«ËÍ¡£"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Messages not bounced."
 msgstr "ÓʼþÒÑ´«ËÍ¡£"
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "ÓʼþÒѱ»´«ËÍ¡£"
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "ÓʼþÒÑ´«ËÍ¡£"
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 #, fuzzy
 msgid "Can't create filter process"
 msgstr "ÎÞ·¨½¨Á¢¹ýÂË"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "ÓùܵÀÊä³öÖÁÃüÁ"
 
-#: commands.c:482
+#: commands.c:483
 #, fuzzy
 msgid "No printing command has been defined."
 msgstr "Ȧѡ½øÈëµÄÓÊͲ"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "´òÓ¡Ðżþ£¿"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "´òÓ¡Òѱê¼ÇµÄÐżþ£¿"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "ÐżþÒÑÓ¡³ö"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "ÐżþÒÑÓ¡³ö"
 
-#: commands.c:498
+#: commands.c:499
 #, fuzzy
 msgid "Message could not be printed"
 msgstr "ÐżþÒÑÓ¡³ö"
 
-#: commands.c:499
+#: commands.c:500
 #, fuzzy
 msgid "Messages could not be printed"
 msgstr "ÐżþÒÑÓ¡³ö"
 
-#: commands.c:508
+#: commands.c:509
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -468,7 +468,7 @@ msgstr ""
 "·´·½Ïò d)ÈÕÆÚ,f)·¢ÐÅÈË,r)ÊÕÐÅʱ¼ä,s)±êÌâ,o)ÊÕÐÅÈË,t)ÐòÁÐ,u)²»ÅÅ,z)´óС,c)·Ö"
 "Êý:"
 
-#: commands.c:509
+#: commands.c:510
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
@@ -477,73 +477,73 @@ msgstr ""
 "ÅÅÐò d)ÈÕÆÚ,f)·¢ÐÅÈË,r)ÊÕÐÅʱ¼ä,s)±êÌâ,o)ÊÕÐÅÈË,t)ÐòÁÐ,u)²»ÅÅÐò,z)´óС,c)·Ö"
 "Êý:"
 
-#: commands.c:510
+#: commands.c:511
 msgid "dfrsotuzcp"
 msgstr ""
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Shell Ö¸Á"
 
-#: commands.c:709
+#: commands.c:716
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:710
+#: commands.c:717
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:711
+#: commands.c:718
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:712
+#: commands.c:719
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:713
+#: commands.c:720
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:713
+#: commands.c:720
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " Òѱê¼Ç"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "¿½±´µ½ %s¡­"
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr ""
 
-#: commands.c:919
+#: commands.c:936
 #, fuzzy, c-format
 msgid "Content-Type changed to %s."
 msgstr "ÕýÁ¬½Óµ½ %s¡­"
 
-#: commands.c:924
+#: commands.c:941
 #, fuzzy, c-format
 msgid "Character set changed to %s; %s."
 msgstr "²»Ã÷µÄ×Ö·û¼¯ %s¡£"
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr ""
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr ""
 
@@ -637,103 +637,681 @@ msgstr ""
 msgid "Attaching selected files..."
 msgstr "ÕýÔÚ¸½¼ÓÑ¡È¡Á˵ÄÎļþ¡­"
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "ÎÞ·¨¸½¼Ó %s£¡"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "´ò¿ªÐÅÏä²¢´ÓËüÑ¡Ôñ¸½¼ÓµÄÐżþ"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "Îļþ¼ÐÖÐûÓÐÐżþ¡£"
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "Çë±ê¼ÇÄúÒª¸½¼ÓµÄÐżþ£¡"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "ÎÞ·¨¸½¼Ó£¡"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "Ö»ÖØбàÂëÊÜÓ°ÏìµÄÎÄ×Ö¸½¼þ"
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "Õâ¸ö¸½¼þ²»»á±»×ª»»¡£"
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "Õâ¸ö¸½¼þ»á±»×ª»»¡£"
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "ÎÞЧµÄ±àÂë¡£"
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "´¢´æÕâ·âÐżþµÄ¿½±´Âð£¿"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "¸ü¸ÄÃû³ÆΪ£º"
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "ÎÞ·¨¶ÁÈ¡£º%s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "½¨Á¢Ðµµ£º"
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type µÄ¸ñʽÊÇ base/sub"
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "²»Ã÷µÄ Content-Type %s"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "ÎÞ·¨½¨Á¢Îļþ %s"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "ÎÒÃÇÎÞ·¨¼ÓÉϸ½¼þ"
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "ÑӳټijöÕâ·âÐżþ£¿"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "½«ÐżþдÈëµ½ÐÅÏä"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "дÈëÐżþµ½ %s ¡­"
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "ÐżþÒÑдÈë¡£"
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+
+#: crypt-gpgme.c:993
+msgid "Warning: One of the keys has been revoked\n"
+msgstr ""
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+msgid "Warning: At least one certification key has expired\n"
+msgstr ""
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "Ö÷Ðżþ²»´æÔÚ¡£"
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+msgid "Fingerprint: "
+msgstr ""
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Ö¸ÁîÐÐÓÐ´í£º%s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- ´íÎó£ºÍ»·¢µÄµµÎ²£¡ --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP Ðżþ¿ªÊ¼ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP ¹«¹²Ô¿³×Çø¶Î¿ªÊ¼ --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP Ç©ÃûµÄÐżþ¿ªÊ¼ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+#, fuzzy
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- PGP Ðżþ½áÊø --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP ¹«¹²Ô¿³×Çø¶Î½áÊø --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+#, fuzzy
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- PGP Ç©ÃûµÄÐżþ½áÊø --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- ´íÎó£ºÕÒ²»µ½ PGP ÐżþµÄ¿ªÍ·£¡ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- ´íÎ󣺲»ÕýÈ·µÄ PGP/MIME Ðżþ£¡ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ÔÝ´æµµ£¡ --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+#, fuzzy
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr ""
+"[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]\n"
+"\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "ÎÞЧµÄÔ·ݣº%s"
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "ÎÞЧµÄÔ·ݣº%s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "ÎÞЧµÄÔ·ݣº%s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "¼ÓÃÜ"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+msgid "certification"
+msgstr ""
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Ô¿³× ID£º0x%s"
+
+#: crypt-gpgme.c:3099
+msgid "[Revoked]"
+msgstr ""
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "À뿪  "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "ÕýÁ¬½Óµ½ %s¡­"
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "ÕýÁ¬Ïßµ½ %s"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Ô¿³× ID£º0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "µÇÈëʧ°Ü¡£"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "À뿪  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "Ñ¡Ôñ    "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "¼ì²éÔ¿³×   "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
+
+#: crypt-gpgme.c:3592
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3594
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+#, fuzzy
+msgid "ID is expired/disabled/revoked."
+msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr ""
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+#, fuzzy
+msgid "ID is not valid."
+msgstr "Õâ¸ö ID ²»±»ÐÅÈΡ£"
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+#, fuzzy
+msgid "ID is only marginally valid."
+msgstr "´Ë ID Ö»ÊÇÃãÇ¿±»ÐÅÈΡ£"
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, fuzzy, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s ÄúÕæµÄҪʹÓÃËü£¿"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "ÕýÑ°ÕÒÆ¥Åä \"%s\" µÄÔ¿³×¡­"
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "ҪΪ %2$s ʹÓÃÔ¿³× ID = \"%1$s\"£¿"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "ÇëÊäÈë %s µÄÔ¿³× ID£º"
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr "(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, (i)nline, »ò (f)·ÅÆú£¿"
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "esabif"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr "(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, (i)nline, »ò (f)·ÅÆú£¿"
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "esabif"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "Ç©ÃûµÄÉí·ÝÊÇ£º"
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "´ò¿ªÎļþÀ´·ÖÎöÎļþͷʧ°Ü¡£"
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -750,29 +1328,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "ÒÑÍü¼Ç PGP ͨÐÐÃÜÂë¡£"
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "Æô¶¯ PGP¡­"
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "ÐżþûÓмijö¡£"
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
@@ -785,7 +1363,7 @@ msgstr ""
 "[-- ´íÎ󣺲»Ò»Ö嵀 multipart/signed ½á¹¹£¡ --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -794,7 +1372,7 @@ msgstr ""
 "[-- ´íÎ󣺲»Ã÷µÄ multipart/signed Э¶¨ %s£¡ --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -804,7 +1382,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
@@ -813,7 +1391,7 @@ msgstr ""
 "[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -821,7 +1399,7 @@ msgstr ""
 "[-- ¾¯¸æ£ºÕÒ²»µ½ÈκεÄÇ©Ãû¡£ --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 #, fuzzy
 msgid ""
 "\n"
@@ -830,230 +1408,260 @@ msgstr ""
 "\n"
 "[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
 
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Æô¶¯ PGP¡­"
+
 # Don't translate this!!
-#: curs_lib.c:190
+#: curs_lib.c:188
 msgid "yes"
 msgstr ""
 
 # Don't translate this!!
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr ""
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "À뿪 Mutt£¿"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "²»Ã÷µÄ´íÎó"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "°´ÏÂÈκÎÒ»¸ö¼ü¼ÌÐø¡­"
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " (Óà '?' ÏÔʾÁбí)£º"
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "ûÓÐÒÑ´ò¿ªÐÅÏä¡£"
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "ûÓÐÐżþ¡£"
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "ÐÅÏäÊÇÖ»¶ÁµÄ¡£"
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "¹¦ÄÜÔÚ attach-message ģʽϲ»±»Ö§³Ö¡£"
 
-#: curs_main.c:55
+#: curs_main.c:56
 #, fuzzy
 msgid "No visible messages."
 msgstr "ûÓÐÐÂÐżþ"
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "ÎÞ·¨Ð´Èëµ½Ò»¸öÖ»¶ÁµÄÐÅÏ䣡"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "ÔÚÀ뿪֮ºó½«»á°Ñ¸Ä±äдÈë×ÊÁϼС£"
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "½«²»»á°Ñ¸Ä±äдÈë×ÊÁϼС£"
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "À뿪"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "´¢´æ"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "Ðżþ"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "»Ø¸²"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "Ⱥ×é"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "ÐÅÏäÒѱ»ÆäËû;¾¶¸Ä±ä¹ý¡£Æì±ê¿ÉÄÜÓдíÎó¡£"
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "Õâ¸öÐÅÏäÖÐÓÐÐÂÐżþ¡£"
 
-#: curs_main.c:503
+#: curs_main.c:504
 #, fuzzy
 msgid "Mailbox was externally modified."
 msgstr "ÐÅÏäÒѱ»ÆäËû;¾¶¸Ä±ä¹ý¡£Æì±ê¿ÉÄÜÓдíÎó¡£"
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "ûÓбê¼ÇÁ˵ÄÐżþ¡£"
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 #, fuzzy
 msgid "Nothing to do."
 msgstr "ÕýÁ¬½Óµ½ %s¡­"
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "Ìøµ½Ðżþ£º"
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "ÐèÒªÒ»¸öÐżþ±àºÅµÄ²ÎÊý¡£"
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Õâ·âÐżþÎÞ·¨ÏÔʾ¡£"
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "ÎÞЧµÄÐżþ±àºÅ¡£"
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "ɾ³ý·ûºÏÕâÑùʽµÄÐżþ£º"
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "ûÓÐÏÞÖÆÑùʽÊÇÓÐЧµÄ¡£"
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "ÏÞÖÆ: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "ÏÞÖÆÖ»·ûºÏÕâÑùʽµÄÐżþ£º"
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "À뿪 Mutt£¿"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "±ê¼ÇÐżþµÄÌõ¼þ£º"
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "·´É¾³ýÐżþµÄÌõ¼þ£º"
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "·´±ê¼ÇÐżþµÄÌõ¼þ£º"
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "ÓÃÖ»¶Áģʽ´ò¿ªÐÅÏä"
 
-#: curs_main.c:1055
-msgid "Open mailbox"
-msgstr "´ò¿ªÐÅÏä"
+#: curs_main.c:1065
+msgid "Open mailbox"
+msgstr "´ò¿ªÐÅÏä"
+
+#: curs_main.c:1081 mx.c:512 mx.c:658
+#, c-format
+msgid "%s is not a mailbox."
+msgstr "%s ²»ÊÇÐÅÏä¡£"
+
+#: curs_main.c:1176
+msgid "Exit Mutt without saving?"
+msgstr "²»´¢´æ±ãÀ뿪 Mutt Âð£¿"
+
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "ÐòÁй¦ÄÜÉÐδÆô¶¯¡£"
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "´¢´æÐżþÒÔ±ãÉÔºó¼Ä³ö"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
-#, c-format
-msgid "%s is not a mailbox."
-msgstr "%s ²»ÊÇÐÅÏä¡£"
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
 
-#: curs_main.c:1165
-msgid "Exit Mutt without saving?"
-msgstr "²»´¢´æ±ãÀ뿪 Mutt Âð£¿"
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "ÄúÒѾ­ÔÚ×îºóÒ»·âÐÅÁË¡£"
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "ÄúÒѾ­ÔÚµÚÒ»·âÐÅÁË¡£"
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "ËÑÑ°ÖÁ¿ªÍ·¡£"
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "ËÑÑ°ÖÁ½áβ¡£"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "ûÓÐÐÂÐżþ"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "ûÓÐÉÐδ¶ÁÈ¡µÄÐżþ"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " ÔÚÕâÏÞ¶¨µÄä¯ÀÀÖÐ"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 #, fuzzy
 msgid "Can't change 'important' flag on POP server."
 msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "ûÓиü¶àµÄÐòÁÐ"
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "ÄúÒѾ­ÔÚµÚÒ»¸öÐòÁÐÉÏ¡£"
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "ÐòÁй¦ÄÜÉÐδÆô¶¯¡£"
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "ÐòÁÐÖÐÓÐÉÐδ¶ÁÈ¡µÄÐżþ¡£"
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 #, fuzzy
 msgid "Can't edit message on POP server."
 msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
@@ -1189,74 +1797,74 @@ msgstr "
 msgid "Clear flag"
 msgstr "Çå³ýÆì±ê"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- ´íÎó£º ÎÞ·¨ÏÔʾ Multipart/Alternative£¡ --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- ¸½¼þ #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- ÐÎ̬:  %s%s, ±àÂë: %s, ´óС: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- ʹÓà %s ×Ô¶¯ÏÔʾ --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Ö´ÐÐ×Ô¶¯ÏÔʾָÁ%s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, fuzzy, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- ÔÚ %s --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- ×Ô¶¯ÏÔʾµÄ %s µÄ stderr ÄÚÈÝ --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr "[-- ´íÎó: message/external-body ûÓдæÈ¡ÀàÐ͵IJÎÊý --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- %s/%s ¸½¼þ "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(%s λԪ×é) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "ÒѾ­±»É¾³ýÁË --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- ÔÚ %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, fuzzy, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- ÔÚ %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, fuzzy, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- %s/%s ¸½¼þ "
 
-#: handler.c:1696
+#: handler.c:1712
 #, fuzzy
 msgid ""
 "[-- and the indicated external source has --]\n"
@@ -1266,36 +1874,36 @@ msgstr ""
 "[-- ²¢ÇÒ±»Ö¸Ê¾µÄÍⲿԭʼµµÒÑ --]\n"
 "[-- ¹ýÆÚ¡£ --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 "[-- %s/%s ¸½¼þÎÞ·¨±»¸½ÉÏ, --]\n"
 "[-- ²¢ÇÒ±»Ö¸Ê¾µÄ´æÈ¡ÀàÐÍ %s ²»±»Ö§³Ö --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "´íÎó£ºmultipart/signed ûÓÐͨѶЭ¶¨¡£"
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "´íÎó£ºmultipart/encrypted ûÓÐÈκÎͨѶЭ¶¨²ÎÊý£¡"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "ÎÞ·¨´ò¿ªÔÝ´æµµ£¡"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s ÉÐδ֧³Ö "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "£¨Ê¹Óà '%s' À´ÏÔʾÕⲿ·Ý£©"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "£¨ÐèÒª¶¨ÒåÒ»¸ö¼ü¸ø 'view-attachments' lä¯ÀÀ¸½¼þ)£¡)"
 
@@ -1405,52 +2013,52 @@ msgstr "
 msgid "SASL authentication failed."
 msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr ""
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 #, fuzzy
 msgid "Getting namespaces..."
 msgstr "¼Ä³öÐżþÖС­"
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 #, fuzzy
 msgid "Getting folder list..."
 msgstr "ÒѽӴ¥ËÅ·þÆ÷£¬ÕýÄÃȡĿ¼±í¡­"
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 #, fuzzy
 msgid "No such folder"
 msgstr "%s£ºÃ»ÓÐÕâÖÖÑÕÉ«"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 #, fuzzy
 msgid "Create mailbox: "
 msgstr "´ò¿ªÐÅÏä"
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 #, fuzzy
 msgid "Mailbox must have a name."
 msgstr "ÐÅÏäûÓиı䡣"
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 #, fuzzy
 msgid "Mailbox created."
 msgstr "ÓÊÏäÒÑɾ³ý¡£"
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "´ò¿ªÐÅÏä"
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "ÓÊÏäÒÑɾ³ý¡£"
@@ -1463,141 +2071,139 @@ msgstr "
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "ÑÏÖØ´íÎó¡£ÐżþÊýÁ¿²»Ð­µ÷£¡"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, fuzzy, c-format
 msgid "Closing connection to %s..."
 msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Õâ¸ö IMAP ËÅ·þÆ÷Òѹýʱ£¬Mutt ÎÞ·¨Ê¹ÓÃËü¡£"
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr ""
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr ""
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+#, fuzzy
+msgid "Encrypted connection unavailable"
+msgstr "¼ÓÃܵÄÔ¿³×"
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "Ñ¡Ôñ %s ÖС­"
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 #, fuzzy
 msgid "Error opening mailbox"
 msgstr "дÈëÐÅÏäʱ·¢Éú´íÎó£¡"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "ÎÞ·¨¸½¼ÓÔÚÕâ¸öËÅ·þÆ÷É쵀 IMAP ÐÅÏä"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "½¨Á¢ %s£¿"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "±êÇ©Á赀 %d ·âÐżþɾȥÁË¡­"
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 #, fuzzy
 msgid "Expunge failed"
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "ÕýÔÚ´¢´æÐżþ״̬Æì±ê¡­ [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 #, fuzzy
 msgid "CLOSE failed"
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 #, fuzzy
 msgid "Bad mailbox name"
 msgstr "´ò¿ªÐÅÏä"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "¶©ÔÄ %s¡­"
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "È¡Ïû¶©ÔÄ %s¡­"
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "ÎÞ·¨È¡»ØʹÓÃÕâ¸ö IMAP ËÅ·þÆ÷°æ±¾µÄÓʼþµÄ±êÍ·¡£"
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, fuzzy, c-format
 msgid "Could not create temporary file %s"
 msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "ÕýÔÚÈ¡»ØÐżþ±êÍ·¡­ [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "ÕýÔÚÈ¡»ØÐżþ±êÍ·¡­ [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 #, fuzzy
 msgid "Fetching message..."
 msgstr "¼Ä³öÐżþÖС­"
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 
-#: imap/message.c:589
+#: imap/message.c:574
 #, fuzzy
 msgid "Uploading message ..."
 msgstr "¼Ä³öÐżþÖС­"
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, fuzzy, c-format
 msgid "Copying %d messages to %s..."
 msgstr "ÕýÔÚ°áÒÆÒѾ­¶ÁÈ¡µÄÐżþµ½ %s ¡­"
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, fuzzy, c-format
 msgid "Copying message %d to %s..."
 msgstr "дÈëÐżþµ½ %s ¡­"
 
-#: imap/util.c:241
+#: imap/util.c:236
 #, fuzzy
 msgid "Continue?"
 msgstr "£¨¼ÌÐø£©\n"
@@ -1607,124 +2213,124 @@ msgstr "
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:678
+#: init.c:644
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "±ê¼Ç·ûºÏij¸ö¸ñʽµÄÐżþ"
 
-#: init.c:680
+#: init.c:646
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "·´±ê¼Ç·ûºÏij¸ö¸ñʽµÄÐżþ"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "±ðÃû£ºÃ»Óеç×ÓÓʼþλַ"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "ÎÞЧµÄ±êÍ·À¸Î»"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s£º²»Ã÷µÄÅÅÐò·½Ê½"
 
-#: init.c:1169
+#: init.c:1135
 #, fuzzy, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_defualt£º´íÎóµÄÕý¹æ±íʾʽ£º%s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s£º²»Ã÷µÄ±äÁ¿"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "ÖØÐÂÉèÖúó×ÖÊ×ÈÔ²»ºÏ¹æ¶¨"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "ÖØÐÂÉèÖúóÖµÈÔ²»ºÏ¹æ¶¨"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s Òѱ»É趨"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s ûÓб»É趨"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s£ºÎÞЧµÄÐÅÏäÖÖÀà"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s£ºÎÞЧµÄÖµ"
 
-#: init.c:1589
+#: init.c:1555
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s£º²»Ã÷µÄÖÖÀà"
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s£º²»Ã÷µÄÖÖÀà"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "%s ·¢Éú´íÎó£¬ÐкŠ%d£º%s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source£º´íÎó·¢ÉúÔÚ %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr ""
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source£º´íÎó·¢ÉúÔÚ %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source£ºÌ«¶à²ÎÊý"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s£º²»Ã÷µÄÖ¸Áî"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Ö¸ÁîÐÐÓÐ´í£º%s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "ÎÞ·¨¾ö¶¨Ê¹ÓÃÕßÃû³Æ"
 
@@ -2196,412 +2802,421 @@ msgid "compose a new mail message"
 msgstr "׫дһ·âеÄÐżþ"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "´ò¿ªÁíÒ»¸öÎļþ¼Ð"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "ÓÃÖ»¶Áģʽ´ò¿ªÁíÒ»¸öÎļþ¼Ð"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "Çå³ýij·âÐżþÉϵÄ״̬Æì±ê"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "ɾ³ý·ûºÏij¸ö¸ñʽµÄÐżþ"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 #, fuzzy
 msgid "force retrieval of mail from IMAP server"
 msgstr "È¡»Ø POP ËÅ·þÆ÷ÉϵÄÐżþ"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "È¡»Ø POP ËÅ·þÆ÷ÉϵÄÐżþ"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "Òƶ¯µ½µÚÒ»·âÐżþ"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "Òƶ¯µ½×îºóÒ»·âÐżþ"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "Ö»ÏÔʾ·ûºÏij¸ö¸ñʽµÄÐżþ"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "ÎÞ·¨´«ËÍÒѱê¼ÇµÄÓʼþÖÁ£º"
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "Ìøµ½ÏÂÒ»·âеÄÐżþ"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 #, fuzzy
 msgid "jump to the next new or unread message"
 msgstr "Ìøµ½ÏÂÒ»¸öδ¶ÁÈ¡µÄÐżþ"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "Ìøµ½ÏÂÒ»¸ö×ÓÐòÁÐ"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "Ìøµ½ÏÂÒ»¸öÐòÁÐ"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "Òƶ¯µ½ÏÂÒ»¸öδɾ³ýµÄÐżþ"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "Ìøµ½ÏÂÒ»¸öδ¶ÁÈ¡µÄÐżþ"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "Ìøµ½Õâ¸öÐòÁеÄÖ÷Ðżþ"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "Ìøµ½ÉÏÒ»¸öÐòÁÐ"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "Ìøµ½ÉÏÒ»¸ö×ÓÐòÁÐ"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 #, fuzzy
 msgid "move to the previous undeleted message"
 msgstr "Òƶ¯µ½ÏÂÒ»¸öδɾ³ýµÄÐżþ"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "Ìøµ½ÉÏÒ»¸öеÄÐżþ"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 #, fuzzy
 msgid "jump to the previous new or unread message"
 msgstr "Ìøµ½ÉÏÒ»¸öδ¶ÁÈ¡µÄÐżþ"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "Ìøµ½ÉÏÒ»¸öδ¶ÁÈ¡µÄÐżþ"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "±ê¼ÇÏÖÔÚµÄÐòÁÐΪÒѶÁÈ¡"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "±ê¼ÇÏÖÔÚµÄ×ÓÐòÁÐΪÒѶÁÈ¡"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "É趨ijһ·âÐżþµÄ״̬Æì±ê"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "´¢´æ±ä¶¯µ½ÐÅÏä"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "±ê¼Ç·ûºÏij¸ö¸ñʽµÄÐżþ"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "·´É¾³ý·ûºÏij¸ö¸ñʽµÄÐżþ"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "·´±ê¼Ç·ûºÏij¸ö¸ñʽµÄÐżþ"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "Òƶ¯µ½±¾Ò³µÄÖмä"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "Òƶ¯µ½ÏÂÒ»Ïî×ÊÁÏ"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "ÏòÏÂ¾í¶¯Ò»ÐÐ"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "ÒƵ½ÏÂÒ»Ò³"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "Ìøµ½ÐżþµÄ×îºóÃæ"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "Çл»ÒýÑÔÏÔʾ"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "Ìø¹ýÒýÑÔ"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "Ìøµ½ÐżþµÄ×îÉÏÃæ"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "Êä³öµ¼Ïò ѶϢ/¸½¼þ ÖÁÃüÁî½âÒëÆ÷"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "ÒƵ½ÉÏÒ»Ïî×ÊÁÏ"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "ÏòÉÏ¾í¶¯Ò»ÐÐ"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "ÒƵ½ÉÏÒ»Ò³"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "´òÓ¡ÏÖÔÚµÄ×ÊÁÏ"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "ÀûÓÃÍⲿӦÓóÌÐò²éѯµØÖ·"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "¸½¼ÓеIJéѯ½á¹ûÖÁÏÖ½ñµÄ²éѯ½á¹û"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "´¢´æ±ä¶¯¹ýµÄ×ÊÁϵ½ÐÅÏä²¢ÇÒÀ뿪"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "ÖØнгöÒ»·â±»ÑӳټijöµÄÐżþ"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "Çå³ý²¢ÖØлæÖÆÆÁÄ»"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{ÄÚ²¿µÄ}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "ɾ³ýÕâ¸öÓÊÏä (Ö»ÊÊÓÃÓÚ IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "»Ø¸²Ò»·âÐżþ"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "ÓÃÕâ·âÐżþ×÷ΪÐÂÐżþµÄÄ£°å"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "´¢´æÐżþ/¸½¼þµ½Ä³¸öÎļþ"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "ÓÃÕý¹æ±íʾʽѰÕÒ"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "ÏòºóËÑÑ°Ò»¸öÕý¹æ±íʾʽ"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "Ñ°ÕÒÏÂÒ»¸ö·ûºÏµÄ×ÊÁÏ"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "·µ·½ÏòËÑÑ°ÏÂÒ»¸ö·ûºÏµÄ×ÊÁÏ"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "Çл»ËÑÑ°¸ñʽµÄÑÕÉ«"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "ÔÚ×Ó shell Ö´ÐÐÖ¸Áî"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "ÐżþÅÅÐò"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "ÒÔÏà·´µÄ´ÎÐòÀ´×öѶϢÅÅÐò"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "±ê¼ÇÏÖÔڵļǼ"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "Ó¦ÓÃÏÂÒ»¸ö¹¦Äܵ½Òѱê¼ÇµÄѶϢ"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 #, fuzzy
 msgid "apply next function ONLY to tagged messages"
 msgstr "Ó¦ÓÃÏÂÒ»¸ö¹¦Äܵ½Òѱê¼ÇµÄѶϢ"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "±ê¼ÇÄ¿Ç°µÄ×ÓÐòÁÐ"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "±ê¼ÇÄ¿Ç°µÄÐòÁÐ"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "Çл»½«Ñ¶Ï¢Çл»Îª 'new' Æì±ê"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "Çл»ÊÇ·ñÖØÐÂдÈëÓÊͲÖÐ"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "Çл»ÊÇ·ñä¯ÀÀÓÊͲ»òËùÓеÄÎļþ"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "ÒƵ½Ò³Ê×"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "·´É¾³ýÏÖÔڵļǼ"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "·´É¾³ýÕâ¸öÐòÁÐÖеÄËùÓÐÐżþ"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "·´É¾³ýÕâ¸ö×ÓÐòÁÐÖеÄËùÓÐÐżþ"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "ÏÔʾ Mutt µÄ°æ±¾ºÅÂëÓëÈÕÆÚ"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "Èç¹ûÐèÒªµÄ»°Ê¹Óà mailcap ä¯ÀÀ¸½¼þ"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "ÏÔʾ MIME ¸½¼þ"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr ""
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "ÏÔʾĿǰÓÐ×÷ÓõÄÏÞÖÆÑùʽ"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "´ò¿ª/¹Ø±Õ Ä¿Ç°µÄÐòÁÐ"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "´ò¿ª/¹Ø±Õ ËùÓеÄÐòÁÐ"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "¸½´øÒ»°Ñ PGP ¹«¹²Ô¿³×"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "ÏÔʾ PGP Ñ¡Ïî"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "¼Ä³ö PGP ¹«¹²Ô¿³×"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "¼ìÑé PGP ¹«¹²Ô¿³×"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "¼ìÔÄÕâ°ÑÔ¿³×µÄʹÓÃÕß id"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr ""
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr ""
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 #, fuzzy
 msgid "Append a remailer to the chain"
 msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 #, fuzzy
 msgid "Insert a remailer into the chain"
 msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 #, fuzzy
 msgid "Delete a remailer from the chain"
 msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 #, fuzzy
 msgid "Select the previous element of the chain"
 msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 #, fuzzy
 msgid "Select the next element of the chain"
 msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr ""
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "ÖÆ×÷½âÃܵĿ½±´²¢ÇÒɾ³ýÖ®"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "ÖÆ×÷Ò»·Ý½âÃܵĿ½±´"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 #, fuzzy
 msgid "wipe passphrase(s) from memory"
 msgstr "Çå³ý¼ÇÒäÌåÖÐµÄ PGP ͨÐÐÃÜÂë"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 #, fuzzy
 msgid "extract supported public keys"
 msgstr "ߢȡ PGP ¹«¹²Ô¿³×"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 #, fuzzy
 msgid "show S/MIME options"
 msgstr "ÏÔʾ PGP Ñ¡Ïî"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr ""
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "¼ÇÒäÌå²»×㣡"
 
@@ -2628,11 +3243,11 @@ msgstr ""
 #: main.c:61
 #, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2674,25 +3289,63 @@ msgstr ""
 "    ÖÁ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, "
 "MA  02111, USA.\n"
 
-#: main.c:99
+#: main.c:99
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"Ó÷¨: mutt [ -nRzZ ] [ -e <ÃüÁî> ] [ -F <Îļþ> ] [ -m <ÀàÐÍ> ] [ -f <Îļþ"
+"> ]\n"
+"        mutt [ -nx ] [ -e <ÃüÁî> ] [ -a <Îļþ> ] [ -F <Îļþ> ] [ -H <Îļþ> ] "
+"[ -i <Îļþ> ] [ -s <Ö÷Ìâ> ] [ -b <µØÖ·> ] [ -c <µØÖ·> ] <µØÖ·> [ ... ]\n"
+"        mutt [ -n ] [ -e <ÃüÁî> ] [ -F <Îļþ> ] -p\n"
+"        mutt -v[v]\n"
+"\n"
+"²ÎÊý£º\n"
+"  -a <Îļþ>     ½«Îļþ¸½ÔÚÐżþÖÐ\n"
+"  -b <µØÖ·>     Ö¸¶¨Ò»¸ö ÃØÃܸ´ÖÆ (BCC) µÄµØÖ·\n"
+"  -c <µØÖ·>     Ö¸¶¨Ò»¸ö ¸´ÖÆ (CC) µÄµØÖ·\n"
+"  -e <ÃüÁî>     Ö¸¶¨Ò»¸ö³õʼ»¯ºóÒª±»Ö´ÐеÄÃüÁî\n"
+"  -f <Îļþ>     Ö¸¶¨ÒªÔĶÁÄÇÒ»¸öÓÊͲ\n"
+"  -F <Îļþ>     Ö¸¶¨ÁíÒ»¸ö muttrc Îļþ\n"
+"  -H <Îļþ>     Ö¸¶¨Ò»¸öÄ£°åÎļþÒÔ¶ÁÈ¡±êÌâÀ´Ô´\n"
+"  -i <Îļþ>     Ö¸¶¨Ò»¸ö°üÀ¨Ôڻظ²ÖеÄÎļþ\n"
+"  -m <ÀàÐÍ>     Ö¸¶¨Ò»¸öÔ¤ÉèµÄÓÊͲÀàÐÍ\n"
+"  -n            ʹ Mutt ²»È¥¶ÁȡϵͳµÄ Muttrc µµ\n"
+"  -p            ½Ð»ØÒ»¸öÑÓºó¼ÄË͵ÄÐżþ\n"
+"  -R            ÒÔÖ»¶Áģʽ´ò¿ªÓÊͲ\n"
+"  -s <Ö÷Ìâ>     Ö¸¶¨Ò»¸öÖ÷Ìâ (Èç¹ûÓпհ׵Ļ°±ØÐë±»°üÀ¨ÔÚÒýÑÔÖÐ)\n"
+"  -v            ÏÔʾ°æ±¾ºÍ±àÒëʱËù¶¨ÒåµÄ²ÎÊý\n"
+"  -x            Ä£Äâ mailx ¼ÄËÍģʽ\n"
+"  -y            Ñ¡ÔñÒ»¸ö±»Ö¸¶¨ÔÚÄúÓÊͲÇåµ¥ÖеÄÓÊͲ\n"
+"  -z            Èç¹ûûÓÐѶϢÔÚÓÊͲÖеĻ°£¬Á¢¼´À뿪\n"
+"  -Z            ´ò¿ªµÚÒ»¸ö¸½ÓÐÐÂÓʼþµÄ×ÊÁϼУ¬Èç¹ûûÓеĻ°Á¢¼´À뿪\n"
+"  -h            Õâ¸ö˵Ã÷ѶϢ"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
 #, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-"<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-"[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-"[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
-"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
-"\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2739,7 +3392,7 @@ msgstr ""
 "  -Z            ´ò¿ªµÚÒ»¸ö¸½ÓÐÐÂÓʼþµÄ×ÊÁϼУ¬Èç¹ûûÓеĻ°Á¢¼´À뿪\n"
 "  -h            Õâ¸ö˵Ã÷ѶϢ"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2747,48 +3400,48 @@ msgstr ""
 "\n"
 "±àÒëÑ¡Ï"
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "ÎÞ·¨³õʼ»¯Öն˻ú¡£"
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "³ý´íģʽÔÚµÚ %d ²ã¡£\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "ÔÚ±àÒëʱºòûÓж¨Òå DEBUG¡£·ÅÆúÖ´ÐС£\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s ²»´æÔÚ¡£ÖÆÔìÂð£¿"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "ÎÞ·¨½¨Á¢ %s: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "ûÓÐÖ¸¶¨½ÓÊÜÕß¡£\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s£ºÎÞ·¨¸½´øÎļþ¡£\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "ûÓÐÐÅÏäÓÐÐÂÐżþ¡£"
 
-#: main.c:897
+#: main.c:910
 #, fuzzy
 msgid "No incoming mailboxes defined."
 msgstr "Ȧѡ½øÈëµÄÓÊͲ"
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "ÐÅÏäÄÚ¿ÕÎÞÒ»Îï¡£"
 
@@ -2805,11 +3458,11 @@ msgstr "
 msgid "Mailbox was corrupted!"
 msgstr "ÐÅÏäÒÑËð»µ!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "ÑÏÖØ´íÎó£¡ÎÞ·¨ÖØдò¿ªÐÅÏ䣡"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "ÎÞ·¨ËøסÐÅÏ䣡"
 
@@ -2817,11 +3470,11 @@ msgstr "
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "ͬ²½£ºÐÅÏäÒѱ»Ð޸ģ¬µ«Ã»Óб»Ð޸ĹýµÄÐżþ£¡£¨Çë»Ø±¨Õâ¸ö´íÎó£©"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "дÈëÐżþÖС­ %d (%d%%)"
@@ -2829,190 +3482,150 @@ msgstr "д
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 #, fuzzy
 msgid "Committing changes..."
 msgstr "±àÒëËÑÑ°ÑùʽÖС­"
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "дÈëʧ°Ü£¡ÒѰѲ¿·ÖµÄÐÅÏä´¢´æÖÁ %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "ÎÞ·¨ÖØ¿ªÐÅÏ䣡"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "ÖØдò¿ªÐÅÏäÖС­"
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "Ìøµ½£º"
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "ÎÞЧµÄË÷Òý±àºÅ¡£"
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "ûÓÐ×ÊÁÏ¡£"
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "ÄúÎÞ·¨ÔÙÏòÏÂ¾í¶¯ÁË¡£"
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "ÄúÎÞ·¨ÔÙÏòÉÏ¾í¶¯ÁË¡£"
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "ÄúÏÖÔÚÔÚ×îºóÒ»Ò³¡£"
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "ÄúÏÖÔÚÔÚµÚÒ»Ò³¡£"
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "ÕýÔÚÏÔʾµÚÒ»Ïî¡£"
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "ÕýÔÚÏÔʾ×îºóÒ»Ïî¡£"
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "ÄúÏÖÔÚÔÚ×îºóÒ»Ïî¡£"
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "ÄúÏÖÔÚÔÚµÚÒ»Ïî¡£"
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "ËÑÑ°£º"
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "·µÏòËÑÑ°£º"
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "ûÓÐËÑÑ°¸ñʽ¡£"
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "ûÓÐÕÒµ½¡£"
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "ûÓÐÒѱê¼ÇµÄ¼Ç¼¡£"
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "Õâ¸öÑ¡µ¥ÖÐûÓÐËÑÑ°¹¦ÄÜ¡£"
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "¶Ô»°Ä£Ê½Öв»Ö§³ÖÌøÔ¾¹¦ÄÜ¡£"
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "¶ÁÈ¡ %s¡­ %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
-#: muttlib.c:846
-#, fuzzy
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "ÎļþÊÇÒ»¸öĿ¼, ´¢´æÔÚËüÏÂÃæ ?"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr ""
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "ÎļþÊÇÒ»¸öĿ¼, ´¢´æÔÚËüÏÂÃæ ?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "ÔÚĿ¼µ×ϵÄÎļþ£º"
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "ÎļþÒѾ­´æÔÚ, (o)¸²¸Ç, (a)¸½¼Ó, »òÊÇ (c)È¡Ïû ?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr ""
-
-#: muttlib.c:1199
-#, fuzzy
-msgid "Can't save message to POP mailbox."
-msgstr "½«ÐżþдÈëµ½ÐÅÏä"
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s ²»ÊÇÐÅÏ䣡"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "¸½¼ÓÐżþµ½ %s ?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, fuzzy, c-format
 msgid "Connection to %s closed"
 msgstr "ÕýÁ¬½Óµ½ %s¡­"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr ""
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 #, fuzzy
 msgid "Preconnect command failed."
 msgstr "Ô¤ÏÈÁ¬½ÓÖ¸Áîʧ°Ü"
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, fuzzy, c-format
 msgid "Error talking to %s (%s)"
 msgstr "ÕýÁ¬Ïßµ½ %s"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, fuzzy, c-format
 msgid "Looking up %s..."
 msgstr "¿½±´µ½ %s¡­"
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, fuzzy, c-format
 msgid "Could not find the host \"%s\""
 msgstr "ÕÒ²»µ½Ö÷»ú %s µÄλַ¡£"
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "ÕýÁ¬½Óµ½ %s¡­"
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, fuzzy, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "ÎÞ·¨´ò¿ª %s"
@@ -3044,7 +3657,8 @@ msgstr ""
 msgid "SSL failed: %s"
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 #, fuzzy
 msgid "Unable to get certificate from peer"
 msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
@@ -3054,89 +3668,205 @@ msgstr "
 msgid "SSL connection using %s (%s)"
 msgstr "ÕýÁ¬Ïßµ½ %s"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 #, fuzzy
 msgid "Unknown"
 msgstr "²»Ã÷µÄ´íÎó"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, fuzzy, c-format
 msgid "[unable to calculate]"
 msgstr "%s£ºÎÞ·¨¸½´øÎļþ"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 #, fuzzy
 msgid "[invalid date]"
 msgstr "%s£ºÎÞЧµÄÖµ"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr ""
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr ""
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr ""
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr ""
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr ""
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr ""
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr ""
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr ""
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr ""
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr ""
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr ""
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr ""
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "À뿪  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr ""
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr ""
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "ÕýÁ¬Ïßµ½ %s"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+msgid "Certificate is not X.509"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "ÎÞ·¨³õʼ»¯Öն˻ú¡£"
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:727
+#, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:732
+msgid "WARNING: Server certificate is not yet valid"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:737
+msgid "WARNING: Server certificate has expired"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:742
+msgid "WARNING: Server certificate has been revoked"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:755
+msgid "TLS/SSL Certificate check"
+msgstr ""
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "ÕýÁ¬½Óµ½ %s¡­"
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "ÕýÁ¬Ïßµ½ %s"
+
+#: muttlib.c:910
+#, fuzzy
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "ÎļþÊÇÒ»¸öĿ¼, ´¢´æÔÚËüÏÂÃæ ?"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr ""
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "ÎļþÊÇÒ»¸öĿ¼, ´¢´æÔÚËüÏÂÃæ ?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "ÔÚĿ¼µ×ϵÄÎļþ£º"
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "ÎļþÒѾ­´æÔÚ, (o)¸²¸Ç, (a)¸½¼Ó, »òÊÇ (c)È¡Ïû ?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr ""
+
+#: muttlib.c:1263
+#, fuzzy
+msgid "Can't save message to POP mailbox."
+msgstr "½«ÐżþдÈëµ½ÐÅÏä"
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "¸½¼ÓÐżþµ½ %s ?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s ²»ÊÇÐÅÏ䣡"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3214,7 +3944,7 @@ msgstr "
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d ·âÐżþ±»±£Áô, %d ·âÐżþ±»°áÒÆ, %d ·âÐżþ±»É¾³ý¡£"
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d ·âÐżþ±»±£Áô, %d ·âÐżþ±»É¾³ý¡£"
@@ -3233,17 +3963,17 @@ msgstr "
 msgid "Mailbox is marked unwritable. %s"
 msgstr "ÐÅÏä±»±ê¼Ç³ÉΪÎÞ·¨Ð´ÈëµÄ. %s"
 
-#: mx.c:1185
+#: mx.c:1187
 #, fuzzy
 msgid "Mailbox checkpointed."
 msgstr "ÓÊÏäÒÑɾ³ý¡£"
 
-#: mx.c:1494
+#: mx.c:1499
 #, fuzzy
 msgid "Can't write message"
 msgstr "±à¼­ÐżþÄÚÈÝ"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
@@ -3251,48 +3981,48 @@ msgstr ""
 msgid "Not available in this menu."
 msgstr "ÔÚÕâ¸ö²Ëµ¥ÖÐûÓÐÕâ¸ö¹¦ÄÜ¡£"
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "ÉÏÒ»Ò³"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "ÏÂÒ»Ò³"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "ÏÔʾ¸½¼þ¡£"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "ÏÂÒ»¸ö"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "ÏÖÕýÏÔʾ×îÏÂÃæµÄÐżþ¡£"
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "ÏÖÕýÏÔʾ×îÉÏÃæµÄÐżþ¡£"
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "·´ÏòËÑÑ°£º"
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "ËÑÑ°£º"
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "ÏÖÕýÏÔʾ˵Ã÷Îļþ¡£"
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "²»ÄÜÓÐÔÙ¶àµÄÒýÑÔ¡£"
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "ÔÚÒýÑÔºóÓйý¶àµÄ·ÇÒýÑÔÎÄ×Ö¡£"
 
@@ -3359,27 +4089,27 @@ msgstr "
 msgid "error: unknown op %d (report this error)."
 msgstr "´íÎ󣺲»Ã÷µÄ op %d (Çë»Ø±¨Õâ¸ö´íÎó)¡£"
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "±àÒëËÑÑ°ÑùʽÖС­"
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "ÕýÔÚ¶Ô·ûºÏµÄÓʼþÖ´ÐÐÃüÁî¡­"
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "ûÓÐÓʼþ·ûºÏÒªÇó¡£"
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "ÒÑËÑÑ°ÖÁ½á⣬²¢Ã»Óз¢ÏÖÈκηûºÏ"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "ÒÑËÑÑ°ÖÁ¿ªÍ·£¬²¢Ã»Óз¢ÏÖÈκηûºÏ"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "ËÑÑ°Òѱ»Öжϡ£"
 
@@ -3391,11 +4121,11 @@ msgstr "
 msgid "PGP passphrase forgotten."
 msgstr "ÒÑÍü¼Ç PGP ͨÐÐÃÜÂë¡£"
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ PGP ×Ó³ÌÐò£¡ --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3403,58 +4133,23 @@ msgstr ""
 "[-- PGP Êä³ö²¿·Ý½áÊø --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP Ðżþ¿ªÊ¼ --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP ¹«¹²Ô¿³×Çø¶Î¿ªÊ¼ --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP Ç©ÃûµÄÐżþ¿ªÊ¼ --]\n"
-"\n"
-
-#: pgp.c:423
+#: pgp.c:387 pgp.c:951
 #, fuzzy
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- PGP Ðżþ½áÊø --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP ¹«¹²Ô¿³×Çø¶Î½áÊø --]\n"
+msgid "Could not decrypt PGP message"
+msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
 
-#: pgp.c:427
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
 #, fuzzy
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- PGP Ç©ÃûµÄÐżþ½áÊø --]\n"
-
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- ´íÎó£ºÕÒ²»µ½ PGP ÐżþµÄ¿ªÍ·£¡ --]\n"
-"\n"
+msgid "PGP message successfully decrypted."
+msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
 
-#: pgp.c:704
+#: pgp.c:723
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "ÄÚ²¿´íÎó¡£ÁªÂç <rosessler@does-not-exist.org>¡£"
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3462,74 +4157,37 @@ msgstr ""
 "[-- ´íÎó£ºÎÞ·¨½¨Á¢ PGP ×Ó³ÌÐò£¡ --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- ´íÎ󣺲»ÕýÈ·µÄ PGP/MIME Ðżþ£¡ --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ÔÝ´æµµ£¡ --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
-"\n"
-
-#: pgp.c:915
+#: pgp.c:828
 #, fuzzy
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr ""
-"\n"
-"[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
+msgid "Decryption failed"
+msgstr "µÇÈëʧ°Ü¡£"
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "ÎÞ·¨´ò¿ª PGP ×Ó³ÌÐò£¡"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "ҪΪ %2$s ʹÓÃÔ¿³× ID = \"%1$s\"£¿"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "ÇëÊäÈë %s µÄÔ¿³× ID£º"
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "²»ÄÜÖ´ÐÐ PGP"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, (i)nline, »ò (f)·ÅÆú£¿"
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1499
+#: pgp.c:1543
 #, fuzzy
 msgid "esabifc"
 msgstr "esabif"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Ç©ÃûµÄÉí·ÝÊÇ£º"
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "ÄÃÈ¡ PGP Ô¿³×ÖС­"
@@ -3539,16 +4197,6 @@ msgstr "
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Ñ¡Ôñ    "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "¼ì²éÔ¿³×   "
-
 #: pgpkey.c:532
 #, fuzzy, c-format
 msgid "PGP keys matching <%s>."
@@ -3563,43 +4211,6 @@ msgstr "PGP Ô¿
 msgid "Can't open /dev/null"
 msgstr "ÎÞ·¨´ò¿ª /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Ô¿³× ID£º0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
-
-#: pgpkey.c:612
-#, fuzzy
-msgid "ID is expired/disabled/revoked."
-msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr ""
-
-#: pgpkey.c:619
-#, fuzzy
-msgid "ID is not valid."
-msgstr "Õâ¸ö ID ²»±»ÐÅÈΡ£"
-
-#: pgpkey.c:622
-#, fuzzy
-msgid "ID is only marginally valid."
-msgstr "´Ë ID Ö»ÊÇÃãÇ¿±»ÐÅÈΡ£"
-
-#: pgpkey.c:626
-#, fuzzy, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s ÄúÕæµÄҪʹÓÃËü£¿"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "ÇëÊäÈëÕâ°ÑÔ¿³×µÄ ID£º"
@@ -3613,11 +4224,6 @@ msgstr "
 msgid "PGP Key %s."
 msgstr "PGP Ô¿³× %s¡£"
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "ÕýÑ°ÕÒÆ¥Åä \"%s\" µÄÔ¿³×¡­"
-
 #: pop.c:90 pop_lib.c:201
 #, fuzzy, c-format
 msgid "Command TOP is not supported by server."
@@ -3680,7 +4286,7 @@ msgstr "д
 msgid "%s [%d of %d messages read]"
 msgstr "%s [ÒÑÔĶÁ %2d ·âÐżþÖÐµÄ %1d ·â]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "ÓëËÅ·þÆ÷µÄÁª½áÖжÏÁË!"
 
@@ -3714,17 +4320,17 @@ msgstr "
 msgid "Error connecting to server: %s"
 msgstr "ÕýÁ¬Ïßµ½ %s"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 #, fuzzy
 msgid "Closing connection to POP server..."
 msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 #, fuzzy
 msgid "Verifying message indexes..."
 msgstr "дÈëÐżþµ½ %s ¡­"
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 #, fuzzy
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
@@ -4112,35 +4718,35 @@ msgstr "
 msgid "Sending in background."
 msgstr "ÕýÔÚºǫ́´«ËÍ¡£"
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "ûÓз¢ÏÖ·Ö½ç±äÁ¿£¡[»Ø±¨´íÎó]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s ÒѾ­²»´æÔÚ£¡"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
 msgstr "%s ²»ÊÇÐÅÏä¡£"
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "ÎÞ·¨´ò¿ª %s"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "¼ÄËÍѶϢ³öÏÖ´íÎó£¬×Ó³ÌÐòÒѽáÊø %d (%s)¡£"
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Delivery process µÄÊä³ö"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
@@ -4264,7 +4870,7 @@ msgstr "
 msgid "No output from OpenSSL..."
 msgstr ""
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"
@@ -4273,26 +4879,26 @@ msgstr ""
 "[-- PGP Êä³ö²¿·Ý½áÊø --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 #, fuzzy
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ PGP ×Ó³ÌÐò£¡ --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 #, fuzzy
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
 "\n"
 
-#: smime.c:1765
+#: smime.c:1767
 #, fuzzy
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]\n"
 "\n"
 
-#: smime.c:1829
+#: smime.c:1831
 #, fuzzy
 msgid ""
 "\n"
@@ -4301,7 +4907,7 @@ msgstr ""
 "\n"
 "[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 #, fuzzy
 msgid ""
 "\n"
@@ -4310,7 +4916,7 @@ msgstr ""
 "\n"
 "[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
@@ -4318,21 +4924,21 @@ msgstr ""
 "(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, Ñ¡Ôñ (m)ic ÑÝËã·¨ »ò (f)·Å"
 "Æú£¿"
 
-#: smime.c:1936
+#: smime.c:1945
 #, fuzzy
 msgid "eswabfc"
 msgstr "esabif"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr ""
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
@@ -4357,6 +4963,9 @@ msgstr "
 msgid "Parent message is not available."
 msgstr "Ö÷Ðżþ²»´æÔÚ¡£"
 
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "ÎÞ·¨¸½¼ÓÔÚÕâ¸öËÅ·þÆ÷É쵀 IMAP ÐÅÏä"
+
 #, fuzzy
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "½¨Á¢Ò»·â application/pgp µÄÐżþ£¿"
@@ -4508,9 +5117,6 @@ msgstr "
 #~ msgid "Recoding successful."
 #~ msgstr "ÖØбàÂë³É¹¦¡£"
 
-#~ msgid "[-- Error: unexpected end of file! --]\n"
-#~ msgstr "[-- ´íÎó£ºÍ»·¢µÄµµÎ²£¡ --]\n"
-
 #~ msgid "CRAM key for %s@%s: "
 #~ msgstr "%s@%s µÄ CRAM Ô¿³×"
 
@@ -4561,10 +5167,6 @@ msgstr "
 #~ msgid "display message with full headers"
 #~ msgstr "±à¼­ÐżþµÄ±êÍ·"
 
-#, fuzzy
-#~ msgid "PGP keys matching "
-#~ msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
-
 #, fuzzy
 #~ msgid "This operation is not currently supported for PGP messages."
 #~ msgstr "Ôݲ»Ö§³Öä¯ÀÀ IMAP Ŀ¼"
@@ -4598,9 +5200,6 @@ msgstr "
 #~ msgid "reserved"
 #~ msgstr "±£ÁôµÄ"
 
-#~ msgid "Encrypted Session Key"
-#~ msgstr "¼ÓÃܵÄÔ¿³×"
-
 #~ msgid "Signature Packet"
 #~ msgstr "Ç©Ãû·â°ü"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index bdff38c90..c7ccd2b70 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.3.22.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-11 23:50+0200\n"
 "PO-Revision-Date: 2001-09-06 18:25+0800\n"
 "Last-Translator: Anthony Wong <ypwong@debian.org>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -14,26 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:154
 #, c-format
 msgid "Username at %s: "
 msgstr "用戶名在 %s："
 
-#: account.c:176
+#: account.c:209
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s 的密碼："
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:43 query.c:48
 #: recvattach.c:54
 msgid "Exit"
 msgstr "離開"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:38 curs_main.c:403 pager.c:1486 postpone.c:44
 msgid "Del"
 msgstr "刪除"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:39 curs_main.c:404 postpone.c:45
 msgid "Undel"
 msgstr "反刪除"
 
@@ -42,9 +42,9 @@ msgid "Select"
 msgstr "選擇"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:409
+#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1578 pgpkey.c:521
+#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
 msgid "Help"
 msgstr "求助"
 
@@ -96,171 +96,171 @@ msgstr "存到檔案："
 msgid "Alias added."
 msgstr "別名已經增加。"
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: attach.c:113 attach.c:245 attach.c:473 attach.c:964
 msgid "Can't match nametemplate, continue?"
 msgstr "無法配合二個同樣名稱，繼續？"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap 編輯項目需要 %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:134 attach.c:264 commands.c:221 compose.c:1183 curs_lib.c:179
+#: curs_lib.c:426
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "執行 \"%s\" 時發生錯誤！"
 
-#: attach.c:143
+#: attach.c:144
 msgid "Failure to open file to parse headers."
 msgstr "開啟檔案來分析檔頭失敗。"
 
-#: attach.c:174
+#: attach.c:175
 msgid "Failure to open file to strip headers."
 msgstr "開啟檔案時去除檔案標頭失敗。"
 
-#: attach.c:183
+#: attach.c:184
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "開啟檔案來分析檔頭失敗。"
 
-#: attach.c:196
+#: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "沒有 %s 的 mailcap 組成登錄，正在建立空的檔案。"
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "編輯 Mailcap 項目時需要 %%s"
 
-#: attach.c:275
+#: attach.c:276
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "沒有 %s 的 mailcap 編輯登錄"
 
-#: attach.c:438
+#: attach.c:439
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "沒有發現配合 mailcap 的登錄。將以文字檔方式瀏覽。"
 
-#: attach.c:451
+#: attach.c:452
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME 形式未被定義. 無法顯示附件內容。"
 
-#: attach.c:541
+#: attach.c:542
 msgid "Cannot create filter"
 msgstr "無法建立過濾器"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
+#: attach.c:672 attach.c:704 attach.c:997 attach.c:1055 handler.c:1576
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "無法建立過濾"
 
-#: attach.c:835
+#: attach.c:836
 msgid "Write fault!"
 msgstr "寫入失敗！"
 
-#: attach.c:1077
+#: attach.c:1078
 msgid "I don't know how to print that!"
 msgstr "我不知道要如何列印它！"
 
-#: browser.c:45
+#: browser.c:46
 msgid "Chdir"
 msgstr "改變目錄"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Mask"
 msgstr "遮罩"
 
-#: browser.c:381 browser.c:989
+#: browser.c:382 browser.c:990
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s 不是一個目錄"
 
-#: browser.c:501
+#: browser.c:502
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "ä¿¡ç®± [%d]"
 
-#: browser.c:508
+#: browser.c:509
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "已訂閱 [%s], 檔案遮罩: %s"
 
-#: browser.c:512
+#: browser.c:513
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "目錄 [%s], 檔案遮罩: %s"
 
-#: browser.c:524
+#: browser.c:525
 msgid "Can't attach a directory!"
 msgstr "無法附帶目錄！"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:656 browser.c:1057 browser.c:1154
 msgid "No files match the file mask"
 msgstr "沒有檔案與檔案遮罩相符"
 
-#: browser.c:860
+#: browser.c:861
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 郵箱才支援製造功能"
 
-#: browser.c:880
+#: browser.c:881
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 郵箱才支援製造功能"
 
-#: browser.c:901
+#: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 郵箱才支援刪除功能"
 
-#: browser.c:909
+#: browser.c:910
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "真的要刪除 \"%s\" 郵箱？"
 
-#: browser.c:923
+#: browser.c:924
 msgid "Mailbox deleted."
 msgstr "郵箱已刪除。"
 
-#: browser.c:929
+#: browser.c:930
 msgid "Mailbox not deleted."
 msgstr "郵箱未被刪除。"
 
-#: browser.c:948
+#: browser.c:949
 msgid "Chdir to: "
 msgstr "改變目錄到："
 
-#: browser.c:977 browser.c:1049
+#: browser.c:978 browser.c:1050
 msgid "Error scanning directory."
 msgstr "無法掃描目錄。"
 
-#: browser.c:1000
+#: browser.c:1001
 msgid "File Mask: "
 msgstr "檔案遮罩："
 
-#: browser.c:1072
+#: browser.c:1073
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "反向排序 (1)日期, (2)字元, (3)大小 或 (4)不排序 ? "
 
-#: browser.c:1073
+#: browser.c:1074
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "依照 (1)日期 (2)字元 (3)大小 來排序，或(4)不排序 ? "
 
-#: browser.c:1074
+#: browser.c:1075
 msgid "dazn"
 msgstr "1234"
 
-#: browser.c:1140
+#: browser.c:1141
 msgid "New file name: "
 msgstr "新檔名："
 
-#: browser.c:1171
+#: browser.c:1172
 msgid "Can't view a directory"
 msgstr "無法顯示目錄"
 
-#: browser.c:1188
+#: browser.c:1189
 msgid "Error trying to view file"
 msgstr "無法試著顯示檔案"
 
@@ -328,7 +328,7 @@ msgstr "不支援預設的色彩"
 msgid "Verify PGP signature?"
 msgstr "檢查 PGP 簽名?"
 
-#: commands.c:117 mbox.c:737
+#: commands.c:117 mbox.c:736
 msgid "Could not create temporary file!"
 msgstr "無法建立暫存檔！"
 
@@ -340,118 +340,118 @@ msgstr "無法建立顯示過濾器"
 msgid "Could not copy message"
 msgstr "無法複制信件"
 
-#: commands.c:186
+#: commands.c:187
 #, fuzzy
 msgid "S/MIME signature successfully verified."
 msgstr "PGP 簽名驗證成功。"
 
-#: commands.c:188
+#: commands.c:189
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: commands.c:191 commands.c:202
+#: commands.c:192 commands.c:203
 msgid "Warning: Part of this message has not been signed."
 msgstr ""
 
-#: commands.c:193
+#: commands.c:194
 #, fuzzy
 msgid "S/MIME signature could NOT be verified."
 msgstr "PGP 簽名無法驗證。"
 
-#: commands.c:200
+#: commands.c:201
 msgid "PGP signature successfully verified."
 msgstr "PGP 簽名驗證成功。"
 
-#: commands.c:204
+#: commands.c:205
 msgid "PGP signature could NOT be verified."
 msgstr "PGP 簽名無法驗證。"
 
-#: commands.c:227
+#: commands.c:228
 msgid "Command: "
 msgstr "指令："
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:247 recvcmd.c:147
 msgid "Bounce message to: "
 msgstr "直接傳送郵件到："
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:249 recvcmd.c:149
 msgid "Bounce tagged messages to: "
 msgstr "無法傳送已標記的郵件至："
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:264 recvcmd.c:158
 msgid "Error parsing address!"
 msgstr "無法分析位址！"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:272 recvcmd.c:166
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce message to %s"
 msgstr "把郵件直接傳送至 %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:283 recvcmd.c:180
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "把郵件直接傳送至 %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Message not bounced."
 msgstr "郵件已被傳送。"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:299 recvcmd.c:196
 #, fuzzy
 msgid "Messages not bounced."
 msgstr "郵件已傳送。"
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Message bounced."
 msgstr "郵件已被傳送。"
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:309 recvcmd.c:215
 msgid "Messages bounced."
 msgstr "郵件已傳送。"
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:386 commands.c:420 commands.c:437
 msgid "Can't create filter process"
 msgstr "無法啟動過濾程序"
 
-#: commands.c:465
+#: commands.c:466
 msgid "Pipe to command: "
 msgstr "用管道輸出至命令："
 
-#: commands.c:482
+#: commands.c:483
 msgid "No printing command has been defined."
 msgstr "沒有定義列印指令。"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print message?"
 msgstr "列印信件？"
 
-#: commands.c:487
+#: commands.c:488
 msgid "Print tagged messages?"
 msgstr "列印已標記的信件？"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Message printed"
 msgstr "信件已印出"
 
-#: commands.c:496
+#: commands.c:497
 msgid "Messages printed"
 msgstr "信件已印出"
 
-#: commands.c:498
+#: commands.c:499
 msgid "Message could not be printed"
 msgstr "信件未能列印出來"
 
-#: commands.c:499
+#: commands.c:500
 msgid "Messages could not be printed"
 msgstr "信件未能列印出來"
 
-#: commands.c:508
+#: commands.c:509
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -460,7 +460,7 @@ msgstr ""
 "反方向 1)日期 2)發信人 3)收信時間 4)標題 5)收信人 6)序列 7)不排 8)大小 9)分"
 "數:"
 
-#: commands.c:509
+#: commands.c:510
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
@@ -469,74 +469,74 @@ msgstr ""
 "排序 1)日期 2)發信人 3)收信時間 4)標題 5)收信人 6)序列 7)不排序 8)大小 9)分"
 "數:"
 
-#: commands.c:510
+#: commands.c:511
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "123456789"
 
-#: commands.c:567
+#: commands.c:568
 msgid "Shell command: "
 msgstr "Shell 指令："
 
-#: commands.c:709
+#: commands.c:716
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "%s%s 到信箱"
 
-#: commands.c:710
+#: commands.c:717
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "%s%s 到信箱"
 
-#: commands.c:711
+#: commands.c:718
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "%s%s 到信箱"
 
-#: commands.c:712
+#: commands.c:719
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "%s%s 到信箱"
 
-#: commands.c:713
+#: commands.c:720
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
 msgstr "%s%s 到信箱"
 
-#: commands.c:713
+#: commands.c:720
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
 msgstr "%s%s 到信箱"
 
-#: commands.c:714
+#: commands.c:721
 msgid " tagged"
 msgstr " 已標記"
 
-#: commands.c:787
+#: commands.c:794
 #, c-format
 msgid "Copying to %s..."
 msgstr "拷貝到 %s…"
 
-#: commands.c:909
+#: commands.c:926
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "送出的時候轉換字符集為 %s ？"
 
-#: commands.c:919
+#: commands.c:936
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type 被改為 %s。"
 
-#: commands.c:924
+#: commands.c:941
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "字符集已換為 %s; %s。"
 
-#: commands.c:926
+#: commands.c:943
 msgid "not converting"
 msgstr "沒有轉換"
 
-#: commands.c:926
+#: commands.c:943
 msgid "converting"
 msgstr "轉換中"
 
@@ -630,103 +630,684 @@ msgstr ""
 msgid "Attaching selected files..."
 msgstr "正在附加選取了的檔案…"
 
-#: compose.c:695
+#: compose.c:696
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "無法附加 %s！"
 
-#: compose.c:714
+#: compose.c:715
 msgid "Open mailbox to attach message from"
 msgstr "開啟信箱並從它選擇附加的信件"
 
-#: compose.c:752
+#: compose.c:753
 msgid "No messages in that folder."
 msgstr "檔案夾中沒有信件。"
 
-#: compose.c:761
+#: compose.c:762
 msgid "Tag the messages you want to attach!"
 msgstr "請標記您要附加的信件！"
 
-#: compose.c:793
+#: compose.c:794
 msgid "Unable to attach!"
 msgstr "無法附加！"
 
-#: compose.c:842
+#: compose.c:845
 msgid "Recoding only affects text attachments."
 msgstr "只重新編碼受影響的文字附件"
 
-#: compose.c:847
+#: compose.c:850
 msgid "The current attachment won't be converted."
 msgstr "這個附件不會被轉換。"
 
-#: compose.c:849
+#: compose.c:852
 msgid "The current attachment will be converted."
 msgstr "這個附件會被轉換。"
 
-#: compose.c:924
+#: compose.c:927
 msgid "Invalid encoding."
 msgstr "無效的編碼。"
 
-#: compose.c:950
+#: compose.c:953
 msgid "Save a copy of this message?"
 msgstr "儲存這封信件的拷貝嗎？"
 
-#: compose.c:1006
+#: compose.c:1009
 msgid "Rename to: "
 msgstr "更改名稱為："
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1014 editmsg.c:116 sendlib.c:856
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "無法讀取：%s"
 
-#: compose.c:1038
+#: compose.c:1041
 msgid "New file: "
 msgstr "建立新檔："
 
-#: compose.c:1051
+#: compose.c:1054
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type 的格式是 base/sub"
 
-#: compose.c:1057
+#: compose.c:1060
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "不明的 Content-Type %s"
 
-#: compose.c:1070
+#: compose.c:1073
 #, c-format
 msgid "Can't create file %s"
 msgstr "無法建立檔案 %s"
 
-#: compose.c:1078
+#: compose.c:1081
 msgid "What we have here is a failure to make an attachment"
 msgstr "我們無法加上附件"
 
-#: compose.c:1139
+#: compose.c:1142
 msgid "Postpone this message?"
 msgstr "延遲寄出這封信件？"
 
-#: compose.c:1196
+#: compose.c:1201
 msgid "Write message to mailbox"
 msgstr "將信件寫入到信箱"
 
-#: compose.c:1199
+#: compose.c:1204
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "寫入信件到 %s …"
 
-#: compose.c:1208
+#: compose.c:1213
 msgid "Message written."
 msgstr "信件已寫入。"
 
-#: compose.c:1220
+#: compose.c:1225
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
-#: compose.c:1246
+#: compose.c:1251
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
+#: crypt-gpgme.c:335
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "在樣式上有錯誤：%s"
+
+#: crypt-gpgme.c:345
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:365
+#, fuzzy, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr "在樣式上有錯誤：%s"
+
+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "在樣式上有錯誤：%s"
+
+#: crypt-gpgme.c:467
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "在樣式上有錯誤：%s"
+
+#: crypt-gpgme.c:489 crypt-gpgme.c:536
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "在樣式上有錯誤：%s"
+
+#: crypt-gpgme.c:597
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "在樣式上有錯誤：%s"
+
+#: crypt-gpgme.c:635
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:645
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
+
+#: crypt-gpgme.c:657
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:701
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "在樣式上有錯誤：%s"
+
+#: crypt-gpgme.c:798
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "在樣式上有錯誤：%s"
+
+#: crypt-gpgme.c:993
+msgid "Warning: One of the keys has been revoked\n"
+msgstr ""
+
+#: crypt-gpgme.c:1002
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1008
+#, fuzzy
+msgid "Warning: At least one certification key has expired\n"
+msgstr "伺服器的驗証已過期"
+
+#: crypt-gpgme.c:1024
+msgid "Warning: The signature expired at: "
+msgstr ""
+
+#: crypt-gpgme.c:1030
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
+
+#: crypt-gpgme.c:1035
+#, fuzzy
+msgid "The CRL is not available\n"
+msgstr "沒有 SSL 功能"
+
+#: crypt-gpgme.c:1041
+msgid "Available CRL is too old\n"
+msgstr ""
+
+#: crypt-gpgme.c:1046
+msgid "A policy requirement was not met\n"
+msgstr ""
+
+#: crypt-gpgme.c:1055
+msgid "A system error occurred"
+msgstr ""
+
+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
+#, fuzzy
+msgid "Fingerprint: "
+msgstr "指模：%s"
+
+#: crypt-gpgme.c:1152
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1159
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1163
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
+
+#: crypt-gpgme.c:1238
+msgid "Error getting key information: "
+msgstr ""
+
+#. We can't decide (yellow) but this is a PGP key with a good
+#. signature, so we display what a PGP user expects: The name,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278
+msgid "Good signature from: "
+msgstr ""
+
+#: crypt-gpgme.c:1255
+msgid "                aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
+msgid "            created: "
+msgstr ""
+
+#: crypt-gpgme.c:1268
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
+
+#: crypt-gpgme.c:1291
+#, fuzzy
+msgid "Error checking signature"
+msgstr "寄信途中發生錯誤。"
+
+#. Note: We don't need a current time output because GPGME avoids
+#. such an attack by separating the meta information from the
+#. data.
+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
+msgid "[-- Begin signature information --]\n"
+msgstr ""
+
+#: crypt-gpgme.c:1344
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "指令行有錯：%s\n"
+
+#: crypt-gpgme.c:1386
+#, c-format
+msgid "*** Begin Notation (signature by: %s) ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1405
+msgid "*** End Notation ***\n"
+msgstr ""
+
+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- 簽署的資料結束 --]\n"
+
+#: crypt-gpgme.c:1507
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- 錯誤：突發的檔尾！ --]\n"
+
+#: crypt-gpgme.c:2006
+#, c-format
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2054
+msgid "Error: copy data failed\n"
+msgstr ""
+
+#: crypt-gpgme.c:2074 pgp.c:405
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP 信件開始 --]\n"
+"\n"
+
+#: crypt-gpgme.c:2076 pgp.c:407
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP 公共鑰匙區段開始 --]\n"
+
+#: crypt-gpgme.c:2079 pgp.c:409
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP 簽名的信件開始 --]\n"
+"\n"
+
+#: crypt-gpgme.c:2106 pgp.c:435
+#, fuzzy
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- PGP 信件結束 --]\n"
+
+#: crypt-gpgme.c:2108 pgp.c:439
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP 公共鑰匙區段結束 --]\n"
+
+#: crypt-gpgme.c:2110 pgp.c:441
+#, fuzzy
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- PGP 簽名的信件結束 --]\n"
+
+#: crypt-gpgme.c:2131 pgp.c:471
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- 錯誤：找不到 PGP 信件的開頭！ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2162 pgp.c:900
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- 錯誤：不正確的 PGP/MIME 信件！ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:913
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- 錯誤：無法建立暫存檔！ --]\n"
+
+#: crypt-gpgme.c:2186
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- 下面是 PGP/MIME 加密資料 --]\n"
+"\n"
+
+#: crypt-gpgme.c:2187 pgp.c:922
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- 下面是 PGP/MIME 加密資料 --]\n"
+"\n"
+
+#: crypt-gpgme.c:2209
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- PGP/MIME 加密資料結束 --]\n"
+
+#: crypt-gpgme.c:2210 pgp.c:942
+#, fuzzy
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- PGP/MIME 加密資料結束 --]\n"
+
+#: crypt-gpgme.c:2252
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr ""
+"[-- 以下的資料已被簽署 --]\n"
+"\n"
+
+#: crypt-gpgme.c:2253
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- 下面是 PGP/MIME 加密資料 --]\n"
+"\n"
+
+#: crypt-gpgme.c:2283
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- 簽署的資料結束 --]\n"
+
+#: crypt-gpgme.c:2284
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- PGP/MIME 加密資料結束 --]\n"
+
+#: crypt-gpgme.c:2876
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2878
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2883
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2962
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
+#, fuzzy
+msgid "[Invalid]"
+msgstr "無效的月份：%s"
+
+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "無效的月份：%s"
+
+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "無效的月份：%s"
+
+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+#, fuzzy
+msgid "encryption"
+msgstr "加密"
+
+#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
+#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
+#, fuzzy
+msgid "certification"
+msgstr "驗証已儲存"
+
+#: crypt-gpgme.c:3068
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:3076
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:3095
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "鑰匙 ID：0x%s"
+
+#: crypt-gpgme.c:3099
+msgid "[Revoked]"
+msgstr ""
+
+#: crypt-gpgme.c:3109
+#, fuzzy
+msgid "[Expired]"
+msgstr "離開  "
+
+#: crypt-gpgme.c:3114
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
+msgid "Can't create temporary file"
+msgstr "無法建立暫存檔"
+
+#: crypt-gpgme.c:3201
+#, fuzzy
+msgid "Collecting data..."
+msgstr "正連接到 %s…"
+
+#: crypt-gpgme.c:3227
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "連線到 %s 時失敗"
+
+#: crypt-gpgme.c:3237
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3248 pgpkey.c:580
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "鑰匙 ID：0x%s"
+
+#: crypt-gpgme.c:3331
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "登入失敗： %s"
+
+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3532
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "所有符合的鑰匙經已過期或取消。"
+
+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
+#: smime.c:431
+msgid "Exit  "
+msgstr "離開  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
+msgid "Select  "
+msgstr "選擇    "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3566 pgpkey.c:519
+msgid "Check key  "
+msgstr "檢查鑰匙   "
+
+#: crypt-gpgme.c:3583
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP 鑰匙符合 <%s>。"
+
+#: crypt-gpgme.c:3585
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP 鑰匙符合 <%s>。"
+
+#: crypt-gpgme.c:3587
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "PGP 鑰匙符合 <%s>。"
+
+#: crypt-gpgme.c:3589
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP 鑰匙符合 <%s>。"
+
+#: crypt-gpgme.c:3592
+#, fuzzy, c-format
+msgid "%s <%s>."
+msgstr "%s 【%s】\n"
+
+#: crypt-gpgme.c:3594
+#, fuzzy, c-format
+msgid "%s \"%s\"."
+msgstr "%s 【%s】\n"
+
+#: crypt-gpgme.c:3621 pgpkey.c:600
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "這個鑰匙不能使用：過期/停用/已取消。"
+
+#: crypt-gpgme.c:3635 pgpkey.c:612
+#, fuzzy
+msgid "ID is expired/disabled/revoked."
+msgstr "這個 ID 已過期/停用/取消。"
+
+#: crypt-gpgme.c:3655 pgpkey.c:616
+msgid "ID has undefined validity."
+msgstr ""
+
+#: crypt-gpgme.c:3658 pgpkey.c:619
+#, fuzzy
+msgid "ID is not valid."
+msgstr "這個 ID 不可接受。"
+
+#: crypt-gpgme.c:3661 pgpkey.c:622
+#, fuzzy
+msgid "ID is only marginally valid."
+msgstr "此 ID 只是勉強可接受。"
+
+#: crypt-gpgme.c:3669 pgpkey.c:626
+#, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s 您真的要使用這個鑰匙？"
+
+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "正找尋匹配 \"%s\" 的鑰匙…"
+
+#: crypt-gpgme.c:4002 pgp.c:1149
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "要為 %2$s 使用鑰匙 ID = \"%1$s\"？"
+
+#: crypt-gpgme.c:4038 pgp.c:1183 smime.c:665 smime.c:790
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "請輸入 %s 的鑰匙 ID："
+
+#: crypt-gpgme.c:4103
+msgid ""
+"\n"
+"Using GPGME backend, although no gpg-agent is running"
+msgstr ""
+
+#: crypt-gpgme.c:4131
+#, fuzzy
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
+msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
+
+#: crypt-gpgme.c:4132
+#, fuzzy
+msgid "esabpfc"
+msgstr "12345"
+
+#: crypt-gpgme.c:4135
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
+
+#: crypt-gpgme.c:4136
+#, fuzzy
+msgid "esabmfc"
+msgstr "12345"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
+msgid "Sign as: "
+msgstr "簽名的身份是："
+
+#: crypt-gpgme.c:4249
+msgid "Failed to verify sender"
+msgstr ""
+
+#: crypt-gpgme.c:4252
+#, fuzzy
+msgid "Failed to figure out sender"
+msgstr "開啟檔案來分析檔頭失敗。"
+
 #: crypt.c:69
 #, c-format
 msgid " (current time: %c)"
@@ -743,29 +1324,29 @@ msgid "Passphrase(s) forgotten."
 msgstr "已忘記 PGP 通行密碼。"
 
 #. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563
 msgid "Invoking PGP..."
 msgstr "啟動 PGP…"
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1438
 msgid "Mail not sent."
 msgstr "信件沒有寄出。"
 
-#: crypt.c:398
+#: crypt.c:397
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:616 crypt.c:660
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.c:641 crypt.c:681
+#: crypt.c:640 crypt.c:680
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
@@ -777,7 +1358,7 @@ msgstr ""
 "[-- 錯誤：不一致的 multipart/signed 結構！ --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:823
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -786,7 +1367,7 @@ msgstr ""
 "[-- 錯誤：不明的 multipart/signed 協定 %s！ --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:862
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -796,7 +1377,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:874
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
@@ -805,7 +1386,7 @@ msgstr ""
 "[-- 以下的資料已被簽署 --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:880
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -813,7 +1394,7 @@ msgstr ""
 "[-- 警告：找不到任何的簽名。 --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:886
 #, fuzzy
 msgid ""
 "\n"
@@ -822,228 +1403,258 @@ msgstr ""
 "\n"
 "[-- 簽署的資料結束 --]\n"
 
+#: cryptglue.c:89
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
+msgstr ""
+
+#: cryptglue.c:112
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "啟動 PGP…"
+
 # Don't translate this!!
-#: curs_lib.c:190
+#: curs_lib.c:188
 msgid "yes"
 msgstr ""
 
 # Don't translate this!!
-#: curs_lib.c:191
+#: curs_lib.c:189
 msgid "no"
 msgstr ""
 
 #. restore blocking operation
-#: curs_lib.c:287
+#: curs_lib.c:285
 msgid "Exit Mutt?"
 msgstr "離開 Mutt？"
 
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
+#: curs_lib.c:378 mutt_socket.c:529 mutt_ssl.c:328
 msgid "unknown error"
 msgstr "不明的錯誤"
 
-#: curs_lib.c:400
+#: curs_lib.c:398
 msgid "Press any key to continue..."
 msgstr "按下任何鍵繼續…"
 
-#: curs_lib.c:444
+#: curs_lib.c:442
 msgid " ('?' for list): "
 msgstr " (用 '?' 顯示列表)："
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
+#: curs_main.c:52 curs_main.c:620 curs_main.c:650
 msgid "No mailbox is open."
 msgstr "沒有已開啟信箱。"
 
-#: curs_main.c:52
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "沒有信件。"
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
 msgid "Mailbox is read-only."
 msgstr "信箱是唯讀的。"
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
+#: curs_main.c:55 pager.c:59 recvattach.c:873
 msgid "Function not permitted in attach-message mode."
 msgstr "功能在 attach-message 模式下不被支援。"
 
-#: curs_main.c:55
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "沒有要被顯示的信件。"
 
-#: curs_main.c:248
+#: curs_main.c:249
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "無法寫入到一個唯讀的信箱！"
 
-#: curs_main.c:255
+#: curs_main.c:256
 msgid "Changes to folder will be written on folder exit."
 msgstr "在離開之後將會把改變寫入資料夾。"
 
-#: curs_main.c:260
+#: curs_main.c:261
 msgid "Changes to folder will not be written."
 msgstr "將不會把改變寫入資料夾。"
 
-#: curs_main.c:401
+#: curs_main.c:402
 msgid "Quit"
 msgstr "離開"
 
-#: curs_main.c:404 recvattach.c:55
+#: curs_main.c:405 recvattach.c:55
 msgid "Save"
 msgstr "儲存"
 
-#: curs_main.c:405 query.c:49
+#: curs_main.c:406 query.c:49
 msgid "Mail"
 msgstr "信件"
 
-#: curs_main.c:406 pager.c:1457
+#: curs_main.c:407 pager.c:1487
 msgid "Reply"
 msgstr "回覆"
 
-#: curs_main.c:407
+#: curs_main.c:408
 msgid "Group"
 msgstr "群組"
 
-#: curs_main.c:496
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "信箱已被其他途徑改變過。旗標可能有錯誤。"
 
-#: curs_main.c:499
+#: curs_main.c:500
 msgid "New mail in this mailbox."
 msgstr "這個信箱中有新信件。"
 
-#: curs_main.c:503
+#: curs_main.c:504
 msgid "Mailbox was externally modified."
 msgstr "信箱已被其他途徑更改過。"
 
-#: curs_main.c:621
+#: curs_main.c:626
 msgid "No tagged messages."
 msgstr "沒有標記了的信件。"
 
-#: curs_main.c:657 menu.c:906
+#: curs_main.c:662 menu.c:915
 #, fuzzy
 msgid "Nothing to do."
 msgstr "正連接到 %s…"
 
-#: curs_main.c:743
+#: curs_main.c:748
 msgid "Jump to message: "
 msgstr "跳到信件："
 
-#: curs_main.c:749
+#: curs_main.c:754
 msgid "Argument must be a message number."
 msgstr "需要一個信件編號的參數。"
 
-#: curs_main.c:782
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "這封信件無法顯示。"
 
-#: curs_main.c:785
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "無效的信件編號。"
 
-#: curs_main.c:804
+#: curs_main.c:809
 msgid "Delete messages matching: "
 msgstr "刪除符合這樣式的信件："
 
-#: curs_main.c:826
+#: curs_main.c:831
 msgid "No limit pattern is in effect."
 msgstr "沒有限制樣式是有效的。"
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:831
+#: curs_main.c:836
 #, c-format
 msgid "Limit: %s"
 msgstr "限制: %s"
 
-#: curs_main.c:841
+#: curs_main.c:846
 msgid "Limit to messages matching: "
 msgstr "限制只符合這樣式的信件："
 
-#: curs_main.c:873
+#: curs_main.c:878
 msgid "Quit Mutt?"
 msgstr "離開 Mutt？"
 
-#: curs_main.c:952
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "標記信件的條件："
 
-#: curs_main.c:966
+#: curs_main.c:976
 msgid "Undelete messages matching: "
 msgstr "反刪除信件的條件："
 
-#: curs_main.c:974
+#: curs_main.c:984
 msgid "Untag messages matching: "
 msgstr "反標記信件的條件："
 
-#: curs_main.c:1053
+#: curs_main.c:1063
 msgid "Open mailbox in read-only mode"
 msgstr "用唯讀模式開啟信箱"
 
-#: curs_main.c:1055
+#: curs_main.c:1065
 msgid "Open mailbox"
 msgstr "開啟信箱"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: curs_main.c:1081 mx.c:512 mx.c:658
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s 不是信箱。"
 
-#: curs_main.c:1165
-msgid "Exit Mutt without saving?"
-msgstr "不儲存便離開 Mutt 嗎？"
+#: curs_main.c:1176
+msgid "Exit Mutt without saving?"
+msgstr "不儲存便離開 Mutt 嗎？"
+
+#: curs_main.c:1194 curs_main.c:1226 curs_main.c:1688 curs_main.c:1720
+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+msgid "Threading is not enabled."
+msgstr "序列功能尚未啟動。"
+
+#: curs_main.c:1206
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1228
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1230
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "儲存信件以便稍後寄出"
+
+#: curs_main.c:1242
+msgid "Threads linked"
+msgstr ""
 
-#: curs_main.c:1199 curs_main.c:1224
+#: curs_main.c:1245
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
 msgstr "您已經在最後一封信了。"
 
-#: curs_main.c:1206 curs_main.c:1250
+#: curs_main.c:1288 curs_main.c:1332
 msgid "No undeleted messages."
 msgstr "沒有要反刪除的信件。"
 
-#: curs_main.c:1243 curs_main.c:1267
+#: curs_main.c:1325 curs_main.c:1349
 msgid "You are on the first message."
 msgstr "您已經在第一封信了。"
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1424 pattern.c:1303
 msgid "Search wrapped to top."
 msgstr "搜尋至開頭。"
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1433 pattern.c:1314
 msgid "Search wrapped to bottom."
 msgstr "搜尋至結尾。"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No new messages"
 msgstr "沒有新信件"
 
-#: curs_main.c:1392
+#: curs_main.c:1474
 msgid "No unread messages"
 msgstr "沒有尚未讀取的信件"
 
-#: curs_main.c:1393
+#: curs_main.c:1475
 msgid " in this limited view"
 msgstr " 在這限定的瀏覽中"
 
-#: curs_main.c:1414 pager.c:2354
+#: curs_main.c:1496 pager.c:2386
 #, fuzzy
 msgid "Can't change 'important' flag on POP server."
 msgstr "無法編輯 POP 伺服器上的信件。"
 
-#: curs_main.c:1538
+#: curs_main.c:1620
 msgid "No more threads."
 msgstr "沒有更多的序列"
 
-#: curs_main.c:1540
+#: curs_main.c:1622
 msgid "You are on the first thread."
 msgstr "您已經在第一個序列上。"
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "序列功能尚未啟動。"
-
-#: curs_main.c:1624
+#: curs_main.c:1706
 msgid "Thread contains unread messages."
 msgstr "序列中有尚未讀取的信件。"
 
-#: curs_main.c:1811
+#: curs_main.c:1893
 msgid "Can't edit message on POP server."
 msgstr "無法編輯 POP 伺服器上的信件。"
 
@@ -1176,75 +1787,75 @@ msgstr "設定旗標"
 msgid "Clear flag"
 msgstr "清除旗標"
 
-#: handler.c:1349
+#: handler.c:1352
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- 錯誤： 無法顯示 Multipart/Alternative！ --]\n"
 
-#: handler.c:1459
+#: handler.c:1469
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- 附件 #%d"
 
-#: handler.c:1471
+#: handler.c:1481
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- 種類：%s%s，編碼：%s，大小：%s --]\n"
 
-#: handler.c:1534
+#: handler.c:1547
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- 使用 %s 自動顯示 --]\n"
 
-#: handler.c:1535
+#: handler.c:1548
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "執行自動顯示指令：%s"
 
-#: handler.c:1567
+#: handler.c:1580
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- 不能執行 %s 。 --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1599 handler.c:1620
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- 自動顯示 %s 的 stderr 內容 --]\n"
 
-#: handler.c:1643
+#: handler.c:1659
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- 錯誤：message/external-body 沒有存取類型 (access-type) 的參數 --]\n"
 
-#: handler.c:1662
+#: handler.c:1678
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- 這個 %s/%s 附件 "
 
-#: handler.c:1669
+#: handler.c:1685
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(%s 個位元組) "
 
-#: handler.c:1671
+#: handler.c:1687
 msgid "has been deleted --]\n"
 msgstr "已經被刪除了 --]\n"
 
-#: handler.c:1676
+#: handler.c:1692
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- 在 %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1697
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- 名稱：%s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1710 handler.c:1726
 #, fuzzy, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- 這個 %s/%s 附件 "
 
-#: handler.c:1696
+#: handler.c:1712
 #, fuzzy
 msgid ""
 "[-- and the indicated external source has --]\n"
@@ -1254,36 +1865,36 @@ msgstr ""
 "[-- 並且被指示的外部原始檔已 --]\n"
 "[-- 過期。 --]\n"
 
-#: handler.c:1714
+#: handler.c:1730
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 "[-- 這個 %s/%s 附件無法被附上, --]\n"
 "[-- 並且被指示的存取類型 (access-type) %s 不被支援 --]\n"
 
-#: handler.c:1822
+#: handler.c:1841
 msgid "Error: multipart/signed has no protocol."
 msgstr "錯誤：multipart/signed 沒有通訊協定。"
 
-#: handler.c:1832
+#: handler.c:1851
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "錯誤：multipart/encrypted 沒有任何通訊協定參數！"
 
-#: handler.c:1872
+#: handler.c:1891
 msgid "Unable to open temporary file!"
 msgstr "無法開啟暫存檔！"
 
-#: handler.c:1933
+#: handler.c:1952
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s 尚未支援 "
 
-#: handler.c:1938
+#: handler.c:1957
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "（按 '%s' 來顯示這部份）"
 
-#: handler.c:1940
+#: handler.c:1959
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "（需要定義一個鍵給 'view-attachments' 來瀏覽附件！)"
 
@@ -1390,47 +2001,47 @@ msgstr "驗證中 (APOP)…"
 msgid "SASL authentication failed."
 msgstr "SASL 驗證失敗。"
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:585
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr ""
 
-#: imap/browse.c:85
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "拿取 namespace 中…"
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "拿取目錄表中…"
 
-#: imap/browse.c:223
+#: imap/browse.c:225
 #, fuzzy
 msgid "No such folder"
 msgstr "%s：沒有這種顏色"
 
-#: imap/browse.c:281
+#: imap/browse.c:288
 msgid "Create mailbox: "
 msgstr "製作信箱："
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:293 imap/browse.c:339
 msgid "Mailbox must have a name."
 msgstr "信箱一定要有名字。"
 
-#: imap/browse.c:294
+#: imap/browse.c:301
 msgid "Mailbox created."
 msgstr "已完成製造郵箱。"
 
-#: imap/browse.c:325
+#: imap/browse.c:332
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "製作信箱："
 
-#: imap/browse.c:338
+#: imap/browse.c:345
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "登入失敗： %s"
 
-#: imap/browse.c:343
+#: imap/browse.c:350
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "已完成製造郵箱。"
@@ -1442,136 +2053,134 @@ msgstr "郵箱已經關掉"
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:337
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "嚴重錯誤。信件數量不協調！"
 
-#: imap/imap.c:168
+#: imap/imap.c:178
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "正在關閉與 %s 的連線…"
 
-#: imap/imap.c:328
+#: imap/imap.c:338
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "這個 IMAP 伺服器已過時，Mutt 無法使用它。"
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
+#: imap/imap.c:420
+msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
 msgstr "利用 TSL 來進行安全連接？"
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:471 pop_lib.c:310
 msgid "Could not negotiate TLS connection"
 msgstr "未能"
 
-#: imap/imap.c:590
+#: imap/imap.c:487 pop_lib.c:331
+#, fuzzy
+msgid "Encrypted connection unavailable"
+msgstr "加密的鑰匙"
+
+#: imap/imap.c:616
 #, c-format
 msgid "Selecting %s..."
 msgstr "正在選擇 %s …"
 
-#: imap/imap.c:726
+#: imap/imap.c:752
 msgid "Error opening mailbox"
 msgstr "開啟信箱時發生錯誤"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "無法附加在這個伺服器上的 IMAP 信箱"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:801 imap/message.c:731 muttlib.c:1300
 #, c-format
 msgid "Create %s?"
 msgstr "建立 %s？"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:1039 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "標簽了的 %d 封信件刪去了…"
 
-#: imap/imap.c:984
+#: imap/imap.c:1048
 msgid "Expunge failed"
 msgstr "刪除 (expunge) 失敗"
 
-#: imap/imap.c:999
+#: imap/imap.c:1061
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "正在儲存信件狀態旗標… [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1094
 msgid "Expunging messages from server..."
 msgstr "正在刪除伺服器上的信件…"
 
-#: imap/imap.c:1088
+#: imap/imap.c:1099
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: imap/imap.c:1122
+#: imap/imap.c:1108 imap/imap.c:1143
 msgid "CLOSE failed"
 msgstr "CLOSE 失敗"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1389
 #, fuzzy
 msgid "Bad mailbox name"
 msgstr "製作信箱："
 
-#: imap/imap.c:1377
+#: imap/imap.c:1412
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "訂閱 %s…"
 
-#: imap/imap.c:1379
+#: imap/imap.c:1414
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "取消訂閱 %s…"
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:92
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "無法取回使用這個 IMAP 伺服器版本的郵件的標頭。"
 
-#: imap/message.c:107
+#: imap/message.c:102
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "無法建立暫存檔 %s"
 
-#: imap/message.c:134
+#: imap/message.c:128
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "正在取回信件標頭… [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop.c:210
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "正在取回信件標頭… [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:358 pop.c:344
 msgid "Fetching message..."
 msgstr "拿取信件中…"
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:401 pop.c:381
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "信件的索引不正確。請再重新開啟信箱。"
 
-#: imap/message.c:589
+#: imap/message.c:574
 msgid "Uploading message ..."
 msgstr "正在上傳信件…"
 
-#: imap/message.c:699
+#: imap/message.c:697
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "正在複制 %d 封信件到 %s …"
 
-#: imap/message.c:703
+#: imap/message.c:701
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "正在複制 信件 %d 到 %s …"
 
-#: imap/util.c:241
+#: imap/util.c:236
 msgid "Continue?"
 msgstr "繼續？"
 
@@ -1580,124 +2189,124 @@ msgstr "繼續？"
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:678
+#: init.c:644
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "標記符合某個格式的信件"
 
-#: init.c:680
+#: init.c:646
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "反標記符合某個格式的信件"
 
-#: init.c:883
+#: init.c:849
 msgid "alias: no address"
 msgstr "別名：沒有電子郵件位址"
 
-#: init.c:928
+#: init.c:894
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: init.c:1006
+#: init.c:972
 msgid "invalid header field"
 msgstr "無效的標頭欄位"
 
-#: init.c:1059
+#: init.c:1025
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s：不明的排序方式"
 
-#: init.c:1169
+#: init.c:1135
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_defualt(%s)：錯誤的正規表示式：%s\n"
 
-#: init.c:1234
+#: init.c:1200
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s：不明的變數"
 
-#: init.c:1243
+#: init.c:1209
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "重新設置後字首仍不合規定"
 
-#: init.c:1249
+#: init.c:1215
 #, c-format
 msgid "value is illegal with reset"
 msgstr "重新設置後值仍不合規定"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is set"
 msgstr "%s 已被設定"
 
-#: init.c:1288
+#: init.c:1254
 #, c-format
 msgid "%s is unset"
 msgstr "%s 沒有被設定"
 
-#: init.c:1478
+#: init.c:1444
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s：無效的信箱種類"
 
-#: init.c:1503 init.c:1548
+#: init.c:1469 init.c:1514
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s：無效的值"
 
-#: init.c:1589
+#: init.c:1555
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s：不明的種類"
 
-#: init.c:1615
+#: init.c:1581
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s：不明的種類"
 
-#: init.c:1674
+#: init.c:1640
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "%s 發生錯誤，行號 %d：%s"
 
 #. the muttrc source keyword
-#: init.c:1697
+#: init.c:1663
 #, c-format
 msgid "source: errors in %s"
 msgstr "source：錯誤發生在 %s"
 
-#: init.c:1698
+#: init.c:1664
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: 因 %s 發生太多錯誤，因此閱讀終止。"
 
-#: init.c:1712
+#: init.c:1678
 #, c-format
 msgid "source: error at %s"
 msgstr "source：錯誤發生在 %s"
 
-#: init.c:1717
+#: init.c:1683
 msgid "source: too many arguments"
 msgstr "source：太多引數"
 
-#: init.c:1768
+#: init.c:1734
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s：不明的指令"
 
-#: init.c:2157
+#: init.c:2178
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "指令行有錯：%s\n"
 
-#: init.c:2206
+#: init.c:2227
 msgid "unable to determine home directory"
 msgstr "無法決定 home 目錄"
 
-#: init.c:2214
+#: init.c:2235
 msgid "unable to determine username"
 msgstr "無法決定使用者名稱"
 
@@ -2158,405 +2767,414 @@ msgid "compose a new mail message"
 msgstr "撰寫一封新的信件"
 
 #: keymap_alldefs.h:103
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:104
 msgid "open a different folder"
 msgstr "開啟另一個檔案夾"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
 msgstr "用唯讀模式開啟另一個檔案夾"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:106
 msgid "clear a status flag from a message"
 msgstr "清除某封信件上的狀態旗標"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
 msgstr "刪除符合某個格式的信件"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "強行取回 IMAP 伺服器上的信件"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:109
 msgid "retrieve mail from POP server"
 msgstr "取回 POP 伺服器上的信件"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:110
 msgid "move to the first message"
 msgstr "移動到第一封信件"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:111
 msgid "move to the last message"
 msgstr "移動到最後一封信件"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:112
 msgid "show only messages matching a pattern"
 msgstr "只顯示符合某個格式的信件"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:113
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "無法傳送已標記的郵件至："
+
+#: keymap_alldefs.h:114
 msgid "jump to the next new message"
 msgstr "跳到下一封新的信件"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:115
 #, fuzzy
 msgid "jump to the next new or unread message"
 msgstr "跳到下一個未讀取的信件"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:116
 msgid "jump to the next subthread"
 msgstr "跳到下一個子序列"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:117
 msgid "jump to the next thread"
 msgstr "跳到下一個序列"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:118
 msgid "move to the next undeleted message"
 msgstr "移動到下一個未刪除的信件"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:119
 msgid "jump to the next unread message"
 msgstr "跳到下一個未讀取的信件"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:120
 msgid "jump to parent message in thread"
 msgstr "跳到這個序列的主信件"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:121
 msgid "jump to previous thread"
 msgstr "跳到上一個序列"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:122
 msgid "jump to previous subthread"
 msgstr "跳到上一個子序列"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:123
 msgid "move to the previous undeleted message"
 msgstr "移動到上一個未刪除的信件"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:124
 msgid "jump to the previous new message"
 msgstr "跳到上一個新的信件"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:125
 #, fuzzy
 msgid "jump to the previous new or unread message"
 msgstr "跳到上一個未讀取的信件"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:126
 msgid "jump to the previous unread message"
 msgstr "跳到上一個未讀取的信件"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:127
 msgid "mark the current thread as read"
 msgstr "標記現在的序列為已讀取"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:128
 msgid "mark the current subthread as read"
 msgstr "標記現在的子序列為已讀取"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:129
 msgid "set a status flag on a message"
 msgstr "設定某一封信件的狀態旗標"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:130
 msgid "save changes to mailbox"
 msgstr "儲存變動到信箱"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:131
 msgid "tag messages matching a pattern"
 msgstr "標記符合某個格式的信件"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:132
 msgid "undelete messages matching a pattern"
 msgstr "反刪除符合某個格式的信件"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:133
 msgid "untag messages matching a pattern"
 msgstr "反標記符合某個格式的信件"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:134
 msgid "move to the middle of the page"
 msgstr "移動到本頁的中間"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:135
 msgid "move to the next entry"
 msgstr "移動到下一項資料"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:136
 msgid "scroll down one line"
 msgstr "向下捲動一行"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:137
 msgid "move to the next page"
 msgstr "移到下一頁"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:138
 msgid "jump to the bottom of the message"
 msgstr "跳到信件的最後面"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:139
 msgid "toggle display of quoted text"
 msgstr "切換引言顯示"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:140
 msgid "skip beyond quoted text"
 msgstr "跳過引言"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:141
 msgid "jump to the top of the message"
 msgstr "跳到信件的最上面"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:142
 msgid "pipe message/attachment to a shell command"
 msgstr "輸出導向 訊息/附件 至命令解譯器"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:143
 msgid "move to the previous entry"
 msgstr "移到上一項資料"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:144
 msgid "scroll up one line"
 msgstr "向上捲動一行"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:145
 msgid "move to the previous page"
 msgstr "移到上一頁"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:146
 msgid "print the current entry"
 msgstr "列印現在的資料"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:147
 msgid "query external program for addresses"
 msgstr "利用外部應用程式查詢地址"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:148
 msgid "append new query results to current results"
 msgstr "附加新的查詢結果至現今的查詢結果"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:149
 msgid "save changes to mailbox and quit"
 msgstr "儲存變動過的資料到信箱並且離開"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:150
 msgid "recall a postponed message"
 msgstr "重新叫出一封被延遲寄出的信件"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:151
 msgid "clear and redraw the screen"
 msgstr "清除並重新繪製畫面"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:152
 msgid "{internal}"
 msgstr "{內部的}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:153
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "刪除所在的郵箱 (只適用於 IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:154
 msgid "reply to a message"
 msgstr "回覆一封信件"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:155
 msgid "use the current message as a template for a new one"
 msgstr "用這封信件作為新信件的範本"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:156
 msgid "save message/attachment to a file"
 msgstr "儲存信件/附件到某個檔案"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:157
 msgid "search for a regular expression"
 msgstr "用正規表示式尋找"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:158
 msgid "search backwards for a regular expression"
 msgstr "向後搜尋一個正規表示式"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:159
 msgid "search for next match"
 msgstr "尋找下一個符合的資料"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:160
 msgid "search for next match in opposite direction"
 msgstr "返方向搜尋下一個符合的資料"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:161
 msgid "toggle search pattern coloring"
 msgstr "切換搜尋格式的顏色"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:162
 msgid "invoke a command in a subshell"
 msgstr "在子 shell 執行指令"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:163
 msgid "sort messages"
 msgstr "信件排序"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:164
 msgid "sort messages in reverse order"
 msgstr "以相反的次序來做訊息排序"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:165
 msgid "tag the current entry"
 msgstr "標記現在的記錄"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:166
 msgid "apply next function to tagged messages"
 msgstr "應用下一個功能到已標記的訊息"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:167
 #, fuzzy
 msgid "apply next function ONLY to tagged messages"
 msgstr "應用下一個功能到已標記的訊息"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:168
 msgid "tag the current subthread"
 msgstr "標記目前的子序列"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:169
 msgid "tag the current thread"
 msgstr "標記目前的序列"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:170
 msgid "toggle a message's 'new' flag"
 msgstr "切換信件的 'new' 旗標"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:171
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "切換是否重新寫入郵箱中"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:172
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "切換瀏覽郵箱抑或所有的檔案"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:173
 msgid "move to the top of the page"
 msgstr "移到頁首"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:174
 msgid "undelete the current entry"
 msgstr "取消刪除所在的記錄"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:175
 msgid "undelete all messages in thread"
 msgstr "取消刪除序列中的所有信件"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:176
 msgid "undelete all messages in subthread"
 msgstr "取消刪除子序列中的所有信件"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:177
 msgid "show the Mutt version number and date"
 msgstr "顯示 Mutt 的版本號碼與日期"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:178
 msgid "view attachment using mailcap entry if necessary"
 msgstr "如果需要的話使用 mailcap 瀏覽附件"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:179
 msgid "show MIME attachments"
 msgstr "顯示 MIME 附件"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:180
 msgid "display the keycode for a key press"
 msgstr ""
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:181
 msgid "show currently active limit pattern"
 msgstr "顯示目前有作用的限制樣式"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:182
 msgid "collapse/uncollapse current thread"
 msgstr "打開/關閉 目前的序列"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:183
 msgid "collapse/uncollapse all threads"
 msgstr "打開/關閉 所有的序列"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:184
 msgid "attach a PGP public key"
 msgstr "附帶一把 PGP 公共鑰匙"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:185
 msgid "show PGP options"
 msgstr "顯示 PGP 選項"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:186
 msgid "mail a PGP public key"
 msgstr "寄出 PGP 公共鑰匙"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:187
 msgid "verify a PGP public key"
 msgstr "檢驗 PGP 公共鑰匙"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:188
 msgid "view the key's user id"
 msgstr "檢閱這把鑰匙的使用者 id"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:189
 msgid "check for classic pgp"
 msgstr "檢查古老的pgp格式"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:190
 msgid "Accept the chain constructed"
 msgstr "同意已建好的鏈結"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:191
 msgid "Append a remailer to the chain"
 msgstr "在鏈結的後面加上郵件轉接器"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:192
 msgid "Insert a remailer into the chain"
 msgstr "在鏈結中加入郵件轉接器"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:193
 msgid "Delete a remailer from the chain"
 msgstr "從鏈結中刪除郵件轉接器"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:194
 msgid "Select the previous element of the chain"
 msgstr "選擇鏈結裏對上一個部份"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:195
 msgid "Select the next element of the chain"
 msgstr "選擇鏈結裏跟著的一個部份"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:196
 msgid "send the message through a mixmaster remailer chain"
 msgstr "利用 mixmaster 郵件轉接器把郵件寄出"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:197
 msgid "make decrypted copy and delete"
 msgstr "製作解密的拷貝並且刪除之"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:198
 msgid "make decrypted copy"
 msgstr "製作一份解密的拷貝"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:199
 #, fuzzy
 msgid "wipe passphrase(s) from memory"
 msgstr "清除記憶體中的 PGP 通行密碼"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:200
 #, fuzzy
 msgid "extract supported public keys"
 msgstr "擷取 PGP 公共鑰匙"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:201
 #, fuzzy
 msgid "show S/MIME options"
 msgstr "顯示 PGP 選項"
 
-#: lib.c:64
+#: lib.c:126
 msgid "Integer overflow -- can't allocate memory!"
 msgstr ""
 
-#: lib.c:71 lib.c:86 lib.c:118
+#: lib.c:133 lib.c:148 lib.c:180
 msgid "Out of memory!"
 msgstr "記憶體不足！"
 
@@ -2584,11 +3202,11 @@ msgstr ""
 #: main.c:61
 #, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -2631,25 +3249,63 @@ msgstr ""
 "    至 Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "    Boston, MA  02111, USA.\n"
 
-#: main.c:99
+#: main.c:99
+#, fuzzy
+msgid ""
+"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"[...]\n"
+"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       mutt -v[v]\n"
+"\n"
+"options:\n"
+"  -A <alias>\texpand the given alias\n"
+"  -a <file>\tattach a file to the message\n"
+"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
+"  -c <address>\tspecify a carbon-copy (CC) address\n"
+"  -D\t\tprint the value of all variables to stderr"
+msgstr ""
+"用法: mutt [ -nRzZ ] [ -e <命令> ] [ -F <檔案> ] [ -m <類型> ] [ -f <檔案"
+"> ]\n"
+"        mutt [ -nx ] [ -e <命令> ] [ -a <檔案> ] [ -F <檔案> ] [ -H <檔案> ] "
+"[ -i <檔案> ] [ -s <主題> ] [ -b <地址> ] [ -c <地址> ] <地址> [ ... ]\n"
+"        mutt [ -n ] [ -e <命令> ] [ -F <檔案> ] -p\n"
+"        mutt -v[v]\n"
+"\n"
+"參數：\n"
+"  -a <檔案>\t\t將檔案附在信件中\n"
+"  -b <地址>\t\t指定一個 秘密複製 (BCC) 的地址\n"
+"  -c <地址>\t\t指定一個 複製 (CC) 的地址\n"
+"  -e <命令>\t\t指定一個初始化後要被執行的命令\n"
+"  -f <檔案>\t\t指定要閱讀那一個郵筒\n"
+"  -F <檔案>\t\t指定另一個 muttrc 檔案\n"
+"  -H <檔案>\t\t指定一個範本檔案以讀取標題來源\n"
+"  -i <檔案>\t\t指定一個包括在回覆中的檔案\n"
+"  -m <類型>\t\t指定一個預設的郵筒類型\n"
+"  -n\t\t使 Mutt 不去讀取系統的 Muttrc 檔\n"
+"  -p\t\t叫回一個延後寄送的信件\n"
+"  -R\t\t以唯讀模式開啟郵筒\n"
+"  -s <主題>\t\t指定一個主題 (如果有空白的話必須被包括在引言中)\n"
+"  -v\t\t顯示版本和編譯時所定義的參數\n"
+"  -x\t\t模擬 mailx 寄送模式\n"
+"  -y\t\t選擇一個被指定在您郵筒清單中的郵筒\n"
+"  -z\t\t如果沒有訊息在郵筒中的話，立即離開\n"
+"  -Z\t\t開啟第一個附有新郵件的資料夾，如果沒有的話立即離開\n"
+"  -h\t\t這個說明訊息"
+
+#: main.c:114
+msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
+msgstr ""
+
+#: main.c:117
 #, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-"<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-"[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-"[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
-"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
-"\n"
-"options:\n"
-"  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
-"  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -2696,7 +3352,7 @@ msgstr ""
 "  -Z\t\t開啟第一個附有新郵件的資料夾，如果沒有的話立即離開\n"
 "  -h\t\t這個說明訊息"
 
-#: main.c:167
+#: main.c:173
 msgid ""
 "\n"
 "Compile options:"
@@ -2704,47 +3360,47 @@ msgstr ""
 "\n"
 "編譯選項："
 
-#: main.c:478
+#: main.c:484
 msgid "Error initializing terminal."
 msgstr "無法初始化終端機。"
 
-#: main.c:583
+#: main.c:594
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "除錯模式在第 %d 層。\n"
 
-#: main.c:585
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "在編譯時候沒有定義 DEBUG。放棄執行。\n"
 
-#: main.c:733
+#: main.c:746
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s 不存在。製造嗎？"
 
-#: main.c:737
+#: main.c:750
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "無法建立 %s: %s."
 
-#: main.c:782
+#: main.c:795
 msgid "No recipients specified.\n"
 msgstr "沒有指定接受者。\n"
 
-#: main.c:868
+#: main.c:881
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s：無法附帶檔案。\n"
 
-#: main.c:888
+#: main.c:901
 msgid "No mailbox with new mail."
 msgstr "沒有信箱有新信件。"
 
-#: main.c:897
+#: main.c:910
 msgid "No incoming mailboxes defined."
 msgstr "沒有定義任何的收信郵箱"
 
-#: main.c:924
+#: main.c:938
 msgid "Mailbox is empty."
 msgstr "信箱內空無一物。"
 
@@ -2761,11 +3417,11 @@ msgstr "信箱已損壞了！"
 msgid "Mailbox was corrupted!"
 msgstr "信箱已損壞!"
 
-#: mbox.c:699 mbox.c:953
+#: mbox.c:701 mbox.c:952
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "嚴重錯誤！無法重新開啟信箱！"
 
-#: mbox.c:708
+#: mbox.c:710
 msgid "Unable to lock mailbox!"
 msgstr "無法鎖住信箱！"
 
@@ -2773,11 +3429,11 @@ msgstr "無法鎖住信箱！"
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:754
+#: mbox.c:753
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "同步：信箱已被修改，但沒有被修改過的信件！（請回報這個錯誤）"
 
-#: mbox.c:793
+#: mbox.c:792
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "寫入信件中… %d (%d%%)"
@@ -2785,187 +3441,148 @@ msgstr "寫入信件中… %d (%d%%)"
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:905
 msgid "Committing changes..."
 msgstr "正在寫入更改的資料…"
 
-#: mbox.c:937
+#: mbox.c:936
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "寫入失敗！已把部分的信箱儲存至 %s"
 
-#: mbox.c:1003
+#: mbox.c:1000
 msgid "Could not reopen mailbox!"
 msgstr "無法重開信箱！"
 
-#: mbox.c:1041
+#: mbox.c:1035
 msgid "Reopening mailbox..."
 msgstr "重新開啟信箱中…"
 
-#: menu.c:416
+#: menu.c:419
 msgid "Jump to: "
 msgstr "跳到："
 
-#: menu.c:425
+#: menu.c:428
 msgid "Invalid index number."
 msgstr "無效的索引編號。"
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:432 menu.c:453 menu.c:491 menu.c:534 menu.c:550 menu.c:561
+#: menu.c:572 menu.c:614 menu.c:625 menu.c:638 menu.c:651 menu.c:1052
 msgid "No entries."
 msgstr "沒有資料。"
 
-#: menu.c:447
+#: menu.c:450
 msgid "You cannot scroll down farther."
 msgstr "您無法再向下捲動了。"
 
-#: menu.c:465
+#: menu.c:468
 msgid "You cannot scroll up farther."
 msgstr "您無法再向上捲動了。"
 
-#: menu.c:485
+#: menu.c:488
 msgid "You are on the last page."
 msgstr "您現在在最後一頁。"
 
-#: menu.c:509
+#: menu.c:512
 msgid "You are on the first page."
 msgstr "您現在在第一頁。"
 
-#: menu.c:588
+#: menu.c:591
 msgid "First entry is shown."
 msgstr "正在顯示第一項。"
 
-#: menu.c:608
+#: menu.c:611
 msgid "Last entry is shown."
 msgstr "正在顯示最後一項。"
 
-#: menu.c:659
+#: menu.c:662
 msgid "You are on the last entry."
 msgstr "您現在在最後一項。"
 
-#: menu.c:670
+#: menu.c:673
 msgid "You are on the first entry."
 msgstr "您現在在第一項。"
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:733 pattern.c:1249
 msgid "Search for: "
 msgstr "搜尋："
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:734 pattern.c:1250
 msgid "Reverse search for: "
 msgstr "返向搜尋："
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:744 pattern.c:1282
 msgid "No search pattern."
 msgstr "沒有搜尋格式。"
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:774 pager.c:1963 pager.c:1979 pager.c:2087 pattern.c:1347
 msgid "Not found."
 msgstr "沒有找到。"
 
-#: menu.c:895
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "沒有已標記的記錄。"
 
-#: menu.c:1000
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "這個選單中沒有搜尋功能。"
 
-#: menu.c:1005
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "對話模式中不支援跳躍功能。"
 
-#: menu.c:1046
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "不支援標記功能。"
 
-#: mh.c:663 mh.c:900
+#: mh.c:667 mh.c:923
 #, c-format
 msgid "Reading %s... %d"
 msgstr "讀取 %s… %d"
 
-#: mh.c:1151
+#: mh.c:1203
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
-#: muttlib.c:846
-#, fuzzy
-msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "檔案是一個目錄, 儲存在它下面 ?"
-
-#: muttlib.c:846
-msgid "yna"
-msgstr ""
-
-#: muttlib.c:862
-msgid "File is a directory, save under it?"
-msgstr "檔案是一個目錄, 儲存在它下面 ?"
-
-#: muttlib.c:868
-msgid "File under directory: "
-msgstr "在目錄底下的檔案："
-
-#: muttlib.c:880
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "檔案已經存在, (1)覆蓋, (2)附加, 或是 (3)取消 ?"
-
-#: muttlib.c:880
-msgid "oac"
-msgstr "123"
-
-#: muttlib.c:1199
-msgid "Can't save message to POP mailbox."
-msgstr "無法將信件存到信箱。"
-
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s 不是信箱！"
-
-#: muttlib.c:1214
-#, c-format
-msgid "Append messages to %s?"
-msgstr "附加信件到 %s ?"
-
 #: mutt_socket.c:91 mutt_socket.c:147
 #, c-format
 msgid "Connection to %s closed"
 msgstr "到 %s 的連線中斷了"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:269
 msgid "SSL is unavailable."
 msgstr "沒有 SSL 功能"
 
-#: mutt_socket.c:302
+#: mutt_socket.c:300
 msgid "Preconnect command failed."
 msgstr "預先連接指令失敗。"
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:371 mutt_socket.c:385
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "連線到 %s (%s) 時失敗"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:424 mutt_socket.c:482
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:431 mutt_socket.c:489
 #, c-format
 msgid "Looking up %s..."
 msgstr "正在尋找 %s…"
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:442 mutt_socket.c:496
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "找不到主機 \"%s\""
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:447 mutt_socket.c:505
 #, c-format
 msgid "Connecting to %s..."
 msgstr "正連接到 %s…"
 
-#: mutt_socket.c:529
+#: mutt_socket.c:528
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "無法連線到 %s (%s)。"
@@ -2998,7 +3615,8 @@ msgstr ""
 msgid "SSL failed: %s"
 msgstr "登入失敗： %s"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+#: mutt_ssl_gnutls.c:531
 msgid "Unable to get certificate from peer"
 msgstr "無法從對方拿取驗証"
 
@@ -3007,87 +3625,208 @@ msgstr "無法從對方拿取驗証"
 msgid "SSL connection using %s (%s)"
 msgstr "利用 %s (%s) 來進行 SSL"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:392
 msgid "Unknown"
 msgstr "不清楚"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
 #, c-format
 msgid "[unable to calculate]"
 msgstr "【無法計算】"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
 msgid "[invalid date]"
 msgstr "【無效的日期】"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:556
 msgid "Server certificate is not yet valid"
 msgstr "伺服器的驗証還未有效"
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:563
 msgid "Server certificate has expired"
 msgstr "伺服器的驗証已過期"
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
 msgid "This certificate belongs to:"
 msgstr "這個驗証屬於："
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
 msgid "This certificate was issued by:"
 msgstr "這個驗証的派發者："
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
 #, c-format
 msgid "This certificate is valid"
 msgstr "這個驗証有效"
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
 #, c-format
 msgid "   from %s"
 msgstr "   由 %s"
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
 #, c-format
 msgid "     to %s"
 msgstr "     至 %s"
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:660
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "指模：%s"
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:662
 msgid "SSL Certificate check"
 msgstr "SSL 驗証測試"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(1)不接受，(2)只是這次接受，(3)永遠接受"
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
 msgid "roa"
 msgstr "123"
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
 msgid "(r)eject, accept (o)nce"
 msgstr "(1)不接受，(2)只是這次接受"
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
 msgid "ro"
 msgstr "12"
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "離開  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:814
 msgid "Warning: Couldn't save certificate"
 msgstr "警告：未能儲存驗証"
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:819
 msgid "Certificate saved"
 msgstr "驗証已儲存"
 
+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:204
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:265
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "利用 %s (%s) 來進行 SSL"
+
+#: mutt_ssl_gnutls.c:508
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:516
+#, fuzzy
+msgid "Certificate is not X.509"
+msgstr "驗証已儲存"
+
+#: mutt_ssl_gnutls.c:523
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "無法初始化終端機。"
+
+#: mutt_ssl_gnutls.c:539
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:724
+#, fuzzy, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr "指模：%s"
+
+#: mutt_ssl_gnutls.c:727
+#, fuzzy, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr "指模：%s"
+
+#: mutt_ssl_gnutls.c:732
+#, fuzzy
+msgid "WARNING: Server certificate is not yet valid"
+msgstr "伺服器的驗証還未有效"
+
+#: mutt_ssl_gnutls.c:737
+#, fuzzy
+msgid "WARNING: Server certificate has expired"
+msgstr "伺服器的驗証已過期"
+
+#: mutt_ssl_gnutls.c:742
+#, fuzzy
+msgid "WARNING: Server certificate has been revoked"
+msgstr "伺服器的驗証已過期"
+
+#: mutt_ssl_gnutls.c:747
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:752
+#, fuzzy
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr "伺服器的驗証還未有效"
+
+#: mutt_ssl_gnutls.c:755
+#, fuzzy
+msgid "TLS/SSL Certificate check"
+msgstr "SSL 驗証測試"
+
+#: mutt_tunnel.c:70
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "正連接到 %s…"
+
+#: mutt_tunnel.c:137
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:155 mutt_tunnel.c:171
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "連線到 %s (%s) 時失敗"
+
+#: muttlib.c:910
+#, fuzzy
+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+msgstr "檔案是一個目錄, 儲存在它下面 ?"
+
+#: muttlib.c:910
+msgid "yna"
+msgstr ""
+
+#: muttlib.c:926
+msgid "File is a directory, save under it?"
+msgstr "檔案是一個目錄, 儲存在它下面 ?"
+
+#: muttlib.c:932
+msgid "File under directory: "
+msgstr "在目錄底下的檔案："
+
+#: muttlib.c:944
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "檔案已經存在, (1)覆蓋, (2)附加, 或是 (3)取消 ?"
+
+#: muttlib.c:944
+msgid "oac"
+msgstr "123"
+
+#: muttlib.c:1263
+msgid "Can't save message to POP mailbox."
+msgstr "無法將信件存到信箱。"
+
+#: muttlib.c:1272
+#, c-format
+msgid "Append messages to %s?"
+msgstr "附加信件到 %s ?"
+
+#: muttlib.c:1284
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s 不是信箱！"
+
 #: mx.c:120
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
@@ -3165,7 +3904,7 @@ msgstr "信箱沒有變動。"
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d 封信件被保留, %d 封信件被搬移, %d 封信件被刪除。"
 
-#: mx.c:1016 mx.c:1188
+#: mx.c:1016 mx.c:1190
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d 封信件被保留, %d 封信件被刪除。"
@@ -3185,15 +3924,15 @@ msgid "Mailbox is marked unwritable. %s"
 msgstr "信箱被標記成為無法寫入的. %s"
 
 # How to translate?
-#: mx.c:1185
+#: mx.c:1187
 msgid "Mailbox checkpointed."
 msgstr ""
 
-#: mx.c:1494
+#: mx.c:1499
 msgid "Can't write message"
 msgstr "無法寫信件"
 
-#: mx.c:1539
+#: mx.c:1544
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
@@ -3201,48 +3940,48 @@ msgstr ""
 msgid "Not available in this menu."
 msgstr "在這個菜單中沒有這個功能。"
 
-#: pager.c:1450
+#: pager.c:1480
 msgid "PrevPg"
 msgstr "上一頁"
 
-#: pager.c:1451
+#: pager.c:1481
 msgid "NextPg"
 msgstr "下一頁"
 
-#: pager.c:1455
+#: pager.c:1485
 msgid "View Attachm."
 msgstr "顯示附件。"
 
-#: pager.c:1458
+#: pager.c:1488
 msgid "Next"
 msgstr "下一個"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1871 pager.c:1902 pager.c:1934 pager.c:2175
 msgid "Bottom of message is shown."
 msgstr "現正顯示最下面的信件。"
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1887 pager.c:1909 pager.c:1916 pager.c:1923
 msgid "Top of message is shown."
 msgstr "現正顯示最上面的信件。"
 
-#: pager.c:1960
+#: pager.c:1992
 msgid "Reverse search: "
 msgstr "反向搜尋："
 
-#: pager.c:1961
+#: pager.c:1993
 msgid "Search: "
 msgstr "搜尋："
 
-#: pager.c:2081
+#: pager.c:2113
 msgid "Help is currently being shown."
 msgstr "現正顯示說明文件。"
 
-#: pager.c:2110
+#: pager.c:2142
 msgid "No more quoted text."
 msgstr "不能有再多的引言。"
 
-#: pager.c:2123
+#: pager.c:2155
 msgid "No more unquoted text after quoted text."
 msgstr "在引言後有過多的非引言文字。"
 
@@ -3309,27 +4048,27 @@ msgstr "空的格式"
 msgid "error: unknown op %d (report this error)."
 msgstr "錯誤：不明的 op %d (請回報這個錯誤)。"
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1137 pattern.c:1268
 msgid "Compiling search pattern..."
 msgstr "編譯搜尋樣式中…"
 
-#: pattern.c:1144
+#: pattern.c:1151
 msgid "Executing command on matching messages..."
 msgstr "正在對符合的郵件執行命令…"
 
-#: pattern.c:1206
+#: pattern.c:1213
 msgid "No messages matched criteria."
 msgstr "沒有郵件符合要求。"
 
-#: pattern.c:1299
+#: pattern.c:1306
 msgid "Search hit bottom without finding match"
 msgstr "已搜尋至結尾，並沒有發現任何符合"
 
-#: pattern.c:1310
+#: pattern.c:1317
 msgid "Search hit top without finding match"
 msgstr "已搜尋至開頭，並沒有發現任何符合"
 
-#: pattern.c:1332
+#: pattern.c:1339
 msgid "Search interrupted."
 msgstr "搜尋已被中斷。"
 
@@ -3341,11 +4080,11 @@ msgstr "請輸入 PGP 通行密碼："
 msgid "PGP passphrase forgotten."
 msgstr "已忘記 PGP 通行密碼。"
 
-#: pgp.c:344
+#: pgp.c:345
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- 錯誤：無法建立 PGP 子程序！ --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:379 pgp.c:615 pgp.c:819
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3353,58 +4092,23 @@ msgstr ""
 "[-- PGP 輸出部份結束 --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP 信件開始 --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP 公共鑰匙區段開始 --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP 簽名的信件開始 --]\n"
-"\n"
-
-#: pgp.c:423
+#: pgp.c:387 pgp.c:951
 #, fuzzy
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- PGP 信件結束 --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP 公共鑰匙區段結束 --]\n"
+msgid "Could not decrypt PGP message"
+msgstr "無法複制信件"
 
-#: pgp.c:427
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:436 pgp.c:947
 #, fuzzy
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- PGP 簽名的信件結束 --]\n"
-
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- 錯誤：找不到 PGP 信件的開頭！ --]\n"
-"\n"
+msgid "PGP message successfully decrypted."
+msgstr "PGP 簽名驗證成功。"
 
-#: pgp.c:704
+#: pgp.c:723
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "內部錯誤。聯絡 <roessler@does-not-exist.org>。"
 
-#: pgp.c:764
+#: pgp.c:784
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3412,74 +4116,37 @@ msgstr ""
 "[-- 錯誤：無法建立 PGP 子程序！ --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- 錯誤：不正確的 PGP/MIME 信件！ --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- 錯誤：無法建立暫存檔！ --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- 下面是 PGP/MIME 加密資料 --]\n"
-"\n"
-
-#: pgp.c:915
+#: pgp.c:828
 #, fuzzy
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr ""
-"\n"
-"[-- PGP/MIME 加密資料結束 --]\n"
+msgid "Decryption failed"
+msgstr "登入失敗。"
 
-#: pgp.c:965
+#: pgp.c:1003
 msgid "Can't open PGP subprocess!"
 msgstr "無法開啟 PGP 子程序！"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "要為 %2$s 使用鑰匙 ID = \"%1$s\"？"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "請輸入 %s 的鑰匙 ID："
-
-#: pgp.c:1397
+#: pgp.c:1439
 msgid "Can't invoke PGP"
 msgstr "不能執行 PGP"
 
-#: pgp.c:1496
+#: pgp.c:1540
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1497
+#: pgp.c:1541
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1499
+#: pgp.c:1543
 #, fuzzy
 msgid "esabifc"
 msgstr "1234i5"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "簽名的身份是："
-
 #: pgpinvoke.c:307
 msgid "Fetching PGP key..."
 msgstr "正在拿取 PGP 鑰匙 …"
@@ -3489,16 +4156,6 @@ msgstr "正在拿取 PGP 鑰匙 …"
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "所有符合的鑰匙經已過期或取消。"
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "選擇    "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "檢查鑰匙   "
-
 #: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
@@ -3513,43 +4170,6 @@ msgstr "PGP 鑰匙符合 \"%s\"。"
 msgid "Can't open /dev/null"
 msgstr "無法開啟 /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "無法建立暫存檔"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "鑰匙 ID：0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "這個鑰匙不能使用：過期/停用/已取消。"
-
-#: pgpkey.c:612
-#, fuzzy
-msgid "ID is expired/disabled/revoked."
-msgstr "這個 ID 已過期/停用/取消。"
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr ""
-
-#: pgpkey.c:619
-#, fuzzy
-msgid "ID is not valid."
-msgstr "這個 ID 不可接受。"
-
-#: pgpkey.c:622
-#, fuzzy
-msgid "ID is only marginally valid."
-msgstr "此 ID 只是勉強可接受。"
-
-#: pgpkey.c:626
-#, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s 您真的要使用這個鑰匙？"
-
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "請輸入這把鑰匙的 ID："
@@ -3563,11 +4183,6 @@ msgstr "啟動 pgp…"
 msgid "PGP Key %s."
 msgstr "PGP 鑰匙 %s。"
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "正找尋匹配 \"%s\" 的鑰匙…"
-
 #: pop.c:90 pop_lib.c:201
 #, c-format
 msgid "Command TOP is not supported by server."
@@ -3625,7 +4240,7 @@ msgstr "寫入信箱時發生錯誤！"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [已閱讀 %2d 封信件中的 %1d 封]"
 
-#: pop.c:688 pop_lib.c:364
+#: pop.c:688 pop_lib.c:373
 msgid "Server closed connection!"
 msgstr "與伺服器的聯結中斷了!"
 
@@ -3655,15 +4270,15 @@ msgstr "無法把信件留在伺服器上。"
 msgid "Error connecting to server: %s"
 msgstr "連線到 %s 時失敗"
 
-#: pop_lib.c:378
+#: pop_lib.c:387
 msgid "Closing connection to POP server..."
 msgstr "正在關閉與 POP 伺服器的連線…"
 
-#: pop_lib.c:544
+#: pop_lib.c:553
 msgid "Verifying message indexes..."
 msgstr "正在檢查信件的指引 …"
 
-#: pop_lib.c:568
+#: pop_lib.c:577
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "連線中斷。再與 POP 伺服器連線嗎？"
 
@@ -4041,35 +4656,35 @@ msgstr "信件已經寄出。"
 msgid "Sending in background."
 msgstr "正在背景作業中傳送。"
 
-#: sendlib.c:468
+#: sendlib.c:410
 msgid "No boundary parameter found! [report this error]"
 msgstr "沒有發現分界變數！[回報錯誤]"
 
-#: sendlib.c:498
+#: sendlib.c:440
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s 已經不存在！"
 
-#: sendlib.c:920
+#: sendlib.c:862
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
 msgstr "%s 不是信箱。"
 
-#: sendlib.c:1089
+#: sendlib.c:1031
 #, c-format
 msgid "Could not open %s"
 msgstr "無法開啟 %s"
 
-#: sendlib.c:2060
+#: sendlib.c:1987
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "寄送訊息出現錯誤，子程序已結束 %d (%s)。"
 
-#: sendlib.c:2066
+#: sendlib.c:1993
 msgid "Output of the delivery process"
 msgstr "Delivery process 的輸出"
 
-#: sendlib.c:2272
+#: sendlib.c:2199
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
@@ -4194,7 +4809,7 @@ msgstr "無法開啟 PGP 子程序！"
 msgid "No output from OpenSSL..."
 msgstr ""
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1636 smime.c:1760
 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"
@@ -4203,26 +4818,26 @@ msgstr ""
 "[-- PGP 輸出部份結束 --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1720 smime.c:1731
 #, fuzzy
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- 錯誤：無法建立 PGP 子程序！ --]\n"
 
-#: smime.c:1762
+#: smime.c:1764
 #, fuzzy
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- 下面是 PGP/MIME 加密資料 --]\n"
 "\n"
 
-#: smime.c:1765
+#: smime.c:1767
 #, fuzzy
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- 以下的資料已被簽署 --]\n"
 "\n"
 
-#: smime.c:1829
+#: smime.c:1831
 #, fuzzy
 msgid ""
 "\n"
@@ -4231,7 +4846,7 @@ msgstr ""
 "\n"
 "[-- PGP/MIME 加密資料結束 --]\n"
 
-#: smime.c:1831
+#: smime.c:1833
 #, fuzzy
 msgid ""
 "\n"
@@ -4240,27 +4855,27 @@ msgstr ""
 "\n"
 "[-- 簽署的資料結束 --]\n"
 
-#: smime.c:1935
+#: smime.c:1944
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
 
-#: smime.c:1936
+#: smime.c:1945
 #, fuzzy
 msgid "eswabfc"
 msgstr "12345"
 
-#: smime.c:1945
+#: smime.c:1954
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 
-#: smime.c:1947
+#: smime.c:1956
 msgid "12345f"
 msgstr ""
 
-#: smime.c:1971
+#: smime.c:1980
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
@@ -4285,6 +4900,9 @@ msgstr "在限制閱覽模式下無法顯示主信件。"
 msgid "Parent message is not available."
 msgstr "主信件不存在。"
 
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "無法附加在這個伺服器上的 IMAP 信箱"
+
 #, fuzzy
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "建立一封 application/pgp 的信件？"
@@ -4336,9 +4954,6 @@ msgstr "主信件不存在。"
 #~ msgid "Copy"
 #~ msgstr "拷貝"
 
-#~ msgid "%s [%s]\n"
-#~ msgstr "%s 【%s】\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "[-- End of PGP output --]\n"
@@ -4440,9 +5055,6 @@ msgstr "主信件不存在。"
 #~ msgid "Recoding successful."
 #~ msgstr "重新編碼成功。"
 
-#~ msgid "[-- Error: unexpected end of file! --]\n"
-#~ msgstr "[-- 錯誤：突發的檔尾！ --]\n"
-
 #~ msgid "CRAM key for %s@%s: "
 #~ msgstr "%s@%s 的 CRAM 鑰匙"
 
@@ -4493,10 +5105,6 @@ msgstr "主信件不存在。"
 #~ msgid "display message with full headers"
 #~ msgstr "編輯信件的標頭"
 
-#, fuzzy
-#~ msgid "PGP keys matching "
-#~ msgstr "PGP 鑰匙符合 <%s>。"
-
 #, fuzzy
 #~ msgid "This operation is not currently supported for PGP messages."
 #~ msgstr "暫不支援瀏覽 IMAP 目錄"
@@ -4530,9 +5138,6 @@ msgstr "主信件不存在。"
 #~ msgid "reserved"
 #~ msgstr "保留的"
 
-#~ msgid "Encrypted Session Key"
-#~ msgstr "加密的鑰匙"
-
 #~ msgid "Signature Packet"
 #~ msgstr "簽名封包"