X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=po%2Fmutt.pot;fp=po%2Fmutt.pot;h=e8f1f260c385bc82d1585f501e897739a4d680d6;hp=f1da0c33a2a77303aec90ab6d51bd581755b489d;hb=3d937534e7b1ee723f86594b5e4c64c95158a933;hpb=d7c69d8f0180e24b9ee48088d08090df7b4e27c2

diff --git a/po/mutt.pot b/po/mutt.pot
index f1da0c3..e8f1f26 100644
--- a/po/mutt.pot
+++ b/po/mutt.pot
@@ -1,12 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-02-01 19:24+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-01-28 11:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -42,9 +44,9 @@ msgid "Select"
 msgstr ""
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:37 browser.c:43 compose.c:91 curs_main.c:404 mutt_ssl.c:627
+#: addrbook.c:37 browser.c:43 compose.c:92 curs_main.c:404 mutt_ssl.c:633
 #: pager.c:1544 pgpkey.c:517 postpone.c:42 query.c:49 recvattach.c:54
-#: smime.c:415
+#: smime.c:432
 msgid "Help"
 msgstr ""
 
@@ -73,7 +75,7 @@ msgstr ""
 msgid "Address: "
 msgstr ""
 
-#: alias.c:289 send.c:201
+#: alias.c:289 send.c:202
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
@@ -96,68 +98,72 @@ msgstr ""
 msgid "Alias added."
 msgstr ""
 
-#: attach.c:108 attach.c:235 attach.c:462 attach.c:952
+#: attach.c:108 attach.c:240 attach.c:468 attach.c:959
 msgid "Can't match nametemplate, continue?"
 msgstr ""
 
 #. For now, editing requires a file, no piping
-#: attach.c:120
+#: attach.c:121
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr ""
 
-#: attach.c:128 attach.c:253 commands.c:216 compose.c:1275 curs_lib.c:149
-#: curs_lib.c:395
+#: attach.c:129 attach.c:259 commands.c:216 compose.c:1174 curs_lib.c:177
+#: curs_lib.c:424
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr ""
 
-#: attach.c:138
+#: attach.c:139
 msgid "Failure to open file to parse headers."
 msgstr ""
 
-#: attach.c:169
+#: attach.c:170
 msgid "Failure to open file to strip headers."
 msgstr ""
 
-#: attach.c:187
+#: attach.c:179
+msgid "Failure to rename file."
+msgstr ""
+
+#: attach.c:192
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr ""
 
 #. For now, editing requires a file, no piping
-#: attach.c:247
+#: attach.c:253
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr ""
 
-#: attach.c:265
+#: attach.c:271
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr ""
 
-#: attach.c:428
+#: attach.c:434
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr ""
 
-#: attach.c:441
+#: attach.c:447
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr ""
 
-#: attach.c:531
+#: attach.c:537
 msgid "Cannot create filter"
 msgstr ""
 
-#: attach.c:660 attach.c:692 attach.c:985 attach.c:1043 handler.c:1556
+#: attach.c:667 attach.c:699 attach.c:992 attach.c:1050 handler.c:1559
 #: pgpkey.c:566 pgpkey.c:755
 msgid "Can't create filter"
 msgstr ""
 
-#: attach.c:824
+#: attach.c:831
 msgid "Write fault!"
 msgstr ""
 
-#: attach.c:1066
+#: attach.c:1073
 msgid "I don't know how to print that!"
 msgstr ""
 
@@ -222,7 +228,7 @@ msgstr ""
 msgid "Chdir to: "
 msgstr ""
 
-#: browser.c:957 browser.c:1024
+#: browser.c:952 browser.c:1024
 msgid "Error scanning directory."
 msgstr ""
 
@@ -300,7 +306,7 @@ msgstr ""
 msgid "%s: no such attribute"
 msgstr ""
 
-#: color.c:696 hook.c:65 hook.c:73 keymap.c:721
+#: color.c:696 hook.c:65 hook.c:73 keymap.c:744
 msgid "too few arguments"
 msgstr ""
 
@@ -438,348 +444,326 @@ msgstr ""
 
 #: commands.c:504
 msgid ""
-"Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
+"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:505
 msgid ""
-"Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
+"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:506
-msgid "dfrsotuzc"
+msgid "dfrsotuzcp"
 msgstr ""
 
-#: commands.c:559
+#: commands.c:563
 msgid "Shell command: "
 msgstr ""
 
-#: commands.c:701
+#: commands.c:705
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr ""
 
-#: commands.c:702
+#: commands.c:706
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr ""
 
-#: commands.c:703
+#: commands.c:707
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr ""
 
-#: commands.c:704
+#: commands.c:708
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr ""
 
-#: commands.c:705
+#: commands.c:709
 #, c-format
 msgid "Save%s to mailbox"
 msgstr ""
 
-#: commands.c:705
+#: commands.c:709
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr ""
 
-#: commands.c:706
+#: commands.c:710
 msgid " tagged"
 msgstr ""
 
-#: commands.c:779
+#: commands.c:783
 #, c-format
 msgid "Copying to %s..."
 msgstr ""
 
-#: commands.c:901
+#: commands.c:905
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr ""
 
-#: commands.c:910
+#: commands.c:915
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr ""
 
-#: commands.c:912
+#: commands.c:920
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr ""
 
-#: commands.c:914
+#: commands.c:922
 msgid "not converting"
 msgstr ""
 
-#: commands.c:914
+#: commands.c:922
 msgid "converting"
 msgstr ""
 
-#: compose.c:42
+#: compose.c:43
 msgid "There are no attachments."
 msgstr ""
 
-#: compose.c:84
+#: compose.c:85
 msgid "Send"
 msgstr ""
 
-#: compose.c:85 remailer.c:483
+#: compose.c:86 remailer.c:483
 msgid "Abort"
 msgstr ""
 
-#: compose.c:89 compose.c:787
+#: compose.c:90 compose.c:664
 msgid "Attach file"
 msgstr ""
 
-#: compose.c:90
+#: compose.c:91
 msgid "Descrip"
 msgstr ""
 
-#: compose.c:127
+#: compose.c:128
 msgid "Sign, Encrypt"
 msgstr ""
 
-#: compose.c:129
+#: compose.c:130
 msgid "Encrypt"
 msgstr ""
 
-#: compose.c:131
+#: compose.c:132
 msgid "Sign"
 msgstr ""
 
-#: compose.c:133
+#: compose.c:134
 msgid "Clear"
 msgstr ""
 
-#: compose.c:140 compose.c:144
-msgid " sign as: "
-msgstr ""
-
-#: compose.c:140 compose.c:144
-msgid "<default>"
-msgstr ""
-
-#: compose.c:149
-msgid "Encrypt with: "
-msgstr ""
-
-#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr ""
-
-#: compose.c:166
-msgid "esabf"
-msgstr ""
-
-#. sign (a)s
-#: compose.c:179 compose.c:269
-msgid "Sign as: "
+#: compose.c:141
+msgid " (inline)"
 msgstr ""
 
