removing an article form the Description of mutt-patched to make lintian happy

[software/mutt-debian.git] / po / mutt.pot

diff --git a/po/mutt.pot b/po/mutt.pot
index 6b5273e976c2f4c943fabd975e294ed652c5d26b..5c3f3cf8b8b604a4175a44db871116d9c2d3cc3b 100644 (file)
--- a/po/mutt.pot
+++ b/po/mutt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-05-17 12:35-0700\n"
+"POT-Creation-Date: 2010-09-15 10:09-0700\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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -16,26 +16,26 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: account.c:164
+#: account.c:163

 #, c-format
 msgid "Username at %s: "
 msgstr ""
 
 #, c-format
 msgid "Username at %s: "
 msgstr ""
 

-#: account.c:223
+#: account.c:224

 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 

-#: addrbook.c:37 browser.c:45 pager.c:1480 postpone.c:43 query.c:49
-#: recvattach.c:54
+#: addrbook.c:37 browser.c:46 pager.c:1530 postpone.c:41 query.c:48
+#: recvattach.c:53

 msgid "Exit"
 msgstr ""
 
 msgid "Exit"
 msgstr ""
 

-#: addrbook.c:38 curs_main.c:408 pager.c:1487 postpone.c:44
+#: addrbook.c:38 curs_main.c:406 pager.c:1537 postpone.c:42

 msgid "Del"
 msgstr ""
 
 msgid "Del"
 msgstr ""
 

-#: addrbook.c:39 curs_main.c:409 postpone.c:45
+#: addrbook.c:39 curs_main.c:407 postpone.c:43

 msgid "Undel"
 msgstr ""
 
 msgid "Undel"
 msgstr ""
 


@@ -44,9 +44,9 @@ msgid "Select"
 msgstr ""
 
 #. __STRCAT_CHECKED__
 msgstr ""
 
 #. __STRCAT_CHECKED__

-#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3647 curs_main.c:414
-#: mutt_ssl.c:679 mutt_ssl_gnutls.c:783 pager.c:1579 pgpkey.c:522
-#: postpone.c:46 query.c:54 recvattach.c:58 smime.c:437
+#: addrbook.c:41 browser.c:49 compose.c:96 crypt-gpgme.c:3827 curs_main.c:412
+#: mutt_ssl.c:988 mutt_ssl_gnutls.c:875 pager.c:1629 pgpkey.c:522
+#: postpone.c:44 query.c:53 recvattach.c:57 smime.c:425

 msgid "Help"
 msgstr ""
 
 msgid "Help"
 msgstr ""
 


@@ -54,59 +54,59 @@ msgstr ""
 msgid "You have no aliases!"
 msgstr ""
 
 msgid "You have no aliases!"
 msgstr ""
 

-#: addrbook.c:156
+#: addrbook.c:155

 msgid "Aliases"
 msgstr ""
 
 #. add a new alias
 msgid "Aliases"
 msgstr ""
 
 #. add a new alias

-#: alias.c:246
+#: alias.c:260

 msgid "Alias as: "
 msgstr ""
 
 msgid "Alias as: "
 msgstr ""
 

-#: alias.c:252
+#: alias.c:266

 msgid "You already have an alias defined with that name!"
 msgstr ""
 
 msgid "You already have an alias defined with that name!"
 msgstr ""
 

-#: alias.c:258
+#: alias.c:272

 msgid "Warning: This alias name may not work.  Fix it?"
 msgstr ""
 
 msgid "Warning: This alias name may not work.  Fix it?"
 msgstr ""
 

-#: alias.c:283
+#: alias.c:297

 msgid "Address: "
 msgstr ""
 
 msgid "Address: "
 msgstr ""
 

-#: alias.c:293 send.c:207
+#: alias.c:307 send.c:206

 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
 
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
 

-#: alias.c:305
+#: alias.c:319

 msgid "Personal name: "
 msgstr ""
 
 msgid "Personal name: "
 msgstr ""
 

-#: alias.c:314
+#: alias.c:328

 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr ""
 
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr ""
 

-#: alias.c:331 recvattach.c:432 recvattach.c:455 recvattach.c:468
-#: recvattach.c:481 recvattach.c:511
+#: alias.c:347 recvattach.c:440 recvattach.c:466 recvattach.c:479
+#: recvattach.c:492 recvattach.c:522

 msgid "Save to file: "
 msgstr ""
 
 msgid "Save to file: "
 msgstr ""
 

-#: alias.c:345
+#: alias.c:361

 msgid "Error reading alias file"
 msgstr ""
 
 msgid "Error reading alias file"
 msgstr ""
 

-#: alias.c:364
+#: alias.c:383

 msgid "Alias added."
 msgstr ""
 
 msgid "Alias added."
 msgstr ""
 

-#: alias.c:372
+#: alias.c:391

 msgid "Error seeking in alias file"
 msgstr ""
 
 msgid "Error seeking in alias file"
 msgstr ""
 

-#: attach.c:113 attach.c:245 attach.c:477 attach.c:968
+#: attach.c:113 attach.c:245 attach.c:477 attach.c:973

 msgid "Can't match nametemplate, continue?"
 msgstr ""
 
 msgid "Can't match nametemplate, continue?"
 msgstr ""
 


@@ -116,8 +116,8 @@ msgstr ""
 msgid "Mailcap compose entry requires %%s"
 msgstr ""
 
 msgid "Mailcap compose entry requires %%s"
 msgstr ""
 

-#: attach.c:134 attach.c:266 commands.c:223 compose.c:1183 curs_lib.c:179
-#: curs_lib.c:533
+#: attach.c:134 attach.c:266 commands.c:223 compose.c:1179 curs_lib.c:180
+#: curs_lib.c:548

 #, c-format
 msgid "Error running \"%s\"!"
 msgstr ""
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr ""


@@ -162,121 +162,141 @@ msgstr ""
 msgid "Cannot create filter"
 msgstr ""
 
 msgid "Cannot create filter"
 msgstr ""
 

-#: attach.c:676 attach.c:708 attach.c:1001 attach.c:1059 handler.c:1279
-#: pgpkey.c:571 pgpkey.c:760
+#: attach.c:554
+#, c-format
+msgid "---Command: %-20.20s Description: %s"
+msgstr ""
+
+#: attach.c:558
+#, c-format
+msgid "---Command: %-30.30s Attachment: %s"
+msgstr ""
+
+#: attach.c:604
+#, c-format
+msgid "---Attachment: %s: %s"
+msgstr ""
+
+#: attach.c:607
+#, c-format
+msgid "---Attachment: %s"
+msgstr ""
+
+#: attach.c:677 attach.c:709 attach.c:1006 attach.c:1064 handler.c:1285
+#: pgpkey.c:570 pgpkey.c:759

 msgid "Can't create filter"
 msgstr ""
 
 msgid "Can't create filter"
 msgstr ""
 

-#: attach.c:840
+#: attach.c:845

 msgid "Write fault!"
 msgstr ""
 
 msgid "Write fault!"
 msgstr ""
 

-#: attach.c:1082
+#: attach.c:1087

 msgid "I don't know how to print that!"
 msgstr ""
 
 msgid "I don't know how to print that!"
 msgstr ""
 

-#: browser.c:46
+#: browser.c:47

 msgid "Chdir"
 msgstr ""
 
 msgid "Chdir"
 msgstr ""
 

-#: browser.c:47
+#: browser.c:48

 msgid "Mask"
 msgstr ""
 
 msgid "Mask"
 msgstr ""
 

-#: browser.c:383 browser.c:1022
+#: browser.c:400 browser.c:1055

 #, c-format
 msgid "%s is not a directory."
 msgstr ""
 
 #, c-format
 msgid "%s is not a directory."
 msgstr ""
 

-#: browser.c:507
+#: browser.c:539

 #, c-format
 msgid "Mailboxes [%d]"
 msgstr ""
 
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr ""
 

-#: browser.c:514
+#: browser.c:546

 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr ""
 
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr ""
 

-#: browser.c:518
+#: browser.c:550

 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr ""
 
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr ""
 

-#: browser.c:530
+#: browser.c:562

 msgid "Can't attach a directory!"
 msgstr ""
 
 msgid "Can't attach a directory!"
 msgstr ""
 

-#: browser.c:670 browser.c:1091 browser.c:1189
+#: browser.c:701 browser.c:1123 browser.c:1221

 msgid "No files match the file mask"
 msgstr ""
 
 msgid "No files match the file mask"
 msgstr ""
 

-#: browser.c:876
+#: browser.c:905

 msgid "Create is only supported for IMAP mailboxes"
 msgstr ""
 
 msgid "Create is only supported for IMAP mailboxes"
 msgstr ""
 

-#: browser.c:897
+#: browser.c:929

 msgid "Rename is only supported for IMAP mailboxes"
 msgstr ""
 
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr ""
 

-#: browser.c:919
+#: browser.c:952

 msgid "Delete is only supported for IMAP mailboxes"
 msgstr ""
 
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr ""
 

-#: browser.c:929
+#: browser.c:962

 msgid "Cannot delete root folder"
 msgstr ""
 
 msgid "Cannot delete root folder"
 msgstr ""
 

-#: browser.c:932
+#: browser.c:965

 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr ""
 
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr ""
 

-#: browser.c:946
+#: browser.c:979

 msgid "Mailbox deleted."
 msgstr ""
 
 msgid "Mailbox deleted."
 msgstr ""
 

-#: browser.c:952
+#: browser.c:985

 msgid "Mailbox not deleted."
 msgstr ""
 
 msgid "Mailbox not deleted."
 msgstr ""
 

-#: browser.c:971
+#: browser.c:1004

 msgid "Chdir to: "
 msgstr ""
 
 msgid "Chdir to: "
 msgstr ""
 

-#: browser.c:1010 browser.c:1084
+#: browser.c:1043 browser.c:1116

 msgid "Error scanning directory."
 msgstr ""
 
 msgid "Error scanning directory."
 msgstr ""
 

-#: browser.c:1034
+#: browser.c:1067

 msgid "File Mask: "
 msgstr ""
 
 msgid "File Mask: "
 msgstr ""
 

-#: browser.c:1107
+#: browser.c:1139

 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 

-#: browser.c:1108
+#: browser.c:1140

 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 

-#: browser.c:1109
+#: browser.c:1141

 msgid "dazn"
 msgstr ""
 
 msgid "dazn"
 msgstr ""
 

-#: browser.c:1176
+#: browser.c:1208

 msgid "New file name: "
 msgstr ""
 
 msgid "New file name: "
 msgstr ""
 

-#: browser.c:1207
+#: browser.c:1239

 msgid "Can't view a directory"
 msgstr ""
 
 msgid "Can't view a directory"
 msgstr ""
 

-#: browser.c:1224
+#: browser.c:1256

 msgid "Error trying to view file"
 msgstr ""
 
 msgid "Error trying to view file"
 msgstr ""
 

-#: buffy.c:424
+#: buffy.c:486

 msgid "New mail in "
 msgstr ""
 
 msgid "New mail in "
 msgstr ""
 


@@ -290,47 +310,47 @@ msgstr ""
 msgid "%s: no such color"
 msgstr ""
 
 msgid "%s: no such color"
 msgstr ""
 

-#: color.c:378 color.c:579 color.c:590
+#: color.c:378 color.c:584 color.c:595

 #, c-format
 msgid "%s: no such object"
 msgstr ""
 
 #, c-format
 msgid "%s: no such object"
 msgstr ""
 

-#: color.c:385
+#: color.c:391

 #, c-format
 #, c-format

-msgid "%s: command valid only for index object"
+msgid "%s: command valid only for index, body, header objects"

 msgstr ""
 
 msgstr ""
 

-#: color.c:393
+#: color.c:399

 #, c-format
 msgid "%s: too few arguments"
 msgstr ""
 
 #, c-format
 msgid "%s: too few arguments"
 msgstr ""
 

-#: color.c:567
+#: color.c:572

 msgid "Missing arguments."
 msgstr ""
 
 msgid "Missing arguments."
 msgstr ""
 

-#: color.c:606 color.c:617
+#: color.c:611 color.c:622

 msgid "color: too few arguments"
 msgstr ""
 
 msgid "color: too few arguments"
 msgstr ""
 

-#: color.c:640
+#: color.c:645

 msgid "mono: too few arguments"
 msgstr ""
 
 msgid "mono: too few arguments"
 msgstr ""
 

-#: color.c:660
+#: color.c:665

 #, c-format
 msgid "%s: no such attribute"
 msgstr ""
 
 #, c-format
 msgid "%s: no such attribute"
 msgstr ""
 

-#: color.c:700 hook.c:69 hook.c:77 keymap.c:751
+#: color.c:705 hook.c:69 hook.c:77 keymap.c:902

 msgid "too few arguments"
 msgstr ""
 
 msgid "too few arguments"
 msgstr ""
 

-#: color.c:709 hook.c:83
+#: color.c:714 hook.c:83

 msgid "too many arguments"
 msgstr ""
 
 msgid "too many arguments"
 msgstr ""
 

-#: color.c:725
+#: color.c:730

 msgid "default colors not supported"
 msgstr ""
 
 msgid "default colors not supported"
 msgstr ""
 


@@ -339,7 +359,7 @@ msgstr ""
 msgid "Verify PGP signature?"
 msgstr ""
 
 msgid "Verify PGP signature?"
 msgstr ""
 

-#: commands.c:115 mbox.c:754
+#: commands.c:115 mbox.c:787

 msgid "Could not create temporary file!"
 msgstr ""
 
 msgid "Could not create temporary file!"
 msgstr ""
 


@@ -375,168 +395,172 @@ msgstr ""
 msgid "PGP signature could NOT be verified."
 msgstr ""
 
 msgid "PGP signature could NOT be verified."
 msgstr ""
 

-#: commands.c:230
+#: commands.c:231

 msgid "Command: "
 msgstr ""
 
 msgid "Command: "
 msgstr ""
 

-#: commands.c:250 recvcmd.c:147
+#: commands.c:256
+msgid "Warning: message has no From: header"
+msgstr ""
+
+#: commands.c:274 recvcmd.c:171

 msgid "Bounce message to: "
 msgstr ""
 
 msgid "Bounce message to: "
 msgstr ""
 

-#: commands.c:252 recvcmd.c:149
+#: commands.c:276 recvcmd.c:173

 msgid "Bounce tagged messages to: "
 msgstr ""
 
 msgid "Bounce tagged messages to: "
 msgstr ""
 

-#: commands.c:267 recvcmd.c:158
+#: commands.c:291 recvcmd.c:182

 msgid "Error parsing address!"
 msgstr ""
 
 msgid "Error parsing address!"
 msgstr ""
 

-#: commands.c:275 recvcmd.c:166
+#: commands.c:299 recvcmd.c:190

 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 

-#: commands.c:286 recvcmd.c:180
+#: commands.c:310 recvcmd.c:204

 #, c-format
 msgid "Bounce message to %s"
 msgstr ""
 
 #, c-format
 msgid "Bounce message to %s"
 msgstr ""
 

-#: commands.c:286 recvcmd.c:180
+#: commands.c:310 recvcmd.c:204

 #, c-format
 msgid "Bounce messages to %s"
 msgstr ""
 
 #, c-format
 msgid "Bounce messages to %s"
 msgstr ""
 

-#: commands.c:302 recvcmd.c:196
+#: commands.c:326 recvcmd.c:220

 msgid "Message not bounced."
 msgstr ""
 
 msgid "Message not bounced."
 msgstr ""
 

-#: commands.c:302 recvcmd.c:196
+#: commands.c:326 recvcmd.c:220

 msgid "Messages not bounced."
 msgstr ""
 
 msgid "Messages not bounced."
 msgstr ""
 

-#: commands.c:312 recvcmd.c:215
+#: commands.c:336 recvcmd.c:239

 msgid "Message bounced."
 msgstr ""
 
 msgid "Message bounced."
 msgstr ""
 

-#: commands.c:312 recvcmd.c:215
+#: commands.c:336 recvcmd.c:239

 msgid "Messages bounced."
 msgstr ""
 
 msgid "Messages bounced."
 msgstr ""
 

-#: commands.c:389 commands.c:423 commands.c:440
+#: commands.c:413 commands.c:447 commands.c:464

 msgid "Can't create filter process"
 msgstr ""
 
 msgid "Can't create filter process"
 msgstr ""
 

-#: commands.c:469
+#: commands.c:493

 msgid "Pipe to command: "
 msgstr ""
 
 msgid "Pipe to command: "
 msgstr ""
 

-#: commands.c:486
+#: commands.c:510

 msgid "No printing command has been defined."
 msgstr ""
 
 msgid "No printing command has been defined."
 msgstr ""
 

-#: commands.c:491
+#: commands.c:515

 msgid "Print message?"
 msgstr ""
 
 msgid "Print message?"
 msgstr ""
 

-#: commands.c:491
+#: commands.c:515

 msgid "Print tagged messages?"
 msgstr ""
 
 msgid "Print tagged messages?"
 msgstr ""
 

-#: commands.c:500
+#: commands.c:524

 msgid "Message printed"
 msgstr ""
 
 msgid "Message printed"
 msgstr ""
 

-#: commands.c:500
+#: commands.c:524

 msgid "Messages printed"
 msgstr ""
 
 msgid "Messages printed"
 msgstr ""
 

-#: commands.c:502
+#: commands.c:526

 msgid "Message could not be printed"
 msgstr ""
 
 msgid "Message could not be printed"
 msgstr ""
 

-#: commands.c:503
+#: commands.c:527

 msgid "Messages could not be printed"
 msgstr ""
 
 msgid "Messages could not be printed"
 msgstr ""
 

-#: commands.c:512
+#: commands.c:536

 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 ""
 
 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:513
+#: commands.c:537

 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 ""
 
 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:514
+#: commands.c:538

 msgid "dfrsotuzcp"
 msgstr ""
 
 msgid "dfrsotuzcp"
 msgstr ""
 

-#: commands.c:571
+#: commands.c:595

 msgid "Shell command: "
 msgstr ""
 
 msgid "Shell command: "
 msgstr ""
 

-#: commands.c:716
+#: commands.c:738

 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr ""
 
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr ""
 

-#: commands.c:717
+#: commands.c:739

 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr ""
 
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr ""
 

-#: commands.c:718
+#: commands.c:740

 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr ""
 
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr ""
 

-#: commands.c:719
+#: commands.c:741

 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr ""
 
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr ""
 

-#: commands.c:720
+#: commands.c:742

 #, c-format
 msgid "Save%s to mailbox"
 msgstr ""
 
 #, c-format
 msgid "Save%s to mailbox"
 msgstr ""
 

-#: commands.c:720
+#: commands.c:742

 #, c-format
 msgid "Copy%s to mailbox"
 msgstr ""
 
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr ""
 

-#: commands.c:721
+#: commands.c:743

 msgid " tagged"
 msgstr ""
 
 msgid " tagged"
 msgstr ""
 

-#: commands.c:794
+#: commands.c:816

 #, c-format
 msgid "Copying to %s..."
 msgstr ""
 
 #, c-format
 msgid "Copying to %s..."
 msgstr ""
 

-#: commands.c:929
+#: commands.c:932

 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr ""
 
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr ""
 

-#: commands.c:939
+#: commands.c:942

 #, c-format
 msgid "Content-Type changed to %s."
 msgstr ""
 
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr ""
 

-#: commands.c:944
+#: commands.c:947

 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr ""
 
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr ""
 

-#: commands.c:946
+#: commands.c:949

 msgid "not converting"
 msgstr ""
 
 msgid "not converting"
 msgstr ""
 

-#: commands.c:946
+#: commands.c:949

 msgid "converting"
 msgstr ""
 
 msgid "converting"
 msgstr ""
 


@@ -552,7 +576,7 @@ msgstr ""
 msgid "Abort"
 msgstr ""
 
 msgid "Abort"
 msgstr ""
 

-#: compose.c:94 compose.c:668
+#: compose.c:94 compose.c:664

 msgid "Attach file"
 msgstr ""
 
 msgid "Attach file"
 msgstr ""
 


@@ -560,301 +584,317 @@ msgstr ""
 msgid "Descrip"
 msgstr ""
 
 msgid "Descrip"
 msgstr ""
 

-#: compose.c:132
+#: compose.c:119
+msgid "Not supported"
+msgstr ""
+
+#: compose.c:124

 msgid "Sign, Encrypt"
 msgstr ""
 
 msgid "Sign, Encrypt"
 msgstr ""
 

-#: compose.c:134
+#: compose.c:126

 msgid "Encrypt"
 msgstr ""
 
 msgid "Encrypt"
 msgstr ""
 

-#: compose.c:136
+#: compose.c:128

 msgid "Sign"
 msgstr ""
 
 msgid "Sign"
 msgstr ""
 

-#: compose.c:138
-msgid "Clear"
+#: compose.c:130
+msgid "None"

 msgstr ""
 
 msgstr ""
 

-#: compose.c:145
-msgid " (inline)"
+#: compose.c:137
+msgid " (inline PGP)"

 msgstr ""
 
 msgstr ""
 

-#: compose.c:147
+#: compose.c:139

 msgid " (PGP/MIME)"
 msgstr ""
 
 msgid " (PGP/MIME)"
 msgstr ""
 

-#: compose.c:155 compose.c:159
+#: compose.c:143
+msgid " (S/MIME)"
+msgstr ""
+
+#: compose.c:152 compose.c:156

 msgid " sign as: "
 msgstr ""
 
 msgid " sign as: "
 msgstr ""
 

-#: compose.c:155 compose.c:159
+#: compose.c:152 compose.c:156

 msgid "<default>"
 msgstr ""
 
 msgid "<default>"
 msgstr ""
 

-#: compose.c:167
+#: compose.c:164

 msgid "Encrypt with: "
 msgstr ""
 
 msgid "Encrypt with: "
 msgstr ""
 

-#: compose.c:221
+#: compose.c:218

 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr ""
 
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr ""
 

-#: compose.c:229
+#: compose.c:226

 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr ""
 
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr ""
 

-#: compose.c:272
+#: compose.c:269

 msgid "-- Attachments"
 msgstr ""
 
 msgid "-- Attachments"
 msgstr ""
 

-#: compose.c:302
+#: compose.c:299

 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
 
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
 

-#: compose.c:325
+#: compose.c:322

 msgid "You may not delete the only attachment."
 msgstr ""
 
 msgid "You may not delete the only attachment."
 msgstr ""
 

-#: compose.c:601 send.c:1561
+#: compose.c:597 send.c:1586

 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
 
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
 