-#: compose.c:227
-msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+#: compose.c:143
+msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:228
-msgid "eswabf"
+#: compose.c:151 compose.c:155
+msgid " sign as: "
 msgstr ""
 
-#: compose.c:236
-msgid ""
-"1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
+#: compose.c:151 compose.c:155
+msgid "<default>"
 msgstr ""
 
-#: compose.c:238
-msgid "12345f"
+#: compose.c:163
+msgid "Encrypt with: "
 msgstr ""
 
-#: compose.c:351
+#: compose.c:217
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr ""
 
-#: compose.c:359
+#: compose.c:225
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr ""
 
-#: compose.c:402
+#: compose.c:268
 msgid "-- Attachments"
 msgstr ""
 
-#: compose.c:432
+#: compose.c:298
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
 
-#: compose.c:455
+#: compose.c:321
 msgid "You may not delete the only attachment."
 msgstr ""
 
-#: compose.c:722 send.c:1451
+#: compose.c:597 send.c:1482
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
 
-#: compose.c:803
+#: compose.c:680
 msgid "Attaching selected files..."
 msgstr ""
 
-#: compose.c:814
+#: compose.c:691
 #, c-format
 msgid "Unable to attach %s!"
 msgstr ""
 
-#: compose.c:832
+#: compose.c:710
 msgid "Open mailbox to attach message from"
 msgstr ""
 
-#: compose.c:870
+#: compose.c:748
 msgid "No messages in that folder."
 msgstr ""
 
-#: compose.c:879
+#: compose.c:757
 msgid "Tag the messages you want to attach!"
 msgstr ""
 
-#: compose.c:911
+#: compose.c:789
 msgid "Unable to attach!"
 msgstr ""
 
-#: compose.c:958
+#: compose.c:838
 msgid "Recoding only affects text attachments."
 msgstr ""
 
-#: compose.c:963
+#: compose.c:843
 msgid "The current attachment won't be converted."
 msgstr ""
 
-#: compose.c:965
+#: compose.c:845
 msgid "The current attachment will be converted."
 msgstr ""
 
-#: compose.c:1036
+#: compose.c:920
 msgid "Invalid encoding."
 msgstr ""
 
-#: compose.c:1057
+#: compose.c:946
 msgid "Save a copy of this message?"
 msgstr ""
 
-#: compose.c:1110
+#: compose.c:1002
 msgid "Rename to: "
 msgstr ""
 
-#: compose.c:1115 editmsg.c:110 sendlib.c:910
+#: compose.c:1007 editmsg.c:110 sendlib.c:910
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr ""
 
-#: compose.c:1141
+#: compose.c:1034
 msgid "New file: "
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1047
 msgid "Content-Type is of the form base/sub"
 msgstr ""
 
-#: compose.c:1160
+#: compose.c:1053
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr ""
 
-#: compose.c:1173
+#: compose.c:1066
 #, c-format
 msgid "Can't create file %s"
 msgstr ""
 
-#: compose.c:1181
+#: compose.c:1074
 msgid "What we have here is a failure to make an attachment"
 msgstr ""
 
-#: compose.c:1236
+#: compose.c:1135
 msgid "Postpone this message?"
 msgstr ""
 
-#: compose.c:1293
+#: compose.c:1192
 msgid "Write message to mailbox"
 msgstr ""
 
-#: compose.c:1296
+#: compose.c:1195
 #, c-format
 msgid "Writing message to %s ..."
 msgstr ""
 
-#: compose.c:1305
+#: compose.c:1204
 msgid "Message written."
 msgstr ""
 
-#: compose.c:1317
+#: compose.c:1216
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
-#: compose.c:1342
+#: compose.c:1242
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
-#: crypt.c:65
+#: crypt.c:66
 #, c-format
 msgid " (current time: %c)"
 msgstr ""
 
-#: crypt.c:71
+#: crypt.c:72
 #, c-format
 msgid "[-- %s output follows%s --]\n"
 msgstr ""
 
-#: crypt.c:86
+#: crypt.c:87
 msgid "Passphrase(s) forgotten."
 msgstr ""
 
-#: crypt.c:129
-msgid "Enter PGP passphrase:"
-msgstr ""
-
-#: crypt.c:147
-msgid "Enter SMIME passphrase:"
+#. they really want to send it inline... go for it
+#: crypt.c:145 pgpkey.c:559
+msgid "Invoking PGP..."
 msgstr ""
 
-#: crypt.c:192
-msgid "Create a traditional (inline) PGP message?"
+#. otherwise inline won't work...ask for revert
+#: crypt.c:154
+msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
-#: crypt.c:200 pgpkey.c:559 postpone.c:547
-msgid "Invoking PGP..."
+#. abort
+#: crypt.c:156 send.c:1434
+msgid "Mail not sent."
 msgstr ""
 
-#: crypt.c:434
+#: crypt.c:392
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 
-#: crypt.c:653 crypt.c:697
+#: crypt.c:611 crypt.c:655
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.c:677 crypt.c:717
+#: crypt.c:635 crypt.c:675
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
-#: crypt.c:838
+#: crypt.c:796
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
 
-#: crypt.c:860
+#: crypt.c:818
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
 
-#: crypt.c:900
+#: crypt.c:858
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -787,46 +771,46 @@ msgid ""
 msgstr ""
 
 #. Now display the signed body
-#: crypt.c:912
+#: crypt.c:870
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
 
-#: crypt.c:918
+#: crypt.c:876
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
 
-#: crypt.c:924
+#: crypt.c:882
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 
-#: curs_lib.c:157
+#: curs_lib.c:186
 msgid "yes"
 msgstr ""
 
-#: curs_lib.c:158
+#: curs_lib.c:187
 msgid "no"
 msgstr ""
 
 #. restore blocking operation
-#: curs_lib.c:254
+#: curs_lib.c:283
 msgid "Exit Mutt?"
 msgstr ""
 
-#: curs_lib.c:347 mutt_socket.c:520 mutt_ssl.c:321
+#: curs_lib.c:376 mutt_socket.c:526 mutt_ssl.c:327
 msgid "unknown error"
 msgstr ""
 
-#: curs_lib.c:367
+#: curs_lib.c:396
 msgid "Press any key to continue..."
 msgstr ""
 
-#: curs_lib.c:411
+#: curs_lib.c:440
 msgid " ('?' for list): "
 msgstr ""
 
@@ -898,7 +882,7 @@ msgstr ""
 msgid "No tagged messages."
 msgstr ""
 
-#: curs_main.c:653 menu.c:896
+#: curs_main.c:653 menu.c:890
 msgid "Nothing to do."
 msgstr ""
 