-#: compose.c:684
+#: compose.c:680

 msgid "Attaching selected files..."
 msgstr ""
 
 msgid "Attaching selected files..."
 msgstr ""
 

-#: compose.c:696
+#: compose.c:692

 #, c-format
 msgid "Unable to attach %s!"
 msgstr ""
 
 #, c-format
 msgid "Unable to attach %s!"
 msgstr ""
 

-#: compose.c:715
+#: compose.c:711

 msgid "Open mailbox to attach message from"
 msgstr ""
 
 msgid "Open mailbox to attach message from"
 msgstr ""
 

-#: compose.c:753
+#: compose.c:749

 msgid "No messages in that folder."
 msgstr ""
 
 msgid "No messages in that folder."
 msgstr ""
 

-#: compose.c:762
+#: compose.c:758

 msgid "Tag the messages you want to attach!"
 msgstr ""
 
 msgid "Tag the messages you want to attach!"
 msgstr ""
 

-#: compose.c:794
+#: compose.c:790

 msgid "Unable to attach!"
 msgstr ""
 
 msgid "Unable to attach!"
 msgstr ""
 

-#: compose.c:845
+#: compose.c:841

 msgid "Recoding only affects text attachments."
 msgstr ""
 
 msgid "Recoding only affects text attachments."
 msgstr ""
 

-#: compose.c:850
+#: compose.c:846

 msgid "The current attachment won't be converted."
 msgstr ""
 
 msgid "The current attachment won't be converted."
 msgstr ""
 

-#: compose.c:852
+#: compose.c:848

 msgid "The current attachment will be converted."
 msgstr ""
 
 msgid "The current attachment will be converted."
 msgstr ""
 

-#: compose.c:927
+#: compose.c:923

 msgid "Invalid encoding."
 msgstr ""
 
 msgid "Invalid encoding."
 msgstr ""
 

-#: compose.c:953
+#: compose.c:949

 msgid "Save a copy of this message?"
 msgstr ""
 
 msgid "Save a copy of this message?"
 msgstr ""
 

-#: compose.c:1009
+#: compose.c:1005

 msgid "Rename to: "
 msgstr ""
 
 msgid "Rename to: "
 msgstr ""
 

-#: compose.c:1014 editmsg.c:96 editmsg.c:121 sendlib.c:857
+#: compose.c:1010 editmsg.c:96 editmsg.c:121 sendlib.c:872

 #, c-format
 msgid "Can't stat %s: %s"
 msgstr ""
 
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr ""
 

-#: compose.c:1041
+#: compose.c:1037

 msgid "New file: "
 msgstr ""
 
 msgid "New file: "
 msgstr ""
 

-#: compose.c:1054
+#: compose.c:1050

 msgid "Content-Type is of the form base/sub"
 msgstr ""
 
 msgid "Content-Type is of the form base/sub"
 msgstr ""
 

-#: compose.c:1060
+#: compose.c:1056

 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr ""
 
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr ""
 

-#: compose.c:1073
+#: compose.c:1069

 #, c-format
 msgid "Can't create file %s"
 msgstr ""
 
 #, c-format
 msgid "Can't create file %s"
 msgstr ""
 

-#: compose.c:1081
+#: compose.c:1077

 msgid "What we have here is a failure to make an attachment"
 msgstr ""
 
 msgid "What we have here is a failure to make an attachment"
 msgstr ""
 

-#: compose.c:1142
+#: compose.c:1138

 msgid "Postpone this message?"
 msgstr ""
 
 msgid "Postpone this message?"
 msgstr ""
 

-#: compose.c:1201
+#: compose.c:1197

 msgid "Write message to mailbox"
 msgstr ""
 
 msgid "Write message to mailbox"
 msgstr ""
 

-#: compose.c:1204
+#: compose.c:1200

 #, c-format
 msgid "Writing message to %s ..."
 msgstr ""
 
 #, c-format
 msgid "Writing message to %s ..."
 msgstr ""
 

-#: compose.c:1213
+#: compose.c:1209

 msgid "Message written."
 msgstr ""
 
 msgid "Message written."
 msgstr ""
 

-#: compose.c:1225
+#: compose.c:1221

 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 

-#: compose.c:1251
+#: compose.c:1247

 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 

-#: crypt-gpgme.c:345
+#: crypt-gpgme.c:358

 #, c-format
 msgid "error creating gpgme context: %s\n"
 msgstr ""
 
 #, c-format
 msgid "error creating gpgme context: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:355
+#: crypt-gpgme.c:368

 #, c-format
 msgid "error enabling CMS protocol: %s\n"
 msgstr ""
 
 #, c-format
 msgid "error enabling CMS protocol: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:375
+#: crypt-gpgme.c:388

 #, c-format
 msgid "error creating gpgme data object: %s\n"
 msgstr ""
 
 #, c-format
 msgid "error creating gpgme data object: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:441 crypt-gpgme.c:459 crypt-gpgme.c:1400
+#: crypt-gpgme.c:454 crypt-gpgme.c:472 crypt-gpgme.c:1431

 #, c-format
 msgid "error allocating data object: %s\n"
 msgstr ""
 
 #, c-format
 msgid "error allocating data object: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:477
+#: crypt-gpgme.c:490

 #, c-format
 msgid "error rewinding data object: %s\n"
 msgstr ""
 
 #, c-format
 msgid "error rewinding data object: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:499 crypt-gpgme.c:546
+#: crypt-gpgme.c:512 crypt-gpgme.c:559

 #, c-format
 msgid "error reading data object: %s\n"
 msgstr ""
 
 #, c-format
 msgid "error reading data object: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:607
+#: crypt-gpgme.c:620

 #, c-format
 msgid "error adding recipient `%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "error adding recipient `%s': %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:645
+#: crypt-gpgme.c:658

 #, c-format
 msgid "secret key `%s' not found: %s\n"
 msgstr ""
 
 #, c-format
 msgid "secret key `%s' not found: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:655
+#: crypt-gpgme.c:668

 #, c-format
 msgid "ambiguous specification of secret key `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "ambiguous specification of secret key `%s'\n"
 msgstr ""
 

-#: crypt-gpgme.c:667
+#: crypt-gpgme.c:680

 #, c-format
 msgid "error setting secret key `%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "error setting secret key `%s': %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:684
+#: crypt-gpgme.c:697

 #, c-format
 msgid "error setting PKA signature notation: %s\n"
 msgstr ""
 
 #, c-format
 msgid "error setting PKA signature notation: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:740
+#: crypt-gpgme.c:753

 #, c-format
 msgid "error encrypting data: %s\n"
 msgstr ""
 
 #, c-format
 msgid "error encrypting data: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:850
+#: crypt-gpgme.c:870

 #, c-format
 msgid "error signing data: %s\n"
 msgstr ""
 
 #, c-format
 msgid "error signing data: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:1045
+#: crypt-gpgme.c:1065

 msgid "Warning: One of the keys has been revoked\n"
 msgstr ""
 
 msgid "Warning: One of the keys has been revoked\n"
 msgstr ""
 

-#: crypt-gpgme.c:1054
+#: crypt-gpgme.c:1074

 msgid "Warning: The key used to create the signature expired at: "
 msgstr ""
 
 msgid "Warning: The key used to create the signature expired at: "
 msgstr ""
 

-#: crypt-gpgme.c:1060
+#: crypt-gpgme.c:1080

 msgid "Warning: At least one certification key has expired\n"
 msgstr ""
 
 msgid "Warning: At least one certification key has expired\n"
 msgstr ""
 

-#: crypt-gpgme.c:1076
+#: crypt-gpgme.c:1096

 msgid "Warning: The signature expired at: "
 msgstr ""
 
 msgid "Warning: The signature expired at: "
 msgstr ""
 

-#: crypt-gpgme.c:1082
+#: crypt-gpgme.c:1102

 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 

-#: crypt-gpgme.c:1087
+#: crypt-gpgme.c:1107

 msgid "The CRL is not available\n"
 msgstr ""
 
 msgid "The CRL is not available\n"
 msgstr ""
 

-#: crypt-gpgme.c:1093
+#: crypt-gpgme.c:1113

 msgid "Available CRL is too old\n"
 msgstr ""
 
 msgid "Available CRL is too old\n"
 msgstr ""
 

-#: crypt-gpgme.c:1098
+#: crypt-gpgme.c:1118

 msgid "A policy requirement was not met\n"
 msgstr ""
 
 msgid "A policy requirement was not met\n"
 msgstr ""
 

-#: crypt-gpgme.c:1107
+#: crypt-gpgme.c:1127

 msgid "A system error occurred"
 msgstr ""
 
 msgid "A system error occurred"
 msgstr ""
 

-#: crypt-gpgme.c:1141
+#: crypt-gpgme.c:1161

 msgid "WARNING: PKA entry does not match signer's address: "
 msgstr ""
 
 msgid "WARNING: PKA entry does not match signer's address: "
 msgstr ""
 

-#: crypt-gpgme.c:1148
+#: crypt-gpgme.c:1168

 msgid "PKA verified signer's address is: "
 msgstr ""
 
 msgid "PKA verified signer's address is: "
 msgstr ""
 

-#: crypt-gpgme.c:1165 crypt-gpgme.c:3114
+#: crypt-gpgme.c:1185 crypt-gpgme.c:3294

 msgid "Fingerprint: "
 msgstr ""
 
 msgid "Fingerprint: "
 msgstr ""
 

-#: crypt-gpgme.c:1225
+#: crypt-gpgme.c:1245

 msgid ""
 "WARNING: We have NO indication whether the key belongs to the person named "
 "as shown above\n"
 msgstr ""
 
 msgid ""
 "WARNING: We have NO indication whether the key belongs to the person named "
 "as shown above\n"
 msgstr ""
 

-#: crypt-gpgme.c:1232
+#: crypt-gpgme.c:1252

 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
 msgstr ""
 
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
 msgstr ""
 

-#: crypt-gpgme.c:1236
+#: crypt-gpgme.c:1256

 msgid ""
 "WARNING: It is NOT certain that the key belongs to the person named as shown "
 "above\n"
 msgstr ""
 
 msgid ""
 "WARNING: It is NOT certain that the key belongs to the person named as shown "
 "above\n"
 msgstr ""
 

-#: crypt-gpgme.c:1311
+#: crypt-gpgme.c:1286
+msgid "aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1297
+msgid "created: "
+msgstr ""
+
+#: crypt-gpgme.c:1362

 msgid "Error getting key information: "
 msgstr ""
 
 msgid "Error getting key information: "
 msgstr ""
 


@@ -862,456 +902,457 @@ msgstr ""
 #. signature, so we display what a PGP user expects: The name,
 #. fingerprint and the key validity (which is neither fully or
 #. ultimate).
 #. 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:1318 crypt-gpgme.c:1351
-msgid "Good signature from: "
+#: crypt-gpgme.c:1369 crypt-gpgme.c:1384
+msgid "Good signature from:"

 msgstr ""
 
 msgstr ""
 

-#: crypt-gpgme.c:1328
-msgid "                aka: "
+#: crypt-gpgme.c:1376
+msgid "*BAD* signature from:"

 msgstr ""
 
 msgstr ""
 

-#: crypt-gpgme.c:1332 crypt-gpgme.c:1354
-msgid "            created: "
+#: crypt-gpgme.c:1392
+msgid "Problem signature from:"

 msgstr ""
 
 msgstr ""
 

-#: crypt-gpgme.c:1341
-msgid "*BAD* signature claimed to be from: "
-msgstr ""
-
-#: crypt-gpgme.c:1364
-msgid "Error checking signature"
+#: crypt-gpgme.c:1393
+msgid "               expires: "

 msgstr ""
 
 #. Note: We don't need a current time output because GPGME avoids
 #. such an attack by separating the meta information from the
 #. data.
 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:1408 crypt-gpgme.c:1623 crypt-gpgme.c:2108
+#: crypt-gpgme.c:1439 crypt-gpgme.c:1654 crypt-gpgme.c:2287

 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 

-#: crypt-gpgme.c:1417
+#: crypt-gpgme.c:1448

 #, c-format
 msgid "Error: verification failed: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Error: verification failed: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:1466
+#: crypt-gpgme.c:1497

 #, c-format
 msgid "*** Begin Notation (signature by: %s) ***\n"
 msgstr ""
 
 #, c-format
 msgid "*** Begin Notation (signature by: %s) ***\n"
 msgstr ""
 

-#: crypt-gpgme.c:1488
+#: crypt-gpgme.c:1519

 msgid "*** End Notation ***\n"
 msgstr ""
 
 msgid "*** End Notation ***\n"
 msgstr ""
 

-#: crypt-gpgme.c:1496 crypt-gpgme.c:1636 crypt-gpgme.c:2123
+#: crypt-gpgme.c:1527 crypt-gpgme.c:1667 crypt-gpgme.c:2302

 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
 
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
 

-#: crypt-gpgme.c:1591
+#: crypt-gpgme.c:1622

 #, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr ""
 

-#: crypt-gpgme.c:2083
+#: crypt-gpgme.c:2079
+#, c-format
+msgid "Error extracting key data!\n"
+msgstr ""
+
+#: crypt-gpgme.c:2262

 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:2131
+#: crypt-gpgme.c:2310

 msgid "Error: copy data failed\n"
 msgstr ""
 
 msgid "Error: copy data failed\n"
 msgstr ""
 

-#: crypt-gpgme.c:2151 pgp.c:428
+#: crypt-gpgme.c:2330 pgp.c:438

 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
 
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
 

-#: crypt-gpgme.c:2153 pgp.c:430
+#: crypt-gpgme.c:2332 pgp.c:440

 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr ""
 
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr ""
 

-#: crypt-gpgme.c:2156 pgp.c:432
+#: crypt-gpgme.c:2335 pgp.c:442

 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
 
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
 

-#: crypt-gpgme.c:2183 pgp.c:458
+#: crypt-gpgme.c:2362 pgp.c:473

 msgid "[-- END PGP MESSAGE --]\n"
 msgstr ""
 
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr ""
 

-#: crypt-gpgme.c:2185 pgp.c:465
+#: crypt-gpgme.c:2364 pgp.c:480

 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr ""
 
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr ""
 

-#: crypt-gpgme.c:2187 pgp.c:467
+#: crypt-gpgme.c:2366 pgp.c:482

 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr ""
 
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr ""
 

-#: crypt-gpgme.c:2208 pgp.c:497
+#: crypt-gpgme.c:2388 pgp.c:515

 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
 
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
 

-#: crypt-gpgme.c:2239 pgp.c:926
+#: crypt-gpgme.c:2419 pgp.c:947

 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
 
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
 

-#: crypt-gpgme.c:2251 crypt-gpgme.c:2317 pgp.c:939
+#: crypt-gpgme.c:2431 crypt-gpgme.c:2497 pgp.c:960

 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr ""
 
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr ""
 

-#: crypt-gpgme.c:2263
+#: crypt-gpgme.c:2443

 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
 
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
 

-#: crypt-gpgme.c:2264 pgp.c:948
+#: crypt-gpgme.c:2444 pgp.c:969

 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
 
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
 

-#: crypt-gpgme.c:2286
+#: crypt-gpgme.c:2466

 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr ""
 
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr ""
 

-#: crypt-gpgme.c:2287 pgp.c:968
+#: crypt-gpgme.c:2467 pgp.c:989

 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr ""
 
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr ""
 

-#: crypt-gpgme.c:2329
+#: crypt-gpgme.c:2509

 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
 
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
 

-#: crypt-gpgme.c:2330
+#: crypt-gpgme.c:2510

 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
 
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
 

-#: crypt-gpgme.c:2360
+#: crypt-gpgme.c:2540

 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 

-#: crypt-gpgme.c:2361
+#: crypt-gpgme.c:2541

 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 

-#: crypt-gpgme.c:2954
+#: crypt-gpgme.c:3134

 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 

-#: crypt-gpgme.c:2956
+#: crypt-gpgme.c:3136

 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 

-#: crypt-gpgme.c:2961
+#: crypt-gpgme.c:3141

 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 

-#: crypt-gpgme.c:3040
+#: crypt-gpgme.c:3220

 msgid " aka ......: "
 msgstr ""
 
 msgid " aka ......: "
 msgstr ""
 

-#: crypt-gpgme.c:3040
+#: crypt-gpgme.c:3220

 msgid "Name ......: "
 msgstr ""
 
 msgid "Name ......: "
 msgstr ""
 

-#: crypt-gpgme.c:3043 crypt-gpgme.c:3182
+#: crypt-gpgme.c:3223 crypt-gpgme.c:3362

 msgid "[Invalid]"
 msgstr ""
 
 msgid "[Invalid]"
 msgstr ""
 

-#: crypt-gpgme.c:3063 crypt-gpgme.c:3206
+#: crypt-gpgme.c:3243 crypt-gpgme.c:3386

 #, c-format
 msgid "Valid From : %s\n"
 msgstr ""
 
 #, c-format
 msgid "Valid From : %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:3076 crypt-gpgme.c:3219
+#: crypt-gpgme.c:3256 crypt-gpgme.c:3399

 #, c-format
 msgid "Valid To ..: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Valid To ..: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:3089 crypt-gpgme.c:3232
+#: crypt-gpgme.c:3269 crypt-gpgme.c:3412

 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:3091 crypt-gpgme.c:3234
+#: crypt-gpgme.c:3271 crypt-gpgme.c:3414

 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 

-#: crypt-gpgme.c:3096 crypt-gpgme.c:3239
+#: crypt-gpgme.c:3276 crypt-gpgme.c:3419

 msgid "encryption"
 msgstr ""
 
 msgid "encryption"
 msgstr ""
 

-#: crypt-gpgme.c:3097 crypt-gpgme.c:3102 crypt-gpgme.c:3107 crypt-gpgme.c:3240
-#: crypt-gpgme.c:3245 crypt-gpgme.c:3250
+#: crypt-gpgme.c:3277 crypt-gpgme.c:3282 crypt-gpgme.c:3287 crypt-gpgme.c:3420
+#: crypt-gpgme.c:3425 crypt-gpgme.c:3430

 msgid ", "
 msgstr ""
 
 msgid ", "
 msgstr ""
 

-#: crypt-gpgme.c:3101 crypt-gpgme.c:3244
+#: crypt-gpgme.c:3281 crypt-gpgme.c:3424

 msgid "signing"
 msgstr ""
 
 msgid "signing"
 msgstr ""
 

-#: crypt-gpgme.c:3106 crypt-gpgme.c:3249
+#: crypt-gpgme.c:3286 crypt-gpgme.c:3429

 msgid "certification"
 msgstr ""
 
 msgid "certification"
 msgstr ""
 

-#: crypt-gpgme.c:3146
+#: crypt-gpgme.c:3326

 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 

-#: crypt-gpgme.c:3154
+#: crypt-gpgme.c:3334

 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
 #. display only the short keyID
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
 #. display only the short keyID

-#: crypt-gpgme.c:3173
+#: crypt-gpgme.c:3353

 #, c-format
 msgid "Subkey ....: 0x%s"
 msgstr ""
 
 #, c-format
 msgid "Subkey ....: 0x%s"
 msgstr ""
 

-#: crypt-gpgme.c:3177
+#: crypt-gpgme.c:3357

 msgid "[Revoked]"
 msgstr ""
 
 msgid "[Revoked]"
 msgstr ""
 

-#: crypt-gpgme.c:3187
+#: crypt-gpgme.c:3367

 msgid "[Expired]"
 msgstr ""
 
 msgid "[Expired]"
 msgstr ""
 

-#: crypt-gpgme.c:3192
+#: crypt-gpgme.c:3372

 msgid "[Disabled]"
 msgstr ""
 
 msgid "[Disabled]"
 msgstr ""
 

-#: crypt-gpgme.c:3276 pgpkey.c:560 pgpkey.c:740
+#: crypt-gpgme.c:3456 pgpkey.c:559 pgpkey.c:739

 msgid "Can't create temporary file"
 msgstr ""
 
 msgid "Can't create temporary file"
 msgstr ""
 

-#: crypt-gpgme.c:3279
+#: crypt-gpgme.c:3459

 msgid "Collecting data..."
 msgstr ""
 
 msgid "Collecting data..."
 msgstr ""
 

-#: crypt-gpgme.c:3305
+#: crypt-gpgme.c:3485

 #, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:3315
+#: crypt-gpgme.c:3495

 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 

-#: crypt-gpgme.c:3326 pgpkey.c:581
+#: crypt-gpgme.c:3506 pgpkey.c:580

 #, c-format
 msgid "Key ID: 0x%s"
 msgstr ""
 
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr ""
 

-#: crypt-gpgme.c:3409
+#: crypt-gpgme.c:3589

 #, c-format
 msgid "gpgme_new failed: %s"
 msgstr ""
 
 #, c-format
 msgid "gpgme_new failed: %s"
 msgstr ""
 

-#: crypt-gpgme.c:3448 crypt-gpgme.c:3511
+#: crypt-gpgme.c:3628 crypt-gpgme.c:3691

 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 

-#: crypt-gpgme.c:3498 crypt-gpgme.c:3539
+#: crypt-gpgme.c:3678 crypt-gpgme.c:3719

 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 

-#: crypt-gpgme.c:3610
+#: crypt-gpgme.c:3790

 msgid "All matching keys are marked expired/revoked."
 msgstr ""
 
 msgid "All matching keys are marked expired/revoked."
 msgstr ""
 

-#: crypt-gpgme.c:3639 mutt_ssl.c:677 mutt_ssl_gnutls.c:781 pgpkey.c:515
-#: smime.c:432
+#: crypt-gpgme.c:3819 mutt_ssl.c:986 mutt_ssl_gnutls.c:873 pgpkey.c:515
+#: smime.c:420

 msgid "Exit  "
 msgstr ""
 
 #. __STRCAT_CHECKED__
 msgid "Exit  "
 msgstr ""
 
 #. __STRCAT_CHECKED__

-#: crypt-gpgme.c:3641 pgpkey.c:517 smime.c:434
+#: crypt-gpgme.c:3821 pgpkey.c:517 smime.c:422

 msgid "Select  "
 msgstr ""
 
 #. __STRCAT_CHECKED__
 msgid "Select  "
 msgstr ""
 
 #. __STRCAT_CHECKED__

-#: crypt-gpgme.c:3644 pgpkey.c:520
+#: crypt-gpgme.c:3824 pgpkey.c:520

 msgid "Check key  "
 msgstr ""
 
 msgid "Check key  "
 msgstr ""
 