@@ -952,77 +936,77 @@ msgstr ""
 msgid "Untag messages matching: "
 msgstr ""
 
-#: curs_main.c:1046
+#: curs_main.c:1049
 msgid "Open mailbox in read-only mode"
 msgstr ""
 
-#: curs_main.c:1048
+#: curs_main.c:1051
 msgid "Open mailbox"
 msgstr ""
 
-#: curs_main.c:1064 mx.c:508 mx.c:654
+#: curs_main.c:1067 mx.c:508 mx.c:654
 #, c-format
 msgid "%s is not a mailbox."
 msgstr ""
 
-#: curs_main.c:1156
+#: curs_main.c:1159
 msgid "Exit Mutt without saving?"
 msgstr ""
 
-#: curs_main.c:1190 curs_main.c:1215
+#: curs_main.c:1193 curs_main.c:1218
 msgid "You are on the last message."
 msgstr ""
 
-#: curs_main.c:1197 curs_main.c:1241
+#: curs_main.c:1200 curs_main.c:1244
 msgid "No undeleted messages."
 msgstr ""
 
-#: curs_main.c:1234 curs_main.c:1258
+#: curs_main.c:1237 curs_main.c:1261
 msgid "You are on the first message."
 msgstr ""
 
-#: curs_main.c:1333 pattern.c:1286
+#: curs_main.c:1336 pattern.c:1292
 msgid "Search wrapped to top."
 msgstr ""
 
-#: curs_main.c:1342 pattern.c:1297
+#: curs_main.c:1345 pattern.c:1303
 msgid "Search wrapped to bottom."
 msgstr ""
 
-#: curs_main.c:1383
+#: curs_main.c:1386
 msgid "No new messages"
 msgstr ""
 
-#: curs_main.c:1383
+#: curs_main.c:1386
 msgid "No unread messages"
 msgstr ""
 
-#: curs_main.c:1384
+#: curs_main.c:1387
 msgid " in this limited view"
 msgstr ""
 
-#: curs_main.c:1405 pager.c:2337
+#: curs_main.c:1408 pager.c:2348
 msgid "Can't change 'important' flag on POP server."
 msgstr ""
 
-#: curs_main.c:1529
+#: curs_main.c:1532
 msgid "No more threads."
 msgstr ""
 
-#: curs_main.c:1531
+#: curs_main.c:1534
 msgid "You are on the first thread."
 msgstr ""
 
-#: curs_main.c:1597 curs_main.c:1629 flags.c:289 thread.c:1014 thread.c:1069
-#: thread.c:1124
+#: curs_main.c:1600 curs_main.c:1632 flags.c:289 thread.c:1018 thread.c:1073
+#: thread.c:1128
 msgid "Threading is not enabled."
 msgstr ""
 
-#: curs_main.c:1615
+#: curs_main.c:1618
 msgid "Thread contains unread messages."
 msgstr ""
 
-#: curs_main.c:1802
+#: curs_main.c:1805
 msgid "Can't edit message on POP server."
 msgstr ""
 
@@ -1151,93 +1135,93 @@ msgstr ""
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr ""
 
-#: handler.c:1527
+#: handler.c:1530
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr ""
 
-#: handler.c:1528
+#: handler.c:1531
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr ""
 
-#: handler.c:1560
+#: handler.c:1563
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr ""
 
-#: handler.c:1578 handler.c:1599
+#: handler.c:1581 handler.c:1602
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr ""
 
-#: handler.c:1636
+#: handler.c:1639
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 
-#: handler.c:1655
+#: handler.c:1658
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr ""
 
-#: handler.c:1662
+#: handler.c:1665
 #, c-format
 msgid "(size %s bytes) "
 msgstr ""
 
-#: handler.c:1664
+#: handler.c:1667
 msgid "has been deleted --]\n"
 msgstr ""
 
-#: handler.c:1669
+#: handler.c:1672
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr ""
 
-#: handler.c:1674
+#: handler.c:1677
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr ""
 
-#: handler.c:1687 handler.c:1703
+#: handler.c:1690 handler.c:1706
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr ""
 
-#: handler.c:1689
+#: handler.c:1692
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
 
-#: handler.c:1707
+#: handler.c:1710
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 
-#: handler.c:1815
+#: handler.c:1818
 msgid "Error: multipart/signed has no protocol."
 msgstr ""
 
-#: handler.c:1825
+#: handler.c:1828
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr ""
 
-#: handler.c:1865
+#: handler.c:1868
 msgid "Unable to open temporary file!"
 msgstr ""
 
-#: handler.c:1925
+#: handler.c:1929
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr ""
 
-#: handler.c:1930
+#: handler.c:1934
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr ""
 
-#: handler.c:1932
+#: handler.c:1936
 msgid "(need 'view-attachments' bound to key!)"
 msgstr ""
 
@@ -1274,6 +1258,7 @@ msgid "Help for %s"
 msgstr ""
 
 #: hook.c:242
+#, c-format
 msgid "unhook: Can't do unhook * from within a hook."
 msgstr ""
 
@@ -1333,11 +1318,11 @@ msgstr ""
 msgid "Authenticating (%s)..."
 msgstr ""
 
-#: imap/auth_sasl.c:199 pop_auth.c:172
+#: imap/auth_sasl.c:208 pop_auth.c:172
 msgid "SASL authentication failed."
 msgstr ""
 
-#: imap/browse.c:64 imap/imap.c:533
+#: imap/browse.c:64 imap/imap.c:538
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr ""
@@ -1395,107 +1380,108 @@ msgstr ""
 msgid "Secure connection with TLS?"
 msgstr ""
 
-#: imap/imap.c:427 pop_lib.c:300
+#: imap/imap.c:431 pop_lib.c:304
 msgid "Could not negotiate TLS connection"
 msgstr ""
 
-#: imap/imap.c:564
+#: imap/imap.c:569
 #, c-format
 msgid "Selecting %s..."
 msgstr ""
 
-#: imap/imap.c:690
+#: imap/imap.c:705
 msgid "Error opening mailbox"
 msgstr ""
 
 #. STATUS not supported
-#: imap/imap.c:744
+#: imap/imap.c:759
 msgid "Unable to append to IMAP mailboxes at this server"
 msgstr ""
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:753 imap/message.c:600 muttlib.c:1206
+#: imap/imap.c:768 imap/message.c:713 muttlib.c:1222
 #, c-format
 msgid "Create %s?"
 msgstr ""
 
-#: imap/imap.c:789
-msgid "Closing connection to IMAP server..."
-msgstr ""
-
-#: imap/imap.c:952 pop.c:461
+#: imap/imap.c:954 pop.c:461
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr ""
 
-#: imap/imap.c:961
+#: imap/imap.c:963
 msgid "Expunge failed"
 msgstr ""
 
-#: imap/imap.c:976
+#: imap/imap.c:978
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr ""
 
-#: imap/imap.c:1060
+#: imap/imap.c:1062
 msgid "Expunging messages from server..."
 msgstr ""
 
-#: imap/imap.c:1065
+#: imap/imap.c:1067
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: imap/imap.c:1099
+#: imap/imap.c:1101
 msgid "CLOSE failed"
 msgstr ""
 
-#: imap/imap.c:1342
+#: imap/imap.c:1344
 msgid "Bad mailbox name"
 msgstr ""
 
-#: imap/imap.c:1354
+#: imap/imap.c:1356
 #, c-format
 msgid "Subscribing to %s..."
 msgstr ""
 
-#: imap/imap.c:1356
+#: imap/imap.c:1358
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr ""
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:74
+#: imap/message.c:90
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr ""
 
-#: imap/message.c:84
+#: imap/message.c:103
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr ""
 
-#: imap/message.c:101 pop.c:206
+#: imap/message.c:130
+#, c-format
+msgid "Evaluating cache... [%d/%d]"
+msgstr ""
+
+#: imap/message.c:198 pop.c:206
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr ""
 
-#: imap/message.c:250 pop.c:340
+#: imap/message.c:363 pop.c:340
 msgid "Fetching message..."
 msgstr ""
 
-#: imap/message.c:293 pop.c:377
+#: imap/message.c:406 pop.c:377
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 
-#: imap/message.c:466
+#: imap/message.c:579
 msgid "Uploading message ..."
 msgstr ""
 
-#: imap/message.c:576
+#: imap/message.c:689
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr ""
 
-#: imap/message.c:580
+#: imap/message.c:693
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr ""
@@ -1504,182 +1490,187 @@ msgstr ""
 msgid "Continue?"
 msgstr ""
 
-#: init.c:611
+#: init.c:381
+#, c-format
+msgid "Bad regexp: %s"
+msgstr ""
+
+#: init.c:646
+msgid "spam: no matching pattern"
+msgstr ""
+
+#: init.c:648
+msgid "nospam: no matching pattern"
+msgstr ""
+
+#: init.c:814
 msgid "alias: no address"
 msgstr ""
 
-#: init.c:651
+#: init.c:859
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: init.c:714
+#: init.c:937
 msgid "invalid header field"
 msgstr ""
 
-#: init.c:767
+#: init.c:990
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr ""
 
-#: init.c:879
+#: init.c:1100
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr ""
 
-#: init.c:944
+#: init.c:1165
 #, c-format
 msgid "%s: unknown variable"
 msgstr ""
 
-#: init.c:953
+#: init.c:1174
+#, c-format
 msgid "prefix is illegal with reset"
 msgstr ""
 
-#: init.c:959
+#: init.c:1180
+#, c-format
 msgid "value is illegal with reset"
 msgstr ""
 
-#: init.c:998
+#: init.c:1219
 #, c-format
 msgid "%s is set"
 msgstr ""
 
-#: init.c:998
+#: init.c:1219
 #, c-format
 msgid "%s is unset"
 msgstr ""
 
-#: init.c:1201
+#: init.c:1409
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr ""
 
-#: init.c:1226 init.c:1271
+#: init.c:1434 init.c:1479
 #, c-format
 msgid "%s: invalid value"
 msgstr ""
 
-#: init.c:1312
+#: init.c:1520
 #, c-format
 msgid "%s: Unknown type."
 msgstr ""
 
-#: init.c:1338
+#: init.c:1546
 #, c-format
 msgid "%s: unknown type"
 msgstr ""
 
-#: init.c:1375
-#, c-format
-msgid "%s: stat: %s"
-msgstr ""
-
-#: init.c:1380
-#, c-format
-msgid "%s: not a regular file"
-msgstr ""
-
-#: init.c:1395
+#: init.c:1605
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr ""
 
 #. the muttrc source keyword
-#: init.c:1411
+#: init.c:1628
 #, c-format
 msgid "source: errors in %s"
 msgstr ""
 
-#: init.c:1412
+#: init.c:1629
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr ""
 
-#: init.c:1426
+#: init.c:1643
 #, c-format
 msgid "source: error at %s"
 msgstr ""
 
-#: init.c:1431
+#: init.c:1648
 msgid "source: too many arguments"
 msgstr ""
 
-#: init.c:1482
+#: init.c:1699
 #, c-format
 msgid "%s: unknown command"
 msgstr ""
 
-#: init.c:1871
+#: init.c:2088
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr ""
 
-#: init.c:1920
+#: init.c:2137
 msgid "unable to determine home directory"
 msgstr ""
 
-#: init.c:1928
+#: init.c:2145
 msgid "unable to determine username"
 msgstr ""
 
-#: keymap.c:455
+#: keymap.c:459
 msgid "Macro loop detected."
 msgstr ""
 
-#: keymap.c:660 keymap.c:668
+#: keymap.c:669 keymap.c:677
 msgid "Key is not bound."
 msgstr ""
 
-#: keymap.c:672
+#: keymap.c:681
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr ""
 
-#: keymap.c:683
+#: keymap.c:692
 msgid "push: too many arguments"
 msgstr ""
 
-#: keymap.c:704
+#: keymap.c:722
 #, c-format
 msgid "%s: no such menu"
 msgstr ""
 
-#: keymap.c:713
+#: keymap.c:737
 msgid "null key sequence"
 msgstr ""
 
-#: keymap.c:792
+#: keymap.c:824
 msgid "bind: too many arguments"
 msgstr ""
 
-#: keymap.c:807
+#: keymap.c:847
 #, c-format
 msgid "%s: no such function in map"
 msgstr ""
 
-#: keymap.c:830
+#: keymap.c:871
 msgid "macro: empty key sequence"
 msgstr ""
 
-#: keymap.c:841
+#: keymap.c:882
 msgid "macro: too many arguments"
 msgstr ""
 
-#: keymap.c:871
+#: keymap.c:918
 msgid "exec: no arguments"
 msgstr ""
 
-#: keymap.c:891
+#: keymap.c:938
 #, c-format
 msgid "%s: no such function"
 msgstr ""
 
-#: keymap.c:912
+#: keymap.c:959
 msgid "Enter keys (^G to abort): "
 msgstr ""
 
-#: keymap.c:917
+#: keymap.c:964
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
@@ -2468,13 +2459,13 @@ msgstr ""
 msgid "Out of memory!"
 msgstr ""
 
-#: main.c:46
+#: main.c:47
 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 ""
 
-#: main.c:50
+#: main.c:51
 msgid ""
 "Copyright (C) 1996-2002 Michael R. Elkins and others.\n"
 "Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n"
@@ -2482,7 +2473,7 @@ msgid ""
 "under certain conditions; type `mutt -vv' for details.\n"
 msgstr ""
 