-#: crypt-gpgme.c:3661
+#: crypt-gpgme.c:3840

 msgid "PGP and S/MIME keys matching"
 msgstr ""
 
 msgid "PGP and S/MIME keys matching"
 msgstr ""
 

-#: crypt-gpgme.c:3663
+#: crypt-gpgme.c:3842

 msgid "PGP keys matching"
 msgstr ""
 
 msgid "PGP keys matching"
 msgstr ""
 

-#: crypt-gpgme.c:3665
+#: crypt-gpgme.c:3844

 msgid "S/MIME keys matching"
 msgstr ""
 
 msgid "S/MIME keys matching"
 msgstr ""
 

-#: crypt-gpgme.c:3667
+#: crypt-gpgme.c:3846

 msgid "keys matching"
 msgstr ""
 
 msgid "keys matching"
 msgstr ""
 

-#: crypt-gpgme.c:3670
+#: crypt-gpgme.c:3849

 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 

-#: crypt-gpgme.c:3672
+#: crypt-gpgme.c:3851

 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 

-#: crypt-gpgme.c:3699 pgpkey.c:601
+#: crypt-gpgme.c:3878 pgpkey.c:600

 msgid "This key can't be used: expired/disabled/revoked."
 msgstr ""
 
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr ""
 

-#: crypt-gpgme.c:3713 pgpkey.c:613
+#: crypt-gpgme.c:3892 pgpkey.c:612

 msgid "ID is expired/disabled/revoked."
 msgstr ""
 
 msgid "ID is expired/disabled/revoked."
 msgstr ""
 

-#: crypt-gpgme.c:3733 pgpkey.c:617
+#: crypt-gpgme.c:3912 pgpkey.c:616

 msgid "ID has undefined validity."
 msgstr ""
 
 msgid "ID has undefined validity."
 msgstr ""
 

-#: crypt-gpgme.c:3736 pgpkey.c:620
+#: crypt-gpgme.c:3915 pgpkey.c:619

 msgid "ID is not valid."
 msgstr ""
 
 msgid "ID is not valid."
 msgstr ""
 

-#: crypt-gpgme.c:3739 pgpkey.c:623
+#: crypt-gpgme.c:3918 pgpkey.c:622

 msgid "ID is only marginally valid."
 msgstr ""
 
 msgid "ID is only marginally valid."
 msgstr ""
 

-#: crypt-gpgme.c:3747 pgpkey.c:627
+#: crypt-gpgme.c:3926 pgpkey.c:626

 #, c-format
 msgid "%s Do you really want to use the key?"
 msgstr ""
 
 #, c-format
 msgid "%s Do you really want to use the key?"
 msgstr ""
 

-#: crypt-gpgme.c:3804 crypt-gpgme.c:3917 pgpkey.c:840 pgpkey.c:956
+#: crypt-gpgme.c:3983 crypt-gpgme.c:4096 pgpkey.c:834 pgpkey.c:939

 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr ""
 
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr ""
 

-#: crypt-gpgme.c:4080 pgp.c:1175
+#: crypt-gpgme.c:4259 pgp.c:1196

 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr ""
 
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr ""
 

-#: crypt-gpgme.c:4116 pgp.c:1209 smime.c:666 smime.c:791
+#: crypt-gpgme.c:4295 pgp.c:1230 smime.c:650 smime.c:775

 #, c-format
 msgid "Enter keyID for %s: "
 msgstr ""
 
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr ""
 

-#: crypt-gpgme.c:4181
+#: crypt-gpgme.c:4360

 msgid ""
 "\n"
 "Using GPGME backend, although no gpg-agent is running"
 msgstr ""
 
 msgid ""
 "\n"
 "Using GPGME backend, although no gpg-agent is running"
 msgstr ""
 

-#: crypt-gpgme.c:4209
+#: crypt-gpgme.c:4388

 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
 
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
 

-#: crypt-gpgme.c:4210
+#: crypt-gpgme.c:4389

 msgid "esabpfc"
 msgstr ""
 
 msgid "esabpfc"
 msgstr ""
 

-#: crypt-gpgme.c:4213
+#: crypt-gpgme.c:4392

 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
 
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
 

-#: crypt-gpgme.c:4214
+#: crypt-gpgme.c:4393

 msgid "esabmfc"
 msgstr ""
 
 #. sign (a)s
 #. unset_option(OPTCRYPTCHECKTRUST);
 #. sign (a)s
 msgid "esabmfc"
 msgstr ""
 
 #. sign (a)s
 #. unset_option(OPTCRYPTCHECKTRUST);
 #. sign (a)s

-#: crypt-gpgme.c:4230 pgp.c:1585 smime.c:2036
+#: crypt-gpgme.c:4409 pgp.c:1629 smime.c:2026 smime.c:2038

 msgid "Sign as: "
 msgstr ""
 
 msgid "Sign as: "
 msgstr ""
 

-#: crypt-gpgme.c:4327
+#: crypt-gpgme.c:4535

 msgid "Failed to verify sender"
 msgstr ""
 
 msgid "Failed to verify sender"
 msgstr ""
 

-#: crypt-gpgme.c:4330
+#: crypt-gpgme.c:4538

 msgid "Failed to figure out sender"
 msgstr ""
 
 msgid "Failed to figure out sender"
 msgstr ""
 

-#: crypt.c:69
+#: crypt.c:68

 #, c-format
 msgid " (current time: %c)"
 msgstr ""
 
 #, c-format
 msgid " (current time: %c)"
 msgstr ""
 

-#: crypt.c:75
+#: crypt.c:74

 #, c-format
 msgid "[-- %s output follows%s --]\n"
 msgstr ""
 
 #, c-format
 msgid "[-- %s output follows%s --]\n"
 msgstr ""
 

-#: crypt.c:90
+#: crypt.c:89

 msgid "Passphrase(s) forgotten."
 msgstr ""
 
 #. they really want to send it inline... go for it
 msgid "Passphrase(s) forgotten."
 msgstr ""
 
 #. they really want to send it inline... go for it

-#: crypt.c:147 cryptglue.c:110 pgpkey.c:564 pgpkey.c:753
+#: crypt.c:146 cryptglue.c:110 pgpkey.c:563 pgpkey.c:752

 msgid "Invoking PGP..."
 msgstr ""
 
 #. otherwise inline won't work...ask for revert
 msgid "Invoking PGP..."
 msgstr ""
 
 #. otherwise inline won't work...ask for revert

-#: crypt.c:156
+#: crypt.c:155

 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort

-#: crypt.c:158 send.c:1513
+#: crypt.c:157 send.c:1537

 msgid "Mail not sent."
 msgstr ""
 
 msgid "Mail not sent."
 msgstr ""
 

-#: crypt.c:409
+#: crypt.c:408

 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 

-#: crypt.c:628 crypt.c:672
+#: crypt.c:627 crypt.c:671

 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 

-#: crypt.c:652 crypt.c:692
+#: crypt.c:651 crypt.c:691

 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 

-#: crypt.c:814
+#: crypt.c:813

 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
 
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
 

-#: crypt.c:835
+#: crypt.c:834

 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
 

-#: crypt.c:874
+#: crypt.c:873

 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"


@@ -1319,19 +1360,19 @@ msgid ""
 msgstr ""
 
 #. Now display the signed body
 msgstr ""
 
 #. Now display the signed body

-#: crypt.c:886
+#: crypt.c:885

 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
 
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
 

-#: crypt.c:892
+#: crypt.c:891

 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
 
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
 

-#: crypt.c:898
+#: crypt.c:897

 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgid ""
 "\n"
 "[-- End of signed data --]\n"


@@ -1345,285 +1386,293 @@ msgstr ""
 msgid "Invoking S/MIME..."
 msgstr ""
 
 msgid "Invoking S/MIME..."
 msgstr ""
 

-#: curs_lib.c:189
+#: curs_lib.c:194

 msgid "yes"
 msgstr ""
 
 msgid "yes"
 msgstr ""
 

-#: curs_lib.c:190
+#: curs_lib.c:195

 msgid "no"
 msgstr ""
 
 #. restore blocking operation
 msgid "no"
 msgstr ""
 
 #. restore blocking operation

-#: curs_lib.c:286
+#: curs_lib.c:297

 msgid "Exit Mutt?"
 msgstr ""
 
 msgid "Exit Mutt?"
 msgstr ""
 

-#: curs_lib.c:485 mutt_socket.c:570 mutt_ssl.c:329
+#: curs_lib.c:500 mutt_socket.c:577 mutt_ssl.c:358

 msgid "unknown error"
 msgstr ""
 
 msgid "unknown error"
 msgstr ""
 

-#: curs_lib.c:505
+#: curs_lib.c:520

 msgid "Press any key to continue..."
 msgstr ""
 
 msgid "Press any key to continue..."
 msgstr ""
 

-#: curs_lib.c:549
+#: curs_lib.c:564

 msgid " ('?' for list): "
 msgstr ""
 
 msgid " ('?' for list): "
 msgstr ""
 

-#: curs_main.c:54 curs_main.c:625 curs_main.c:655
+#: curs_main.c:52 curs_main.c:613 curs_main.c:643

 msgid "No mailbox is open."
 msgstr ""
 
 msgid "No mailbox is open."
 msgstr ""
 

-#: curs_main.c:55
+#: curs_main.c:53

 msgid "There are no messages."
 msgstr ""
 
 msgid "There are no messages."
 msgstr ""
 

-#: curs_main.c:56 mx.c:1115 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1095 pager.c:51 recvattach.c:43

 msgid "Mailbox is read-only."
 msgstr ""
 
 msgid "Mailbox is read-only."
 msgstr ""
 

-#: curs_main.c:57 pager.c:59 recvattach.c:913
+#: curs_main.c:55 pager.c:52 recvattach.c:924

 msgid "Function not permitted in attach-message mode."
 msgstr ""
 
 msgid "Function not permitted in attach-message mode."
 msgstr ""
 

-#: curs_main.c:58
+#: curs_main.c:56

 msgid "No visible messages."
 msgstr ""
 
 msgid "No visible messages."
 msgstr ""
 

-#: curs_main.c:98 pager.c:89
+#: curs_main.c:96 pager.c:82

 #, c-format
 msgid "Cannot %s: Operation not permitted by ACL"
 msgstr ""
 
 #, c-format
 msgid "Cannot %s: Operation not permitted by ACL"
 msgstr ""
 

-#: curs_main.c:253
+#: curs_main.c:251

 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr ""
 
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr ""
 

-#: curs_main.c:260
+#: curs_main.c:258

 msgid "Changes to folder will be written on folder exit."
 msgstr ""
 
 msgid "Changes to folder will be written on folder exit."
 msgstr ""
 

-#: curs_main.c:265
+#: curs_main.c:263

 msgid "Changes to folder will not be written."
 msgstr ""
 
 msgid "Changes to folder will not be written."
 msgstr ""
 

-#: curs_main.c:407
+#: curs_main.c:405

 msgid "Quit"
 msgstr ""
 
 msgid "Quit"
 msgstr ""
 

-#: curs_main.c:410 recvattach.c:55
+#: curs_main.c:408 recvattach.c:54

 msgid "Save"
 msgstr ""
 
 msgid "Save"
 msgstr ""
 

-#: curs_main.c:411 query.c:50
+#: curs_main.c:409 query.c:49

 msgid "Mail"
 msgstr ""
 
 msgid "Mail"
 msgstr ""
 

-#: curs_main.c:412 pager.c:1488
+#: curs_main.c:410 pager.c:1538

 msgid "Reply"
 msgstr ""
 
 msgid "Reply"
 msgstr ""
 

-#: curs_main.c:413
+#: curs_main.c:411

 msgid "Group"
 msgstr ""
 
 msgid "Group"
 msgstr ""
 

-#: curs_main.c:502
+#: curs_main.c:495

 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
 
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
 

-#: curs_main.c:505
+#: curs_main.c:498

 msgid "New mail in this mailbox."
 msgstr ""
 
 msgid "New mail in this mailbox."
 msgstr ""
 

-#: curs_main.c:509
+#: curs_main.c:502

 msgid "Mailbox was externally modified."
 msgstr ""
 
 msgid "Mailbox was externally modified."
 msgstr ""
 

-#: curs_main.c:631
+#: curs_main.c:619

 msgid "No tagged messages."
 msgstr ""
 
 msgid "No tagged messages."
 msgstr ""
 

-#: curs_main.c:667 menu.c:906
+#: curs_main.c:655 menu.c:914

 msgid "Nothing to do."
 msgstr ""
 
 msgid "Nothing to do."
 msgstr ""
 

-#: curs_main.c:753
+#: curs_main.c:741

 msgid "Jump to message: "
 msgstr ""
 
 msgid "Jump to message: "
 msgstr ""
 

-#: curs_main.c:759
+#: curs_main.c:747

 msgid "Argument must be a message number."
 msgstr ""
 
 msgid "Argument must be a message number."
 msgstr ""
 

-#: curs_main.c:792
+#: curs_main.c:779

 msgid "That message is not visible."
 msgstr ""
 
 msgid "That message is not visible."
 msgstr ""
 

-#: curs_main.c:795
+#: curs_main.c:782

 msgid "Invalid message number."
 msgstr ""
 
 msgid "Invalid message number."
 msgstr ""
 

-#: curs_main.c:808 curs_main.c:1849 pager.c:2279
+#: curs_main.c:795 curs_main.c:1872 pager.c:2373

 msgid "delete message(s)"
 msgstr ""
 
 msgid "delete message(s)"
 msgstr ""
 

-#: curs_main.c:811
+#: curs_main.c:798

 msgid "Delete messages matching: "
 msgstr ""
 
 msgid "Delete messages matching: "
 msgstr ""
 

-#: curs_main.c:833
+#: curs_main.c:820

 msgid "No limit pattern is in effect."
 msgstr ""
 
 #. i18n: ask for a limit to apply
 msgid "No limit pattern is in effect."
 msgstr ""
 
 #. i18n: ask for a limit to apply

-#: curs_main.c:838
+#: curs_main.c:825

 #, c-format
 msgid "Limit: %s"
 msgstr ""
 
 #, c-format
 msgid "Limit: %s"
 msgstr ""
 

-#: curs_main.c:848
+#: curs_main.c:835

 msgid "Limit to messages matching: "
 msgstr ""
 
 msgid "Limit to messages matching: "
 msgstr ""
 

-#: curs_main.c:870
+#: curs_main.c:857

 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 

-#: curs_main.c:882
+#: curs_main.c:869

 msgid "Quit Mutt?"
 msgstr ""
 
 msgid "Quit Mutt?"
 msgstr ""
 

-#: curs_main.c:967
+#: curs_main.c:959

 msgid "Tag messages matching: "
 msgstr ""
 
 msgid "Tag messages matching: "
 msgstr ""
 

-#: curs_main.c:976 curs_main.c:2138 pager.c:2589
+#: curs_main.c:968 curs_main.c:2166 pager.c:2683

 msgid "undelete message(s)"
 msgstr ""
 
 msgid "undelete message(s)"
 msgstr ""
 

-#: curs_main.c:978
+#: curs_main.c:970

 msgid "Undelete messages matching: "
 msgstr ""
 
 msgid "Undelete messages matching: "
 msgstr ""
 

-#: curs_main.c:986
+#: curs_main.c:978

 msgid "Untag messages matching: "
 msgstr ""
 
 msgid "Untag messages matching: "
 msgstr ""
 

-#: curs_main.c:1066
+#: curs_main.c:1004
+msgid "Logged out of IMAP servers."
+msgstr ""
+
+#: curs_main.c:1083

 msgid "Open mailbox in read-only mode"
 msgstr ""
 
 msgid "Open mailbox in read-only mode"
 msgstr ""
 

-#: curs_main.c:1068
+#: curs_main.c:1085

 msgid "Open mailbox"
 msgstr ""
 
 msgid "Open mailbox"
 msgstr ""
 

-#: curs_main.c:1078
+#: curs_main.c:1095

 msgid "No mailboxes have new mail"
 msgstr ""
 
 msgid "No mailboxes have new mail"
 msgstr ""
 

-#: curs_main.c:1106 mx.c:503 mx.c:652
+#: curs_main.c:1123 mx.c:472 mx.c:621

 #, c-format
 msgid "%s is not a mailbox."
 msgstr ""
 
 #, c-format
 msgid "%s is not a mailbox."
 msgstr ""
 

-#: curs_main.c:1201
+#: curs_main.c:1222

 msgid "Exit Mutt without saving?"
 msgstr ""
 
 msgid "Exit Mutt without saving?"
 msgstr ""
 

-#: curs_main.c:1219 curs_main.c:1252 curs_main.c:1696 curs_main.c:1728
-#: flags.c:286 thread.c:1026 thread.c:1081 thread.c:1136
+#: curs_main.c:1240 curs_main.c:1275 curs_main.c:1719 curs_main.c:1751
+#: flags.c:282 thread.c:1029 thread.c:1084 thread.c:1139

 msgid "Threading is not enabled."
 msgstr ""
 
 msgid "Threading is not enabled."
 msgstr ""
 

-#: curs_main.c:1231
+#: curs_main.c:1252

 msgid "Thread broken"
 msgstr ""
 
 msgid "Thread broken"
 msgstr ""
 

-#: curs_main.c:1249
+#: curs_main.c:1263
+msgid "Thread cannot be broken, message is not part of a thread"
+msgstr ""
+
+#: curs_main.c:1272

 msgid "link threads"
 msgstr ""
 
 msgid "link threads"
 msgstr ""
 

-#: curs_main.c:1254
+#: curs_main.c:1277

 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 

-#: curs_main.c:1256
+#: curs_main.c:1279

 msgid "First, please tag a message to be linked here"
 msgstr ""
 
 msgid "First, please tag a message to be linked here"
 msgstr ""
 

-#: curs_main.c:1268
+#: curs_main.c:1291

 msgid "Threads linked"
 msgstr ""
 
 msgid "Threads linked"
 msgstr ""
 

-#: curs_main.c:1271
+#: curs_main.c:1294

 msgid "No thread linked"
 msgstr ""
 
 msgid "No thread linked"
 msgstr ""
 

-#: curs_main.c:1307 curs_main.c:1332
+#: curs_main.c:1330 curs_main.c:1355

 msgid "You are on the last message."
 msgstr ""
 
 msgid "You are on the last message."
 msgstr ""
 

-#: curs_main.c:1314 curs_main.c:1358
+#: curs_main.c:1337 curs_main.c:1381

 msgid "No undeleted messages."
 msgstr ""
 
 msgid "No undeleted messages."
 msgstr ""
 

-#: curs_main.c:1351 curs_main.c:1375
+#: curs_main.c:1374 curs_main.c:1398

 msgid "You are on the first message."
 msgstr ""
 
 msgid "You are on the first message."
 msgstr ""
 

-#: curs_main.c:1450 pattern.c:1479
+#: curs_main.c:1473 menu.c:759 pager.c:2042 pattern.c:1477

 msgid "Search wrapped to top."
 msgstr ""
 
 msgid "Search wrapped to top."
 msgstr ""
 

-#: curs_main.c:1459 pattern.c:1490
+#: curs_main.c:1482 pager.c:2064 pattern.c:1488

 msgid "Search wrapped to bottom."
 msgstr ""
 
 msgid "Search wrapped to bottom."
 msgstr ""
 

-#: curs_main.c:1500
+#: curs_main.c:1523

 msgid "No new messages"
 msgstr ""
 
 msgid "No new messages"
 msgstr ""
 

-#: curs_main.c:1500
+#: curs_main.c:1523

 msgid "No unread messages"
 msgstr ""
 
 msgid "No unread messages"
 msgstr ""
 

-#: curs_main.c:1501
+#: curs_main.c:1524

 msgid " in this limited view"
 msgstr ""
 
 msgid " in this limited view"
 msgstr ""
 

-#: curs_main.c:1517
+#: curs_main.c:1540

 msgid "flag message"
 msgstr ""
 
 msgid "flag message"
 msgstr ""
 

-#: curs_main.c:1554 pager.c:2555
+#: curs_main.c:1577 pager.c:2649

 msgid "toggle new"
 msgstr ""
 
 msgid "toggle new"
 msgstr ""
 

-#: curs_main.c:1631
+#: curs_main.c:1654

 msgid "No more threads."
 msgstr ""
 
 msgid "No more threads."
 msgstr ""
 

-#: curs_main.c:1633
+#: curs_main.c:1656

 msgid "You are on the first thread."
 msgstr ""
 
 msgid "You are on the first thread."
 msgstr ""
 

-#: curs_main.c:1714
+#: curs_main.c:1737

 msgid "Thread contains unread messages."
 msgstr ""
 
 msgid "Thread contains unread messages."
 msgstr ""
 

-#: curs_main.c:1808 pager.c:2262
+#: curs_main.c:1831 pager.c:2342

 msgid "delete message"
 msgstr ""
 
 msgid "delete message"
 msgstr ""
 

-#: curs_main.c:1890
+#: curs_main.c:1913

 msgid "edit message"
 msgstr ""
 
 msgid "edit message"
 msgstr ""
 

-#: curs_main.c:2021
+#: curs_main.c:2044

 msgid "mark message(s) as read"
 msgstr ""
 
 msgid "mark message(s) as read"
 msgstr ""
 

-#: curs_main.c:2111 pager.c:2574
+#: curs_main.c:2139 pager.c:2668

 msgid "undelete message"
 msgstr ""
 
 msgid "undelete message"
 msgstr ""
 


@@ -1657,41 +1706,41 @@ msgid ""
 ".\t\ton a line by itself ends input\n"
 msgstr ""
 
 ".\t\ton a line by itself ends input\n"
 msgstr ""
 

-#: edit.c:188
+#: edit.c:187

 #, c-format
 msgid "%d: invalid message number.\n"
 msgstr ""
 
 #, c-format
 msgid "%d: invalid message number.\n"
 msgstr ""
 

-#: edit.c:330
+#: edit.c:329

 msgid "(End message with a . on a line by itself)\n"
 msgstr ""
 
 msgid "(End message with a . on a line by itself)\n"
 msgstr ""
 

-#: edit.c:389
+#: edit.c:388

 msgid "No mailbox.\n"
 msgstr ""
 
 msgid "No mailbox.\n"
 msgstr ""
 

-#: edit.c:393
+#: edit.c:392

 msgid "Message contains:\n"
 msgstr ""
 
 msgid "Message contains:\n"
 msgstr ""
 

-#: edit.c:397 edit.c:454
+#: edit.c:396 edit.c:453

 msgid "(continue)\n"
 msgstr ""
 
 msgid "(continue)\n"
 msgstr ""
 

-#: edit.c:410
+#: edit.c:409

 msgid "missing filename.\n"
 msgstr ""
 
 msgid "missing filename.\n"
 msgstr ""
 

-#: edit.c:430
+#: edit.c:429

 msgid "No lines in message.\n"
 msgstr ""
 
 msgid "No lines in message.\n"
 msgstr ""
 

-#: edit.c:447
+#: edit.c:446

 #, c-format
 msgid "Bad IDN in %s: '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Bad IDN in %s: '%s'\n"
 msgstr ""
 

-#: edit.c:465
+#: edit.c:464

 #, c-format
 msgid "%s: unknown editor command (~? for help)\n"
 msgstr ""
 #, c-format
 msgid "%s: unknown editor command (~? for help)\n"
 msgstr ""


@@ -1734,119 +1783,127 @@ msgstr ""
 msgid "Error. Preserving temporary file: %s"
 msgstr ""
 
 msgid "Error. Preserving temporary file: %s"
 msgstr ""
 

-#: flags.c:329
+#: flags.c:325

 msgid "Set flag"
 msgstr ""
 
 msgid "Set flag"
 msgstr ""
 

-#: flags.c:329
+#: flags.c:325

 msgid "Clear flag"
 msgstr ""
 
 msgid "Clear flag"
 msgstr ""
 

-#: handler.c:1049
+#: handler.c:1058

 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 

-#: handler.c:1166
+#: handler.c:1176

 #, c-format
 msgid "[-- Attachment #%d"
 msgstr ""
 
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr ""
 

-#: handler.c:1178
+#: handler.c:1188

 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr ""
 
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr ""
 

-#: handler.c:1250
+#: handler.c:1204
+msgid "One or more parts of this message could not be displayed"
+msgstr ""
+
+#: handler.c:1256

 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr ""
 
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr ""
 

-#: handler.c:1251
+#: handler.c:1257

 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr ""
 
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr ""
 

-#: handler.c:1283
+#: handler.c:1289

 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr ""
 
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr ""
 

-#: handler.c:1302 handler.c:1323
+#: handler.c:1308 handler.c:1329

 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr ""
 
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr ""
 

-#: handler.c:1362
+#: handler.c:1368

 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 

-#: handler.c:1383
+#: handler.c:1389

 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr ""
 
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr ""
 

-#: handler.c:1390
+#: handler.c:1396

 #, c-format
 msgid "(size %s bytes) "
 msgstr ""
 
 #, c-format
 msgid "(size %s bytes) "
 msgstr ""
 

-#: handler.c:1392
+#: handler.c:1398

 msgid "has been deleted --]\n"
 msgstr ""
 
 msgid "has been deleted --]\n"
 msgstr ""
 

-#: handler.c:1397
+#: handler.c:1403

 #, c-format
 msgid "[-- on %s --]\n"
 msgstr ""
 
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr ""
 

-#: handler.c:1402
+#: handler.c:1408

 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr ""
 
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr ""
 

-#: handler.c:1415 handler.c:1431
+#: handler.c:1421 handler.c:1437

 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr ""
 
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr ""
 

-#: handler.c:1417
+#: handler.c:1423

 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
 
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
 

-#: handler.c:1435
+#: handler.c:1441

 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 

-#: handler.c:1550
+#: handler.c:1583

 msgid "Error: multipart/signed has no protocol."
 msgstr ""
 
 msgid "Error: multipart/signed has no protocol."
 msgstr ""
 

-#: handler.c:1560
+#: handler.c:1593

 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr ""
 
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr ""
 

-#: handler.c:1600
+#: handler.c:1650

 msgid "Unable to open temporary file!"
 msgstr ""
 
 msgid "Unable to open temporary file!"
 msgstr ""
 

-#: handler.c:1667
+#: handler.c:1723
+msgid "[-- This is an attachment "
+msgstr ""
+
+#: handler.c:1725

 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr ""
 
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr ""
 

-#: handler.c:1672
+#: handler.c:1730

 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr ""
 
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr ""
 

-#: handler.c:1674
+#: handler.c:1732

 msgid "(need 'view-attachments' bound to key!)"
 msgstr ""
 
 msgid "(need 'view-attachments' bound to key!)"
 msgstr ""
 

-#: headers.c:177
+#: headers.c:189

 #, c-format
 msgid "%s: unable to attach file"
 msgstr ""
 #, c-format
 msgid "%s: unable to attach file"
 msgstr ""


@@ -1883,22 +1940,22 @@ msgstr ""
 msgid "Bad history file format (line %d)"
 msgstr ""
 
 msgid "Bad history file format (line %d)"
 msgstr ""
 

-#: hook.c:251
+#: hook.c:250

 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
 msgstr ""
 
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
 msgstr ""
 

-#: hook.c:263
+#: hook.c:262

 #, c-format
 msgid "unhook: unknown hook type: %s"
 msgstr ""
 
 #, c-format
 msgid "unhook: unknown hook type: %s"
 msgstr ""
 

-#: hook.c:269
+#: hook.c:268

 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
 msgstr ""
 
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
 msgstr ""
 

-#: imap/auth.c:108 pop_auth.c:398 smtp.c:452
+#: imap/auth.c:108 pop_auth.c:398 smtp.c:515

 msgid "No authenticators available"
 msgstr ""
 
 msgid "No authenticators available"
 msgstr ""
 


@@ -1919,11 +1976,11 @@ msgid "CRAM-MD5 authentication failed."
 msgstr ""
 
 #. now begin login
 msgstr ""
 
 #. now begin login

-#: imap/auth_gss.c:142
+#: imap/auth_gss.c:144

 msgid "Authenticating (GSSAPI)..."
 msgstr ""
 
 msgid "Authenticating (GSSAPI)..."
 msgstr ""
 

-#: imap/auth_gss.c:307
+#: imap/auth_gss.c:309

 msgid "GSSAPI authentication failed."
 msgstr ""
 
 msgid "GSSAPI authentication failed."
 msgstr ""
 


@@ -1939,7 +1996,7 @@ msgstr ""
 msgid "Login failed."
 msgstr ""
 
 msgid "Login failed."
 msgstr ""
 

-#: imap/auth_sasl.c:97 smtp.c:487
+#: imap/auth_sasl.c:97 smtp.c:551

 #, c-format
 msgid "Authenticating (%s)..."
 msgstr ""
 #, c-format
 msgid "Authenticating (%s)..."
 msgstr ""


@@ -1948,7 +2005,7 @@ msgstr ""
 msgid "SASL authentication failed."
 msgstr ""
 
 msgid "SASL authentication failed."
 msgstr ""
 

-#: imap/browse.c:58 imap/imap.c:562
+#: imap/browse.c:58 imap/imap.c:569

 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr ""
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr ""


@@ -1957,416 +2014,440 @@ msgstr ""
 msgid "Getting folder list..."
 msgstr ""
 
 msgid "Getting folder list..."
 msgstr ""
 

-#: imap/browse.c:189
+#: imap/browse.c:191

 msgid "No such folder"
 msgstr ""
 
 msgid "No such folder"
 msgstr ""
 

-#: imap/browse.c:276
+#: imap/browse.c:280

 msgid "Create mailbox: "
 msgstr ""
 
 msgid "Create mailbox: "
 msgstr ""
 

-#: imap/browse.c:281 imap/browse.c:327
+#: imap/browse.c:285 imap/browse.c:331

 msgid "Mailbox must have a name."
 msgstr ""
 
 msgid "Mailbox must have a name."
 msgstr ""
 

-#: imap/browse.c:289
+#: imap/browse.c:293

 msgid "Mailbox created."
 msgstr ""
 
 msgid "Mailbox created."
 msgstr ""
 

-#: imap/browse.c:320
+#: imap/browse.c:324

 #, c-format
 msgid "Rename mailbox %s to: "
 msgstr ""
 
 #, c-format
 msgid "Rename mailbox %s to: "
 msgstr ""
 

-#: imap/browse.c:333
+#: imap/browse.c:339

 #, c-format
 msgid "Rename failed: %s"
 msgstr ""
 
 #, c-format
 msgid "Rename failed: %s"
 msgstr ""
 

-#: imap/browse.c:338
+#: imap/browse.c:344

 msgid "Mailbox renamed."
 msgstr ""
 
 msgid "Mailbox renamed."
 msgstr ""
 

-#: imap/command.c:372
+#: imap/command.c:445

 msgid "Mailbox closed"
 msgstr ""
 
 msgid "Mailbox closed"
 msgstr ""
 

-#: imap/imap.c:185
+#: imap/imap.c:126
+#, c-format
+msgid "CREATE failed: %s"
+msgstr ""
+
+#: imap/imap.c:190

 #, c-format
 msgid "Closing connection to %s..."
 msgstr ""
 
 #, c-format
 msgid "Closing connection to %s..."
 msgstr ""
 

-#: imap/imap.c:306
+#: imap/imap.c:310

 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr ""
 
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr ""
 

-#: imap/imap.c:429 pop_lib.c:286 smtp.c:373
+#: imap/imap.c:433 pop_lib.c:295 smtp.c:424

 msgid "Secure connection with TLS?"
 msgstr ""
 
 msgid "Secure connection with TLS?"
 msgstr ""
 

-#: imap/imap.c:438 pop_lib.c:306 smtp.c:385
+#: imap/imap.c:442 pop_lib.c:315 smtp.c:436

 msgid "Could not negotiate TLS connection"
 msgstr ""
 
 msgid "Could not negotiate TLS connection"
 msgstr ""
 

-#: imap/imap.c:454 pop_lib.c:327
+#: imap/imap.c:458 pop_lib.c:336

 msgid "Encrypted connection unavailable"
 msgstr ""
 
 msgid "Encrypted connection unavailable"
 msgstr ""
 

-#: imap/imap.c:594
+#: imap/imap.c:603

 #, c-format
 msgid "Selecting %s..."
 msgstr ""
 
 #, c-format
 msgid "Selecting %s..."
 msgstr ""
 

-#: imap/imap.c:749
+#: imap/imap.c:758

 msgid "Error opening mailbox"
 msgstr ""
 
 msgid "Error opening mailbox"
 msgstr ""
 

-#: imap/imap.c:802 imap/message.c:792 muttlib.c:1466
+#: imap/imap.c:813 imap/message.c:851 muttlib.c:1545

 #, c-format
 msgid "Create %s?"
 msgstr ""
 
 #, c-format
 msgid "Create %s?"
 msgstr ""
 

-#: imap/imap.c:1132
-#, c-format
-msgid "Marking %d messages deleted..."
+#: imap/imap.c:1186
+msgid "Expunge failed"

 msgstr ""
 
 msgstr ""
 

-#: imap/imap.c:1141
-msgid "Expunge failed"
+#: imap/imap.c:1198
+#, c-format
+msgid "Marking %d messages deleted..."

 msgstr ""
 
 msgstr ""
 

-#: imap/imap.c:1174
+#: imap/imap.c:1230

 #, c-format
 msgid "Saving changed messages... [%d/%d]"
 msgstr ""
 
 #, c-format
 msgid "Saving changed messages... [%d/%d]"
 msgstr ""
 

-#: imap/imap.c:1228
+#: imap/imap.c:1279

 msgid "Error saving flags. Close anyway?"
 msgstr ""
 
 msgid "Error saving flags. Close anyway?"
 msgstr ""
 

-#: imap/imap.c:1236
+#: imap/imap.c:1287

 msgid "Error saving flags"
 msgstr ""
 
 msgid "Error saving flags"
 msgstr ""
 

-#: imap/imap.c:1248
+#: imap/imap.c:1299

 msgid "Expunging messages from server..."
 msgstr ""
 
 msgid "Expunging messages from server..."
 msgstr ""
 

-#: imap/imap.c:1253
+#: imap/imap.c:1304

 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 

-#: imap/imap.c:1726
+#: imap/imap.c:1754

 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 

-#: imap/imap.c:1798
+#: imap/imap.c:1826

 msgid "Bad mailbox name"
 msgstr ""
 
 msgid "Bad mailbox name"
 msgstr ""
 

-#: imap/imap.c:1821
+#: imap/imap.c:1851

 #, c-format
 msgid "Subscribing to %s..."
 msgstr ""
 
 #, c-format
 msgid "Subscribing to %s..."
 msgstr ""
 

-#: imap/imap.c:1823
+#: imap/imap.c:1853

 #, c-format
 msgid "Unsubscribing from %s..."
 msgstr ""
 
 #, c-format
 msgid "Unsubscribing from %s..."
 msgstr ""
 

-#: imap/imap.c:1833
+#: imap/imap.c:1863

 #, c-format
 msgid "Subscribed to %s"
 msgstr ""
 
 #, c-format
 msgid "Subscribed to %s"
 msgstr ""
 

-#: imap/imap.c:1835
+#: imap/imap.c:1865

 #, c-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
 #. Unable to fetch headers for lower versions
 #, c-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
 #. Unable to fetch headers for lower versions

-#: imap/message.c:97
+#: imap/message.c:99

 msgid "Unable to fetch headers from this IMAP server version."
 msgstr ""
 
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr ""
 

-#: imap/message.c:107
+#: imap/message.c:109

 #, c-format
 msgid "Could not create temporary file %s"
 msgstr ""
 
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr ""
 

-#: imap/message.c:137
+#: imap/message.c:141

 msgid "Evaluating cache..."
 msgstr ""
 
 msgid "Evaluating cache..."
 msgstr ""
 

-#: imap/message.c:221 pop.c:272
+#: imap/message.c:232 pop.c:272

 msgid "Fetching message headers..."
 msgstr ""
 
 msgid "Fetching message headers..."
 msgstr ""
 

-#: imap/message.c:402 imap/message.c:459 pop.c:547
+#: imap/message.c:441 imap/message.c:498 pop.c:563

 msgid "Fetching message..."
 msgstr ""
 
 msgid "Fetching message..."
 msgstr ""
 

-#: imap/message.c:448 pop.c:542
+#: imap/message.c:487 pop.c:558

 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 

-#: imap/message.c:599
+#: imap/message.c:641

 msgid "Uploading message..."
 msgstr ""
 
 msgid "Uploading message..."
 msgstr ""
 

-#: imap/message.c:758
+#: imap/message.c:815

 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr ""
 
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr ""
 

-#: imap/message.c:762
+#: imap/message.c:819

 #, c-format
 msgid "Copying message %d to %s..."
 msgstr ""
 
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr ""
 

-#: imap/util.c:335
+#: imap/util.c:358

 msgid "Continue?"
 msgstr ""
 
 msgid "Continue?"
 msgstr ""
 

-#: init.c:57 init.c:1755 pager.c:57
+#: init.c:60 init.c:1758 pager.c:50

 #, c-format
 msgid "Not available in this menu."
 msgstr ""
 
 #, c-format
 msgid "Not available in this menu."
 msgstr ""
 

-#: init.c:465
+#: init.c:468

 #, c-format
 msgid "Bad regexp: %s"
 msgstr ""
 
 #, c-format
 msgid "Bad regexp: %s"
 msgstr ""
 

-#: init.c:522
+#: init.c:525

 #, c-format
 msgid "Not enough subexpressions for spam template"
 msgstr ""
 
 #, c-format
 msgid "Not enough subexpressions for spam template"
 msgstr ""
 

-#: init.c:748
+#: init.c:715

 msgid "spam: no matching pattern"
 msgstr ""
 
 msgid "spam: no matching pattern"
 msgstr ""
 

-#: init.c:750
+#: init.c:717

 msgid "nospam: no matching pattern"
 msgstr ""
 
 msgid "nospam: no matching pattern"
 msgstr ""
 

-#: init.c:887
-msgid "Missing -rx or -addr."
+#: init.c:861
+#, c-format
+msgid "%sgroup: missing -rx or -addr."

 msgstr ""
 
 msgstr ""
 

-#: init.c:900
+#: init.c:879

 #, c-format
 #, c-format

-msgid "Warning: Bad IDN '%s'.\n"
+msgid "%sgroup: warning: bad IDN '%s'.\n"

 msgstr ""
 
 msgstr ""
 

-#: init.c:1108
+#: init.c:1094

 msgid "attachments: no disposition"
 msgstr ""
 
 msgid "attachments: no disposition"
 msgstr ""
 

-#: init.c:1146
+#: init.c:1132

 msgid "attachments: invalid disposition"
 msgstr ""
 
 msgid "attachments: invalid disposition"
 msgstr ""
 

-#: init.c:1160
+#: init.c:1146

 msgid "unattachments: no disposition"
 msgstr ""
 
 msgid "unattachments: no disposition"
 msgstr ""
 

-#: init.c:1183
+#: init.c:1169

 msgid "unattachments: invalid disposition"
 msgstr ""
 
 msgid "unattachments: invalid disposition"
 msgstr ""
 

-#: init.c:1310
+#: init.c:1296

 msgid "alias: no address"
 msgstr ""
 
 msgid "alias: no address"
 msgstr ""
 

-#: init.c:1357
+#: init.c:1344

 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 

-#: init.c:1445
+#: init.c:1432

 msgid "invalid header field"
 msgstr ""
 
 msgid "invalid header field"
 msgstr ""
 

-#: init.c:1498
+#: init.c:1485

 #, c-format
 msgid "%s: unknown sorting method"
 msgstr ""
 
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr ""
 

-#: init.c:1608
+#: init.c:1592

 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr ""
 
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr ""
 

-#: init.c:1732 init.c:1845
+#: init.c:1735 init.c:1848

 #, c-format
 msgid "%s: unknown variable"
 msgstr ""
 
 #, c-format
 msgid "%s: unknown variable"
 msgstr ""
 

-#: init.c:1741
+#: init.c:1744

 #, c-format
 msgid "prefix is illegal with reset"
 msgstr ""
 
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr ""
 

-#: init.c:1747
+#: init.c:1750

 #, c-format
 msgid "value is illegal with reset"
 msgstr ""
 
 #, c-format
 msgid "value is illegal with reset"
 msgstr ""
 

-#: init.c:1783 init.c:1795
+#: init.c:1786 init.c:1798

 #, c-format
 msgid "Usage: set variable=yes|no"
 msgstr ""
 
 #, c-format
 msgid "Usage: set variable=yes|no"
 msgstr ""
 

-#: init.c:1803
+#: init.c:1806

 #, c-format
 msgid "%s is set"
 msgstr ""
 
 #, c-format
 msgid "%s is set"
 msgstr ""
 

-#: init.c:1803
+#: init.c:1806

 #, c-format
 msgid "%s is unset"
 msgstr ""
 
 #, c-format
 msgid "%s is unset"
 msgstr ""
 

-#: init.c:2033
+#: init.c:1909
+#, c-format
+msgid "Invalid value for option %s: \"%s\""
+msgstr ""
+
+#: init.c:2046

 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr ""
 
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr ""
 

-#: init.c:2064 init.c:2117
+#: init.c:2077
+#, c-format
+msgid "%s: invalid value (%s)"
+msgstr ""
+
+#: init.c:2078
+msgid "format error"
+msgstr ""
+
+#: init.c:2078
+msgid "number overflow"
+msgstr ""
+
+#: init.c:2138

 #, c-format
 msgid "%s: invalid value"
 msgstr ""
 
 #, c-format
 msgid "%s: invalid value"
 msgstr ""
 

-#: init.c:2158
+#: init.c:2179

 #, c-format
 msgid "%s: Unknown type."
 msgstr ""
 
 #, c-format
 msgid "%s: Unknown type."
 msgstr ""
 

-#: init.c:2185
+#: init.c:2206

 #, c-format
 msgid "%s: unknown type"
 msgstr ""
 
 #, c-format
 msgid "%s: unknown type"
 msgstr ""
 

-#: init.c:2247
+#: init.c:2268

 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr ""
 
 #. the muttrc source keyword
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr ""
 
 #. the muttrc source keyword

-#: init.c:2270
+#: init.c:2291

 #, c-format
 msgid "source: errors in %s"
 msgstr ""
 
 #, c-format
 msgid "source: errors in %s"
 msgstr ""
 

-#: init.c:2271
+#: init.c:2292

 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr ""
 
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr ""
 

-#: init.c:2285
+#: init.c:2306

 #, c-format
 msgid "source: error at %s"
 msgstr ""
 
 #, c-format
 msgid "source: error at %s"
 msgstr ""
 

-#: init.c:2290
+#: init.c:2311

 msgid "source: too many arguments"
 msgstr ""
 
 msgid "source: too many arguments"
 msgstr ""
 

-#: init.c:2341
+#: init.c:2365

 #, c-format
 msgid "%s: unknown command"
 msgstr ""
 
 #, c-format
 msgid "%s: unknown command"
 msgstr ""
 

-#: init.c:2826
+#: init.c:2850

 #, c-format
 msgid "Error in command line: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr ""
 

-#: init.c:2878
+#: init.c:2923

 msgid "unable to determine home directory"
 msgstr ""
 
 msgid "unable to determine home directory"
 msgstr ""
 

-#: init.c:2886
+#: init.c:2931

 msgid "unable to determine username"
 msgstr ""
 
 msgid "unable to determine username"
 msgstr ""
 

-#: init.c:3122
+#: init.c:3167

 msgid "-group: no group name"
 msgstr ""
 
 msgid "-group: no group name"
 msgstr ""
 

-#: init.c:3132
+#: init.c:3177

 msgid "out of arguments"
 msgstr ""
 
 msgid "out of arguments"
 msgstr ""
 

-#: keymap.c:466
+#: keymap.c:526

 msgid "Macro loop detected."
 msgstr ""
 
 msgid "Macro loop detected."
 msgstr ""
 

-#: keymap.c:676 keymap.c:684
+#: keymap.c:827 keymap.c:835

 msgid "Key is not bound."
 msgstr ""
 
 msgid "Key is not bound."
 msgstr ""
 

-#: keymap.c:688
+#: keymap.c:839

 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr ""
 
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr ""
 

-#: keymap.c:699
+#: keymap.c:850

 msgid "push: too many arguments"
 msgstr ""
 
 msgid "push: too many arguments"
 msgstr ""
 

-#: keymap.c:729
+#: keymap.c:880

 #, c-format
 msgid "%s: no such menu"
 msgstr ""
 
 #, c-format
 msgid "%s: no such menu"
 msgstr ""
 

-#: keymap.c:744
+#: keymap.c:895

 msgid "null key sequence"
 msgstr ""
 
 msgid "null key sequence"
 msgstr ""
 