-#: main.c:56
+#: main.c:57
 msgid ""
 "Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -2510,7 +2501,7 @@ msgid ""
 "    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
 msgstr ""
 
-#: main.c:94
+#: main.c:95
 msgid ""
 "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
@@ -2547,53 +2538,53 @@ msgid ""
 "  -h\t\tthis help message"
 msgstr ""
 
-#: main.c:162
+#: main.c:163
 msgid ""
 "\n"
 "Compile options:"
 msgstr ""
 
-#: main.c:454
+#: main.c:474
 msgid "Error initializing terminal."
 msgstr ""
 
-#: main.c:559
+#: main.c:579
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr ""
 
-#: main.c:561
+#: main.c:581
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr ""
 
-#: main.c:706
+#: main.c:729
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr ""
 
-#: main.c:710
+#: main.c:733
 #, c-format
 msgid "Can't create %s: %s."
 msgstr ""
 
-#: main.c:755
+#: main.c:778
 msgid "No recipients specified.\n"
 msgstr ""
 
-#: main.c:841
+#: main.c:864
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr ""
 
-#: main.c:861
+#: main.c:884
 msgid "No mailbox with new mail."
 msgstr ""
 
-#: main.c:870
+#: main.c:893
 msgid "No incoming mailboxes defined."
 msgstr ""
 
-#: main.c:897
+#: main.c:920
 msgid "Mailbox is empty."
 msgstr ""
 
@@ -2651,126 +2642,126 @@ msgstr ""
 msgid "Reopening mailbox..."
 msgstr ""
 
-#: menu.c:413
+#: menu.c:407
 msgid "Jump to: "
 msgstr ""
 
-#: menu.c:422
+#: menu.c:416
 msgid "Invalid index number."
 msgstr ""
 
-#: menu.c:426 menu.c:444 menu.c:480 menu.c:521 menu.c:537 menu.c:548
-#: menu.c:559 menu.c:601 menu.c:612 menu.c:625 menu.c:638 menu.c:1033
+#: menu.c:420 menu.c:438 menu.c:474 menu.c:515 menu.c:531 menu.c:542
+#: menu.c:553 menu.c:595 menu.c:606 menu.c:619 menu.c:632 menu.c:1027
 msgid "No entries."
 msgstr ""
 
-#: menu.c:441
+#: menu.c:435
 msgid "You cannot scroll down farther."
 msgstr ""
 
-#: menu.c:457
+#: menu.c:451
 msgid "You cannot scroll up farther."
 msgstr ""
 
-#: menu.c:477
+#: menu.c:471
 msgid "You are on the last page."
 msgstr ""
 
-#: menu.c:499
+#: menu.c:493
 msgid "You are on the first page."
 msgstr ""
 
-#: menu.c:578
+#: menu.c:572
 msgid "First entry is shown."
 msgstr ""
 
-#: menu.c:598
+#: menu.c:592
 msgid "Last entry is shown."
 msgstr ""
 
-#: menu.c:649
+#: menu.c:643
 msgid "You are on the last entry."
 msgstr ""
 
-#: menu.c:660
+#: menu.c:654
 msgid "You are on the first entry."
 msgstr ""
 
-#: menu.c:720 pattern.c:1232
+#: menu.c:714 pattern.c:1238
 msgid "Search for: "
 msgstr ""
 
-#: menu.c:721 pattern.c:1233
+#: menu.c:715 pattern.c:1239
 msgid "Reverse search for: "
 msgstr ""
 
-#: menu.c:731 pattern.c:1265
+#: menu.c:725 pattern.c:1271
 msgid "No search pattern."
 msgstr ""
 
-#: menu.c:761 pager.c:1925 pager.c:1941 pager.c:2049 pattern.c:1330
+#: menu.c:755 pager.c:1925 pager.c:1941 pager.c:2049 pattern.c:1336
 msgid "Not found."
 msgstr ""
 
-#: menu.c:885
+#: menu.c:879
 msgid "No tagged entries."
 msgstr ""
 
-#: menu.c:990
+#: menu.c:984
 msgid "Search is not implemented for this menu."
 msgstr ""
 
-#: menu.c:995
+#: menu.c:989
 msgid "Jumping is not implemented for dialogs."
 msgstr ""
 
-#: menu.c:1036
+#: menu.c:1030
 msgid "Tagging is not supported."
 msgstr ""
 
-#: mh.c:655
+#: mh.c:659 mh.c:896
 #, c-format
 msgid "Reading %s... %d"
 msgstr ""
 
-#: mh.c:1041
+#: mh.c:1147
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
-#: muttlib.c:835
+#: muttlib.c:842
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr ""
 
-#: muttlib.c:835
+#: muttlib.c:842
 msgid "yna"
 msgstr ""
 
-#: muttlib.c:851
+#: muttlib.c:858
 msgid "File is a directory, save under it?"
 msgstr ""
 
-#: muttlib.c:857
+#: muttlib.c:864
 msgid "File under directory: "
 msgstr ""
 
-#: muttlib.c:869
+#: muttlib.c:876
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr ""
 
-#: muttlib.c:869
+#: muttlib.c:876
 msgid "oac"
 msgstr ""
 
-#: muttlib.c:1171
+#: muttlib.c:1187
 msgid "Can't save message to POP mailbox."
 msgstr ""
 
-#: muttlib.c:1180
+#: muttlib.c:1196
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr ""
 
-#: muttlib.c:1186
+#: muttlib.c:1202
 #, c-format
 msgid "Append messages to %s?"
 msgstr ""
@@ -2780,160 +2771,158 @@ msgstr ""
 msgid "Connection to %s closed"
 msgstr ""
 
-#: mutt_socket.c:261
+#: mutt_socket.c:267
 msgid "SSL is unavailable."
 msgstr ""
 
-#: mutt_socket.c:292
+#: mutt_socket.c:298
 msgid "Preconnect command failed."
 msgstr ""
 
-#: mutt_socket.c:363 mutt_socket.c:377
+#: mutt_socket.c:369 mutt_socket.c:383
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr ""
 
-#: mutt_socket.c:416 mutt_socket.c:473
+#: mutt_socket.c:422 mutt_socket.c:479
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: mutt_socket.c:423 mutt_socket.c:480
+#: mutt_socket.c:429 mutt_socket.c:486
 #, c-format
 msgid "Looking up %s..."
 msgstr ""
 
-#: mutt_socket.c:434 mutt_socket.c:487
+#: mutt_socket.c:440 mutt_socket.c:493
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr ""
 
-#: mutt_socket.c:438 mutt_socket.c:496
+#: mutt_socket.c:444 mutt_socket.c:502
 #, c-format
 msgid "Connecting to %s..."
 msgstr ""
 
-#: mutt_socket.c:519
+#: mutt_socket.c:525
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr ""
 
-#: mutt_ssl.c:170
+#: mutt_ssl.c:174
 msgid "Failed to find enough entropy on your system"
 msgstr ""
 
-#: mutt_ssl.c:194
+#: mutt_ssl.c:198
 #, c-format
 msgid "Filling entropy pool: %s...\n"
 msgstr ""
 
-#: mutt_ssl.c:202
+#: mutt_ssl.c:206
 #, c-format
 msgid "%s has insecure permissions!"
 msgstr ""
 
-#: mutt_ssl.c:221
+#: mutt_ssl.c:225
 msgid "SSL disabled due the lack of entropy"
 msgstr ""
 
-#: mutt_ssl.c:315
+#: mutt_ssl.c:321
 msgid "I/O error"
 msgstr ""
 
-#: mutt_ssl.c:318
-msgid "unspecified protocol error"
-msgstr ""
-
-#: mutt_ssl.c:324
+#: mutt_ssl.c:330
 #, c-format
 msgid "SSL failed: %s"
 msgstr ""
 
-#: mutt_ssl.c:333
+#: mutt_ssl.c:339
 msgid "Unable to get certificate from peer"
 msgstr ""
 
-#: mutt_ssl.c:341
+#: mutt_ssl.c:347
 #, c-format
 msgid "SSL connection using %s (%s)"
 msgstr ""
 
-#: mutt_ssl.c:381
+#: mutt_ssl.c:387
 msgid "Unknown"
 msgstr ""
 
-#: mutt_ssl.c:406
+#: mutt_ssl.c:412
+#, c-format
 msgid "[unable to calculate]"
 msgstr ""
 
-#: mutt_ssl.c:424
+#: mutt_ssl.c:430
 msgid "[invalid date]"
 msgstr ""
 
-#: mutt_ssl.c:499
+#: mutt_ssl.c:505
 msgid "Server certificate is not yet valid"
 msgstr ""
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:512
 msgid "Server certificate has expired"
 msgstr ""
 
-#: mutt_ssl.c:579
+#: mutt_ssl.c:585
 msgid "This certificate belongs to:"
 msgstr ""
 
-#: mutt_ssl.c:590
+#: mutt_ssl.c:596
 msgid "This certificate was issued by:"
 msgstr ""
 
-#: mutt_ssl.c:601
+#: mutt_ssl.c:607
+#, c-format
 msgid "This certificate is valid"
 msgstr ""
 
-#: mutt_ssl.c:602
+#: mutt_ssl.c:608
 #, c-format
 msgid "   from %s"
 msgstr ""
 
-#: mutt_ssl.c:604
+#: mutt_ssl.c:610
 #, c-format
 msgid "     to %s"
 msgstr ""
 
-#: mutt_ssl.c:610
+#: mutt_ssl.c:616
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
 
-#: mutt_ssl.c:612
+#: mutt_ssl.c:618
 msgid "SSL Certificate check"
 msgstr ""
 
-#: mutt_ssl.c:615
+#: mutt_ssl.c:621
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr ""
 
-#: mutt_ssl.c:616
+#: mutt_ssl.c:622
 msgid "roa"
 msgstr ""
 
-#: mutt_ssl.c:620
+#: mutt_ssl.c:626
 msgid "(r)eject, accept (o)nce"
 msgstr ""
 
-#: mutt_ssl.c:621
+#: mutt_ssl.c:627
 msgid "ro"
 msgstr ""
 
-#: mutt_ssl.c:625 pgpkey.c:510 smime.c:410
+#: mutt_ssl.c:631 pgpkey.c:510 smime.c:427
 msgid "Exit  "
 msgstr ""
 
-#: mutt_ssl.c:652
+#: mutt_ssl.c:658
 msgid "Warning: Couldn't save certificate"
 msgstr ""
 
-#: mutt_ssl.c:657
+#: mutt_ssl.c:663
 msgid "Certificate saved"
 msgstr ""
 
@@ -3094,188 +3083,215 @@ msgstr ""
 msgid "No more unquoted text after quoted text."
 msgstr ""
 
-#: parse.c:597
+#: parse.c:598
 msgid "multipart message has no boundary parameter!"
 msgstr ""
 
-#: pattern.c:238
+#: pattern.c:240
 #, c-format
 msgid "Error in expression: %s"
 msgstr ""
 
-#: pattern.c:348
+#: pattern.c:350
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr ""
 
-#: pattern.c:362
+#: pattern.c:364
 #, c-format
 msgid "Invalid month: %s"
 msgstr ""
 
 #. getDate has its own error message, don't overwrite it here
-#: pattern.c:514
+#: pattern.c:516
 #, c-format
 msgid "Invalid relative date: %s"
 msgstr ""
 
-#: pattern.c:528
+#: pattern.c:530
 msgid "error in expression"
 msgstr ""
 
-#: pattern.c:734 pattern.c:842
+#: pattern.c:736 pattern.c:844
 #, c-format
 msgid "error in pattern at: %s"
 msgstr ""
 
-#: pattern.c:782
+#: pattern.c:784
 #, c-format
 msgid "%c: invalid command"
 msgstr ""
 
-#: pattern.c:788
+#: pattern.c:790
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr ""
 
-#: pattern.c:801
+#: pattern.c:803
+#, c-format
 msgid "missing parameter"
 msgstr ""
 
-#: pattern.c:817
+#: pattern.c:819
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr ""
 
-#: pattern.c:849
+#: pattern.c:851
 msgid "empty pattern"
 msgstr ""
 
-#: pattern.c:1051
+#: pattern.c:1057
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr ""
 
-#: pattern.c:1120 pattern.c:1251
+#: pattern.c:1126 pattern.c:1257
 msgid "Compiling search pattern..."
 msgstr ""
 
-#: pattern.c:1134
+#: pattern.c:1140
 msgid "Executing command on matching messages..."
 msgstr ""
 
-#: pattern.c:1196
+#: pattern.c:1202
 msgid "No messages matched criteria."
 msgstr ""
 
-#: pattern.c:1289
+#: pattern.c:1295
 msgid "Search hit bottom without finding match"
 msgstr ""
 
-#: pattern.c:1300
+#: pattern.c:1306
 msgid "Search hit top without finding match"
 msgstr ""
 
-#: pattern.c:1322
+#: pattern.c:1328
 msgid "Search interrupted."
 msgstr ""
 
-#: pgp.c:73
+#: pgp.c:86
+msgid "Enter PGP passphrase:"
+msgstr ""
+
+#: pgp.c:100
 msgid "PGP passphrase forgotten."
 msgstr ""
 
-#: pgp.c:308
+#: pgp.c:340
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr ""
 
-#: pgp.c:337 pgp.c:554 pgp.c:755
+#: pgp.c:375 pgp.c:592 pgp.c:793
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
 msgstr ""
 