-#: keymap.c:831
+#: keymap.c:982

 msgid "bind: too many arguments"
 msgstr ""
 
 msgid "bind: too many arguments"
 msgstr ""
 

-#: keymap.c:854
+#: keymap.c:1005

 #, c-format
 msgid "%s: no such function in map"
 msgstr ""
 
 #, c-format
 msgid "%s: no such function in map"
 msgstr ""
 

-#: keymap.c:878
+#: keymap.c:1029

 msgid "macro: empty key sequence"
 msgstr ""
 
 msgid "macro: empty key sequence"
 msgstr ""
 

-#: keymap.c:889
+#: keymap.c:1040

 msgid "macro: too many arguments"
 msgstr ""
 
 msgid "macro: too many arguments"
 msgstr ""
 

-#: keymap.c:925
+#: keymap.c:1076

 msgid "exec: no arguments"
 msgstr ""
 
 msgid "exec: no arguments"
 msgstr ""
 

-#: keymap.c:945
+#: keymap.c:1096

 #, c-format
 msgid "%s: no such function"
 msgstr ""
 
 #, c-format
 msgid "%s: no such function"
 msgstr ""
 

-#: keymap.c:966
+#: keymap.c:1117

 msgid "Enter keys (^G to abort): "
 msgstr ""
 
 msgid "Enter keys (^G to abort): "
 msgstr ""
 

-#: keymap.c:971
+#: keymap.c:1122

 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
 
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
 

-#: lib.c:129
+#: lib.c:131

 msgid "Integer overflow -- can't allocate memory!"
 msgstr ""
 
 msgid "Integer overflow -- can't allocate memory!"
 msgstr ""
 

-#: lib.c:136 lib.c:151 lib.c:183
+#: lib.c:138 lib.c:153 lib.c:185

 msgid "Out of memory!"
 msgstr ""
 
 msgid "Out of memory!"
 msgstr ""
 


@@ -2378,7 +2459,7 @@ msgstr ""
 
 #: main.c:67
 msgid ""
 
 #: main.c:67
 msgid ""

-"Copyright (C) 1996-2008 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2009 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"
 "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"


@@ -2388,17 +2469,18 @@ msgstr ""
 msgid ""
 "Copyright (C) 1996-2007 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
 msgid ""
 "Copyright (C) 1996-2007 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"

-"Copyright (C) 1997-2007 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1997-2008 Thomas Roessler <roessler@does-not-exist.org>\n"

 "Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
 "Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"

-"Copyright (C) 1999-2008 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1999-2009 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"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"

+"Copyright (C) 2006-2009 Rocco Rutte <pdmef@gmx.net>\n"

 "\n"
 "Many others not mentioned here contributed code, fixes,\n"
 "and suggestions.\n"
 msgstr ""
 
 "\n"
 "Many others not mentioned here contributed code, fixes,\n"
 "and suggestions.\n"
 msgstr ""
 

-#: main.c:85
+#: main.c:86

 msgid ""
 "    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"
 msgid ""
 "    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"


@@ -2411,7 +2493,7 @@ msgid ""
 "    GNU General Public License for more details.\n"
 msgstr ""
 
 "    GNU General Public License for more details.\n"
 msgstr ""
 

-#: main.c:95
+#: main.c:96

 msgid ""
 "    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"
 msgid ""
 "    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"


@@ -2419,11 +2501,13 @@ msgid ""
 "1301, USA.\n"
 msgstr ""
 
 "1301, USA.\n"
 msgstr ""
 

-#: main.c:112
+#: main.c:113

 msgid ""
 "usage: mutt [<options>] [-z] [-f <file> | -yZ]\n"
 "       mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "
 msgid ""
 "usage: mutt [<options>] [-z] [-f <file> | -yZ]\n"
 "       mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "

-"<file> [...]] [--] <addr> [...]\n"
+"<file> [...] --] <addr> [...]\n"
+"       mutt [<options>] [-x] [-s <subj>] [-bc <addr>] [-a <file> [...] --] "
+"<addr> [...] < message\n"

 "       mutt [<options>] -p\n"
 "       mutt [<options>] -A <alias> [...]\n"
 "       mutt [<options>] -Q <query> [...]\n"
 "       mutt [<options>] -p\n"
 "       mutt [<options>] -A <alias> [...]\n"
 "       mutt [<options>] -Q <query> [...]\n"


@@ -2431,21 +2515,22 @@ msgid ""
 "       mutt -v[v]\n"
 msgstr ""
 
 "       mutt -v[v]\n"
 msgstr ""
 

-#: main.c:120
+#: main.c:122

 msgid ""
 "options:\n"
 "  -A <alias>\texpand the given alias\n"
 msgid ""
 "options:\n"
 "  -A <alias>\texpand the given alias\n"

-"  -a <file>\tattach a file to the message\n"
+"  -a <file> [...] --\tattach file(s) to the message\n"
+"\t\tthe list of files must be terminated with the \"--\" sequence\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 stdout"
 msgstr ""
 
 "  -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 stdout"
 msgstr ""
 

-#: main.c:128
+#: main.c:131

 msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
 msgstr ""
 
 msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
 msgstr ""
 

-#: main.c:131
+#: main.c:134

 msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"


@@ -2457,7 +2542,7 @@ msgid ""
 "  -p\t\trecall a postponed message"
 msgstr ""
 
 "  -p\t\trecall a postponed message"
 msgstr ""
 

-#: main.c:140
+#: main.c:143

 msgid ""
 "  -Q <variable>\tquery a configuration variable\n"
 "  -R\t\topen mailbox in read-only mode\n"
 msgid ""
 "  -Q <variable>\tquery a configuration variable\n"
 "  -R\t\topen mailbox in read-only mode\n"


@@ -2470,84 +2555,83 @@ msgid ""
 "  -h\t\tthis help message"
 msgstr ""
 
 "  -h\t\tthis help message"
 msgstr ""
 

-#: main.c:150
-msgid ""
-"  --\t\ttreat remaining arguments as addr even if starting with a dash\n"
-"\t\twhen using -a with multiple filenames using -- is mandatory"
-msgstr ""
-
-#: main.c:195
+#: main.c:196

 msgid ""
 "\n"
 "Compile options:"
 msgstr ""
 
 msgid ""
 "\n"
 "Compile options:"
 msgstr ""
 

-#: main.c:502
+#: main.c:500

 msgid "Error initializing terminal."
 msgstr ""
 
 msgid "Error initializing terminal."
 msgstr ""
 

-#: main.c:620
+#: main.c:636
+#, c-format
+msgid "Error: value '%s' is invalid for -d.\n"
+msgstr ""
+
+#: main.c:639

 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr ""
 
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr ""
 

-#: main.c:622
+#: main.c:641

 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr ""
 
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr ""
 

-#: main.c:785
+#: main.c:806

 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr ""
 
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr ""
 

-#: main.c:789
+#: main.c:810

 #, c-format
 msgid "Can't create %s: %s."
 msgstr ""
 
 #, c-format
 msgid "Can't create %s: %s."
 msgstr ""
 

-#: main.c:831
+#: main.c:852

 msgid "Failed to parse mailto: link\n"
 msgstr ""
 
 msgid "Failed to parse mailto: link\n"
 msgstr ""
 

-#: main.c:843
+#: main.c:864

 msgid "No recipients specified.\n"
 msgstr ""
 
 msgid "No recipients specified.\n"
 msgstr ""
 

-#: main.c:929
+#: main.c:950

 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr ""
 
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr ""
 

-#: main.c:952
+#: main.c:973

 msgid "No mailbox with new mail."
 msgstr ""
 
 msgid "No mailbox with new mail."
 msgstr ""
 

-#: main.c:961
+#: main.c:982

 msgid "No incoming mailboxes defined."
 msgstr ""
 
 msgid "No incoming mailboxes defined."
 msgstr ""
 

-#: main.c:989
+#: main.c:1010

 msgid "Mailbox is empty."
 msgstr ""
 
 msgid "Mailbox is empty."
 msgstr ""
 

-#: mbox.c:123 mbox.c:277 mh.c:1137 mx.c:673
+#: mbox.c:119 mbox.c:269 mh.c:1152 mx.c:642

 #, c-format
 msgid "Reading %s..."
 msgstr ""
 
 #, c-format
 msgid "Reading %s..."
 msgstr ""
 

-#: mbox.c:161 mbox.c:218
+#: mbox.c:157 mbox.c:214

 msgid "Mailbox is corrupt!"
 msgstr ""
 
 msgid "Mailbox is corrupt!"
 msgstr ""
 

-#: mbox.c:678
+#: mbox.c:670

 msgid "Mailbox was corrupted!"
 msgstr ""
 
 msgid "Mailbox was corrupted!"
 msgstr ""
 

-#: mbox.c:719 mbox.c:975
+#: mbox.c:752 mbox.c:1008

 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr ""
 
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr ""
 

-#: mbox.c:728
+#: mbox.c:761

 msgid "Unable to lock mailbox!"
 msgstr ""
 
 msgid "Unable to lock mailbox!"
 msgstr ""
 


@@ -2555,110 +2639,107 @@ msgstr ""
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.

-#: mbox.c:771
+#: mbox.c:804

 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 

-#: mbox.c:795 mh.c:1636 mx.c:766
+#: mbox.c:828 mh.c:1658 mx.c:739

 #, c-format
 msgid "Writing %s..."
 msgstr ""
 
 #, c-format
 msgid "Writing %s..."
 msgstr ""
 

-#. copy the temp mailbox back into place starting at the first
-#. * change/deleted message
-#.
-#: mbox.c:928
+#: mbox.c:963

 msgid "Committing changes..."
 msgstr ""
 
 msgid "Committing changes..."
 msgstr ""
 

-#: mbox.c:959
+#: mbox.c:994

 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr ""
 
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr ""
 

-#: mbox.c:1023
+#: mbox.c:1056

 msgid "Could not reopen mailbox!"
 msgstr ""
 
 msgid "Could not reopen mailbox!"
 msgstr ""
 

-#: mbox.c:1058
+#: mbox.c:1092

 msgid "Reopening mailbox..."
 msgstr ""
 
 msgid "Reopening mailbox..."
 msgstr ""
 

-#: menu.c:425
+#: menu.c:423

 msgid "Jump to: "
 msgstr ""
 
 msgid "Jump to: "
 msgstr ""
 

-#: menu.c:434
+#: menu.c:432

 msgid "Invalid index number."
 msgstr ""
 
 msgid "Invalid index number."
 msgstr ""
 

-#: menu.c:438 menu.c:459 menu.c:524 menu.c:567 menu.c:583 menu.c:594
-#: menu.c:605 menu.c:616 menu.c:629 menu.c:642 menu.c:1043
+#: menu.c:436 menu.c:457 menu.c:522 menu.c:565 menu.c:581 menu.c:592
+#: menu.c:603 menu.c:614 menu.c:627 menu.c:640 menu.c:1051

 msgid "No entries."
 msgstr ""
 
 msgid "No entries."
 msgstr ""
 

-#: menu.c:456
+#: menu.c:454

 msgid "You cannot scroll down farther."
 msgstr ""
 
 msgid "You cannot scroll down farther."
 msgstr ""
 

-#: menu.c:474
+#: menu.c:472

 msgid "You cannot scroll up farther."
 msgstr ""
 
 msgid "You cannot scroll up farther."
 msgstr ""
 

-#: menu.c:517
+#: menu.c:515

 msgid "You are on the first page."
 msgstr ""
 
 msgid "You are on the first page."
 msgstr ""
 

-#: menu.c:518
+#: menu.c:516

 msgid "You are on the last page."
 msgstr ""
 
 msgid "You are on the last page."
 msgstr ""
 

-#: menu.c:653
+#: menu.c:651

 msgid "You are on the last entry."
 msgstr ""
 
 msgid "You are on the last entry."
 msgstr ""
 

-#: menu.c:664
+#: menu.c:662

 msgid "You are on the first entry."
 msgstr ""
 
 msgid "You are on the first entry."
 msgstr ""
 

-#: menu.c:724 pattern.c:1417
+#: menu.c:733 pager.c:2086 pattern.c:1417

 msgid "Search for: "
 msgstr ""
 
 msgid "Search for: "
 msgstr ""
 

-#: menu.c:725 pattern.c:1418
+#: menu.c:733 pager.c:2086 pattern.c:1417

 msgid "Reverse search for: "
 msgstr ""
 
 msgid "Reverse search for: "
 msgstr ""
 

-#: menu.c:735 pattern.c:1450
-msgid "No search pattern."
-msgstr ""
-
-#: menu.c:765 pager.c:1987 pager.c:2003 pager.c:2111 pattern.c:1533
+#: menu.c:777 pager.c:2039 pager.c:2061 pager.c:2181 pattern.c:1531

 msgid "Not found."
 msgstr ""
 
 msgid "Not found."
 msgstr ""
 

-#: menu.c:895
+#: menu.c:903

 msgid "No tagged entries."
 msgstr ""
 
 msgid "No tagged entries."
 msgstr ""
 

-#: menu.c:1000
+#: menu.c:1008

 msgid "Search is not implemented for this menu."
 msgstr ""
 
 msgid "Search is not implemented for this menu."
 msgstr ""
 

-#: menu.c:1005
+#: menu.c:1013

 msgid "Jumping is not implemented for dialogs."
 msgstr ""
 
 msgid "Jumping is not implemented for dialogs."
 msgstr ""
 

-#: menu.c:1046
+#: menu.c:1054

 msgid "Tagging is not supported."
 msgstr ""
 
 msgid "Tagging is not supported."
 msgstr ""
 

-#: mh.c:1116
+#: mh.c:1131

 #, c-format
 msgid "Scanning %s..."
 msgstr ""
 
 #, c-format
 msgid "Scanning %s..."
 msgstr ""
 

-#: mh.c:1358
+#: mh.c:1332 mh.c:1410
+msgid "Could not flush message to disk"
+msgstr ""
+
+#: mh.c:1377

 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 


@@ -2678,229 +2759,248 @@ msgstr ""
 msgid "Error setting SASL external security strength"
 msgstr ""
 
 msgid "Error setting SASL external security strength"
 msgstr ""
 

-#: mutt_sasl.c:252
+#: mutt_sasl.c:255

 msgid "Error setting SASL external user name"
 msgstr ""
 
 msgid "Error setting SASL external user name"
 msgstr ""
 

-#: mutt_socket.c:103 mutt_socket.c:174
+#: mutt_socket.c:103 mutt_socket.c:181

 #, c-format
 msgid "Connection to %s closed"
 msgstr ""
 
 #, c-format
 msgid "Connection to %s closed"
 msgstr ""
 

-#: mutt_socket.c:294
+#: mutt_socket.c:300

 msgid "SSL is unavailable."
 msgstr ""
 
 msgid "SSL is unavailable."
 msgstr ""
 

-#: mutt_socket.c:326
+#: mutt_socket.c:332

 msgid "Preconnect command failed."
 msgstr ""
 
 msgid "Preconnect command failed."
 msgstr ""
 

-#: mutt_socket.c:397 mutt_socket.c:411
+#: mutt_socket.c:403 mutt_socket.c:417

 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr ""
 
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr ""
 

-#: mutt_socket.c:464 mutt_socket.c:522
+#: mutt_socket.c:470 mutt_socket.c:529

 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr ""
 

-#: mutt_socket.c:471 mutt_socket.c:529
+#: mutt_socket.c:478 mutt_socket.c:537

 #, c-format
 msgid "Looking up %s..."
 msgstr ""
 
 #, c-format
 msgid "Looking up %s..."
 msgstr ""
 

-#: mutt_socket.c:482 mutt_socket.c:536
+#: mutt_socket.c:488 mutt_socket.c:546

 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr ""
 
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr ""
 

-#: mutt_socket.c:487 mutt_socket.c:545
+#: mutt_socket.c:494 mutt_socket.c:552

 #, c-format
 msgid "Connecting to %s..."
 msgstr ""
 
 #, c-format
 msgid "Connecting to %s..."
 msgstr ""
 

-#: mutt_socket.c:569
+#: mutt_socket.c:576

 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr ""
 
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr ""
 

-#: mutt_ssl.c:175
+#: mutt_ssl.c:187

 msgid "Failed to find enough entropy on your system"
 msgstr ""
 
 msgid "Failed to find enough entropy on your system"
 msgstr ""
 

-#: mutt_ssl.c:199
+#: mutt_ssl.c:211

 #, c-format
 msgid "Filling entropy pool: %s...\n"
 msgstr ""
 
 #, c-format
 msgid "Filling entropy pool: %s...\n"
 msgstr ""
 

-#: mutt_ssl.c:207
+#: mutt_ssl.c:219

 #, c-format
 msgid "%s has insecure permissions!"
 msgstr ""
 
 #, c-format
 msgid "%s has insecure permissions!"
 msgstr ""
 

-#: mutt_ssl.c:226
+#: mutt_ssl.c:238

 msgid "SSL disabled due the lack of entropy"
 msgstr ""
 
 msgid "SSL disabled due the lack of entropy"
 msgstr ""
 

-#: mutt_ssl.c:323
+#: mutt_ssl.c:352

 msgid "I/O error"
 msgstr ""
 
 msgid "I/O error"
 msgstr ""
 

-#: mutt_ssl.c:332
+#: mutt_ssl.c:361

 #, c-format
 msgid "SSL failed: %s"
 msgstr ""
 
 #, c-format
 msgid "SSL failed: %s"
 msgstr ""
 

-#: mutt_ssl.c:341 mutt_ssl_gnutls.c:504 mutt_ssl_gnutls.c:513
-#: mutt_ssl_gnutls.c:542
+#: mutt_ssl.c:370 mutt_ssl_gnutls.c:950 mutt_ssl_gnutls.c:984
+#: mutt_ssl_gnutls.c:994

 msgid "Unable to get certificate from peer"
 msgstr ""
 
 msgid "Unable to get certificate from peer"
 msgstr ""
 

-#: mutt_ssl.c:349
+#: mutt_ssl.c:378

 #, c-format
 msgid "SSL connection using %s (%s)"
 msgstr ""
 
 #, c-format
 msgid "SSL connection using %s (%s)"
 msgstr ""
 

-#: mutt_ssl.c:393
+#: mutt_ssl.c:480

 msgid "Unknown"
 msgstr ""
 
 msgid "Unknown"
 msgstr ""
 

-#: mutt_ssl.c:418 mutt_ssl_gnutls.c:392
+#: mutt_ssl.c:505 mutt_ssl_gnutls.c:473

 #, c-format
 msgid "[unable to calculate]"
 msgstr ""
 
 #, c-format
 msgid "[unable to calculate]"
 msgstr ""
 

-#: mutt_ssl.c:436 mutt_ssl_gnutls.c:415
+#: mutt_ssl.c:523 mutt_ssl_gnutls.c:496

 msgid "[invalid date]"
 msgstr ""
 
 msgid "[invalid date]"
 msgstr ""
 

-#: mutt_ssl.c:557
+#: mutt_ssl.c:651

 msgid "Server certificate is not yet valid"
 msgstr ""
 
 msgid "Server certificate is not yet valid"
 msgstr ""
 

-#: mutt_ssl.c:564
+#: mutt_ssl.c:658

 msgid "Server certificate has expired"
 msgstr ""
 
 msgid "Server certificate has expired"
 msgstr ""
 

-#: mutt_ssl.c:630 mutt_ssl_gnutls.c:645
+#: mutt_ssl.c:780
+msgid "cannot get certificate subject"
+msgstr ""
+
+#: mutt_ssl.c:790 mutt_ssl.c:799
+msgid "cannot get certificate common name"
+msgstr ""
+
+#: mutt_ssl.c:813
+#, c-format
+msgid "certificate owner does not match hostname %s"
+msgstr ""
+
+#: mutt_ssl.c:854
+#, c-format
+msgid "Certificate host check failed: %s"
+msgstr ""
+
+#: mutt_ssl.c:932 mutt_ssl_gnutls.c:732

 msgid "This certificate belongs to:"
 msgstr ""
 
 msgid "This certificate belongs to:"
 msgstr ""
 

-#: mutt_ssl.c:641 mutt_ssl_gnutls.c:684
+#: mutt_ssl.c:945 mutt_ssl_gnutls.c:771

 msgid "This certificate was issued by:"
 msgstr ""
 
 msgid "This certificate was issued by:"
 msgstr ""
 

-#: mutt_ssl.c:652 mutt_ssl_gnutls.c:723
+#: mutt_ssl.c:956 mutt_ssl_gnutls.c:810

 #, c-format
 msgid "This certificate is valid"
 msgstr ""
 
 #, c-format
 msgid "This certificate is valid"
 msgstr ""
 

-#: mutt_ssl.c:653 mutt_ssl_gnutls.c:726
+#: mutt_ssl.c:957 mutt_ssl_gnutls.c:813

 #, c-format
 msgid "   from %s"
 msgstr ""
 
 #, c-format
 msgid "   from %s"
 msgstr ""
 

-#: mutt_ssl.c:655 mutt_ssl_gnutls.c:730
+#: mutt_ssl.c:959 mutt_ssl_gnutls.c:817

 #, c-format
 msgid "     to %s"
 msgstr ""
 
 #, c-format
 msgid "     to %s"
 msgstr ""
 

-#: mutt_ssl.c:661
+#: mutt_ssl.c:965

 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
 
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
 

-#: mutt_ssl.c:663
-msgid "SSL Certificate check"
+#: mutt_ssl.c:968 mutt_ssl_gnutls.c:854
+#, c-format
+msgid "SSL Certificate check (certificate %d of %d in chain)"

 msgstr ""
 
 msgstr ""
 

-#: mutt_ssl.c:667 mutt_ssl_gnutls.c:771
+#: mutt_ssl.c:976 mutt_ssl_gnutls.c:863

 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr ""
 
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr ""
 

-#: mutt_ssl.c:668 mutt_ssl_gnutls.c:772
+#: mutt_ssl.c:977 mutt_ssl_gnutls.c:864

 msgid "roa"
 msgstr ""
 
 msgid "roa"
 msgstr ""
 

-#: mutt_ssl.c:672 mutt_ssl_gnutls.c:776
+#: mutt_ssl.c:981 mutt_ssl_gnutls.c:868

 msgid "(r)eject, accept (o)nce"
 msgstr ""
 
 msgid "(r)eject, accept (o)nce"
 msgstr ""
 

-#: mutt_ssl.c:673 mutt_ssl_gnutls.c:777
+#: mutt_ssl.c:982 mutt_ssl_gnutls.c:869

 msgid "ro"
 msgstr ""
 
 msgid "ro"
 msgstr ""
 