-#: pgp.c:352
+#: pgp.c:390
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
 
-#: pgp.c:354
+#: pgp.c:392
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr ""
 
-#: pgp.c:356
+#: pgp.c:394
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
 
-#: pgp.c:381
+#: pgp.c:419
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr ""
 
-#: pgp.c:383
+#: pgp.c:421
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr ""
 
-#: pgp.c:385
+#: pgp.c:423
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr ""
 
-#: pgp.c:412
+#: pgp.c:450
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
 
-#: pgp.c:662
+#: pgp.c:700
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr ""
 
-#: pgp.c:722
+#: pgp.c:760
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
 msgstr ""
 
-#: pgp.c:821
+#: pgp.c:867
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
 
-#: pgp.c:834
+#: pgp.c:880
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr ""
 
-#: pgp.c:843
+#: pgp.c:889
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
 
-#: pgp.c:863
+#: pgp.c:909
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr ""
 
-#: pgp.c:913
+#: pgp.c:959
 msgid "Can't open PGP subprocess!"
 msgstr ""
 
-#: pgp.c:1057
+#: pgp.c:1103
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr ""
 
-#: pgp.c:1091 smime.c:654 smime.c:781
+#: pgp.c:1137 smime.c:661 smime.c:786
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr ""
 
-#: pgp.c:1345
+#: pgp.c:1391
 msgid "Can't invoke PGP"
 msgstr ""
 
+#: pgp.c:1485
+#, c-format
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr ""
+
+#: pgp.c:1486
+msgid "PGP/M(i)ME"
+msgstr ""
+
+#: pgp.c:1486
+msgid "(i)nline"
+msgstr ""
+
+#: pgp.c:1488
+msgid "esabifc"
+msgstr ""
+
+#. sign (a)s
+#: pgp.c:1503 smime.c:1977
+msgid "Sign as: "
+msgstr ""
+
 #: pgpinvoke.c:303
 msgid "Fetching PGP key..."
 msgstr ""
@@ -3285,7 +3301,7 @@ msgid "All matching keys are expired, revoked, or disabled."
 msgstr ""
 
 #. __STRCAT_CHECKED__
-#: pgpkey.c:512 smime.c:412
+#: pgpkey.c:512 smime.c:429
 msgid "Select  "
 msgstr ""
 
@@ -3361,6 +3377,7 @@ msgid "Looking for keys matching \"%s\"..."
 msgstr ""
 
 #: pop.c:86 pop_lib.c:197
+#, c-format
 msgid "Command TOP is not supported by server."
 msgstr ""
 
@@ -3369,6 +3386,7 @@ msgid "Can't write header to temporary file!"
 msgstr ""
 
 #: pop.c:194 pop_lib.c:199
+#, c-format
 msgid "Command UIDL is not supported by server."
 msgstr ""
 
@@ -3415,7 +3433,7 @@ msgstr ""
 msgid "%s [%d of %d messages read]"
 msgstr ""
 
-#: pop.c:684 pop_lib.c:356
+#: pop.c:684 pop_lib.c:360
 msgid "Server closed connection!"
 msgstr ""
 
@@ -3432,6 +3450,7 @@ msgid "APOP authentication failed."
 msgstr ""
 
 #: pop_auth.c:264
+#, c-format
 msgid "Command USER is not supported by server."
 msgstr ""
 
@@ -3444,15 +3463,15 @@ msgstr ""
 msgid "Error connecting to server: %s"
 msgstr ""
 
-#: pop_lib.c:370
+#: pop_lib.c:374
 msgid "Closing connection to POP server..."
 msgstr ""
 
-#: pop_lib.c:536
+#: pop_lib.c:540
 msgid "Verifying message indexes..."
 msgstr ""
 
-#: pop_lib.c:560
+#: pop_lib.c:564
 msgid "Connection lost. Reconnect to POP server?"
 msgstr ""
 
@@ -3464,7 +3483,7 @@ msgstr ""
 msgid "No postponed messages."
 msgstr ""
 
-#: postpone.c:438 postpone.c:459 postpone.c:488
+#: postpone.c:438 postpone.c:459 postpone.c:493
 msgid "Illegal PGP header"
 msgstr ""
 
@@ -3472,7 +3491,11 @@ msgstr ""
 msgid "Illegal S/MIME header"
 msgstr ""
 
-#: postpone.c:554
+#: postpone.c:552
+msgid "Decrypting message..."
+msgstr ""
+
+#: postpone.c:561
 msgid "Decryption failed."
 msgstr ""
 
@@ -3497,6 +3520,7 @@ msgid "Query command not defined."
 msgstr ""
 
 #: query.c:286
+#, c-format
 msgid "Query"
 msgstr ""
 
@@ -3556,27 +3580,27 @@ msgstr ""
 msgid "Print attachment?"
 msgstr ""
 
-#: recvattach.c:938
+#: recvattach.c:953
 msgid "Can't decrypt encrypted message!"
 msgstr ""
 
-#: recvattach.c:951
+#: recvattach.c:966
 msgid "Attachments"
 msgstr ""
 
-#: recvattach.c:987
+#: recvattach.c:1002
 msgid "There are no subparts to show!"
 msgstr ""
 
-#: recvattach.c:1048
+#: recvattach.c:1063
 msgid "Can't delete attachment from POP server."
 msgstr ""
 
-#: recvattach.c:1056
+#: recvattach.c:1071
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr ""
 
-#: recvattach.c:1075 recvattach.c:1092
+#: recvattach.c:1090 recvattach.c:1107
 msgid "Only deletion of multipart attachments is supported."
 msgstr ""
 
@@ -3618,7 +3642,7 @@ msgstr ""
 msgid "Can't find any tagged messages."
 msgstr ""
 
-#: recvcmd.c:745 send.c:707
+#: recvcmd.c:745 send.c:711
 msgid "No mailing lists found!"
 msgstr ""
 
@@ -3712,11 +3736,11 @@ msgstr ""
 msgid "score: too many arguments"
 msgstr ""
 
-#: send.c:247
+#: send.c:248
 msgid "No subject, abort?"
 msgstr ""
 
-#: send.c:249
+#: send.c:250
 msgid "No subject, aborting."
 msgstr ""
 
@@ -3725,12 +3749,12 @@ msgstr ""
 #. * to send a message to only the sender of the message.  This
 #. * provides a way to do that.
 #.
-#: send.c:483
+#: send.c:484
 #, c-format
 msgid "Reply to %s%s?"
 msgstr ""
 
-#: send.c:517
+#: send.c:518
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr ""
@@ -3738,87 +3762,82 @@ msgstr ""
 #. This could happen if the user tagged some messages and then did
 #. * a limit such that none of the tagged message are visible.
 #.
-#: send.c:682
+#: send.c:686
 msgid "No tagged messages are visible!"
 msgstr ""
 
-#: send.c:733
+#: send.c:737
 msgid "Include message in reply?"
 msgstr ""
 
-#: send.c:738
+#: send.c:742
 msgid "Including quoted message..."
 msgstr ""
 
-#: send.c:748
+#: send.c:752
 msgid "Could not include all requested messages!"
 msgstr ""
 
-#: send.c:762
+#: send.c:766
 msgid "Forward as attachment?"
 msgstr ""
 
-#: send.c:766
+#: send.c:770
 msgid "Preparing forwarded message..."
 msgstr ""
 
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:1062
+#: send.c:1066
 msgid "Recall postponed message?"
 msgstr ""
 
-#: send.c:1336
+#: send.c:1365
 msgid "Edit forwarded message?"
 msgstr ""
 
-#: send.c:1359
+#: send.c:1390
 msgid "Abort unmodified message?"
 msgstr ""
 
-#: send.c:1361
+#: send.c:1392
 msgid "Aborted unmodified message."
 msgstr ""
 
-#. abort
-#: send.c:1403
-msgid "Mail not sent."
-msgstr ""
-
-#: send.c:1430
+#: send.c:1461
 msgid "Message postponed."
 msgstr ""
 
-#: send.c:1439
+#: send.c:1470
 msgid "No recipients are specified!"
 msgstr ""
 
-#: send.c:1444
+#: send.c:1475
 msgid "No recipients were specified."
 msgstr ""
 
-#: send.c:1460
+#: send.c:1491
 msgid "No subject, abort sending?"
 msgstr ""
 
-#: send.c:1464
+#: send.c:1495
 msgid "No subject specified."
 msgstr ""
 
-#: send.c:1526
+#: send.c:1557
 msgid "Sending message..."
 msgstr ""
 
-#: send.c:1667
+#: send.c:1698
 msgid "Could not send the message."
 msgstr ""
 
-#: send.c:1672
+#: send.c:1703
 msgid "Mail sent."
 msgstr ""
 
-#: send.c:1672
+#: send.c:1703
 msgid "Sending in background."
 msgstr ""
 
@@ -3870,132 +3889,158 @@ msgstr ""
 msgid "Caught signal %d...  Exiting.\n"
 msgstr ""
 
-#: smime.c:300
+#: smime.c:107
+msgid "Enter SMIME passphrase:"
+msgstr ""
+
+#: smime.c:317
 msgid "Trusted   "
 msgstr ""
 
-#: smime.c:303
+#: smime.c:320
 msgid "Verified  "
 msgstr ""
 
-#: smime.c:306
+#: smime.c:323
 msgid "Unverified"
 msgstr ""
 
-#: smime.c:309
+#: smime.c:326
 msgid "Expired   "
 msgstr ""
 
-#: smime.c:312
+#: smime.c:329
 msgid "Revoked   "
 msgstr ""
 
-#: smime.c:315
+#: smime.c:332
 msgid "Invalid   "
 msgstr ""
 
-#: smime.c:318
+#: smime.c:335
 msgid "Unknown   "
 msgstr ""
 
-#: smime.c:347
+#: smime.c:364
 msgid "Enter keyID: "
 msgstr ""
 
-#: smime.c:370
+#: smime.c:387
 #, c-format
 msgid "S/MIME certificates matching \"%s\"."
 msgstr ""
 
-#: smime.c:519 smime.c:588 smime.c:609
+#: smime.c:537 smime.c:607 smime.c:625
 #, c-format
 msgid "ID %s is unverified. Do you want to use it for %s ?"
 msgstr ""
 
-#: smime.c:523 smime.c:592
+#: smime.c:541 smime.c:611
 #, c-format
 msgid "Use (untrusted!) ID %s for %s ?"
 msgstr ""
 
-#: smime.c:526 smime.c:595
+#: smime.c:544 smime.c:614
 #, c-format
 msgid "Use ID %s for %s ?"
 msgstr ""
 
-#: smime.c:621
+#: smime.c:633
 #, c-format
 msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
 msgstr ""
 
-#: smime.c:787
+#: smime.c:792
 #, c-format
 msgid "No (valid) certificate found for %s."
 msgstr ""
 
-#: smime.c:842 smime.c:870 smime.c:935 smime.c:979 smime.c:1044 smime.c:1119
+#: smime.c:847 smime.c:875 smime.c:940 smime.c:984 smime.c:1049 smime.c:1124
 msgid "Error: unable to create OpenSSL subprocess!"
 msgstr ""
 
-#: smime.c:1197
+#: smime.c:1202
 msgid "no certfile"
 msgstr ""
 
-#: smime.c:1200
+#: smime.c:1205
 msgid "no mbox"
 msgstr ""
 
 #. fatal error while trying to encrypt message
-#: smime.c:1343
+#: smime.c:1348
 msgid "No output from OpenSSL.."
 msgstr ""
 
-#: smime.c:1381
+#: smime.c:1386
 msgid "Warning: Intermediate certificate not found."
 msgstr ""
 
-#: smime.c:1426
+#: smime.c:1429
 msgid "Can't open OpenSSL subprocess!"
 msgstr ""
 
-#: smime.c:1464
+#: smime.c:1467
 msgid "No output from OpenSSL..."
 msgstr ""
 
-#: smime.c:1629 smime.c:1751
+#: smime.c:1632 smime.c:1754
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
 msgstr ""
 
-#: smime.c:1712 smime.c:1722
+#: smime.c:1715 smime.c:1725
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr ""
 
-#: smime.c:1755
+#: smime.c:1758
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 
-#: smime.c:1758
+#: smime.c:1761
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 
-#: smime.c:1822
+#: smime.c:1825
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
 msgstr ""
 
-#: smime.c:1824
+#: smime.c:1827
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
 msgstr ""
 
-#: sort.c:202
+#: smime.c:1931
+msgid ""
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
+msgstr ""
+
+#: smime.c:1932
+msgid "eswabfc"
+msgstr ""
+
+#: smime.c:1941
+msgid ""
+"1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
+msgstr ""
+
+#: smime.c:1943
+msgid "12345f"
+msgstr ""
+
+#: smime.c:1967
+msgid "Can't sign: No key specified. Use Sign As."
+msgstr ""
+
+#: sort.c:255
 msgid "Sorting mailbox..."
 msgstr ""
 
-#: sort.c:239
+#: sort.c:292
 msgid "Could not find sorting function! [report this bug]"
 msgstr ""
 
@@ -4003,10 +4048,10 @@ msgstr ""
 msgid "(no mailbox)"
 msgstr ""
 
-#: thread.c:1081
+#: thread.c:1085
 msgid "Parent message is not visible in this limited view."
 msgstr ""
 
-#: thread.c:1087
+#: thread.c:1091
 msgid "Parent message is not available."
 msgstr ""