-#: mutt_ssl.c:704 mutt_ssl_gnutls.c:826
+#: mutt_ssl.c:1013 mutt_ssl_gnutls.c:918

 msgid "Warning: Couldn't save certificate"
 msgstr ""
 
 msgid "Warning: Couldn't save certificate"
 msgstr ""
 

-#: mutt_ssl.c:709 mutt_ssl_gnutls.c:831
+#: mutt_ssl.c:1018 mutt_ssl_gnutls.c:923

 msgid "Certificate saved"
 msgstr ""
 
 msgid "Certificate saved"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:96 mutt_ssl_gnutls.c:119
+#: mutt_ssl_gnutls.c:106 mutt_ssl_gnutls.c:133

 msgid "Error: no TLS socket open"
 msgstr ""
 
 msgid "Error: no TLS socket open"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:215
+#: mutt_ssl_gnutls.c:292

 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:276
+#: mutt_ssl_gnutls.c:356

 #, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr ""
 
 #, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:519
-#, c-format
-msgid "Certificate verification error (%s)"
-msgstr ""
-
-#: mutt_ssl_gnutls.c:527
-msgid "Certificate is not X.509"
-msgstr ""
-
-#: mutt_ssl_gnutls.c:534
+#: mutt_ssl_gnutls.c:563 mutt_ssl_gnutls.c:712

 msgid "Error initialising gnutls certificate data"
 msgstr ""
 
 msgid "Error initialising gnutls certificate data"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:550
+#: mutt_ssl_gnutls.c:570 mutt_ssl_gnutls.c:719

 msgid "Error processing certificate data"
 msgstr ""
 
 msgid "Error processing certificate data"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:735
+#: mutt_ssl_gnutls.c:703
+msgid "Warning: Server certificate was signed using an insecure algorithm"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:822

 #, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr ""
 
 #, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:738
+#: mutt_ssl_gnutls.c:825

 #, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr ""
 
 #, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:743
+#: mutt_ssl_gnutls.c:830

 msgid "WARNING: Server certificate is not yet valid"
 msgstr ""
 
 msgid "WARNING: Server certificate is not yet valid"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:748
+#: mutt_ssl_gnutls.c:835

 msgid "WARNING: Server certificate has expired"
 msgstr ""
 
 msgid "WARNING: Server certificate has expired"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:753
+#: mutt_ssl_gnutls.c:840

 msgid "WARNING: Server certificate has been revoked"
 msgstr ""
 
 msgid "WARNING: Server certificate has been revoked"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:758
+#: mutt_ssl_gnutls.c:845

 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:763
+#: mutt_ssl_gnutls.c:850

 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr ""
 
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:766
-msgid "TLS/SSL Certificate check"
+#: mutt_ssl_gnutls.c:956
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:965
+msgid "Certificate is not X.509"

 msgstr ""
 
 #: mutt_tunnel.c:72
 msgstr ""
 
 #: mutt_tunnel.c:72


@@ -2918,40 +3018,40 @@ msgstr ""
 msgid "Tunnel error talking to %s: %s"
 msgstr ""
 
 msgid "Tunnel error talking to %s: %s"
 msgstr ""
 

-#: muttlib.c:911
+#: muttlib.c:976

 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr ""
 
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr ""
 

-#: muttlib.c:911
+#: muttlib.c:976

 msgid "yna"
 msgstr ""
 
 msgid "yna"
 msgstr ""
 

-#: muttlib.c:927
+#: muttlib.c:992

 msgid "File is a directory, save under it?"
 msgstr ""
 
 msgid "File is a directory, save under it?"
 msgstr ""
 

-#: muttlib.c:933
+#: muttlib.c:998

 msgid "File under directory: "
 msgstr ""
 
 msgid "File under directory: "
 msgstr ""
 

-#: muttlib.c:945
+#: muttlib.c:1010

 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr ""
 
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr ""
 

-#: muttlib.c:945
+#: muttlib.c:1010

 msgid "oac"
 msgstr ""
 
 msgid "oac"
 msgstr ""
 

-#: muttlib.c:1429
+#: muttlib.c:1511

 msgid "Can't save message to POP mailbox."
 msgstr ""
 
 msgid "Can't save message to POP mailbox."
 msgstr ""
 

-#: muttlib.c:1438
+#: muttlib.c:1520

 #, c-format
 msgid "Append messages to %s?"
 msgstr ""
 
 #, c-format
 msgid "Append messages to %s?"
 msgstr ""
 

-#: muttlib.c:1450
+#: muttlib.c:1532

 #, c-format
 msgid "%s is not a mailbox!"
 msgstr ""
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr ""


@@ -2984,195 +3084,192 @@ msgstr ""
 msgid "Waiting for flock attempt... %d"
 msgstr ""
 
 msgid "Waiting for flock attempt... %d"
 msgstr ""
 

-#: mx.c:586
+#: mx.c:555

 #, c-format
 msgid "Couldn't lock %s\n"
 msgstr ""
 
 #, c-format
 msgid "Couldn't lock %s\n"
 msgstr ""
 

-#: mx.c:798
+#: mx.c:771

 #, c-format
 msgid "Could not synchronize mailbox %s!"
 msgstr ""
 
 #, c-format
 msgid "Could not synchronize mailbox %s!"
 msgstr ""
 

-#: mx.c:862
+#: mx.c:835

 #, c-format
 msgid "Move read messages to %s?"
 msgstr ""
 
 #, c-format
 msgid "Move read messages to %s?"
 msgstr ""
 

-#: mx.c:878 mx.c:1130
+#: mx.c:851 mx.c:1111

 #, c-format
 msgid "Purge %d deleted message?"
 msgstr ""
 
 #, c-format
 msgid "Purge %d deleted message?"
 msgstr ""
 

-#: mx.c:878 mx.c:1130
+#: mx.c:851 mx.c:1111

 #, c-format
 msgid "Purge %d deleted messages?"
 msgstr ""
 
 #, c-format
 msgid "Purge %d deleted messages?"
 msgstr ""
 

-#: mx.c:898
+#: mx.c:872

 #, c-format
 msgid "Moving read messages to %s..."
 msgstr ""
 
 #, c-format
 msgid "Moving read messages to %s..."
 msgstr ""
 

-#: mx.c:957 mx.c:1121
+#: mx.c:932 mx.c:1102

 msgid "Mailbox is unchanged."
 msgstr ""
 
 msgid "Mailbox is unchanged."
 msgstr ""
 

-#: mx.c:993
+#: mx.c:972

 #, c-format
 msgid "%d kept, %d moved, %d deleted."
 msgstr ""
 
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
 msgstr ""
 

-#: mx.c:996 mx.c:1170
+#: mx.c:975 mx.c:1154

 #, c-format
 msgid "%d kept, %d deleted."
 msgstr ""
 
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr ""
 

-#: mx.c:1106
+#: mx.c:1086

 #, c-format
 msgid " Press '%s' to toggle write"
 msgstr ""
 
 #, c-format
 msgid " Press '%s' to toggle write"
 msgstr ""
 

-#: mx.c:1108
+#: mx.c:1088

 msgid "Use 'toggle-write' to re-enable write!"
 msgstr ""
 
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr ""
 

-#: mx.c:1110
+#: mx.c:1090

 #, c-format
 msgid "Mailbox is marked unwritable. %s"
 msgstr ""
 
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
 msgstr ""
 

-#: mx.c:1167
+#: mx.c:1148

 msgid "Mailbox checkpointed."
 msgstr ""
 
 msgid "Mailbox checkpointed."
 msgstr ""
 

-#: mx.c:1479
+#: mx.c:1466

 msgid "Can't write message"
 msgstr ""
 
 msgid "Can't write message"
 msgstr ""
 

-#: mx.c:1524
+#: mx.c:1505

 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 

-#: pager.c:1481
+#: pager.c:1531

 msgid "PrevPg"
 msgstr ""
 
 msgid "PrevPg"
 msgstr ""
 

-#: pager.c:1482
+#: pager.c:1532

 msgid "NextPg"
 msgstr ""
 
 msgid "NextPg"
 msgstr ""
 

-#: pager.c:1486
+#: pager.c:1536

 msgid "View Attachm."
 msgstr ""
 
 msgid "View Attachm."
 msgstr ""
 

-#: pager.c:1489
+#: pager.c:1539

 msgid "Next"
 msgstr ""
 
 #. emulate "less -q" and don't go on to the next message.
 msgid "Next"
 msgstr ""
 
 #. emulate "less -q" and don't go on to the next message.

-#: pager.c:1895 pager.c:1926 pager.c:1958 pager.c:2199
+#: pager.c:1940 pager.c:1971 pager.c:2003 pager.c:2279

 msgid "Bottom of message is shown."
 msgstr ""
 
 msgid "Bottom of message is shown."
 msgstr ""
 

-#: pager.c:1911 pager.c:1933 pager.c:1940 pager.c:1947
+#: pager.c:1956 pager.c:1978 pager.c:1985 pager.c:1992

 msgid "Top of message is shown."
 msgstr ""
 
 msgid "Top of message is shown."
 msgstr ""
 

-#: pager.c:2016
-msgid "Reverse search: "
-msgstr ""
-
-#: pager.c:2017
-msgid "Search: "
-msgstr ""
-
-#: pager.c:2137
+#: pager.c:2217

 msgid "Help is currently being shown."
 msgstr ""
 
 msgid "Help is currently being shown."
 msgstr ""
 

-#: pager.c:2166
+#: pager.c:2246

 msgid "No more quoted text."
 msgstr ""
 
 msgid "No more quoted text."
 msgstr ""
 

-#: pager.c:2179
+#: pager.c:2259

 msgid "No more unquoted text after quoted text."
 msgstr ""
 
 msgid "No more unquoted text after quoted text."
 msgstr ""
 

-#: parse.c:622
+#: parse.c:577

 msgid "multipart message has no boundary parameter!"
 msgstr ""
 
 msgid "multipart message has no boundary parameter!"
 msgstr ""
 

-#: pattern.c:275
+#: pattern.c:264

 #, c-format
 msgid "Error in expression: %s"
 msgstr ""
 
 #, c-format
 msgid "Error in expression: %s"
 msgstr ""
 

-#: pattern.c:280
+#: pattern.c:269

 #, c-format
 msgid "Empty expression"
 msgstr ""
 
 #, c-format
 msgid "Empty expression"
 msgstr ""
 

-#: pattern.c:411
+#: pattern.c:402

 #, c-format
 msgid "Invalid day of month: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr ""
 

-#: pattern.c:425
+#: pattern.c:416

 #, c-format
 msgid "Invalid month: %s"
 msgstr ""
 
 #. getDate has its own error message, don't overwrite it here
 #, c-format
 msgid "Invalid month: %s"
 msgstr ""
 
 #. getDate has its own error message, don't overwrite it here

-#: pattern.c:577
+#: pattern.c:568

 #, c-format
 msgid "Invalid relative date: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid relative date: %s"
 msgstr ""
 

-#: pattern.c:591
+#: pattern.c:582

 msgid "error in expression"
 msgstr ""
 
 msgid "error in expression"
 msgstr ""
 

-#: pattern.c:812 pattern.c:958
+#: pattern.c:804 pattern.c:956

 #, c-format
 msgid "error in pattern at: %s"
 msgstr ""
 
 #, c-format
 msgid "error in pattern at: %s"
 msgstr ""
 

-#: pattern.c:842
+#: pattern.c:830
+#, c-format
+msgid "missing pattern: %s"
+msgstr ""
+
+#: pattern.c:840

 #, c-format
 msgid "mismatched brackets: %s"
 msgstr ""
 
 #, c-format
 msgid "mismatched brackets: %s"
 msgstr ""
 

-#: pattern.c:898
+#: pattern.c:896

 #, c-format
 msgid "%c: invalid pattern modifier"
 msgstr ""
 
 #, c-format
 msgid "%c: invalid pattern modifier"
 msgstr ""
 

-#: pattern.c:904
+#: pattern.c:902

 #, c-format
 msgid "%c: not supported in this mode"
 msgstr ""
 
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr ""
 

-#: pattern.c:917
+#: pattern.c:915

 #, c-format
 msgid "missing parameter"
 msgstr ""
 
 #, c-format
 msgid "missing parameter"
 msgstr ""
 

-#: pattern.c:933
+#: pattern.c:931

 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr ""
 
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr ""
 

-#: pattern.c:965
+#: pattern.c:963

 msgid "empty pattern"
 msgstr ""
 
 msgid "empty pattern"
 msgstr ""
 

-#: pattern.c:1218
+#: pattern.c:1217

 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr ""
 
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr ""
 

-#: pattern.c:1301 pattern.c:1436
+#: pattern.c:1300 pattern.c:1438

 msgid "Compiling search pattern..."
 msgstr ""
 
 msgid "Compiling search pattern..."
 msgstr ""
 


@@ -3184,19 +3281,19 @@ msgstr ""
 msgid "No messages matched criteria."
 msgstr ""
 
 msgid "No messages matched criteria."
 msgstr ""
 

-#: pattern.c:1469
+#: pattern.c:1467

 msgid "Searching..."
 msgstr ""
 
 msgid "Searching..."
 msgstr ""
 

-#: pattern.c:1482
+#: pattern.c:1480

 msgid "Search hit bottom without finding match"
 msgstr ""
 
 msgid "Search hit bottom without finding match"
 msgstr ""
 

-#: pattern.c:1493
+#: pattern.c:1491

 msgid "Search hit top without finding match"
 msgstr ""
 
 msgid "Search hit top without finding match"
 msgstr ""
 

-#: pattern.c:1525
+#: pattern.c:1523

 msgid "Search interrupted."
 msgstr ""
 
 msgid "Search interrupted."
 msgstr ""
 


@@ -3208,62 +3305,77 @@ msgstr ""
 msgid "PGP passphrase forgotten."
 msgstr ""
 
 msgid "PGP passphrase forgotten."
 msgstr ""
 

-#: pgp.c:358
+#: pgp.c:368

 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr ""
 
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr ""
 

-#: pgp.c:392 pgp.c:641 pgp.c:845
+#: pgp.c:402 pgp.c:659 pgp.c:863

 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
 msgstr ""
 
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
 msgstr ""
 

-#: pgp.c:412 pgp.c:460 pgp.c:977
+#: pgp.c:424 pgp.c:475 pgp.c:998

 msgid "Could not decrypt PGP message"
 msgstr ""
 
 #. clear 'Invoking...' message, since there's no error
 msgid "Could not decrypt PGP message"
 msgstr ""
 
 #. clear 'Invoking...' message, since there's no error

-#: pgp.c:462 pgp.c:973
+#: pgp.c:477 pgp.c:994

 msgid "PGP message successfully decrypted."
 msgstr ""
 
 msgid "PGP message successfully decrypted."
 msgstr ""
 

-#: pgp.c:749
+#: pgp.c:767

 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr ""
 
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr ""
 

-#: pgp.c:810
+#: pgp.c:828

 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
 msgstr ""
 
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
 msgstr ""
 

-#: pgp.c:854
+#: pgp.c:875

 msgid "Decryption failed"
 msgstr ""
 
 msgid "Decryption failed"
 msgstr ""
 

-#: pgp.c:1029
+#: pgp.c:1050

 msgid "Can't open PGP subprocess!"
 msgstr ""
 
 msgid "Can't open PGP subprocess!"
 msgstr ""
 

-#: pgp.c:1466
+#: pgp.c:1487

 msgid "Can't invoke PGP"
 msgstr ""
 
 msgid "Can't invoke PGP"
 msgstr ""
 

-#: pgp.c:1567
+#: pgp.c:1592

 #, c-format
 #, c-format

-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s format, or (c)lear? "

 msgstr ""
 
 msgstr ""
 

-#: pgp.c:1568
+#: pgp.c:1593

 msgid "PGP/M(i)ME"
 msgstr ""
 
 msgid "PGP/M(i)ME"
 msgstr ""
 

-#: pgp.c:1568
+#: pgp.c:1593

 msgid "(i)nline"
 msgstr ""
 
 msgid "(i)nline"
 msgstr ""
 

-#: pgp.c:1570
-msgid "esabifc"
+#. The keys accepted for this prompt *must* match the order in the second
+#. * version in the else clause since the switch statement below depends on
+#. * it.  The 'i' key is appended in this version.
+#.
+#: pgp.c:1599
+msgid "esabfci"
+msgstr ""
+
+#. The keys accepted *must* be a prefix of the accepted keys in the "if"
+#. * clause above since the switch statement below depends on it.
+#.
+#: pgp.c:1606
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (c)lear? "
+msgstr ""
+
+#: pgp.c:1607
+msgid "esabfc"

 msgstr ""
 
 #: pgpinvoke.c:308
 msgstr ""
 
 #: pgpinvoke.c:308


@@ -3274,30 +3386,30 @@ msgstr ""
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr ""
 
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr ""
 

-#: pgpkey.c:533
+#: pgpkey.c:532

 #, c-format
 msgid "PGP keys matching <%s>."
 msgstr ""
 
 #, c-format
 msgid "PGP keys matching <%s>."
 msgstr ""
 

-#: pgpkey.c:535
+#: pgpkey.c:534

 #, c-format
 msgid "PGP keys matching \"%s\"."
 msgstr ""
 
 #, c-format
 msgid "PGP keys matching \"%s\"."
 msgstr ""
 

-#: pgpkey.c:554 pgpkey.c:746
+#: pgpkey.c:553 pgpkey.c:745

 msgid "Can't open /dev/null"
 msgstr ""
 
 msgid "Can't open /dev/null"
 msgstr ""
 

-#: pgpkey.c:725
+#: pgpkey.c:724

 msgid "Please enter the key ID: "
 msgstr ""
 
 msgid "Please enter the key ID: "
 msgstr ""
 

-#: pgpkey.c:778
+#: pgpkey.c:777

 #, c-format
 msgid "PGP Key %s."
 msgstr ""
 
 #, c-format
 msgid "PGP Key %s."
 msgstr ""
 

-#: pop.c:101 pop_lib.c:201
+#: pop.c:101 pop_lib.c:210

 #, c-format
 msgid "Command TOP is not supported by server."
 msgstr ""
 #, c-format
 msgid "Command TOP is not supported by server."
 msgstr ""


@@ -3306,59 +3418,64 @@ msgstr ""
 msgid "Can't write header to temporary file!"
 msgstr ""
 
 msgid "Can't write header to temporary file!"
 msgstr ""
 

-#: pop.c:267 pop_lib.c:203
+#: pop.c:267 pop_lib.c:212

 #, c-format
 msgid "Command UIDL is not supported by server."
 msgstr ""
 
 #, c-format
 msgid "Command UIDL is not supported by server."
 msgstr ""
 

-#: pop.c:391 pop.c:761
+#: pop.c:287
+#, c-format
+msgid "%d messages have been lost. Try reopening the mailbox."
+msgstr ""
+
+#: pop.c:402 pop.c:785

 #, c-format
 msgid "%s is an invalid POP path"
 msgstr ""
 
 #, c-format
 msgid "%s is an invalid POP path"
 msgstr ""
 

-#: pop.c:429
+#: pop.c:445

 msgid "Fetching list of messages..."
 msgstr ""
 
 msgid "Fetching list of messages..."
 msgstr ""
 

-#: pop.c:587
+#: pop.c:603

 msgid "Can't write message to temporary file!"
 msgstr ""
 
 msgid "Can't write message to temporary file!"
 msgstr ""
 

-#: pop.c:646
+#: pop.c:662

 msgid "Marking messages deleted..."
 msgstr ""
 
 msgid "Marking messages deleted..."
 msgstr ""
 

-#: pop.c:716 pop.c:781
+#: pop.c:740 pop.c:805

 msgid "Checking for new messages..."
 msgstr ""
 
 msgid "Checking for new messages..."
 msgstr ""
 

-#: pop.c:745
+#: pop.c:769

 msgid "POP host is not defined."
 msgstr ""
 
 msgid "POP host is not defined."
 msgstr ""
 

-#: pop.c:809
+#: pop.c:833

 msgid "No new mail in POP mailbox."
 msgstr ""
 
 msgid "No new mail in POP mailbox."
 msgstr ""
 

-#: pop.c:816
+#: pop.c:840

 msgid "Delete messages from server?"
 msgstr ""
 
 msgid "Delete messages from server?"
 msgstr ""
 

-#: pop.c:818
+#: pop.c:842

 #, c-format
 msgid "Reading new messages (%d bytes)..."
 msgstr ""
 
 #, c-format
 msgid "Reading new messages (%d bytes)..."
 msgstr ""
 

-#: pop.c:860
+#: pop.c:884

 msgid "Error while writing mailbox!"
 msgstr ""
 
 msgid "Error while writing mailbox!"
 msgstr ""
 

-#: pop.c:864
+#: pop.c:888

 #, c-format
 msgid "%s [%d of %d messages read]"
 msgstr ""
 
 #, c-format
 msgid "%s [%d of %d messages read]"
 msgstr ""
 

-#: pop.c:887 pop_lib.c:369
+#: pop.c:911 pop_lib.c:378

 msgid "Server closed connection!"
 msgstr ""
 
 msgid "Server closed connection!"
 msgstr ""
 


@@ -3383,199 +3500,208 @@ msgstr ""
 msgid "Command USER is not supported by server."
 msgstr ""
 
 msgid "Command USER is not supported by server."
 msgstr ""
 

-#: pop_lib.c:199
+#: pop_lib.c:55
+#, c-format
+msgid "Invalid POP URL: %s\n"
+msgstr ""
+
+#: pop_lib.c:208

 msgid "Unable to leave messages on server."
 msgstr ""
 
 msgid "Unable to leave messages on server."
 msgstr ""
 

-#: pop_lib.c:229
+#: pop_lib.c:238

 #, c-format
 msgid "Error connecting to server: %s"
 msgstr ""
 
 #, c-format
 msgid "Error connecting to server: %s"
 msgstr ""
 

-#: pop_lib.c:383
+#: pop_lib.c:392

 msgid "Closing connection to POP server..."
 msgstr ""
 
 msgid "Closing connection to POP server..."
 msgstr ""
 

-#: pop_lib.c:553
+#: pop_lib.c:563

 msgid "Verifying message indexes..."
 msgstr ""
 
 msgid "Verifying message indexes..."
 msgstr ""
 

-#: pop_lib.c:575
+#: pop_lib.c:585

 msgid "Connection lost. Reconnect to POP server?"
 msgstr ""
 
 msgid "Connection lost. Reconnect to POP server?"
 msgstr ""
 

-#: postpone.c:167
+#: postpone.c:165

 msgid "Postponed Messages"
 msgstr ""
 
 msgid "Postponed Messages"
 msgstr ""
 

-#: postpone.c:247 postpone.c:256
+#: postpone.c:245 postpone.c:254

 msgid "No postponed messages."
 msgstr ""
 
 msgid "No postponed messages."
 msgstr ""
 

-#: postpone.c:444 postpone.c:465 postpone.c:499
+#: postpone.c:442 postpone.c:463 postpone.c:497

 msgid "Illegal crypto header"
 msgstr ""
 
 msgid "Illegal crypto header"
 msgstr ""
 

-#: postpone.c:485
+#: postpone.c:483

 msgid "Illegal S/MIME header"
 msgstr ""
 
 msgid "Illegal S/MIME header"
 msgstr ""
 

-#: postpone.c:565
+#: postpone.c:563

 msgid "Decrypting message..."
 msgstr ""
 
 msgid "Decrypting message..."
 msgstr ""
 

-#: postpone.c:574
+#: postpone.c:572

 msgid "Decryption failed."
 msgstr ""
 
 msgid "Decryption failed."
 msgstr ""
 

-#: query.c:51
+#: query.c:50

 msgid "New Query"
 msgstr ""
 
 msgid "New Query"
 msgstr ""
 

-#: query.c:52
+#: query.c:51

 msgid "Make Alias"
 msgstr ""
 
 msgid "Make Alias"
 msgstr ""
 

-#: query.c:53
+#: query.c:52

 msgid "Search"
 msgstr ""
 
 msgid "Search"
 msgstr ""
 

-#: query.c:101
+#: query.c:95

 msgid "Waiting for response..."
 msgstr ""
 
 msgid "Waiting for response..."
 msgstr ""
 

-#: query.c:263 query.c:291
+#: query.c:246 query.c:274

 msgid "Query command not defined."
 msgstr ""
 
 msgid "Query command not defined."
 msgstr ""
 

-#: query.c:318
+#: query.c:301

 #, c-format
 msgid "Query"
 msgstr ""
 
 #. Prompt for Query
 #, c-format
 msgid "Query"
 msgstr ""
 
 #. Prompt for Query

-#: query.c:331 query.c:356
+#: query.c:313 query.c:338

 msgid "Query: "
 msgstr ""
 
 msgid "Query: "
 msgstr ""
 

-#: query.c:339 query.c:365
+#: query.c:321 query.c:347

 #, c-format
 msgid "Query '%s'"
 msgstr ""
 
 #, c-format
 msgid "Query '%s'"
 msgstr ""
 

-#: recvattach.c:56
+#: recvattach.c:55

 msgid "Pipe"
 msgstr ""
 
 msgid "Pipe"
 msgstr ""
 

-#: recvattach.c:57
+#: recvattach.c:56

 msgid "Print"
 msgstr ""
 
 msgid "Print"
 msgstr ""
 

-#: recvattach.c:473
+#: recvattach.c:484

 msgid "Saving..."
 msgstr ""
 
 msgid "Saving..."
 msgstr ""
 

-#: recvattach.c:476 recvattach.c:567
+#: recvattach.c:487 recvattach.c:578

 msgid "Attachment saved."
 msgstr ""
 
 msgid "Attachment saved."
 msgstr ""
 

-#: recvattach.c:579
+#: recvattach.c:590

 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr ""
 
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr ""
 

-#: recvattach.c:597
+#: recvattach.c:608

 msgid "Attachment filtered."
 msgstr ""
 
 msgid "Attachment filtered."
 msgstr ""
 

-#: recvattach.c:664
+#: recvattach.c:675

 msgid "Filter through: "
 msgstr ""
 
 msgid "Filter through: "
 msgstr ""
 

-#: recvattach.c:664
+#: recvattach.c:675

 msgid "Pipe to: "
 msgstr ""
 
 msgid "Pipe to: "
 msgstr ""
 

-#: recvattach.c:699
+#: recvattach.c:710

 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr ""
 
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr ""
 

-#: recvattach.c:764
+#: recvattach.c:775

 msgid "Print tagged attachment(s)?"
 msgstr ""
 
 msgid "Print tagged attachment(s)?"
 msgstr ""
 

-#: recvattach.c:764
+#: recvattach.c:775

 msgid "Print attachment?"
 msgstr ""
 
 msgid "Print attachment?"
 msgstr ""
 

-#: recvattach.c:997
+#: recvattach.c:1008

 msgid "Can't decrypt encrypted message!"
 msgstr ""
 
 msgid "Can't decrypt encrypted message!"
 msgstr ""
 

-#: recvattach.c:1010
+#: recvattach.c:1020

 msgid "Attachments"
 msgstr ""
 
 msgid "Attachments"
 msgstr ""
 

-#: recvattach.c:1046
+#: recvattach.c:1056

 msgid "There are no subparts to show!"
 msgstr ""
 
 msgid "There are no subparts to show!"
 msgstr ""
 

-#: recvattach.c:1107
+#: recvattach.c:1117

 msgid "Can't delete attachment from POP server."
 msgstr ""
 
 msgid "Can't delete attachment from POP server."
 msgstr ""
 

-#: recvattach.c:1115
+#: recvattach.c:1125

 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr ""
 
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr ""
 

-#: recvattach.c:1134 recvattach.c:1151
+#: recvattach.c:1144 recvattach.c:1161

 msgid "Only deletion of multipart attachments is supported."
 msgstr ""
 
 msgid "Only deletion of multipart attachments is supported."
 msgstr ""
 

-#: recvcmd.c:47
+#: recvcmd.c:43

 msgid "You may only bounce message/rfc822 parts."
 msgstr ""
 
 msgid "You may only bounce message/rfc822 parts."
 msgstr ""
 

-#: recvcmd.c:217
+#: recvcmd.c:148 recvcmd.c:161
+msgid "Warning: message contains no From: header"
+msgstr ""
+
+#: recvcmd.c:241

 msgid "Error bouncing message!"
 msgstr ""
 
 msgid "Error bouncing message!"
 msgstr ""
 

-#: recvcmd.c:217
+#: recvcmd.c:241

 msgid "Error bouncing messages!"
 msgstr ""
 
 msgid "Error bouncing messages!"
 msgstr ""
 

-#: recvcmd.c:417
+#: recvcmd.c:441

 #, c-format
 msgid "Can't open temporary file %s."
 msgstr ""
 
 #, c-format
 msgid "Can't open temporary file %s."
 msgstr ""
 

-#: recvcmd.c:448
+#: recvcmd.c:472

 msgid "Forward as attachments?"
 msgstr ""
 
 msgid "Forward as attachments?"
 msgstr ""
 

-#: recvcmd.c:462
+#: recvcmd.c:486

 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
 
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
 

-#: recvcmd.c:587
+#: recvcmd.c:611

 msgid "Forward MIME encapsulated?"
 msgstr ""
 
 msgid "Forward MIME encapsulated?"
 msgstr ""
 

-#: recvcmd.c:595 recvcmd.c:845
+#: recvcmd.c:619 recvcmd.c:869

 #, c-format
 msgid "Can't create %s."
 msgstr ""
 
 #, c-format
 msgid "Can't create %s."
 msgstr ""
 

-#: recvcmd.c:728
+#: recvcmd.c:752

 msgid "Can't find any tagged messages."
 msgstr ""
 
 msgid "Can't find any tagged messages."
 msgstr ""
 

-#: recvcmd.c:749 send.c:728
+#: recvcmd.c:773 send.c:738

 msgid "No mailing lists found!"
 msgstr ""
 
 msgid "No mailing lists found!"
 msgstr ""
 

-#: recvcmd.c:824
+#: recvcmd.c:848

 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
 
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
 


@@ -3599,60 +3725,60 @@ msgstr ""
 msgid "Can't get mixmaster's type2.list!"
 msgstr ""
 
 msgid "Can't get mixmaster's type2.list!"
 msgstr ""
 

-#: remailer.c:543
+#: remailer.c:542

 msgid "Select a remailer chain."
 msgstr ""
 
 msgid "Select a remailer chain."
 msgstr ""
 

-#: remailer.c:603
+#: remailer.c:602

 #, c-format
 msgid "Error: %s can't be used as the final remailer of a chain."
 msgstr ""
 
 #, c-format
 msgid "Error: %s can't be used as the final remailer of a chain."
 msgstr ""
 

-#: remailer.c:633
+#: remailer.c:632

 #, c-format
 msgid "Mixmaster chains are limited to %d elements."
 msgstr ""
 
 #, c-format
 msgid "Mixmaster chains are limited to %d elements."
 msgstr ""
 

-#: remailer.c:656
+#: remailer.c:655

 msgid "The remailer chain is already empty."
 msgstr ""
 
 msgid "The remailer chain is already empty."
 msgstr ""
 

-#: remailer.c:666
+#: remailer.c:665

 msgid "You already have the first chain element selected."
 msgstr ""
 
 msgid "You already have the first chain element selected."
 msgstr ""
 

-#: remailer.c:676
+#: remailer.c:675

 msgid "You already have the last chain element selected."
 msgstr ""
 
 msgid "You already have the last chain element selected."
 msgstr ""
 

-#: remailer.c:715
+#: remailer.c:714

 msgid "Mixmaster doesn't accept Cc or Bcc headers."
 msgstr ""
 
 msgid "Mixmaster doesn't accept Cc or Bcc headers."
 msgstr ""
 

-#: remailer.c:739
+#: remailer.c:738

 msgid ""
 "Please set the hostname variable to a proper value when using mixmaster!"
 msgstr ""
 
 msgid ""
 "Please set the hostname variable to a proper value when using mixmaster!"
 msgstr ""
 

-#: remailer.c:773
+#: remailer.c:772

 #, c-format
 msgid "Error sending message, child exited %d.\n"
 msgstr ""
 
 #, c-format
 msgid "Error sending message, child exited %d.\n"
 msgstr ""
 

-#: remailer.c:777
+#: remailer.c:776

 msgid "Error sending message."
 msgstr ""
 
 msgid "Error sending message."
 msgstr ""
 

-#: rfc1524.c:163
+#: rfc1524.c:164

 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr ""
 
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr ""
 

-#: rfc1524.c:395
+#: rfc1524.c:396

 msgid "No mailcap path specified"
 msgstr ""
 
 msgid "No mailcap path specified"
 msgstr ""
 

-#: rfc1524.c:423
+#: rfc1524.c:424

 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr ""
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr ""


@@ -3665,11 +3791,15 @@ msgstr ""
 msgid "score: too many arguments"
 msgstr ""
 
 msgid "score: too many arguments"
 msgstr ""
 

-#: send.c:253
+#: score.c:122
+msgid "Error: score: invalid number"
+msgstr ""
+
+#: send.c:252

 msgid "No subject, abort?"
 msgstr ""
 
 msgid "No subject, abort?"
 msgstr ""
 

-#: send.c:255
+#: send.c:254

 msgid "No subject, aborting."
 msgstr ""
 
 msgid "No subject, aborting."
 msgstr ""
 


@@ -3678,12 +3808,12 @@ msgstr ""
 #. * to send a message to only the sender of the message.  This
 #. * provides a way to do that.
 #.
 #. * to send a message to only the sender of the message.  This
 #. * provides a way to do that.
 #.

-#: send.c:497
+#: send.c:501

 #, c-format
 msgid "Reply to %s%s?"
 msgstr ""
 
 #, c-format
 msgid "Reply to %s%s?"
 msgstr ""
 

-#: send.c:531
+#: send.c:535

 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr ""
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr ""


@@ -3691,114 +3821,119 @@ msgstr ""
 #. This could happen if the user tagged some messages and then did
 #. * a limit such that none of the tagged message are visible.
 #.
 #. 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:703
+#: send.c:713

 msgid "No tagged messages are visible!"
 msgstr ""
 
 msgid "No tagged messages are visible!"
 msgstr ""
 

-#: send.c:754
+#: send.c:764

 msgid "Include message in reply?"
 msgstr ""
 
 msgid "Include message in reply?"
 msgstr ""
 

-#: send.c:759
+#: send.c:769

 msgid "Including quoted message..."
 msgstr ""
 
 msgid "Including quoted message..."
 msgstr ""
 

-#: send.c:769
+#: send.c:779

 msgid "Could not include all requested messages!"
 msgstr ""
 
 msgid "Could not include all requested messages!"
 msgstr ""
 

-#: send.c:783
+#: send.c:793

 msgid "Forward as attachment?"
 msgstr ""
 
 msgid "Forward as attachment?"
 msgstr ""
 

-#: send.c:787
+#: send.c:797

 msgid "Preparing forwarded message..."
 msgstr ""
 
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
 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:1117
+#: send.c:1147

 msgid "Recall postponed message?"
 msgstr ""
 
 msgid "Recall postponed message?"
 msgstr ""
 

-#: send.c:1429
+#: send.c:1379

 msgid "Edit forwarded message?"
 msgstr ""
 
 msgid "Edit forwarded message?"
 msgstr ""
 

-#: send.c:1469
+#: send.c:1419

 msgid "Abort unmodified message?"
 msgstr ""
 
 msgid "Abort unmodified message?"
 msgstr ""
 

-#: send.c:1471
+#: send.c:1421

 msgid "Aborted unmodified message."
 msgstr ""
 
 msgid "Aborted unmodified message."
 msgstr ""
 

-#: send.c:1540
+#: send.c:1564

 msgid "Message postponed."
 msgstr ""
 
 msgid "Message postponed."
 msgstr ""
 

-#: send.c:1549
+#: send.c:1574

 msgid "No recipients are specified!"
 msgstr ""
 
 msgid "No recipients are specified!"
 msgstr ""
 

-#: send.c:1554
+#: send.c:1579

 msgid "No recipients were specified."
 msgstr ""
 
 msgid "No recipients were specified."
 msgstr ""
 

-#: send.c:1570
+#: send.c:1595

 msgid "No subject, abort sending?"
 msgstr ""
 
 msgid "No subject, abort sending?"
 msgstr ""
 

-#: send.c:1574
+#: send.c:1599

 msgid "No subject specified."
 msgstr ""
 
 msgid "No subject specified."
 msgstr ""
 

-#: send.c:1636 smtp.c:158
+#: send.c:1661 smtp.c:185

 msgid "Sending message..."
 msgstr ""
 
 msgid "Sending message..."
 msgstr ""
 

-#: send.c:1777
+#. check to see if the user wants copies of all attachments
+#: send.c:1694
+msgid "Save attachments in Fcc?"
+msgstr ""
+
+#: send.c:1803

 msgid "Could not send the message."
 msgstr ""
 
 msgid "Could not send the message."
 msgstr ""
 

-#: send.c:1782
+#: send.c:1808

 msgid "Mail sent."
 msgstr ""
 
 msgid "Mail sent."
 msgstr ""
 

-#: send.c:1782
+#: send.c:1808

 msgid "Sending in background."
 msgstr ""
 
 msgid "Sending in background."
 msgstr ""
 

-#: sendlib.c:410
+#: sendlib.c:425

 msgid "No boundary parameter found! [report this error]"
 msgstr ""
 
 msgid "No boundary parameter found! [report this error]"
 msgstr ""
 

-#: sendlib.c:440
+#: sendlib.c:455

 #, c-format
 msgid "%s no longer exists!"
 msgstr ""
 
 #, c-format
 msgid "%s no longer exists!"
 msgstr ""
 

-#: sendlib.c:863
+#: sendlib.c:878

 #, c-format
 msgid "%s isn't a regular file."
 msgstr ""
 
 #, c-format
 msgid "%s isn't a regular file."
 msgstr ""
 

-#: sendlib.c:1035
+#: sendlib.c:1050

 #, c-format
 msgid "Could not open %s"
 msgstr ""
 
 #, c-format
 msgid "Could not open %s"
 msgstr ""
 

-#: sendlib.c:2228
+#: sendlib.c:2414

 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr ""
 
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr ""
 

-#: sendlib.c:2234
+#: sendlib.c:2420

 msgid "Output of the delivery process"
 msgstr ""
 
 msgid "Output of the delivery process"
 msgstr ""
 

-#: sendlib.c:2448
+#: sendlib.c:2594

 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""


@@ -3850,177 +3985,190 @@ msgstr ""
 msgid "Unknown   "
 msgstr ""
 
 msgid "Unknown   "
 msgstr ""
 

-#: smime.c:369
+#: smime.c:368

 msgid "Enter keyID: "
 msgstr ""
 
 msgid "Enter keyID: "
 msgstr ""
 

-#: smime.c:392
+#: smime.c:378

 #, c-format
 msgid "S/MIME certificates matching \"%s\"."
 msgstr ""
 
 #, c-format
 msgid "S/MIME certificates matching \"%s\"."
 msgstr ""
 

-#: smime.c:542 smime.c:612 smime.c:630
+#: smime.c:526 smime.c:596 smime.c:614

 #, c-format
 msgid "ID %s is unverified. Do you want to use it for %s ?"
 msgstr ""
 
 #, c-format
 msgid "ID %s is unverified. Do you want to use it for %s ?"
 msgstr ""
 

-#: smime.c:546 smime.c:616
+#: smime.c:530 smime.c:600

 #, c-format
 msgid "Use (untrusted!) ID %s for %s ?"
 msgstr ""
 
 #, c-format
 msgid "Use (untrusted!) ID %s for %s ?"
 msgstr ""
 

-#: smime.c:549 smime.c:619
+#: smime.c:533 smime.c:603

 #, c-format
 msgid "Use ID %s for %s ?"
 msgstr ""
 
 #, c-format
 msgid "Use ID %s for %s ?"
 msgstr ""
 

-#: smime.c:638
+#: smime.c:622

 #, c-format
 msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
 msgstr ""
 
 #, c-format
 msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
 msgstr ""
 

-#: smime.c:797
+#: smime.c:781

 #, c-format
 msgid "No (valid) certificate found for %s."
 msgstr ""
 
 #, c-format
 msgid "No (valid) certificate found for %s."
 msgstr ""
 

-#: smime.c:852 smime.c:880 smime.c:945 smime.c:989 smime.c:1054 smime.c:1129
+#: smime.c:836 smime.c:864 smime.c:929 smime.c:973 smime.c:1038 smime.c:1113

 msgid "Error: unable to create OpenSSL subprocess!"
 msgstr ""
 
 msgid "Error: unable to create OpenSSL subprocess!"
 msgstr ""
 

-#: smime.c:1207
+#: smime.c:1191

 msgid "no certfile"
 msgstr ""
 
 msgid "no certfile"
 msgstr ""
 

-#: smime.c:1210
+#: smime.c:1194

 msgid "no mbox"
 msgstr ""
 
 #. fatal error while trying to encrypt message
 msgid "no mbox"
 msgstr ""
 
 #. fatal error while trying to encrypt message

-#: smime.c:1353
+#: smime.c:1337

 msgid "No output from OpenSSL.."
 msgstr ""
 
 msgid "No output from OpenSSL.."
 msgstr ""
 

-#: smime.c:1391
+#: smime.c:1375
+msgid "Can't sign: No key specified. Use Sign As."
+msgstr ""
+
+#: smime.c:1382

 msgid "Warning: Intermediate certificate not found."
 msgstr ""
 
 msgid "Warning: Intermediate certificate not found."
 msgstr ""
 

-#: smime.c:1434
+#: smime.c:1429

 msgid "Can't open OpenSSL subprocess!"
 msgstr ""
 
 msgid "Can't open OpenSSL subprocess!"
 msgstr ""
 

-#: smime.c:1472
+#: smime.c:1469

 msgid "No output from OpenSSL..."
 msgstr ""
 
 msgid "No output from OpenSSL..."
 msgstr ""
 

-#: smime.c:1637 smime.c:1762
+#: smime.c:1634 smime.c:1759

 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
 msgstr ""
 
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
 msgstr ""
 

-#: smime.c:1721 smime.c:1732
+#: smime.c:1718 smime.c:1729

 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr ""
 
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr ""
 

-#: smime.c:1766
+#: smime.c:1763

 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 

-#: smime.c:1769
+#: smime.c:1766

 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 

-#: smime.c:1833
+#: smime.c:1830

 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
 msgstr ""
 
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
 msgstr ""
 

-#: smime.c:1835
+#: smime.c:1832

 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
 msgstr ""
 
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
 msgstr ""
 

-#: smime.c:1946
+#: smime.c:1943

 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
 
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
 

-#: smime.c:1947
+#: smime.c:1944

 msgid "eswabfc"
 msgstr ""
 
 #. I use "dra" because "123" is recognized anyway
 msgid "eswabfc"
 msgstr ""
 
 #. I use "dra" because "123" is recognized anyway

-#: smime.c:1962
+#: smime.c:1959

 msgid "Choose algorithm family: 1: DES, 2: RC2, 3: AES, or (c)lear? "
 msgstr ""
 
 msgid "Choose algorithm family: 1: DES, 2: RC2, 3: AES, or (c)lear? "
 msgstr ""
 

-#: smime.c:1965
+#: smime.c:1962

 msgid "drac"
 msgstr ""
 
 msgid "drac"
 msgstr ""
 

-#: smime.c:1968
+#: smime.c:1965

 msgid "1: DES, 2: Triple-DES "
 msgstr ""
 
 msgid "1: DES, 2: Triple-DES "
 msgstr ""
 

-#: smime.c:1969
+#: smime.c:1966

 msgid "dt"
 msgstr ""
 
 msgid "dt"
 msgstr ""
 

-#: smime.c:1981
+#: smime.c:1978

 msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 "
 msgstr ""
 
 msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 "
 msgstr ""
 

-#: smime.c:1982
+#: smime.c:1979

 msgid "468"
 msgstr ""
 
 msgid "468"
 msgstr ""
 

-#: smime.c:1997
+#: smime.c:1994

 msgid "1: AES128, 2: AES192, 3: AES256 "
 msgstr ""
 
 msgid "1: AES128, 2: AES192, 3: AES256 "
 msgstr ""
 

-#: smime.c:1998
+#: smime.c:1995

 msgid "895"
 msgstr ""
 
 msgid "895"
 msgstr ""
 

-#: smime.c:2026
-msgid "Can't sign: No key specified. Use Sign As."
-msgstr ""
-
-#: smtp.c:113
+#: smtp.c:134

 #, c-format
 msgid "SMTP session failed: %s"
 msgstr ""
 
 #, c-format
 msgid "SMTP session failed: %s"
 msgstr ""
 

-#: smtp.c:153
+#: smtp.c:180

 #, c-format
 msgid "SMTP session failed: unable to open %s"
 msgstr ""
 
 #, c-format
 msgid "SMTP session failed: unable to open %s"
 msgstr ""
 

-#: smtp.c:269
+#: smtp.c:258
+msgid "No from address given"
+msgstr ""
+
+#: smtp.c:314

 msgid "SMTP session failed: read error"
 msgstr ""
 
 msgid "SMTP session failed: read error"
 msgstr ""
 

-#: smtp.c:271
+#: smtp.c:316

 msgid "SMTP session failed: write error"
 msgstr ""
 
 msgid "SMTP session failed: write error"
 msgstr ""
 

-#: smtp.c:294
+#: smtp.c:318
+msgid "Invalid server response"
+msgstr ""
+
+#: smtp.c:341

 #, c-format
 msgid "Invalid SMTP URL: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid SMTP URL: %s"
 msgstr ""
 

-#: smtp.c:400
+#: smtp.c:451

 msgid "SMTP server does not support authentication"
 msgstr ""
 
 msgid "SMTP server does not support authentication"
 msgstr ""
 

-#: smtp.c:408
+#: smtp.c:459

 msgid "SMTP authentication requires SASL"
 msgstr ""
 
 msgid "SMTP authentication requires SASL"
 msgstr ""
 

-#: smtp.c:551
+#: smtp.c:493
+#, c-format
+msgid "%s authentication failed, trying next method"
+msgstr ""
+
+#: smtp.c:510

 msgid "SASL authentication failed"
 msgstr ""
 
 msgid "SASL authentication failed"
 msgstr ""
 


@@ -4036,11 +4184,11 @@ msgstr ""
 msgid "(no mailbox)"
 msgstr ""
 
 msgid "(no mailbox)"
 msgstr ""
 

-#: thread.c:1093
+#: thread.c:1096

 msgid "Parent message is not visible in this limited view."
 msgstr ""
 
 msgid "Parent message is not visible in this limited view."
 msgstr ""
 

-#: thread.c:1099
+#: thread.c:1102

 msgid "Parent message is not available."
 msgstr ""
 
 msgid "Parent message is not available."
 msgstr ""
 


@@ -4461,377 +4609,381 @@ msgid "force retrieval of mail from IMAP server"
 msgstr ""
 
 #: ../keymap_alldefs.h:109
 msgstr ""
 
 #: ../keymap_alldefs.h:109

-msgid "retrieve mail from POP server"
+msgid "logout from all IMAP servers"

 msgstr ""
 
 #: ../keymap_alldefs.h:110
 msgstr ""
 
 #: ../keymap_alldefs.h:110

-msgid "move to the first message"
+msgid "retrieve mail from POP server"

 msgstr ""
 
 #: ../keymap_alldefs.h:111
 msgstr ""
 
 #: ../keymap_alldefs.h:111

-msgid "move to the last message"
+msgid "move to the first message"

 msgstr ""
 
 #: ../keymap_alldefs.h:112
 msgstr ""
 
 #: ../keymap_alldefs.h:112

-msgid "show only messages matching a pattern"
+msgid "move to the last message"

 msgstr ""
 
 #: ../keymap_alldefs.h:113
 msgstr ""
 
 #: ../keymap_alldefs.h:113

-msgid "link tagged message to the current one"
+msgid "show only messages matching a pattern"

 msgstr ""
 
 #: ../keymap_alldefs.h:114
 msgstr ""
 
 #: ../keymap_alldefs.h:114

-msgid "open next mailbox with new mail"
+msgid "link tagged message to the current one"

 msgstr ""
 
 #: ../keymap_alldefs.h:115
 msgstr ""
 
 #: ../keymap_alldefs.h:115

-msgid "jump to the next new message"
+msgid "open next mailbox with new mail"

 msgstr ""
 
 #: ../keymap_alldefs.h:116
 msgstr ""
 
 #: ../keymap_alldefs.h:116

-msgid "jump to the next new or unread message"
+msgid "jump to the next new message"

 msgstr ""
 
 #: ../keymap_alldefs.h:117
 msgstr ""
 
 #: ../keymap_alldefs.h:117

-msgid "jump to the next subthread"
+msgid "jump to the next new or unread message"

 msgstr ""
 
 #: ../keymap_alldefs.h:118
 msgstr ""
 
 #: ../keymap_alldefs.h:118

-msgid "jump to the next thread"
+msgid "jump to the next subthread"

 msgstr ""
 
 #: ../keymap_alldefs.h:119
 msgstr ""
 
 #: ../keymap_alldefs.h:119

-msgid "move to the next undeleted message"
+msgid "jump to the next thread"

 msgstr ""
 
 #: ../keymap_alldefs.h:120
 msgstr ""
 
 #: ../keymap_alldefs.h:120

-msgid "jump to the next unread message"
+msgid "move to the next undeleted message"

 msgstr ""
 
 #: ../keymap_alldefs.h:121
 msgstr ""
 
 #: ../keymap_alldefs.h:121

-msgid "jump to parent message in thread"
+msgid "jump to the next unread message"

 msgstr ""
 
 #: ../keymap_alldefs.h:122
 msgstr ""
 
 #: ../keymap_alldefs.h:122

-msgid "jump to previous thread"
+msgid "jump to parent message in thread"

 msgstr ""
 
 #: ../keymap_alldefs.h:123
 msgstr ""
 
 #: ../keymap_alldefs.h:123

-msgid "jump to previous subthread"
+msgid "jump to previous thread"

 msgstr ""
 
 #: ../keymap_alldefs.h:124
 msgstr ""
 
 #: ../keymap_alldefs.h:124

-msgid "move to the previous undeleted message"
+msgid "jump to previous subthread"

 msgstr ""
 
 #: ../keymap_alldefs.h:125
 msgstr ""
 
 #: ../keymap_alldefs.h:125

-msgid "jump to the previous new message"
+msgid "move to the previous undeleted message"

 msgstr ""
 
 #: ../keymap_alldefs.h:126
 msgstr ""
 
 #: ../keymap_alldefs.h:126

-msgid "jump to the previous new or unread message"
+msgid "jump to the previous new message"

 msgstr ""
 
 #: ../keymap_alldefs.h:127
 msgstr ""
 
 #: ../keymap_alldefs.h:127

-msgid "jump to the previous unread message"
+msgid "jump to the previous new or unread message"

 msgstr ""
 
 #: ../keymap_alldefs.h:128
 msgstr ""
 
 #: ../keymap_alldefs.h:128

-msgid "mark the current thread as read"
+msgid "jump to the previous unread message"

 msgstr ""
 
 #: ../keymap_alldefs.h:129
 msgstr ""
 
 #: ../keymap_alldefs.h:129

-msgid "mark the current subthread as read"
+msgid "mark the current thread as read"

 msgstr ""
 
 #: ../keymap_alldefs.h:130
 msgstr ""
 
 #: ../keymap_alldefs.h:130

-msgid "set a status flag on a message"
+msgid "mark the current subthread as read"

 msgstr ""
 
 #: ../keymap_alldefs.h:131
 msgstr ""
 
 #: ../keymap_alldefs.h:131

-msgid "save changes to mailbox"
+msgid "set a status flag on a message"

 msgstr ""
 
 #: ../keymap_alldefs.h:132
 msgstr ""
 
 #: ../keymap_alldefs.h:132

-msgid "tag messages matching a pattern"
+msgid "save changes to mailbox"

 msgstr ""
 
 #: ../keymap_alldefs.h:133
 msgstr ""
 
 #: ../keymap_alldefs.h:133

-msgid "undelete messages matching a pattern"
+msgid "tag messages matching a pattern"

 msgstr ""
 
 #: ../keymap_alldefs.h:134
 msgstr ""
 
 #: ../keymap_alldefs.h:134

-msgid "untag messages matching a pattern"
+msgid "undelete messages matching a pattern"

 msgstr ""
 
 #: ../keymap_alldefs.h:135
 msgstr ""
 
 #: ../keymap_alldefs.h:135

-msgid "move to the middle of the page"
+msgid "untag messages matching a pattern"

 msgstr ""
 
 #: ../keymap_alldefs.h:136
 msgstr ""
 
 #: ../keymap_alldefs.h:136

-msgid "move to the next entry"
+msgid "move to the middle of the page"

 msgstr ""
 
 #: ../keymap_alldefs.h:137
 msgstr ""
 
 #: ../keymap_alldefs.h:137

-msgid "scroll down one line"
+msgid "move to the next entry"

 msgstr ""
 
 #: ../keymap_alldefs.h:138
 msgstr ""
 
 #: ../keymap_alldefs.h:138

-msgid "move to the next page"
+msgid "scroll down one line"

 msgstr ""
 
 #: ../keymap_alldefs.h:139
 msgstr ""
 
 #: ../keymap_alldefs.h:139

-msgid "jump to the bottom of the message"
+msgid "move to the next page"

 msgstr ""
 
 #: ../keymap_alldefs.h:140
 msgstr ""
 
 #: ../keymap_alldefs.h:140

-msgid "toggle display of quoted text"
+msgid "jump to the bottom of the message"

 msgstr ""
 
 #: ../keymap_alldefs.h:141
 msgstr ""
 
 #: ../keymap_alldefs.h:141

-msgid "skip beyond quoted text"
+msgid "toggle display of quoted text"

 msgstr ""
 
 #: ../keymap_alldefs.h:142
 msgstr ""
 
 #: ../keymap_alldefs.h:142

-msgid "jump to the top of the message"
+msgid "skip beyond quoted text"

 msgstr ""
 
 #: ../keymap_alldefs.h:143
 msgstr ""
 
 #: ../keymap_alldefs.h:143

-msgid "pipe message/attachment to a shell command"
+msgid "jump to the top of the message"

 msgstr ""
 
 #: ../keymap_alldefs.h:144
 msgstr ""
 
 #: ../keymap_alldefs.h:144

-msgid "move to the previous entry"
+msgid "pipe message/attachment to a shell command"

 msgstr ""
 
 #: ../keymap_alldefs.h:145
 msgstr ""
 
 #: ../keymap_alldefs.h:145

-msgid "scroll up one line"
+msgid "move to the previous entry"

 msgstr ""
 
 #: ../keymap_alldefs.h:146
 msgstr ""
 
 #: ../keymap_alldefs.h:146

-msgid "move to the previous page"
+msgid "scroll up one line"

 msgstr ""
 
 #: ../keymap_alldefs.h:147
 msgstr ""
 
 #: ../keymap_alldefs.h:147

-msgid "print the current entry"
+msgid "move to the previous page"

 msgstr ""
 
 #: ../keymap_alldefs.h:148
 msgstr ""
 
 #: ../keymap_alldefs.h:148

-msgid "query external program for addresses"
+msgid "print the current entry"

 msgstr ""
 
 #: ../keymap_alldefs.h:149
 msgstr ""
 
 #: ../keymap_alldefs.h:149

-msgid "append new query results to current results"
+msgid "query external program for addresses"

 msgstr ""
 
 #: ../keymap_alldefs.h:150
 msgstr ""
 
 #: ../keymap_alldefs.h:150

-msgid "save changes to mailbox and quit"
+msgid "append new query results to current results"

 msgstr ""
 
 #: ../keymap_alldefs.h:151
 msgstr ""
 
 #: ../keymap_alldefs.h:151

-msgid "recall a postponed message"
+msgid "save changes to mailbox and quit"

 msgstr ""
 
 #: ../keymap_alldefs.h:152
 msgstr ""
 
 #: ../keymap_alldefs.h:152

-msgid "clear and redraw the screen"
+msgid "recall a postponed message"

 msgstr ""
 
 #: ../keymap_alldefs.h:153
 msgstr ""
 
 #: ../keymap_alldefs.h:153

-msgid "{internal}"
+msgid "clear and redraw the screen"

 msgstr ""
 
 #: ../keymap_alldefs.h:154
 msgstr ""
 
 #: ../keymap_alldefs.h:154

-msgid "rename the current mailbox (IMAP only)"
+msgid "{internal}"

 msgstr ""
 
 #: ../keymap_alldefs.h:155
 msgstr ""
 
 #: ../keymap_alldefs.h:155

-msgid "reply to a message"
+msgid "rename the current mailbox (IMAP only)"

 msgstr ""
 
 #: ../keymap_alldefs.h:156
 msgstr ""
 
 #: ../keymap_alldefs.h:156

-msgid "use the current message as a template for a new one"
+msgid "reply to a message"

 msgstr ""
 
 #: ../keymap_alldefs.h:157
 msgstr ""
 
 #: ../keymap_alldefs.h:157

-msgid "save message/attachment to a file"
+msgid "use the current message as a template for a new one"

 msgstr ""
 
 #: ../keymap_alldefs.h:158
 msgstr ""
 
 #: ../keymap_alldefs.h:158

-msgid "search for a regular expression"
+msgid "save message/attachment to a mailbox/file"

 msgstr ""
 
 #: ../keymap_alldefs.h:159
 msgstr ""
 
 #: ../keymap_alldefs.h:159

-msgid "search backwards for a regular expression"
+msgid "search for a regular expression"

 msgstr ""
 
 #: ../keymap_alldefs.h:160
 msgstr ""
 
 #: ../keymap_alldefs.h:160

-msgid "search for next match"
+msgid "search backwards for a regular expression"

 msgstr ""
 
 #: ../keymap_alldefs.h:161
 msgstr ""
 
 #: ../keymap_alldefs.h:161

-msgid "search for next match in opposite direction"
+msgid "search for next match"

 msgstr ""
 
 #: ../keymap_alldefs.h:162
 msgstr ""
 
 #: ../keymap_alldefs.h:162

-msgid "toggle search pattern coloring"
+msgid "search for next match in opposite direction"

 msgstr ""
 
 #: ../keymap_alldefs.h:163
 msgstr ""
 
 #: ../keymap_alldefs.h:163

-msgid "invoke a command in a subshell"
+msgid "toggle search pattern coloring"

 msgstr ""
 
 #: ../keymap_alldefs.h:164
 msgstr ""
 
 #: ../keymap_alldefs.h:164

-msgid "sort messages"
+msgid "invoke a command in a subshell"

 msgstr ""
 
 #: ../keymap_alldefs.h:165
 msgstr ""
 
 #: ../keymap_alldefs.h:165

-msgid "sort messages in reverse order"
+msgid "sort messages"

 msgstr ""
 
 #: ../keymap_alldefs.h:166
 msgstr ""
 
 #: ../keymap_alldefs.h:166

-msgid "tag the current entry"
+msgid "sort messages in reverse order"

 msgstr ""
 
 #: ../keymap_alldefs.h:167
 msgstr ""
 
 #: ../keymap_alldefs.h:167

-msgid "apply next function to tagged messages"
+msgid "tag the current entry"

 msgstr ""
 
 #: ../keymap_alldefs.h:168
 msgstr ""
 
 #: ../keymap_alldefs.h:168

-msgid "apply next function ONLY to tagged messages"
+msgid "apply next function to tagged messages"

 msgstr ""
 
 #: ../keymap_alldefs.h:169
 msgstr ""
 
 #: ../keymap_alldefs.h:169

-msgid "tag the current subthread"
+msgid "apply next function ONLY to tagged messages"

 msgstr ""
 
 #: ../keymap_alldefs.h:170
 msgstr ""
 
 #: ../keymap_alldefs.h:170

-msgid "tag the current thread"
+msgid "tag the current subthread"

 msgstr ""
 
 #: ../keymap_alldefs.h:171
 msgstr ""
 
 #: ../keymap_alldefs.h:171

-msgid "toggle a message's 'new' flag"
+msgid "tag the current thread"

 msgstr ""
 
 #: ../keymap_alldefs.h:172
 msgstr ""
 
 #: ../keymap_alldefs.h:172

-msgid "toggle whether the mailbox will be rewritten"
+msgid "toggle a message's 'new' flag"

 msgstr ""
 
 #: ../keymap_alldefs.h:173
 msgstr ""
 
 #: ../keymap_alldefs.h:173

-msgid "toggle whether to browse mailboxes or all files"
+msgid "toggle whether the mailbox will be rewritten"

 msgstr ""
 
 #: ../keymap_alldefs.h:174
 msgstr ""
 
 #: ../keymap_alldefs.h:174

-msgid "move to the top of the page"
+msgid "toggle whether to browse mailboxes or all files"

 msgstr ""
 
 #: ../keymap_alldefs.h:175
 msgstr ""
 
 #: ../keymap_alldefs.h:175

-msgid "undelete the current entry"
+msgid "move to the top of the page"

 msgstr ""
 
 #: ../keymap_alldefs.h:176
 msgstr ""
 
 #: ../keymap_alldefs.h:176

-msgid "undelete all messages in thread"
+msgid "undelete the current entry"

 msgstr ""
 
 #: ../keymap_alldefs.h:177
 msgstr ""
 
 #: ../keymap_alldefs.h:177

-msgid "undelete all messages in subthread"
+msgid "undelete all messages in thread"

 msgstr ""
 
 #: ../keymap_alldefs.h:178
 msgstr ""
 
 #: ../keymap_alldefs.h:178

-msgid "show the Mutt version number and date"
+msgid "undelete all messages in subthread"

 msgstr ""
 
 #: ../keymap_alldefs.h:179
 msgstr ""
 
 #: ../keymap_alldefs.h:179

-msgid "view attachment using mailcap entry if necessary"
+msgid "show the Mutt version number and date"

 msgstr ""
 
 #: ../keymap_alldefs.h:180
 msgstr ""
 
 #: ../keymap_alldefs.h:180

-msgid "show MIME attachments"
+msgid "view attachment using mailcap entry if necessary"

 msgstr ""
 
 #: ../keymap_alldefs.h:181
 msgstr ""
 
 #: ../keymap_alldefs.h:181

-msgid "display the keycode for a key press"
+msgid "show MIME attachments"

 msgstr ""
 
 #: ../keymap_alldefs.h:182
 msgstr ""
 
 #: ../keymap_alldefs.h:182

-msgid "show currently active limit pattern"
+msgid "display the keycode for a key press"

 msgstr ""
 
 #: ../keymap_alldefs.h:183
 msgstr ""
 
 #: ../keymap_alldefs.h:183

-msgid "collapse/uncollapse current thread"
+msgid "show currently active limit pattern"

 msgstr ""
 
 #: ../keymap_alldefs.h:184
 msgstr ""
 
 #: ../keymap_alldefs.h:184

-msgid "collapse/uncollapse all threads"
+msgid "collapse/uncollapse current thread"

 msgstr ""
 
 #: ../keymap_alldefs.h:185
 msgstr ""
 
 #: ../keymap_alldefs.h:185

-msgid "attach a PGP public key"
+msgid "collapse/uncollapse all threads"

 msgstr ""
 
 #: ../keymap_alldefs.h:186
 msgstr ""
 
 #: ../keymap_alldefs.h:186

-msgid "show PGP options"
+msgid "attach a PGP public key"

 msgstr ""
 
 #: ../keymap_alldefs.h:187
 msgstr ""
 
 #: ../keymap_alldefs.h:187

-msgid "mail a PGP public key"
+msgid "show PGP options"

 msgstr ""
 
 #: ../keymap_alldefs.h:188
 msgstr ""
 
 #: ../keymap_alldefs.h:188

-msgid "verify a PGP public key"
+msgid "mail a PGP public key"

 msgstr ""
 
 #: ../keymap_alldefs.h:189
 msgstr ""
 
 #: ../keymap_alldefs.h:189

-msgid "view the key's user id"
+msgid "verify a PGP public key"

 msgstr ""
 
 #: ../keymap_alldefs.h:190
 msgstr ""
 
 #: ../keymap_alldefs.h:190

-msgid "check for classic PGP"
+msgid "view the key's user id"

 msgstr ""
 
 #: ../keymap_alldefs.h:191
 msgstr ""
 
 #: ../keymap_alldefs.h:191

-msgid "Accept the chain constructed"
+msgid "check for classic PGP"

 msgstr ""
 
 #: ../keymap_alldefs.h:192
 msgstr ""
 
 #: ../keymap_alldefs.h:192

-msgid "Append a remailer to the chain"
+msgid "Accept the chain constructed"

 msgstr ""
 
 #: ../keymap_alldefs.h:193
 msgstr ""
 
 #: ../keymap_alldefs.h:193

-msgid "Insert a remailer into the chain"
+msgid "Append a remailer to the chain"

 msgstr ""
 
 #: ../keymap_alldefs.h:194
 msgstr ""
 
 #: ../keymap_alldefs.h:194

-msgid "Delete a remailer from the chain"
+msgid "Insert a remailer into the chain"

 msgstr ""
 
 #: ../keymap_alldefs.h:195
 msgstr ""
 
 #: ../keymap_alldefs.h:195

-msgid "Select the previous element of the chain"
+msgid "Delete a remailer from the chain"

 msgstr ""
 
 #: ../keymap_alldefs.h:196
 msgstr ""
 
 #: ../keymap_alldefs.h:196

-msgid "Select the next element of the chain"
+msgid "Select the previous element of the chain"

 msgstr ""
 
 #: ../keymap_alldefs.h:197
 msgstr ""
 
 #: ../keymap_alldefs.h:197

-msgid "send the message through a mixmaster remailer chain"
+msgid "Select the next element of the chain"

 msgstr ""
 
 #: ../keymap_alldefs.h:198
 msgstr ""
 
 #: ../keymap_alldefs.h:198

-msgid "make decrypted copy and delete"
+msgid "send the message through a mixmaster remailer chain"

 msgstr ""
 
 #: ../keymap_alldefs.h:199
 msgstr ""
 
 #: ../keymap_alldefs.h:199

-msgid "make decrypted copy"
+msgid "make decrypted copy and delete"

 msgstr ""
 
 #: ../keymap_alldefs.h:200
 msgstr ""
 
 #: ../keymap_alldefs.h:200

-msgid "wipe passphrase(s) from memory"
+msgid "make decrypted copy"

 msgstr ""
 
 #: ../keymap_alldefs.h:201
 msgstr ""
 
 #: ../keymap_alldefs.h:201

-msgid "extract supported public keys"
+msgid "wipe passphrase(s) from memory"

 msgstr ""
 
 #: ../keymap_alldefs.h:202
 msgstr ""
 
 #: ../keymap_alldefs.h:202

+msgid "extract supported public keys"
+msgstr ""
+
+#: ../keymap_alldefs.h:203

 msgid "show S/MIME options"
 msgstr ""
 msgid "show S/MIME options"
 msgstr ""