sidebar patch applied, all old patches removed from series

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

diff --git a/po/uk.po b/po/uk.po
index 8e73d4f494b85623a2bfd92cb7795b74633f2585..e0ed0c5472cef129531bc262822f11c3bc7ed8e1 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.3.27/1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-05 16:36-0800\n"
+"POT-Creation-Date: 2010-09-15 10:09-0700\n"
 "PO-Revision-Date: 2002-01-23 15:14+0200\n"
 "Last-Translator: Andrej N. Gritsenko <andrej@lucky.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:161
+#: account.c:163
 #, c-format
 msgid "Username at %s: "
 msgstr "ëÏÒÉÓÔÕ×ÁÞ Õ %s: "
 
-#: account.c:220
+#: account.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "ðÁÒÏÌØ ÄÌÑ %s@%s: "
 
-#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:41 query.c:48
+#: addrbook.c:37 browser.c:46 pager.c:1530 postpone.c:41 query.c:48
 #: recvattach.c:53
 msgid "Exit"
 msgstr "÷ÉȦÄ"
 
-#: addrbook.c:38 curs_main.c:406 pager.c:1486 postpone.c:42
+#: addrbook.c:38 curs_main.c:406 pager.c:1537 postpone.c:42
 msgid "Del"
 msgstr "÷ÉÄ."
 
@@ -41,9 +41,9 @@ msgid "Select"
 msgstr "÷ɦÒ"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3832 curs_main.c:412
-#: mutt_ssl.c:899 mutt_ssl_gnutls.c:805 pager.c:1578 pgpkey.c:522
-#: postpone.c:44 query.c:53 recvattach.c:57 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 "ð¦ÄËÁÚËÁ"
 
@@ -86,8 +86,8 @@ msgstr "
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] ÷¦ÒÎÏ?"
 
-#: alias.c:347 recvattach.c:431 recvattach.c:454 recvattach.c:467
-#: recvattach.c:480 recvattach.c:510
+#: alias.c:347 recvattach.c:440 recvattach.c:466 recvattach.c:479
+#: recvattach.c:492 recvattach.c:522
 msgid "Save to file: "
 msgstr "÷ÎÅÓÔÉ ÄÏ ÆÁÊÌÕ: "
 
@@ -96,16 +96,16 @@ msgstr "
 msgid "Error reading alias file"
 msgstr "ðÏÍÉÌËÁ ÞÉÔÁÎÎÑ ÌÉÓÔÁ!"
 
-#: alias.c:382
+#: alias.c:383
 msgid "Alias added."
 msgstr "ðÓÅ×ÄÏÎ¦Í ÄÏÄÁÎÏ."
 
-#: alias.c:390
+#: alias.c:391
 #, fuzzy
 msgid "Error seeking in alias file"
 msgstr "îÅÍÏÖÌÉ×Ï ÐÏÂÁÞÉÔÉ ÆÁÊÌ"
 
-#: attach.c:113 attach.c:245 attach.c:477 attach.c:969
+#: attach.c:113 attach.c:245 attach.c:477 attach.c:973
 msgid "Can't match nametemplate, continue?"
 msgstr "îÅÍÁ¤ צÄÐÏצÄÎÏÇÏ ¦ÍÅΦ, ÄÁ̦?"
 
@@ -115,8 +115,8 @@ msgstr "
 msgid "Mailcap compose entry requires %%s"
 msgstr "ëÏÍÐÏÎÕ×ÁÎÎÑ, ×ËÁÚÁÎÅ Õ mailcap, ÐÏÔÒÅÂÕ¤ %%s"
 
-#: attach.c:134 attach.c:266 commands.c:223 compose.c:1182 curs_lib.c:177
-#: curs_lib.c:543
+#: 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 "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ \"%s\"!"
@@ -162,123 +162,143 @@ msgstr "
 msgid "Cannot create filter"
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Æ¦ÌØÔÒ"
 
-#: attach.c:677 attach.c:709 attach.c:1002 attach.c:1060 handler.c:1304
+#: 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
+#, fuzzy, c-format
+msgid "---Attachment: %s: %s"
+msgstr "-- äÏÄÁÔËÉ"
+
+#: attach.c:607
+#, fuzzy, 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 "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Æ¦ÌØÔÒ"
 
-#: attach.c:841
+#: attach.c:845
 msgid "Write fault!"
 msgstr "úÂ¦Ê ÚÁÐÉÓÕ!"
 
-#: attach.c:1083
+#: attach.c:1087
 msgid "I don't know how to print that!"
 msgstr "îÅ ÚÎÁÀ, ÑË ÃÅ ÄÒÕËÕ×ÁÔÉ!"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Chdir"
 msgstr "ëÁÔÁÌÏÇ"
 
-#: browser.c:47
+#: browser.c:48
 msgid "Mask"
 msgstr "íÁÓËÁ"
 
-#: browser.c:383 browser.c:1023
+#: browser.c:400 browser.c:1055
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ÎÅ ¤ ËÁÔÁÌÏÇÏÍ."
 
-#: browser.c:507
+#: browser.c:539
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "ðÏÛÔÏצ ÓËÒÉÎØËÉ [%d]"
 
-#: browser.c:514
+#: browser.c:546
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "ð¦ÄÐÉÓÁΦ [%s] Ú ÍÁÓËÏÀ: %s"
 
-#: browser.c:518
+#: browser.c:550
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "ëÁÔÁÌÏÇ [%s] Ú ÍÁÓËÏÀ: %s"
 
-#: browser.c:530
+#: browser.c:562
 msgid "Can't attach a directory!"
 msgstr "îÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ ËÁÔÁÌÏÇ!"
 
-#: browser.c:669 browser.c:1092 browser.c:1190
+#: browser.c:701 browser.c:1123 browser.c:1221
 msgid "No files match the file mask"
 msgstr "îÅÍÁ¤ ÆÁÊ̦×, ÝÏ ×¦ÄÐÏצÄÁÀÔØ ÍÁÓæ"
 
-#: browser.c:873
+#: browser.c:905
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "óÔ×ÏÒÅÎÎÑ Ð¦ÄÔÒÉÍÕ¤ÔØÓÑ ÌÉÛÅ ÄÌÑ ÓËÒÉÎØÏË IMAP"
 
-#: browser.c:897
+#: browser.c:929
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "óÔ×ÏÒÅÎÎÑ Ð¦ÄÔÒÉÍÕ¤ÔØÓÑ ÌÉÛÅ ÄÌÑ ÓËÒÉÎØÏË IMAP"
 
-#: browser.c:920
+#: browser.c:952
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "÷ÉÄÁÌÅÎÎÑ Ð¦ÄÔÒÉÍÕ¤ÔØÓÑ ÌÉÛÅ ÄÌÑ ÓËÒÉÎØÏË IMAP"
 
-#: browser.c:930
+#: browser.c:962
 #, fuzzy
 msgid "Cannot delete root folder"
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Æ¦ÌØÔÒ"
 
-#: browser.c:933
+#: browser.c:965
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "÷ÐÅ×ÎÅΦ Õ ×ÉÄÁÌÅÎΦ ÓËÒÉÎØËÉ \"%s\"?"
 
-#: browser.c:947
+#: browser.c:979
 msgid "Mailbox deleted."
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ×ÉÄÁÌÅÎÏ."
 
-#: browser.c:953
+#: browser.c:985
 msgid "Mailbox not deleted."
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÎÅ ×ÉÄÁÌÅÎÏ."
 
-#: browser.c:972
+#: browser.c:1004
 msgid "Chdir to: "
 msgstr "ðÅÒÅÊÔÉ ÄÏ: "
 
-#: browser.c:1011 browser.c:1085
+#: browser.c:1043 browser.c:1116
 msgid "Error scanning directory."
 msgstr "ëÁÔÁÌÏÇ ÎÅ ÓËÁÎÕ¤ÔØÓÑ."
 
-#: browser.c:1035
+#: browser.c:1067
 msgid "File Mask: "
 msgstr "íÁÓËÁ: "
 
-#: browser.c:1108
+#: browser.c:1139
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "ú×ÏÒÏÔÎØÏ ÓÏÒÔÕ×ÁÔÉ ÚÁ ÄÁÔÏÀ(d), ̦ÔÅÒÏÀ(a), ÒÏÚͦÒÏÍ(s), ÞÉ Î¦(n)?"
 
-#: browser.c:1109
+#: browser.c:1140
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "óÏÒÔÕ×ÁÔÉ ÚÁ ÄÁÔÏÀ(d), ̦ÔÅÒÏÀ(a), ÒÏÚͦÒÏÍ(s), ÞÉ Î¦(n)?"
 
-#: browser.c:1110
+#: browser.c:1141
 msgid "dazn"
 msgstr ""
 
-#: browser.c:1177
+#: browser.c:1208
 msgid "New file name: "
 msgstr "¶Í'Ñ ÎÏ×ÏÇÏ ÆÁÊÌÕ: "
 
-#: browser.c:1208
+#: browser.c:1239
 msgid "Can't view a directory"
 msgstr "îÅÍÏÖÌÉ×Ï ÐÏÂÁÞÉÔÉ ËÁÔÁÌÏÇ"
 
-#: browser.c:1225
+#: browser.c:1256
 msgid "Error trying to view file"
 msgstr "îÅÍÏÖÌÉ×Ï ÐÏÂÁÞÉÔÉ ÆÁÊÌ"
 
-#: buffy.c:424
+#: buffy.c:486
 #, fuzzy
 msgid "New mail in "
 msgstr "îÏ×Á ÐÏÛÔÁ × %s."
@@ -293,47 +313,47 @@ msgstr "%s: 
 msgid "%s: no such color"
 msgstr "%s: ÔÁËÏÇÏ ËÏÌØÏÒÕ ÎÅÍÁ¤"
 
-#: 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 "%s: ÔÁËÏÇÏ ÏÂ'¤ËÔÕ ÎÅÍÁ¤"
 
-#: color.c:385
-#, c-format
-msgid "%s: command valid only for index object"
+#: color.c:391
+#, fuzzy, c-format
+msgid "%s: command valid only for index, body, header objects"
 msgstr "%s: ËÏÍÁÎÄÁ ÍÏÖÌÉ×Á Ô¦ÌØËÉ Õ ÓÐÉÓËÏצ ÌÉÓÔ¦×"
 
-#: color.c:393
+#: color.c:399
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s: ÄÕÖÅ ÍÁÌÏ ÁÒÇÕÍÅÎÔ¦×"
 
-#: color.c:567
+#: color.c:572
 msgid "Missing arguments."
 msgstr "îÅÄÏÓÔÁÔÎØÏ ÁÒÇÕÍÅÎÔ¦×."
 
-#: color.c:606 color.c:617
+#: color.c:611 color.c:622
 msgid "color: too few arguments"
 msgstr "color: ÄÕÖÅ ÍÁÌÏ ÁÒÇÕÍÅÎÔ¦×"
 
-#: color.c:640
+#: color.c:645
 msgid "mono: too few arguments"
 msgstr "mono: ÄÕÖÅ ÍÁÌÏ ÁÒÇÕÍÅÎÔ¦×"
 
-#: color.c:660
+#: color.c:665
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s: ÔÁËÏÇÏ ÁÔÒ¦ÂÕÔÕ ÎÅÍÁ¤"
 
-#: color.c:700 hook.c:69 hook.c:77 keymap.c:776
+#: color.c:705 hook.c:69 hook.c:77 keymap.c:902
 msgid "too few arguments"
 msgstr "ÄÕÖÅ ÍÁÌÏ ÁÒÇÕÍÅÎÔ¦×"
 
-#: color.c:709 hook.c:83
+#: color.c:714 hook.c:83
 msgid "too many arguments"
 msgstr "ÄÕÖÅ ÂÁÇÁÔÏ ÁÒÇÕÍÅÎÔ¦×"
 
-#: color.c:725
+#: color.c:730
 msgid "default colors not supported"
 msgstr "ËÏÌ¦Ò default ΊЦÄÔÒÉÍÕ¤ÔØÓÑ"
 
@@ -342,7 +362,7 @@ msgstr "
 msgid "Verify PGP signature?"
 msgstr "ðÅÒÅצÒÉÔÉ Ð¦ÄÐÉÓ PGP?"
 
-#: commands.c:115 mbox.c:754
+#: commands.c:115 mbox.c:787
 msgid "Could not create temporary file!"
 msgstr "îÅ ×ÉÊÛÌÏ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ!"
 
@@ -380,170 +400,175 @@ msgstr "
 msgid "PGP signature could NOT be verified."
 msgstr "ð¦ÄÐÉÓ PGP ÐÅÒÅצÒÉÔÉ ÎÅÍÏÖÌÉ×Ï."
 
-#: commands.c:230
+#: commands.c:231
 msgid "Command: "
 msgstr "ëÏÍÁÎÄÁ: "
 
-#: commands.c:250 recvcmd.c:143
+#: commands.c:256
+#, fuzzy
+msgid "Warning: message has no From: header"
+msgstr "ÐÅÒÅÊÔÉ ÄÏ \"ÂÁÔØ˦×ÓØËÏÇÏ\" ÌÉÓÔÁ Õ ÂÅӦĦ"
+
+#: commands.c:274 recvcmd.c:171
 msgid "Bounce message to: "
 msgstr "îÁĦÓÌÁÔÉ ËÏЦÀ ÌÉÓÔÁ: "
 
-#: commands.c:252 recvcmd.c:145
+#: commands.c:276 recvcmd.c:173
 msgid "Bounce tagged messages to: "
 msgstr "îÁĦÓÌÁÔÉ ËÏЦ§ ×ÉĦÌÅÎÉÈ ÌÉÓÔ¦×: "
 
-#: commands.c:267 recvcmd.c:154
+#: commands.c:291 recvcmd.c:182
 msgid "Error parsing address!"
 msgstr "ðÏÍÉÌËÁ ÒÏÚÂÏÒÕ ÁÄÒÅÓÉ!"
 
-#: commands.c:275 recvcmd.c:162
+#: commands.c:299 recvcmd.c:190
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 
-#: commands.c:286 recvcmd.c:176
+#: commands.c:310 recvcmd.c:204
 #, c-format
 msgid "Bounce message to %s"
 msgstr "îÁĦÓÌÁÔÉ ËÏЦÀ ÌÉÓÔÁ %s"
 
-#: commands.c:286 recvcmd.c:176
+#: commands.c:310 recvcmd.c:204
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "îÁĦÓÌÁÔÉ ËÏЦ§ ÌÉÓÔ¦× %s"
 
-#: commands.c:302 recvcmd.c:192
+#: commands.c:326 recvcmd.c:220
 #, fuzzy
 msgid "Message not bounced."
 msgstr "ëÏЦÀ ÌÉÓÔÁ ÐÅÒÅÓÌÁÎÏ."
 
-#: commands.c:302 recvcmd.c:192
+#: commands.c:326 recvcmd.c:220
 #, fuzzy
 msgid "Messages not bounced."
 msgstr "ëÏЦ§ ÌÉÓÔ¦× ÐÅÒÅÓÌÁÎÏ."
 
-#: commands.c:312 recvcmd.c:211
+#: commands.c:336 recvcmd.c:239
 msgid "Message bounced."
 msgstr "ëÏЦÀ ÌÉÓÔÁ ÐÅÒÅÓÌÁÎÏ."
 
-#: commands.c:312 recvcmd.c:211
+#: commands.c:336 recvcmd.c:239
 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 "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÐÒÏÃÅÓ Æ¦ÌØÔÒÕ"
 
-#: commands.c:469
+#: commands.c:493
 msgid "Pipe to command: "
 msgstr "ðÅÒÅÄÁÔÉ ÄÏ ÐÒÏÇÒÁÍÉ: "
 
-#: commands.c:486
+#: commands.c:510
 msgid "No printing command has been defined."
 msgstr "ëÏÍÁÎÄÕ ÄÌÑ ÄÒÕËÕ ÎÅ ×ÉÚÎÁÞÅÎÏ."
 
-#: commands.c:491
+#: commands.c:515
 msgid "Print message?"
 msgstr "äÒÕËÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ?"
 
-#: commands.c:491
+#: commands.c:515
 msgid "Print tagged messages?"
 msgstr "äÒÕËÕ×ÁÔÉ ×ÉĦÌÅΦ ÐÏצÄÏÍÌÅÎÎÑ?"
 
-#: commands.c:500
+#: commands.c:524
 msgid "Message printed"
 msgstr "ðÏצÄÏÍÌÅÎÎÑ ÎÁÄÒÕËÏ×ÁÎÏ"
 
-#: commands.c:500
+#: commands.c:524
 msgid "Messages printed"
 msgstr "ðÏצÄÏÍÌÅÎÎÑ ÎÁÄÒÕËÏ×ÁÎÏ"
 
-#: commands.c:502
+#: commands.c:526
 msgid "Message could not be printed"
 msgstr "ðÏצÄÏÍÌÅÎÎÑ ÎÅ ÍÏÖÅ ÂÕÔÉ ÎÁÄÒÕËÏ×ÁÎÏ"
 
-#: commands.c:503
+#: commands.c:527
 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 ""
 
-#: 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 ""
 
-#: commands.c:514
+#: commands.c:538
 msgid "dfrsotuzcp"
 msgstr ""
 
-#: commands.c:571
+#: commands.c:595
 msgid "Shell command: "
 msgstr "ëÏÍÁÎÄÁ ÓÉÓÔÅÍÉ: "
 
-#: commands.c:716
+#: commands.c:738
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "òÏÚËÏÄÕ×ÁÔÉ-ÐÅÒÅÎÅÓÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
 
-#: commands.c:717
+#: commands.c:739
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "òÏÚËÏÄÕ×ÁÔÉ-ËÏЦÀ×ÁÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
 
-#: commands.c:718
+#: commands.c:740
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "òÏÚÛÉÆÒÕ×ÁÔÉ-ÐÅÒÅÎÅÓÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
 
-#: commands.c:719
+#: commands.c:741
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "òÏÚÛÉÆÒÕ×ÁÔÉ-ËÏЦÀ×ÁÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
 
-#: commands.c:720
+#: commands.c:742
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "ðÅÒÅÎÅÓÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
 
-#: commands.c:720
+#: commands.c:742
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "ëÏЦÀ×ÁÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
 
-#: commands.c:721
+#: commands.c:743
 msgid " tagged"
 msgstr " ×ÉĦÌÅΦ"
 
-#: commands.c:794
+#: commands.c:816
 #, c-format
 msgid "Copying to %s..."
 msgstr "ëÏЦÀ×ÁÎÎÑ ÄÏ %s..."
 
-#: commands.c:929
+#: commands.c:932
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "ðÅÒÅÔ×ÏÒÉÔÉ ÎÁ %s ÐÒÉ ÎÁÄÓÉÌÁÎΦ?"
 
-#: commands.c:939
+#: commands.c:942
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "ôÉÐ ÄÏÄÁÔËÕ ÚͦÎÅÎÏ ÎÁ %s."
 
-#: commands.c:944
+#: commands.c:947
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "ëÏÄÕ×ÁÎÎÑ ÚͦÎÅÎÏ ÎÁ %s; %s."
 
-#: commands.c:946
+#: commands.c:949
 msgid "not converting"
 msgstr "ÎÅ ÐÅÒÅÔ×ÏÒÅÎÏ"
 
-#: commands.c:946
+#: commands.c:949
 msgid "converting"
 msgstr "ÐÅÒÅÔ×ÏÒÅÎÏ"
 
@@ -559,7 +584,7 @@ msgstr "
 msgid "Abort"
 msgstr "÷¦ÄͦÎÁ"
 
-#: compose.c:94 compose.c:667
+#: compose.c:94 compose.c:664
 msgid "Attach file"
 msgstr "äÏÄÁÔÉ ÆÁÊÌ"
 
@@ -567,170 +592,179 @@ msgstr "
 msgid "Descrip"
 msgstr "ðÏÑÓÎ."
 
-#: compose.c:132
+#: compose.c:119
+#, fuzzy
+msgid "Not supported"
+msgstr "÷ÉĦÌÅÎÎÑ ÎŠЦÄÔÒÉÍÕ¤ÔØÓÑ."
+
+#: compose.c:124
 msgid "Sign, Encrypt"
 msgstr "ð¦ÄÐÉÓ, ÛÉÆÒÕ×ÁÎÎÑ"
 
-#: compose.c:134
+#: compose.c:126
 msgid "Encrypt"
 msgstr "ûÉÆÒÕ×ÁÎÎÑ"
 
-#: compose.c:136
+#: compose.c:128
 msgid "Sign"
 msgstr "ð¦ÄÐÉÓ"
 
-#: compose.c:138
-msgid "Clear"
-msgstr "îÅ ÚÁÓÔÏÓÏ×Õ×ÁÔÉ"
+#: compose.c:130
+msgid "None"
+msgstr ""
 
-#: compose.c:145
+#: compose.c:137
 #, fuzzy
-msgid " (inline)"
+msgid " (inline PGP)"
 msgstr "(ÄÁ̦)\n"
 
-#: compose.c:147
+#: compose.c:139
 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 " ЦÄÐÉÓ ÑË:"
 
-#: compose.c:155 compose.c:159
+#: compose.c:152 compose.c:156
 msgid "<default>"
 msgstr "<ÚÁ ÚÍÏ×ÞÁÎÎÑÍ>"
 
-#: compose.c:167
+#: compose.c:164
 #, fuzzy
 msgid "Encrypt with: "
 msgstr "ûÉÆÒÕ×ÁÎÎÑ"
 
-#: compose.c:221
+#: compose.c:218
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] ¦ÌØÛÅ ÎÅ ¦ÓÎÕ¤!"
 
-#: compose.c:229
+#: compose.c:226
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "%s [#%d] ÚͦÎÅÎÏ. úͦÎÉÔÉ ËÏÄÕ×ÁÎÎÑ?"
 
-#: compose.c:272
+#: compose.c:269
 msgid "-- Attachments"
 msgstr "-- äÏÄÁÔËÉ"
 
-#: compose.c:302
+#: compose.c:299
 #, 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 "ãÅ ¤ÄÉÎÁ ÞÁÓÔÉÎÁ ÌÉÓÔÁ, §§ ÎÅ ÍÏÖÎÁ ×ÉÄÁÌÑÔÉ."
 
-#: compose.c:600 send.c:1560
+#: compose.c:597 send.c:1586
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
 
-#: compose.c:683
+#: compose.c:680
 msgid "Attaching selected files..."
 msgstr "äÏÄÁ×ÁÎÎÑ ×ÉÂÒÁÎÉÈ ÆÁÊ̦×..."
 
-#: compose.c:695
+#: compose.c:692
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "îÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ %s!"
 
-#: compose.c:714
+#: compose.c:711
 msgid "Open mailbox to attach message from"
 msgstr "óËÒÉÎØËÁ, Ú ÑËϧ ÄÏÄÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: compose.c:752
+#: compose.c:749
 msgid "No messages in that folder."
 msgstr "ãÑ ÓËÒÉÎØËÁ ÚÏ×Ó¦Í ÐÏÒÏÖÎÑ."
 
-#: compose.c:761
+#: compose.c:758
 msgid "Tag the messages you want to attach!"
 msgstr "÷ÉĦ̦ÔØ ÐÏצÄÏÍÌÅÎÎÑ, ÝÏ ÄÏÄÁ¤ÔÅ!"
 
-#: compose.c:793
+#: compose.c:790
 msgid "Unable to attach!"
 msgstr "îÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ!"
 
-#: compose.c:844
+#: compose.c:841
 msgid "Recoding only affects text attachments."
 msgstr "ðÅÒÅËÏÄÕ×ÁÎÎÑ ÍÏÖÅ ÂÕÔÉ ÚÁÓÔÏÓÏ×ÁÎÅ Ô¦ÌØËÉ ÄÏ ÔÅËÓÔÏ×ÉÈ ÄÏÄÁÔ˦×."
 
-#: compose.c:849
+#: compose.c:846
 msgid "The current attachment won't be converted."
 msgstr "ðÏÔÏÞÎÉÊ ÄÏÄÁÔÏË ÎÅ ÂÕÄÅ ÐÅÒÅÔ×ÏÒÅÎÏ."
 
-#: compose.c:851
+#: compose.c:848
 msgid "The current attachment will be converted."
 msgstr "ðÏÔÏÞÎÉÊ ÄÏÄÁÔÏË ÂÕÄÅ ÐÅÒÅÔ×ÏÒÅÎÏ."
 
-#: compose.c:926
+#: compose.c:923
 msgid "Invalid encoding."
 msgstr "îÅצÒÎÅ ËÏÄÕ×ÁÎÎÑ."
 
-#: compose.c:952
+#: compose.c:949
 msgid "Save a copy of this message?"
 msgstr "úÂÅÒÅÇÔÉ ËÏЦÀ ÃØÏÇÏ ÐÏצÄÏÍÌÅÎÎÑ?"
 
-#: compose.c:1008
+#: compose.c:1005
 msgid "Rename to: "
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ Õ: "
 
-#: compose.c:1013 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 "îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ÄÁΦ %s: %s"
 
-#: compose.c:1040
+#: compose.c:1037
 msgid "New file: "
 msgstr "îÏ×ÉÊ ÆÁÊÌ: "
 
-#: compose.c:1053
+#: compose.c:1050
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type ÐÏ ÆÏÒͦ base/sub"
 
-#: compose.c:1059
+#: compose.c:1056
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "îÅצÄÏÍÉÊ Content-Type %s"
 
-#: compose.c:1072
+#: compose.c:1069
 #, c-format
 msgid "Can't create file %s"
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÆÁÊÌ %s"
 
-#: compose.c:1080
+#: compose.c:1077
 msgid "What we have here is a failure to make an attachment"
 msgstr "îÅ ×ÉÊÛÌÏ ÓÔ×ÏÒÉÔÉ ÄÏÄÁÔÏË"
 
-#: compose.c:1141
+#: compose.c:1138
 msgid "Postpone this message?"
 msgstr "úÁÌÉÛÉÔÉ ÌÉÓÔ ÄÏ ÐÏÄÁÌØÛÏÇÏ ÒÅÄÁÇÕ×ÁÎÎÑ ÔÁ צÄÐÒÁ×ËÉ?"
 
-#: compose.c:1200
+#: compose.c:1197
 msgid "Write message to mailbox"
 msgstr "úÁÐÉÓÁÔÉ ÌÉÓÔ ÄÏ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ"
 
-#: compose.c:1203
+#: compose.c:1200
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "úÁÐÉÓ ÌÉÓÔÁ ÄÏ %s..."
 
-#: compose.c:1212
+#: compose.c:1209
 msgid "Message written."
 msgstr "ìÉÓÔ ÚÁÐÉÓÁÎÏ."
 
-#: compose.c:1224
+#: compose.c:1221
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
-#: compose.c:1250
+#: compose.c:1247
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
@@ -845,7 +879,7 @@ msgstr ""
 msgid "PKA verified signer's address is: "
 msgstr ""
 
-#: crypt-gpgme.c:1185 crypt-gpgme.c:3299
+#: crypt-gpgme.c:1185 crypt-gpgme.c:3294
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "÷¦ÄÂÉÔÏË: %s"
@@ -902,7 +936,7 @@ 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:1439 crypt-gpgme.c:1654 crypt-gpgme.c:2290
+#: crypt-gpgme.c:1439 crypt-gpgme.c:1654 crypt-gpgme.c:2287
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
@@ -920,7 +954,7 @@ msgstr ""
 msgid "*** End Notation ***\n"
 msgstr ""
 
-#: crypt-gpgme.c:1527 crypt-gpgme.c:1667 crypt-gpgme.c:2305
+#: crypt-gpgme.c:1527 crypt-gpgme.c:1667 crypt-gpgme.c:2302
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
@@ -934,21 +968,21 @@ msgid ""
 "\n"
 msgstr "[-- ðÏÍÉÌËÁ: ˦ÎÅÃØ ÆÁÊÌÕ ÎÅ ÚÎÁÊÄÅÎÏ! --]\n"
 
-#: crypt-gpgme.c:2082
+#: crypt-gpgme.c:2079
 #, fuzzy, c-format
 msgid "Error extracting key data!\n"
 msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
 
-#: crypt-gpgme.c:2265
+#: crypt-gpgme.c:2262
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
-#: crypt-gpgme.c:2313
+#: crypt-gpgme.c:2310
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt-gpgme.c:2333 pgp.c:427
+#: crypt-gpgme.c:2330 pgp.c:438
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -956,11 +990,11 @@ msgstr ""
 "[-- ðÏÞÁÔÏË ÐÏצÄÏÍÌÅÎÎÑ PGP --]\n"
 "\n"
 
-#: crypt-gpgme.c:2335 pgp.c:429
+#: crypt-gpgme.c:2332 pgp.c:440
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- ðÏÞÁÔÏË ÂÌÏËÕ ×¦ÄËÒÉÔÏÇÏ ËÌÀÞÁ PGP --]\n"
 
-#: crypt-gpgme.c:2338 pgp.c:431
+#: crypt-gpgme.c:2335 pgp.c:442
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -968,19 +1002,19 @@ msgstr ""
 "[-- ðÏÞÁÔÏË ÐÏצÄÏÍÌÅÎÎÑ Ú PGP ЦÄÐÉÓÏÍ --]\n"
 "\n"
 
-#: crypt-gpgme.c:2365 pgp.c:457
+#: crypt-gpgme.c:2362 pgp.c:473
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr "[-- ë¦ÎÅÃØ ÐÏצÄÏÍÌÅÎÎÑ PGP --]\n"
 
-#: crypt-gpgme.c:2367 pgp.c:464
+#: crypt-gpgme.c:2364 pgp.c:480
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- ë¦ÎÅÃØ ÂÌÏËÕ ×¦ÄËÒÉÔÏÇÏ ËÌÀÞÁ PGP --]\n"
 
-#: crypt-gpgme.c:2369 pgp.c:466
+#: crypt-gpgme.c:2366 pgp.c:482
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr "[-- ë¦ÎÅÃØ ÐÏצÄÏÍÌÅÎÎÑ Ú PGP ЦÄÐÉÓÏÍ --]\n"
 
-#: crypt-gpgme.c:2393 pgp.c:499
+#: crypt-gpgme.c:2388 pgp.c:515
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -988,7 +1022,7 @@ msgstr ""
 "[-- ðÏÍÉÌËÁ: ÎÅ ×ÉÊÛÌÏ ÚÎÁÊÔÉ ÐÏÞÁÔÏË ÐÏצÄÏÍÌÅÎÎÑ PGP! --]\n"
 "\n"
 
-#: crypt-gpgme.c:2424 pgp.c:931
+#: crypt-gpgme.c:2419 pgp.c:947
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -996,11 +1030,11 @@ msgstr ""
 "[-- ðÏÍÉÌËÁ: ÎÅÓÆÏÒÍÏ×ÁÎÉÊ ÌÉÓÔ PGP/MIME! --]\n"
 "\n"
 
-#: crypt-gpgme.c:2436 crypt-gpgme.c:2502 pgp.c:944
+#: crypt-gpgme.c:2431 crypt-gpgme.c:2497 pgp.c:960
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- ðÏÍÉÌËÁ: ÎÅ ×ÉÊÛÌÏ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ! --]\n"
 
-#: crypt-gpgme.c:2448
+#: crypt-gpgme.c:2443
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
@@ -1009,7 +1043,7 @@ msgstr ""
 "[-- îÁÓÔÕÐΦ ÄÁΦ ÚÁÛÉÆÒÏ×ÁÎÏ PGP/MIME --]\n"
 "\n"
 
-#: crypt-gpgme.c:2449 pgp.c:953
+#: crypt-gpgme.c:2444 pgp.c:969
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
@@ -1017,16 +1051,16 @@ msgstr ""
 "[-- îÁÓÔÕÐΦ ÄÁΦ ÚÁÛÉÆÒÏ×ÁÎÏ PGP/MIME --]\n"
 "\n"
 
-#: crypt-gpgme.c:2471
+#: crypt-gpgme.c:2466
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr "[-- ë¦ÎÅÃØ ÄÁÎÉÈ, ÚÁÛÉÆÒÏ×ÁÎÉÈ PGP/MIME --]\n"
 
-#: crypt-gpgme.c:2472 pgp.c:973
+#: crypt-gpgme.c:2467 pgp.c:989
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr "[-- ë¦ÎÅÃØ ÄÁÎÉÈ, ÚÁÛÉÆÒÏ×ÁÎÉÈ PGP/MIME --]\n"
 
-#: crypt-gpgme.c:2514
+#: crypt-gpgme.c:2509
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
@@ -1035,7 +1069,7 @@ msgstr ""
 "[-- îÁÓÔÕÐΦ ÄÁΦ ЦÄÐÉÓÁÎÏ --]\n"
 "\n"
 
-#: crypt-gpgme.c:2515
+#: crypt-gpgme.c:2510
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
@@ -1044,259 +1078,259 @@ msgstr ""
 "[-- îÁÓÔÕÐΦ ÄÁΦ ÚÁÛÉÆÒÏ×ÁÎÏ S/MIME --]\n"
 "\n"
 
-#: crypt-gpgme.c:2545
+#: crypt-gpgme.c:2540
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr "[-- ë¦ÎÅÃØ Ð¦ÄÐÉÓÁÎÉÈ ÄÁÎÉÈ --]\n"
 
-#: crypt-gpgme.c:2546
+#: crypt-gpgme.c:2541
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr "[-- ë¦ÎÅÃØ ÄÁÎÉÈ, ÚÁÛÉÆÒÏ×ÁÎÉÈ PGP/MIME --]\n"
 
-#: crypt-gpgme.c:3139
+#: crypt-gpgme.c:3134
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt-gpgme.c:3141
+#: crypt-gpgme.c:3136
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt-gpgme.c:3146
+#: crypt-gpgme.c:3141
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt-gpgme.c:3225
+#: crypt-gpgme.c:3220
 msgid " aka ......: "
 msgstr ""
 
-#: crypt-gpgme.c:3225
+#: crypt-gpgme.c:3220
 msgid "Name ......: "
 msgstr ""
 
-#: crypt-gpgme.c:3228 crypt-gpgme.c:3367
+#: crypt-gpgme.c:3223 crypt-gpgme.c:3362
 #, fuzzy
 msgid "[Invalid]"
 msgstr "í¦ÓÑÃØ '%s' ÎÅ ¦ÓÎÕ¤"
 
-#: crypt-gpgme.c:3248 crypt-gpgme.c:3391
+#: crypt-gpgme.c:3243 crypt-gpgme.c:3386
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
 msgstr "í¦ÓÑÃØ '%s' ÎÅ ¦ÓÎÕ¤"
 
-#: crypt-gpgme.c:3261 crypt-gpgme.c:3404
+#: crypt-gpgme.c:3256 crypt-gpgme.c:3399
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
 msgstr "í¦ÓÑÃØ '%s' ÎÅ ¦ÓÎÕ¤"
 
-#: crypt-gpgme.c:3274 crypt-gpgme.c:3417
+#: crypt-gpgme.c:3269 crypt-gpgme.c:3412
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt-gpgme.c:3276 crypt-gpgme.c:3419
+#: crypt-gpgme.c:3271 crypt-gpgme.c:3414
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: crypt-gpgme.c:3281 crypt-gpgme.c:3424
+#: crypt-gpgme.c:3276 crypt-gpgme.c:3419
 #, fuzzy
 msgid "encryption"
 msgstr "ûÉÆÒÕ×ÁÎÎÑ"
 
-#: crypt-gpgme.c:3282 crypt-gpgme.c:3287 crypt-gpgme.c:3292 crypt-gpgme.c:3425
-#: crypt-gpgme.c:3430 crypt-gpgme.c:3435
+#: 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 ""
 
-#: crypt-gpgme.c:3286 crypt-gpgme.c:3429
+#: crypt-gpgme.c:3281 crypt-gpgme.c:3424
 msgid "signing"
 msgstr ""
 
-#: crypt-gpgme.c:3291 crypt-gpgme.c:3434
+#: crypt-gpgme.c:3286 crypt-gpgme.c:3429
 #, fuzzy
 msgid "certification"
 msgstr "óÅÒÔÉƦËÁÔ ÚÂÅÒÅÖÅÎÏ"
 
-#: crypt-gpgme.c:3331
+#: crypt-gpgme.c:3326
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: crypt-gpgme.c:3339
+#: crypt-gpgme.c:3334
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
 #. display only the short keyID
-#: crypt-gpgme.c:3358
+#: crypt-gpgme.c:3353
 #, c-format
 msgid "Subkey ....: 0x%s"
 msgstr ""
 
-#: crypt-gpgme.c:3362
+#: crypt-gpgme.c:3357
 msgid "[Revoked]"
 msgstr ""
 
-#: crypt-gpgme.c:3372
+#: crypt-gpgme.c:3367
 #, fuzzy
 msgid "[Expired]"
 msgstr "÷ÉÈ¦Ä  "
 
-#: crypt-gpgme.c:3377
+#: crypt-gpgme.c:3372
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt-gpgme.c:3461 pgpkey.c:559 pgpkey.c:739
+#: crypt-gpgme.c:3456 pgpkey.c:559 pgpkey.c:739
 msgid "Can't create temporary file"
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ"
 
-#: crypt-gpgme.c:3464
+#: crypt-gpgme.c:3459
 #, fuzzy
 msgid "Collecting data..."
 msgstr "ú'¤ÄÎÁÎÎÑ Ú %s..."
 
-#: crypt-gpgme.c:3490
+#: crypt-gpgme.c:3485
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "ðÏÍÉÌËÁ Ú'¤ÄÎÁÎÎÑ Ú ÓÅÒ×ÅÒÏÍ: %s"
 
-#: crypt-gpgme.c:3500
+#: crypt-gpgme.c:3495
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt-gpgme.c:3511 pgpkey.c:580
+#: crypt-gpgme.c:3506 pgpkey.c:580
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr ""
 
-#: crypt-gpgme.c:3594
+#: crypt-gpgme.c:3589
 #, fuzzy, c-format
 msgid "gpgme_new failed: %s"
 msgstr "ðÏÍÉÌËÁ SSL: %s"
 
-#: crypt-gpgme.c:3633 crypt-gpgme.c:3696
+#: crypt-gpgme.c:3628 crypt-gpgme.c:3691
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 
-#: crypt-gpgme.c:3683 crypt-gpgme.c:3724
+#: crypt-gpgme.c:3678 crypt-gpgme.c:3719
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt-gpgme.c:3795
+#: crypt-gpgme.c:3790
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
 msgstr "÷Ó¦ צÄÐÏצÄΦ ËÌÀÞ¦ ÄÁ×Φ/ÚÁͦÎÅΦ."
 
-#: crypt-gpgme.c:3824 mutt_ssl.c:897 mutt_ssl_gnutls.c:803 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__
-#: crypt-gpgme.c:3826 pgpkey.c:517 smime.c:434
+#: crypt-gpgme.c:3821 pgpkey.c:517 smime.c:422
 msgid "Select  "
 msgstr "÷ÉÂ¦Ò  "
 
 #. __STRCAT_CHECKED__
-#: crypt-gpgme.c:3829 pgpkey.c:520
+#: crypt-gpgme.c:3824 pgpkey.c:520
 msgid "Check key  "
 msgstr "ðÅÒÅצÒËÁ  "
 
-#: crypt-gpgme.c:3845
+#: crypt-gpgme.c:3840
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "PGP ËÌÀÞ¦, ÝÏ ×¦ÄÐÏצÄÁÀÔØ \"%s\"."
 
-#: crypt-gpgme.c:3847
+#: crypt-gpgme.c:3842
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "PGP ËÌÀÞ¦, ÝÏ ×¦ÄÐÏצÄÁÀÔØ \"%s\"."
 
-#: crypt-gpgme.c:3849
+#: crypt-gpgme.c:3844
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "S/MIME ËÌÀÞ¦, ÝÏ ×¦ÄÐÏצÄÁÀÔØ \"%s\"."
 
-#: crypt-gpgme.c:3851
+#: crypt-gpgme.c:3846
 #, fuzzy
 msgid "keys matching"
 msgstr "PGP ËÌÀÞ¦, ÝÏ ×¦ÄÐÏצÄÁÀÔØ \"%s\"."
 
-#: crypt-gpgme.c:3854
+#: crypt-gpgme.c:3849
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt-gpgme.c:3856
+#: crypt-gpgme.c:3851
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: crypt-gpgme.c:3883 pgpkey.c:600
+#: crypt-gpgme.c:3878 pgpkey.c:600
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr "ãÅÊ ËÌÀÞ ÎÅÍÏÖÌÉ×Ï ×ÉËÏÒÉÓÔÁÔÉ: ÄÁ×ΦÊ/×ÉÍËÎÅÎÉÊ/ÚÁͦÎÅÎÉÊ."
 
-#: crypt-gpgme.c:3897 pgpkey.c:612
+#: crypt-gpgme.c:3892 pgpkey.c:612
 msgid "ID is expired/disabled/revoked."
 msgstr "ID ÄÁ×ΦÊ/×ÉÍËÎÅÎÉÊ/ÚÁͦÎÅÎÉÊ."
 
-#: crypt-gpgme.c:3917 pgpkey.c:616
+#: crypt-gpgme.c:3912 pgpkey.c:616
 msgid "ID has undefined validity."
 msgstr "ä¦ÊÓΦÓÔØ ID ÎÅ ×ÉÚÎÁÞÅÎÁ."
 
-#: crypt-gpgme.c:3920 pgpkey.c:619
+#: crypt-gpgme.c:3915 pgpkey.c:619
 msgid "ID is not valid."
 msgstr "ID ÎÅĦÊÓÎÉÊ."
 
-#: crypt-gpgme.c:3923 pgpkey.c:622
+#: crypt-gpgme.c:3918 pgpkey.c:622
 msgid "ID is only marginally valid."
 msgstr "ID ĦÊÓÎÉÊ ÌÉÛÅ ÞÁÓÔËÏ×Ï."
 
-#: crypt-gpgme.c:3931 pgpkey.c:626
+#: crypt-gpgme.c:3926 pgpkey.c:626
 #, c-format
 msgid "%s Do you really want to use the key?"
 msgstr "%s ÷É ÓÐÒÁ×Ħ ÂÁÖÁ¤ÔÅ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ËÌÀÞ?"
 
-#: crypt-gpgme.c:3988 crypt-gpgme.c:4101 pgpkey.c:834 pgpkey.c:935
+#: crypt-gpgme.c:3983 crypt-gpgme.c:4096 pgpkey.c:834 pgpkey.c:939
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "ðÏÛÕË ËÌÀÞ¦×, ÝÏ ×¦ÄÐÏצÄÁÀÔØ \"%s\"..."
 
-#: crypt-gpgme.c:4264 pgp.c:1180
+#: crypt-gpgme.c:4259 pgp.c:1196
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ keyID = \"%s\" ÄÌÑ %s?"
 
-#: crypt-gpgme.c:4300 pgp.c:1214 smime.c:664 smime.c:789
+#: crypt-gpgme.c:4295 pgp.c:1230 smime.c:650 smime.c:775
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "÷×ÅĦÔØ keyID ÄÌÑ %s: "
 
-#: crypt-gpgme.c:4365
+#: crypt-gpgme.c:4360
 msgid ""
 "\n"
 "Using GPGME backend, although no gpg-agent is running"
 msgstr ""
 
-#: crypt-gpgme.c:4393
+#: crypt-gpgme.c:4388
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr "ÛÉÆÒ.(e), ЦÄÐ.(s), ЦÄÐ. ÑË(a), ÕÓÅ(b), (i)nline ÞÉ ×¦ÄͦÎÁ(f)? "
 
-#: crypt-gpgme.c:4394
+#: crypt-gpgme.c:4389
 #, fuzzy
 msgid "esabpfc"
 msgstr "esabif"
 
-#: crypt-gpgme.c:4397
+#: crypt-gpgme.c:4392
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr "ÛÉÆÒ.(e), ЦÄÐ.(s), ЦÄÐ. ÑË(a), ÕÓÅ(b), (i)nline ÞÉ ×¦ÄͦÎÁ(f)? "
 
-#: crypt-gpgme.c:4398
+#: crypt-gpgme.c:4393
 #, fuzzy
 msgid "esabmfc"
 msgstr "esabif"
@@ -1304,15 +1338,15 @@ msgstr "esabif"
 #. sign (a)s
 #. unset_option(OPTCRYPTCHECKTRUST);
 #. sign (a)s
-#: crypt-gpgme.c:4414 pgp.c:1590 smime.c:2033 smime.c:2045
+#: crypt-gpgme.c:4409 pgp.c:1629 smime.c:2026 smime.c:2038
 msgid "Sign as: "
 msgstr "ð¦ÄÐÉÓ ÑË: "
 
-#: crypt-gpgme.c:4511
+#: crypt-gpgme.c:4535
 msgid "Failed to verify sender"
 msgstr ""
 
-#: crypt-gpgme.c:4514
+#: crypt-gpgme.c:4538
 #, fuzzy
 msgid "Failed to figure out sender"
 msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÒÏÚÂÏÒÕ ÚÁÇÏÌÏ×ËÕ."
@@ -1343,7 +1377,7 @@ msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:157 send.c:1512
+#: crypt.c:157 send.c:1537
 msgid "Mail not sent."
 msgstr "ìÉÓÔ ÎŠצÄÐÒÁ×ÌÅÎÏ."
 
@@ -1419,32 +1453,32 @@ msgstr ""
 msgid "Invoking S/MIME..."
 msgstr "÷ÉËÌÉË S/MIME..."
 
-#: curs_lib.c:191
+#: curs_lib.c:194
 msgid "yes"
 msgstr ""
 
-#: curs_lib.c:192
+#: curs_lib.c:195
 msgid "no"
 msgstr ""
 
 #. restore blocking operation
-#: curs_lib.c:288
+#: curs_lib.c:297
 msgid "Exit Mutt?"
 msgstr "ðÏËÉÎÕÔÉ Mutt?"
 
-#: curs_lib.c:495 mutt_socket.c:577 mutt_ssl.c:337
+#: curs_lib.c:500 mutt_socket.c:577 mutt_ssl.c:358
 msgid "unknown error"
 msgstr "ÎÅצÄÏÍÁ ÐÏÍÉÌËÁ"
 
-#: curs_lib.c:515
+#: curs_lib.c:520
 msgid "Press any key to continue..."
 msgstr "îÁÔÉÓΦÔØ ÂÕÄØ-ÑËÕ ËÌÁצÛÕ..."
 
-#: curs_lib.c:559
+#: curs_lib.c:564
 msgid " ('?' for list): "
 msgstr " ('?' - ÐÅÒÅ̦Ë): "
 
-#: curs_main.c:52 curs_main.c:617 curs_main.c:647
+#: curs_main.c:52 curs_main.c:613 curs_main.c:643
 msgid "No mailbox is open."
 msgstr "îÅÍÁ¤ צÄËÒÉÔϧ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ."
 
@@ -1452,11 +1486,11 @@ msgstr "
 msgid "There are no messages."
 msgstr "öÏÄÎÏÇÏ ÐÏצÄÏÍÌÅÎÎÑ ÎÅÍÁ¤."
 
-#: curs_main.c:54 mx.c:1115 pager.c:51 recvattach.c:43
+#: curs_main.c:54 mx.c:1095 pager.c:51 recvattach.c:43
 msgid "Mailbox is read-only."
 msgstr "ðÏÛÔÏ×Á ÓËÒÉÎØËÁ צÄËÒÉÔÁ Ô¦ÌØËÉ ÄÌÑ ÞÉÔÁÎÎÑ"
 
-#: curs_main.c:55 pager.c:52 recvattach.c:912
+#: curs_main.c:55 pager.c:52 recvattach.c:924
 msgid "Function not permitted in attach-message mode."
 msgstr "æÕÎËæÀ ÎÅ ÄÏÚ×ÏÌÅÎÏ × ÒÅÖÉͦ ÄÏÄÁ×ÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ."
 
@@ -1493,7 +1527,7 @@ msgstr "
 msgid "Mail"
 msgstr "ìÉÓÔ"
 
-#: curs_main.c:410 pager.c:1487
+#: curs_main.c:410 pager.c:1538
 msgid "Reply"
 msgstr "÷¦ÄÐ."
 
@@ -1501,212 +1535,221 @@ msgstr "
 msgid "Group"
 msgstr "÷Ó¦Í"
 
-#: curs_main.c:499
+#: curs_main.c:495
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÚͦÎÉÌÁ ÚÏ×ΦÛÎÑ ÐÒÏÇÒÁÍÁ. æÌÁÇÉ ÍÏÖÕÔØ ÂÕÔÉ ÚͦÎÅΦ."
 
-#: curs_main.c:502
+#: curs_main.c:498
 msgid "New mail in this mailbox."
 msgstr "îÏ×Á ÐÏÛÔÁ Õ Ã¦Ê ÐÏÛÔÏ×¦Ê ÓËÒÉÎØæ."
 
-#: curs_main.c:506
+#: curs_main.c:502
 msgid "Mailbox was externally modified."
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÚͦÎÉÌÁ ÚÏ×ΦÛÎÑ ÐÒÏÇÒÁÍÁ."
 
-#: curs_main.c:623
+#: curs_main.c:619
 msgid "No tagged messages."
 msgstr "öÏÄÎÏÇÏ ÌÉÓÔÁ ÎÅ ×ÉĦÌÅÎÏ."
 
-#: curs_main.c:659 menu.c:921
+#: curs_main.c:655 menu.c:914
 #, fuzzy
 msgid "Nothing to do."
 msgstr "ú'¤ÄÎÁÎÎÑ Ú %s..."
 
-#: curs_main.c:749
+#: curs_main.c:741
 msgid "Jump to message: "
 msgstr "ðÅÒÅÊÔÉ ÄÏ ÌÉÓÔÁ: "
 
-#: curs_main.c:755
+#: curs_main.c:747
 msgid "Argument must be a message number."
 msgstr "áÒÇÕÍÅÎÔ ÐÏ×ÉÎÅÎ ÂÕÔÉ ÎÏÍÅÒÏÍ ÌÉÓÔÁ."
 
-#: curs_main.c:788
+#: curs_main.c:779
 msgid "That message is not visible."
 msgstr "ãÅÊ ÌÉÓÔ ÎÅ ÍÏÖÎÁ ÐÏÂÁÞÉÔÉ."
 
-#: curs_main.c:791
+#: curs_main.c:782
 msgid "Invalid message number."
 msgstr "îÅצÒÎÉÊ ÎÏÍÅÒ ÌÉÓÔÁ."
 
-#: curs_main.c:804 curs_main.c:1845 pager.c:2288
+#: curs_main.c:795 curs_main.c:1872 pager.c:2373
 #, fuzzy
 msgid "delete message(s)"
 msgstr "÷Ó¦ ÌÉÓÔÉ ×ÉÄÁÌÅÎÏ."
 
-#: curs_main.c:807
+#: curs_main.c:798
 msgid "Delete messages matching: "
 msgstr "÷ÉÄÁÌÉÔÉ ÌÉÓÔÉ ÚÁ ÛÁÂÌÏÎÏÍ: "
 
-#: curs_main.c:829
+#: curs_main.c:820
 msgid "No limit pattern is in effect."
 msgstr "îÅ ×ÓÔÁÎÏ×ÌÅÎÏ ÏÂÍÅÖÅÎØ."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:834
+#: curs_main.c:825
 #, c-format
 msgid "Limit: %s"
 msgstr "ïÂÍÅÖÅÎÎÑ: %s"
 
-#: curs_main.c:844
+#: curs_main.c:835
 msgid "Limit to messages matching: "
 msgstr "ïÂÍÅÖÉÔÉÓØ ÐÏצÄÏÍÌÅÎÎÑÍÉ ÚÁ ÛÁÂÌÏÎÏÍ: "
 
-#: curs_main.c:866
+#: curs_main.c:857
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: curs_main.c:878
+#: curs_main.c:869
 msgid "Quit Mutt?"
 msgstr "÷ÉÊÔÉ Ú Mutt?"
 
-#: curs_main.c:963
+#: curs_main.c:959
 msgid "Tag messages matching: "
 msgstr "÷ÉĦÌÉÔÉ ÌÉÓÔÉ ÚÁ ÛÁÂÌÏÎÏÍ: "
 
-#: curs_main.c:972 curs_main.c:2134 pager.c:2598
+#: curs_main.c:968 curs_main.c:2166 pager.c:2683
 #, fuzzy
 msgid "undelete message(s)"
 msgstr "÷Ó¦ ÌÉÓÔÉ ×ÉÄÁÌÅÎÏ."
 
-#: curs_main.c:974
+#: curs_main.c:970
 msgid "Undelete messages matching: "
 msgstr "÷¦ÄÎÏ×ÉÔÉ ÌÉÓÔÉ ÚÁ ÛÁÂÌÏÎÏÍ: "
 
-#: curs_main.c:982
+#: curs_main.c:978
 msgid "Untag messages matching: "
 msgstr "úÎÑÔÉ ×ÉĦÌÅÎÎÑ Ú ÌÉÓÔ¦× ÚÁ ÛÁÂÌÏÎÏÍ: "
 
-#: curs_main.c:1062
+#: curs_main.c:1004
+#, fuzzy
+msgid "Logged out of IMAP servers."
+msgstr "úÁËÒÉÔÔÑ Ú'¤ÄÎÁÎÎÑ Ú ÓÅÒ×ÅÒÏÍ IMAP..."
+
+#: curs_main.c:1083
 msgid "Open mailbox in read-only mode"
 msgstr "÷¦ÄËÒÉÔÉ ÓËÒÉÎØËÕ ÌÉÛÅ ÄÌÑ ÞÉÔÁÎÎÑ"
 
-#: curs_main.c:1064
+#: curs_main.c:1085
 msgid "Open mailbox"
 msgstr "÷¦ÄËÒÉÔÉ ÓËÒÉÎØËÕ"
 
-#: curs_main.c:1074
+#: curs_main.c:1095
 #, fuzzy
 msgid "No mailboxes have new mail"
 msgstr "îÅÍÁ¤ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ Ú ÎÏ×ÏÀ ÐÏÛÔÏÀ."
 
-#: curs_main.c:1102 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 "%s ÎÅ ¤ ÐÏÛÔÏ×ÏÀ ÓËÒÉÎØËÏÀ."
 
-#: curs_main.c:1197
+#: curs_main.c:1222
 msgid "Exit Mutt without saving?"
 msgstr "ðÏËÉÎÕÔÉ Mutt ÂÅÚ ÚÂÅÒÅÖÅÎÎÑ ÚͦÎ?"
 
-#: curs_main.c:1215 curs_main.c:1248 curs_main.c:1692 curs_main.c:1724
-#: flags.c:282 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 "óÛÉ×ÁÎÎÑ ÎÅÄÏÓÔÕÐÎÅ."
 
-#: curs_main.c:1227
+#: curs_main.c:1252
 msgid "Thread broken"
 msgstr ""
 
-#: curs_main.c:1245
+#: 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 ""
 
-#: curs_main.c:1250
+#: curs_main.c:1277
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: curs_main.c:1252
+#: curs_main.c:1279
 #, fuzzy
 msgid "First, please tag a message to be linked here"
 msgstr "ÚÂÅÒÅÇÔÉ ÃÅÊ ÌÉÓÔ, ÁÂÉ ×¦Ä¦ÓÌÁÔÉ Ð¦ÚΦÛÅ"
 
-#: curs_main.c:1264
+#: curs_main.c:1291
 msgid "Threads linked"
 msgstr ""
 
-#: curs_main.c:1267
+#: curs_main.c:1294
 msgid "No thread linked"
 msgstr ""
 
-#: curs_main.c:1303 curs_main.c:1328
+#: curs_main.c:1330 curs_main.c:1355
 msgid "You are on the last message."
 msgstr "ãÅ ÏÓÔÁÎÎ¦Ê ÌÉÓÔ."
 
-#: curs_main.c:1310 curs_main.c:1354
+#: curs_main.c:1337 curs_main.c:1381
 msgid "No undeleted messages."
 msgstr "÷Ó¦ ÌÉÓÔÉ ×ÉÄÁÌÅÎÏ."
 
-#: curs_main.c:1347 curs_main.c:1371
+#: curs_main.c:1374 curs_main.c:1398
 msgid "You are on the first message."
 msgstr "ãÅ ÐÅÒÛÉÊ ÌÉÓÔ."
 
-#: curs_main.c:1446 menu.c:766 pager.c:1986 pattern.c:1466
+#: curs_main.c:1473 menu.c:759 pager.c:2042 pattern.c:1477
 msgid "Search wrapped to top."
 msgstr "äÏÓÑÇÎÕÔÏ Ë¦ÎÅÃØ. ðÏÛÕË ÐÅÒÅÎÅÓÅÎÏ ÎÁ ÐÏÞÁÔÏË."
 
-#: curs_main.c:1455 pager.c:2008 pattern.c:1477
+#: curs_main.c:1482 pager.c:2064 pattern.c:1488
 msgid "Search wrapped to bottom."
 msgstr "äÏÓÑÇÎÕÔÏ ÐÏÞÁÔÏË. ðÏÛÕË ÐÅÒÅÎÅÓÅÎÏ ÎÁ ˦ÎÅÃØ."
 
-#: curs_main.c:1496
+#: curs_main.c:1523
 msgid "No new messages"
 msgstr "îÅÍÁ¤ ÎÏ×ÉÈ ÌÉÓÔ¦×"
 
-#: curs_main.c:1496
+#: curs_main.c:1523
 msgid "No unread messages"
 msgstr "îÅÍÁ¤ ÎÅÞÉÔÁÎÉÈ ÌÉÓÔ¦×"
 
-#: curs_main.c:1497
+#: curs_main.c:1524
 msgid " in this limited view"
 msgstr " Õ ÃÉÈ ÍÅÖÁÈ ÏÇÌÑÄÕ"
 
-#: curs_main.c:1513
+#: curs_main.c:1540
 #, fuzzy
 msgid "flag message"
 msgstr "ÐÏËÁÚÁÔÉ ÌÉÓÔ"
 
-#: curs_main.c:1550 pager.c:2564
+#: curs_main.c:1577 pager.c:2649
 msgid "toggle new"
 msgstr ""
 
-#: curs_main.c:1627
+#: curs_main.c:1654
 msgid "No more threads."
 msgstr "âÅÓ¦Ä Â¦ÌØÛ ÎÅÍÁ."
 
-#: curs_main.c:1629
+#: curs_main.c:1656
 msgid "You are on the first thread."
 msgstr "ãÅ ÐÅÒÛÁ ÂÅÓ¦ÄÁ."
 
-#: curs_main.c:1710
+#: curs_main.c:1737
 msgid "Thread contains unread messages."
 msgstr "âÅÓ¦ÄÁ ÍÁ¤ ÎÅÞÉÔÁΦ ÌÉÓÔÉ."
 
-#: curs_main.c:1804 pager.c:2271
+#: curs_main.c:1831 pager.c:2342
 #, fuzzy
 msgid "delete message"
 msgstr "÷Ó¦ ÌÉÓÔÉ ×ÉÄÁÌÅÎÏ."
 
-#: curs_main.c:1886
+#: curs_main.c:1913
 #, fuzzy
 msgid "edit message"
 msgstr "ÒÅÄÁÇÕ×ÁÔÉ ÌÉÓÔ"
 
-#: curs_main.c:2017
+#: curs_main.c:2044
 #, fuzzy
 msgid "mark message(s) as read"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ \"ÂÁÔØ˦×ÓØËÏÇÏ\" ÌÉÓÔÁ Õ ÂÅӦĦ"
 
-#: curs_main.c:2107 pager.c:2583
+#: curs_main.c:2139 pager.c:2668
 #, fuzzy
 msgid "undelete message"
 msgstr "÷Ó¦ ÌÉÓÔÉ ×ÉÄÁÌÅÎÏ."
@@ -1779,41 +1822,41 @@ msgstr ""
 "~?\t\tÃÅ ÐÏצÄÏÍÌÅÎÎÑ\n"
 ".\t\tÒÑÄÏË Ú ÏÄΦ¤§ ËÒÁÐËÉ - ÐÒÉÚÎÁË Ë¦ÎÃÑ ××ÏÄÕ\n"
 
-#: edit.c:188
+#: edit.c:187
 #, c-format
 msgid "%d: invalid message number.\n"
 msgstr "%d: ÎÅצÒÎÉÊ ÎÏÍÅÒ ÌÉÓÔÁ.\n"
 
-#: edit.c:330
+#: edit.c:329
 msgid "(End message with a . on a line by itself)\n"
 msgstr "(úÁ˦ÎÞ¦ÔØ ÌÉÓÔ ÒÑÄËÏÍ, ÝÏ ÓËÌÁÄÁ¤ÔØÓÑ Ú ÏÄΦ¤§ . )\n"
 
-#: edit.c:389
+#: edit.c:388
 msgid "No mailbox.\n"
 msgstr "îÅ ÐÏÛÔÏ×Á ÓËÒÉÎØËÁ.\n"
 
-#: edit.c:393
+#: edit.c:392
 msgid "Message contains:\n"
 msgstr "ìÉÓÔ Í¦ÓÔÉÔØ:\n"
 
-#: edit.c:397 edit.c:454
+#: edit.c:396 edit.c:453
 msgid "(continue)\n"
 msgstr "(ÄÁ̦)\n"
 
-#: edit.c:410
+#: edit.c:409
 msgid "missing filename.\n"
 msgstr "ÎÅÍÁ¤ ¦ÍÅΦ ÆÁÊÌÕ.\n"
 
-#: edit.c:430
+#: edit.c:429
 msgid "No lines in message.\n"
 msgstr "÷ ÌÉÓÔ¦ - ÖÏÄÎÏÇÏ ÒÑÄËÕ.\n"
 
-#: edit.c:447
+#: edit.c:446
 #, 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 "%s: ÎÅצÄÏÍÁ ËÏÍÁÎÄÁ ÒÅÄÁËÔÏÒÁ (~? - ЦÄËÁÚËÁ)\n"
@@ -1864,116 +1907,121 @@ msgstr "
 msgid "Clear flag"
 msgstr "úÎÑÔÉ ÆÌÁÇ"
 
-#: handler.c:1070
+#: handler.c:1058
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- ðÏÍÉÌËÁ: ÖÏÄÎÕ ÞÁÓÔÉÎÕ Multipart/Alternative ÎÅ ×ÉÊÛÌÏ ÐÏÂÁÞÉÔÉ! --]\n"
 
-#: handler.c:1187
+#: handler.c:1176
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- äÏÄÁÔÏË ÎÏÍÅÒ %d"
 
-#: handler.c:1199
+#: handler.c:1188
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- ôÉÐ: %s/%s, ËÏÄÕ×ÁÎÎÑ: %s, ÒÏÚͦÒ: %s --]\n"
 
-#: handler.c:1223
+#: handler.c:1204
 msgid "One or more parts of this message could not be displayed"
 msgstr ""
 
-#: handler.c:1275
+#: handler.c:1256
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- á×ÔÏÐÒÏÇÌÑÄÁÎÎÑ ÚÁ ÄÏÐÏÍÏÇÏÀ %s --]\n"
 
-#: handler.c:1276
+#: handler.c:1257
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "÷ÉËÌÉË ËÏÍÁÎÄÉ Á×ÔÏÍÁÔÉÞÎÏÇÏ ÐÒÏÇÌÑÄÁÎÎÑ: %s"
 
-#: handler.c:1308
+#: handler.c:1289
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- îÅÍÏÖÌÉ×Ï ×ÉËÏÎÁÔÉ %s. --]\n"
 
-#: handler.c:1327 handler.c:1348
+#: handler.c:1308 handler.c:1329
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- ðÒÏÇÒÁÍÍÁ ÐÒÏÇÌÑÄÁÎÎÑ %s ÐÏצÄÏÍÉÌÁ ÐÏÍÉÌËÕ --]\n"
 
-#: handler.c:1387
+#: handler.c:1368
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr "[-- ðÏÍÉÌËÁ: message/external-body ÎÅ ÍÁ¤ ÐÁÒÁÍÅÔÒÕ ÔÉÐÕ ÄÏÓÔÕÐÕ --]\n"
 
-#: handler.c:1408
+#: handler.c:1389
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- ãÅÊ %s/%s ÄÏÄÁÔÏË "
 
-#: handler.c:1415
+#: handler.c:1396
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(ÒÏÚÍ. %s ÂÁÊÔ) "
 
-#: handler.c:1417
+#: handler.c:1398
 msgid "has been deleted --]\n"
 msgstr "ÂÕÌÏ ×ÉÄÁÌÅÎÏ --]\n"
 
-#: handler.c:1422
+#: handler.c:1403
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- %s --]\n"
 
-#: handler.c:1427
+#: handler.c:1408
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- ¦Í'Ñ: %s --]\n"
 
-#: handler.c:1440 handler.c:1456
+#: handler.c:1421 handler.c:1437
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- ãÅÊ %s/%s ÄÏÄÁÔÏË ÎÅ ×ËÌÀÞÅÎÏ, --]\n"
 
-#: handler.c:1442
+#: handler.c:1423
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr "[-- צÄÐÏצÄÎÅ ÚÏ×ΦÛΤ ÄÖÅÒÅÌÏ ×ÉÄÁÌÅÎÏ ÚÁ ÄÁ×ΦÓÔÀ. --]\n"
 
-#: handler.c:1460
+#: handler.c:1441
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- צÄÐÏצÄÎÉÊ ÔÉÐ ÄÏÓÔÕÐÕ %s ΊЦÄÔÒÉÍÕ¤ÔØÓÑ --]\n"
 
-#: handler.c:1575
+#: handler.c:1583
 msgid "Error: multipart/signed has no protocol."
 msgstr "ðÏÍÉÌËÁ: ÎÅÍÁ¤ ÐÒÏÔÏËÏÌÕ ÄÌÑ multipart/signed."
 
-#: handler.c:1585
+#: handler.c:1593
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "ðÏÍÉÌËÁ: ÎÅÍÁ¤ ÐÁÒÁÍÅÔÒÕ ÐÒÏÔÏËÏÌÕ ÄÌÑ multipart/encrypted!"
 
-#: handler.c:1639
+#: handler.c:1650
 msgid "Unable to open temporary file!"
 msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ!"
 
-#: handler.c:1706
+#: handler.c:1723
+#, fuzzy
+msgid "[-- This is an attachment "
+msgstr "[-- ãÅÊ %s/%s ÄÏÄÁÔÏË "
+
+#: handler.c:1725
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s ΊЦÄÔÒÉÍÕ¤ÔØÓÑ "
 
-#: handler.c:1711
+#: handler.c:1730
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(×ÉËÏÒÉÓÔÏ×ÕÊÔÅ '%s' ÄÌÑ Ã¦¤§ ÞÁÓÔÉÎÉ)"
 
-#: handler.c:1713
+#: handler.c:1732
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(ÔÒÅÂÁ ÐÒÉÚÎÁÞÉÔÉ ËÌÁצÛÕ ÄÏ 'view-attachments'!)"
 
-#: headers.c:173
+#: headers.c:189
 #, c-format
 msgid "%s: unable to attach file"
 msgstr "%s: ÎÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ ÆÁÊÌ"
@@ -2016,22 +2064,22 @@ 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 "unhook: îÅÍÏÖÌÉ×Ï ÚÒÏÂÉÔÉ unhook * Ú hook."
 
-#: hook.c:263
+#: hook.c:262
 #, c-format
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook: ÎÅצÄÏÍÉÊ ÔÉÐ hook: %s"
 
-#: hook.c:269
+#: hook.c:268
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
 msgstr "unhook: îÅÍÏÖÌÉ×Ï ×ÉÄÁÌÉÔÉ %s Ú %s."
 
-#: imap/auth.c:108 pop_auth.c:398 smtp.c:483
+#: imap/auth.c:108 pop_auth.c:398 smtp.c:515
 msgid "No authenticators available"
 msgstr "áÕÔÅÎÔÉƦËÁÔÏÒ¦× ÎÅÍÁ¤."
 
@@ -2072,7 +2120,7 @@ msgstr "
 msgid "Login failed."
 msgstr "ðÏÍÉÌËÁ ÒŤÓÔÒÁæ§."
 
-#: imap/auth_sasl.c:97 smtp.c:519
+#: imap/auth_sasl.c:97 smtp.c:551
 #, fuzzy, c-format
 msgid "Authenticating (%s)..."
 msgstr "áÕÔÅÎÔÉƦËÁÃ¦Ñ (APOP)..."
@@ -2081,7 +2129,7 @@ msgstr "
 msgid "SASL authentication failed."
 msgstr "ðÏÍÉÌËÁ ÁÕÔÅÎÔÉƦËÁæ§ SASL."
 
-#: imap/browse.c:58 imap/imap.c:567
+#: imap/browse.c:58 imap/imap.c:569
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s - ÎÅÐÒÉÐÕÓÔÉÍÉÊ ÛÌÑÈ IMAP"
@@ -2090,38 +2138,38 @@ msgstr "%s - 
 msgid "Getting folder list..."
 msgstr "ïÔÒÉÍÁÎÎÑ ÐÅÒÅ̦ËÕ ÓËÒÉÎØÏË..."
 
-#: imap/browse.c:189
+#: imap/browse.c:191
 msgid "No such folder"
 msgstr "ôÁËϧ ÓËÒÉÎØËÉ ÎÅÍÁ¤"
 
-#: imap/browse.c:278
+#: imap/browse.c:280
 msgid "Create mailbox: "
 msgstr "óÔ×ÏÒÉÔÉ ÓËÒÉÎØËÕ: "
 
-#: imap/browse.c:283 imap/browse.c:329
+#: imap/browse.c:285 imap/browse.c:331
 msgid "Mailbox must have a name."
 msgstr "ðÏÛÔÏ×Á ÓËÒÉÎØËÁ ÍÕÓÉÔØ ÍÁÔÉ ¦Í'Ñ."
 
-#: imap/browse.c:291
+#: imap/browse.c:293
 msgid "Mailbox created."
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÓÔ×ÏÒÅÎÏ."
 
-#: imap/browse.c:322
+#: imap/browse.c:324
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "óÔ×ÏÒÉÔÉ ÓËÒÉÎØËÕ: "
 
-#: imap/browse.c:337
+#: imap/browse.c:339
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "ðÏÍÉÌËÁ SSL: %s"
 
-#: imap/browse.c:342
+#: imap/browse.c:344
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÓÔ×ÏÒÅÎÏ."
 
-#: imap/command.c:448
+#: imap/command.c:445
 msgid "Mailbox closed"
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÚÁËÒÉÔÏ"
 
@@ -2135,107 +2183,107 @@ msgstr "
 msgid "Closing connection to %s..."
 msgstr "úÁËÒÉÔÔÑ Ú'¤ÄÎÁÎÎÑ Ú %s..."
 
-#: imap/imap.c:311
+#: imap/imap.c:310
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "ãÅÊ ÓÅÒ×ÅÒ IMAP ÎÁÄÔÏ ÄÁ×ΦÊ. Mutt ÎÅ ÍÏÖÅ ÐÒÁÃÀ×ÁÔÉ Ú ÎÉÍ."
 
-#: imap/imap.c:434 pop_lib.c:286 smtp.c:392
+#: imap/imap.c:433 pop_lib.c:295 smtp.c:424
 msgid "Secure connection with TLS?"
 msgstr "ëÏÄÏ×ÁÎÅ Ú'¤ÄÎÁÎÎÑ Ú TLS?"
 
-#: imap/imap.c:443 pop_lib.c:306 smtp.c:404
+#: imap/imap.c:442 pop_lib.c:315 smtp.c:436
 msgid "Could not negotiate TLS connection"
 msgstr "îÅ ×ÉÊÛÌÏ ÄÏÍÏ×ÉÔÉÓØ ÐÒÏ TLS Ú'¤ÄÎÁÎÎÑ"
 
-#: imap/imap.c:459 pop_lib.c:327
+#: imap/imap.c:458 pop_lib.c:336
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: imap/imap.c:601
+#: imap/imap.c:603
 #, c-format
 msgid "Selecting %s..."
 msgstr "÷ÉÂ¦Ò %s..."
 
-#: imap/imap.c:756
+#: imap/imap.c:758
 msgid "Error opening mailbox"
 msgstr "ðÏÍÉÌËÁ צÄËÒÉÔÔÑ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ"
 
-#: imap/imap.c:811 imap/message.c:834 muttlib.c:1478
+#: imap/imap.c:813 imap/message.c:851 muttlib.c:1545
 #, c-format
 msgid "Create %s?"
 msgstr "óÔ×ÏÒÉÔÉ %s?"
 
-#: imap/imap.c:1183
+#: imap/imap.c:1186
 msgid "Expunge failed"
 msgstr "ðÏÍÉÌËÁ ×ÉÄÁÌÅÎÎÑ"
 
-#: imap/imap.c:1195
+#: imap/imap.c:1198
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "íÁÒËÕ×ÁÎÎÑ %d ÎÏ×ÉÈ ÐÏצÄÏÍÌÅÎØ ×ÉÄÁÌÅÎÉÍÉ..."
 
-#: imap/imap.c:1224
+#: imap/imap.c:1230
 #, fuzzy, c-format
 msgid "Saving changed messages... [%d/%d]"
 msgstr "úÂÅÒÅÖÅÎÎÑ ÆÌÁÇ¦× ÓÔÁÔÕÓÕ ÌÉÓÔÁ... [%d/%d]"
 
-#: imap/imap.c:1273
+#: imap/imap.c:1279
 msgid "Error saving flags. Close anyway?"
 msgstr ""
 
-#: imap/imap.c:1281
+#: imap/imap.c:1287
 #, fuzzy
 msgid "Error saving flags"
 msgstr "ðÏÍÉÌËÁ ÒÏÚÂÏÒÕ ÁÄÒÅÓÉ!"
 
-#: imap/imap.c:1293
+#: imap/imap.c:1299
 msgid "Expunging messages from server..."
 msgstr "÷ÉÄÁÌÅÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú ÓÅÒ×ÅÒÕ..."
 
-#: imap/imap.c:1298
+#: imap/imap.c:1304
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: ÐÏÍÉÌËÁ EXPUNGE"
 
-#: imap/imap.c:1746
+#: imap/imap.c:1754
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: imap/imap.c:1818
+#: imap/imap.c:1826
 msgid "Bad mailbox name"
 msgstr "ðÏÇÁÎÅ ¦Í'Ñ ÄÌÑ ÓËÒÉÎØËÉ"
 
-#: imap/imap.c:1843
+#: imap/imap.c:1851
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "ð¦ÄÐÉÓÕ×ÁÎÎÑ ÄÏ %s..."
 
-#: imap/imap.c:1845
+#: imap/imap.c:1853
 #, fuzzy, c-format
 msgid "Unsubscribing from %s..."
 msgstr "÷¦ÄÐÉÓÕ×ÁÎÎÑ ×¦Ä %s..."
 
-#: imap/imap.c:1855
+#: imap/imap.c:1863
 #, fuzzy, c-format
 msgid "Subscribed to %s"
 msgstr "ð¦ÄÐÉÓÕ×ÁÎÎÑ ÄÏ %s..."
 
-#: imap/imap.c:1857
+#: imap/imap.c:1865
 #, fuzzy, c-format
 msgid "Unsubscribed from %s"
 msgstr "÷¦ÄÐÉÓÕ×ÁÎÎÑ ×¦Ä %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:98
+#: imap/message.c:99
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "ú ÓÅÒ×ÅÒÕ IMAP 椧 ×ÅÒÓ¦§ ÏÔÒÉÍÁÔÉ ÚÁÇÏÌÏ×ËÉ ÎÅÍÏÖÌÉ×Ï."
 
-#: imap/message.c:108
+#: imap/message.c:109
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "îÅ ×ÉÊÛÌÏ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ %s"
 
-#: imap/message.c:140
+#: imap/message.c:141
 #, fuzzy
 msgid "Evaluating cache..."
 msgstr "ïÔÒÉÍÁÎÎÑ ÚÁÇÏÌÏ×Ë¦× ÌÉÓÔ¦×... [%d/%d]"
@@ -2245,274 +2293,288 @@ msgstr "
 msgid "Fetching message headers..."
 msgstr "ïÔÒÉÍÁÎÎÑ ÚÁÇÏÌÏ×Ë¦× ÌÉÓÔ¦×... [%d/%d]"
 
-#: imap/message.c:428 imap/message.c:485 pop.c:547
+#: imap/message.c:441 imap/message.c:498 pop.c:563
 msgid "Fetching message..."
 msgstr "ïÔÒÉÍÁÎÎÑ ÌÉÓÔÁ..."
 
-#: imap/message.c:474 pop.c:542
+#: imap/message.c:487 pop.c:558
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "îÅËÏÒÅËÔÎÉÊ ÎÏÍÅÒ ÐÏצÄÏÍÌÅÎÎÑ. óÐÒÏÂÕÊÔŠצÄËÒÉÔÉ ÓËÒÉÎØËÕ ÝÅ ÒÁÚ."
 
-#: imap/message.c:627
+#: imap/message.c:641
 #, fuzzy
 msgid "Uploading message..."
 msgstr "÷¦ÄÐÒÁ×ÌÅÎÎÑ ÌÉÓÔÁ..."
 
-#: imap/message.c:798
+#: imap/message.c:815
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "ëÏЦÀ×ÁÎÎÑ %d ÌÉÓÔ¦× ÄÏ %s..."
 
-#: imap/message.c:802
+#: imap/message.c:819
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "ëÏЦÀ×ÁÎÎÑ %d ÌÉÓÔÁ ÄÏ %s..."
 
-#: imap/util.c:336
+#: imap/util.c:358
 msgid "Continue?"
 msgstr "äÁ̦?"
 
-#: init.c:58 init.c:1777 pager.c:50
+#: init.c:60 init.c:1758 pager.c:50
 #, c-format
 msgid "Not available in this menu."
 msgstr "îÅÍÏÖÌÉ×Ï Õ ÃØÏÍÕ ÍÅÎÀ."
 
-#: init.c:466
+#: init.c:468
 #, c-format
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:523
+#: init.c:525
 #, c-format
 msgid "Not enough subexpressions for spam template"
 msgstr ""
 
-#: init.c:749
+#: init.c:715
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "×ÉĦÌÉÔÉ ÌÉÓÔÉ, ÝÏ Í¦ÓÔÑÔØ ×ÉÒÁÚ"
 
-#: init.c:751
+#: init.c:717
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "ÚÎÑÔÉ ×ÉĦÌÅÎÎÑ Ú ÌÉÓÔ¦×, ÝÏ Í¦ÓÔÑÔØ ×ÉÒÁÚ"
 
-#: init.c:888
-msgid "Missing -rx or -addr."
+#: init.c:861
+#, c-format
+msgid "%sgroup: missing -rx or -addr."
 msgstr ""
 
-#: init.c:901
+#: init.c:879
 #, c-format
-msgid "Warning: Bad IDN '%s'.\n"
+msgid "%sgroup: warning: bad IDN '%s'.\n"
 msgstr ""
 
-#: init.c:1109
+#: init.c:1094
 #, fuzzy
 msgid "attachments: no disposition"
 msgstr "ÚͦÎÉÔÉ ÐÏÑÓÎÅÎÎÑ ÄÏ ÄÏÄÁÔËÕ"
 
-#: init.c:1147
+#: init.c:1132
 #, fuzzy
 msgid "attachments: invalid disposition"
 msgstr "ÚͦÎÉÔÉ ÐÏÑÓÎÅÎÎÑ ÄÏ ÄÏÄÁÔËÕ"
 
-#: init.c:1161
+#: init.c:1146
 #, fuzzy
 msgid "unattachments: no disposition"
 msgstr "ÚͦÎÉÔÉ ÐÏÑÓÎÅÎÎÑ ÄÏ ÄÏÄÁÔËÕ"
 
-#: init.c:1184
+#: init.c:1169
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:1311
+#: init.c:1296
 msgid "alias: no address"
 msgstr "alias: ÁÄÒÅÓÉ ÎÅÍÁ¤"
 
-#: init.c:1359
+#: init.c:1344
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: init.c:1447
+#: init.c:1432
 msgid "invalid header field"
 msgstr "ÎÅצÒÎÅ ÐÏÌÅ ÚÁÇÏÌÏ×ËÕ"
 
-#: init.c:1500
+#: init.c:1485
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: ÎÅצÄÏÍÉÊ ÍÅÔÏÄ ÓÏÒÔÕ×ÁÎÎÑ"
 
-#: init.c:1610
+#: init.c:1592
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): ÐÏÍÉÌËÁ ×ÉÒÁÚÕ: %s\n"
 
-#: init.c:1754 init.c:1867
+#: init.c:1735 init.c:1848
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: ÎÅצÄÏÍÁ ÚͦÎÎÁ"
 
-#: init.c:1763
+#: init.c:1744
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "ÐÒÅƦËÓ ÎÅÐÒÉÐÕÓÔÉÍÉÊ ÄÌÑ ÓËÉÄÁÎÎÑ"
 
-#: init.c:1769
+#: init.c:1750
 #, c-format
 msgid "value is illegal with reset"
 msgstr "ÚÎÁÞÅÎÎÑ ÎÅÐÒÉÐÕÓÔÉÍÅ ÄÌÑ ÓËÉÄÁÎÎÑ"
 
-#: init.c:1805 init.c:1817
+#: init.c:1786 init.c:1798
 #, c-format
 msgid "Usage: set variable=yes|no"
 msgstr ""
 
-#: init.c:1825
+#: init.c:1806
 #, c-format
 msgid "%s is set"
 msgstr "%s ×ÓÔÁÎÏ×ÌÅÎÏ"
 
-#: init.c:1825
+#: init.c:1806
 #, c-format
 msgid "%s is unset"
 msgstr "%s ÎÅ ×ÓÔÁÎÏ×ÌÅÎÏ"
 
-#: init.c:1926
+#: init.c:1909
 #, fuzzy, c-format
 msgid "Invalid value for option %s: \"%s\""
 msgstr "äÅÎØ '%s' × Í¦ÓÑæ ÎÅ ¦ÓÎÕ¤"
 
-#: init.c:2064
+#: init.c:2046
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: ÎÅצÒÎÉÊ ÔÉÐ ÓËÒÉÎØËÉ"
 
-#: init.c:2095 init.c:2155
+#: init.c:2077
+#, fuzzy, c-format
+msgid "%s: invalid value (%s)"
+msgstr "%s: ÎÅצÒÎÅ ÚÎÁÞÅÎÎÑ"
+
+#: init.c:2078
+msgid "format error"
+msgstr ""
+
+#: init.c:2078
+msgid "number overflow"
+msgstr ""
+
+#: init.c:2138
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: ÎÅצÒÎÅ ÚÎÁÞÅÎÎÑ"
 
-#: init.c:2196
+#: init.c:2179
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s: ÎÅצÄÏÍÉÊ ÔÉÐ"
 
-#: init.c:2223
+#: init.c:2206
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: ÎÅצÄÏÍÉÊ ÔÉÐ"
 
-#: init.c:2285
+#: init.c:2268
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "ðÏÍÉÌËÁ × %s, ÒÑÄÏË %d: %s"
 
 #. the muttrc source keyword
-#: init.c:2308
+#: init.c:2291
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: ÐÏÍÉÌËÉ × %s"
 
-#: init.c:2309
+#: init.c:2292
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: ÞÉÔÁÎÎÑ ÚÁ×ÅÒÛÅÎÏ, ÄÕÖÅ ÂÁÇÁÔÏ ÐÏÍÉÌÏË Õ %s"
 
-#: init.c:2323
+#: init.c:2306
 #, c-format
 msgid "source: error at %s"
 msgstr "source: ÐÏÍÉÌËÁ × %s"
 
-#: init.c:2328
+#: init.c:2311
 msgid "source: too many arguments"
 msgstr "source: ÄÕÖÅ ÂÁÇÁÔÏ ÁÒÇÕÍÅÎÔ¦×"
 
-#: init.c:2382
+#: init.c:2365
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: ÎÅצÄÏÍÁ ËÏÍÁÎÄÁ"
 
-#: init.c:2867
+#: init.c:2850
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "ðÏÍÉÌËÁ ËÏÍÁÎÄÎÏÇÏ ÒÑÄËÕ: %s\n"
 
-#: init.c:2922
+#: init.c:2923
 msgid "unable to determine home directory"
 msgstr "ÎÅÍÏÖÌÉ×Ï Ú'ÑÓÕ×ÁÔÉ ÄÏÍÁÛÎ¦Ê ËÁÔÁÌÏÇ"
 
-#: init.c:2930
+#: init.c:2931
 msgid "unable to determine username"
 msgstr "ÎÅÍÏÖÌÉ×Ï Ú'ÑÓÕ×ÁÔÉ ¦Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ"
 
-#: init.c:3166
+#: init.c:3167
 msgid "-group: no group name"
 msgstr ""
 
-#: init.c:3176
+#: init.c:3177
 #, fuzzy
 msgid "out of arguments"
 msgstr "ÄÕÖÅ ÍÁÌÏ ÁÒÇÕÍÅÎÔ¦×"
 
-#: keymap.c:491
+#: keymap.c:526
 msgid "Macro loop detected."
 msgstr "úÎÁÊÄÅÎÏ ÚÁÃÉËÌÅÎÎÑ ÍÁËÒÏÓÕ."
 
-#: keymap.c:701 keymap.c:709
+#: keymap.c:827 keymap.c:835
 msgid "Key is not bound."
 msgstr "ëÌÁצÛÕ ÎÅ ÐÒÉÚÎÁÞÅÎÏ."
 
-#: keymap.c:713
+#: keymap.c:839
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "ëÌÁצÛÕ ÎÅ ÐÒÉÚÎÁÞÅÎÏ. îÁÔÉÓΦÔØ '%s' ÄÌÑ Ð¦ÄËÁÚËÉ."
 
-#: keymap.c:724
+#: keymap.c:850
 msgid "push: too many arguments"
 msgstr "push: ÄÕÖÅ ÂÁÇÁÔÏ ÁÒÇÕÍÅÎÔ¦×"
 
-#: keymap.c:754
+#: keymap.c:880
 #, c-format
 msgid "%s: no such menu"
 msgstr "ÍÅÎÀ '%s' ÎÅ ¦ÓÎÕ¤"
 
-#: keymap.c:769
+#: keymap.c:895
 msgid "null key sequence"
 msgstr "ÐÏÒÏÖÎÑ ÐÏÓ̦ÄÏ×ΦÓÔØ ËÌÁצÛ"
 
-#: keymap.c:856
+#: keymap.c:982
 msgid "bind: too many arguments"
 msgstr "bind: ÄÕÖÅ ÂÁÇÁÔÏ ÁÒÇÕÍÅÎÔ¦×"
 
-#: keymap.c:879
+#: keymap.c:1005
 #, c-format
 msgid "%s: no such function in map"
 msgstr "ÆÕÎËÃ¦Ñ '%s' ÎÅ ¦ÓÎÕ¤ × ËÁÒÔ¦"
 
-#: keymap.c:903
+#: keymap.c:1029
 msgid "macro: empty key sequence"
 msgstr "macro: ÐÏÒÏÖÎÑ ÐÏÓ̦ÄÏ×ΦÓÔØ ËÌÁצÛ"
 
-#: keymap.c:914
+#: keymap.c:1040
 msgid "macro: too many arguments"
 msgstr "macro: ÄÕÖÅ ÂÁÇÁÔÏ ÁÒÇÕÍÅÎÔ¦×"
 
-#: keymap.c:950
+#: keymap.c:1076
 msgid "exec: no arguments"
 msgstr "exec: ÎÅÍÁ¤ ÁÒÇÕÍÅÎÔ¦×"
 
-#: keymap.c:970
+#: keymap.c:1096
 #, c-format
 msgid "%s: no such function"
 msgstr "ÆÕÎËÃ¦Ñ '%s' ÎÅ ¦ÓÎÕ¤"
 
-#: keymap.c:991
+#: keymap.c:1117
 #, fuzzy
 msgid "Enter keys (^G to abort): "
 msgstr "÷×ÅĦÔØ keyID ÄÌÑ %s: "
 
-#: keymap.c:996
+#: keymap.c:1122
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
@@ -2551,7 +2613,7 @@ msgid ""
 "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) 2006-2008 Rocco Rutte <pdmef@gmx.net>\n"
+"Copyright (C) 2006-2009 Rocco Rutte <pdmef@gmx.net>\n"
 "\n"
 "Many others not mentioned here contributed code, fixes,\n"
 "and suggestions.\n"
@@ -2582,8 +2644,8 @@ msgstr ""
 msgid ""
 "usage: mutt [<options>] [-z] [-f <file> | -yZ]\n"
 "       mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "
-"<file> [...]] [--] <addr> [...]\n"
-"       mutt [<options>] [-x] [-s <subj>] [-bc <addr>] [-a <file> [...]] [--] "
+"<file> [...] --] <addr> [...]\n"
+"       mutt [<options>] [-x] [-s <subj>] [-bc <addr>] [-a <file> [...] --] "
 "<addr> [...] < message\n"
 "       mutt [<options>] -p\n"
 "       mutt [<options>] -A <alias> [...]\n"
@@ -2596,17 +2658,18 @@ msgstr ""
 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 ""
 
-#: main.c:130
+#: main.c:131
 msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
 msgstr ""
 
-#: main.c:133
+#: main.c:134
 #, fuzzy
 msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
@@ -2646,7 +2709,7 @@ msgstr ""
 "  -Z\t\tצÄËÒÉÔÉ ÐÅÒÛÕ ÓËÒÉÎØËÕ Ú ÎÏ×ÉÍ ÌÉÓÔÏÍ, ÑËÝÏ ÎÅÍÁ¤ - ÏÄÒÁÚÕ ×ÉÊÔÉ\n"
 "  -h\t\tÃÑ Ð¦ÄËÁÚËÁ"
 
-#: main.c:142
+#: main.c:143
 #, fuzzy
 msgid ""
 "  -Q <variable>\tquery a configuration variable\n"
@@ -2687,13 +2750,7 @@ msgstr ""
 "  -Z\t\tצÄËÒÉÔÉ ÐÅÒÛÕ ÓËÒÉÎØËÕ Ú ÎÏ×ÉÍ ÌÉÓÔÏÍ, ÑËÝÏ ÎÅÍÁ¤ - ÏÄÒÁÚÕ ×ÉÊÔÉ\n"
 "  -h\t\tÃÑ Ð¦ÄËÁÚËÁ"
 
-#: main.c:152
-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:197
+#: main.c:196
 msgid ""
 "\n"
 "Compile options:"
@@ -2701,72 +2758,77 @@ msgstr ""
 "\n"
 "ðÁÒÁÍÅÔÒÉ ËÏÍЦÌÑæ§:"
 
-#: main.c:501
+#: main.c:500
 msgid "Error initializing terminal."
 msgstr "ðÏÍÉÌËÁ ¦Î¦Ã¦Á̦ÚÁæ§ ÔÅÒͦÎÁÌÕ."
 
-#: main.c:635
+#: 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 ""
 
-#: main.c:637
+#: main.c:641
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG ÎÅ ×ËÁÚÁÎÏ Ð¦Ä ÞÁÓ ËÏÍЦÌÑæ§. ¶ÇÎÏÒÕ¤ÔØÓÑ.\n"
 
-#: main.c:802
+#: main.c:806
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s ÎÅ ¦ÓÎÕ¤. óÔ×ÏÒÉÔÉ ÊÏÇÏ?"
 
-#: main.c:806
+#: main.c:810
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ %s: %s."
 
-#: main.c:848
+#: main.c:852
 msgid "Failed to parse mailto: link\n"
 msgstr ""
 
-#: main.c:860
+#: main.c:864
 msgid "No recipients specified.\n"
 msgstr "ïÔÒÉÍÕ×ÁÞ¦× ÎÅ ×ËÁÚÁÎÏ.\n"
 
-#: main.c:946
+#: main.c:950
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: ÎÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ ÆÁÊÌ.\n"
 
-#: main.c:969
+#: main.c:973
 msgid "No mailbox with new mail."
 msgstr "îÅÍÁ¤ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ Ú ÎÏ×ÏÀ ÐÏÛÔÏÀ."
 
-#: main.c:978
+#: main.c:982
 msgid "No incoming mailboxes defined."
 msgstr "÷ȦÄÎÉÈ ÐÏÛÔÏ×ÉÈ ÓËÒÉÎØÏË ÎÅ ×ËÁÚÁÎÏ."
 
-#: main.c:1006
+#: main.c:1010
 msgid "Mailbox is empty."
 msgstr "ðÏÛÔÏ×Á ÓËÒÉÎØËÁ ÐÏÒÏÖÎÑ."
 
-#: mbox.c:123 mbox.c:277 mh.c:1135 mx.c:673
+#: mbox.c:119 mbox.c:269 mh.c:1152 mx.c:642
 #, c-format
 msgid "Reading %s..."
 msgstr "þÉÔÁÎÎÑ %s..."
 
-#: mbox.c:161 mbox.c:218
+#: mbox.c:157 mbox.c:214
 msgid "Mailbox is corrupt!"
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ Ú¦ÐÓÏ×ÁÎÏ!"
 
-#: mbox.c:678
+#: mbox.c:670
 msgid "Mailbox was corrupted!"
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÂÕÌÏ Ú¦ÐÓÏ×ÁÎÏ!"
 
-#: mbox.c:719 mbox.c:976
+#: mbox.c:752 mbox.c:1008
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "æÁÔÁÌØÎÁ ÐÏÍÉÌËÁ! îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÚÎÏ×Õ!"
 
-#: mbox.c:728
+#: mbox.c:761
 msgid "Unable to lock mailbox!"
 msgstr "ðÏÛÔÏ×Á ÓËÒÉÎØËÁ ÎÅ ÂÌÏËÕ¤ÔØÓÑ!"
 
@@ -2774,32 +2836,29 @@ msgstr "
 #. * 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 "sync: ÓËÒÉÎØËÕ ÚͦÎÅÎÏ, ÁÌÅ ÎÅÍÁ¤ ÚͦÎÅÎÉÈ ÌÉÓÔ¦×! (ÐÏצÄÏÍØÔÅ ÐÒÏ ÃÅ)"
 
-#: mbox.c:795 mh.c:1640 mx.c:766
+#: mbox.c:828 mh.c:1658 mx.c:739
 #, c-format
 msgid "Writing %s..."
 msgstr "úÁÐÉÓ %s..."
 
-#. copy the temp mailbox back into place starting at the first
-#. * change/deleted message
-#.
-#: mbox.c:929
+#: mbox.c:963
 msgid "Committing changes..."
 msgstr "÷ÎÅÓÅÎÎÑ ÚͦÎ..."
 
-#: mbox.c:960
+#: mbox.c:994
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "úÂ¦Ê ÚÁÐÉÓÕ! þÁÓÔËÏ×Õ ÓËÒÉÎØËÕ ÚÂÅÒÅÖÅÎÏ Õ %s"
 
-#: mbox.c:1024
+#: mbox.c:1056
 msgid "Could not reopen mailbox!"
 msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÚÎÏ×Õ!"
 
-#: mbox.c:1059
+#: mbox.c:1092
 msgid "Reopening mailbox..."
 msgstr "ðÏ×ÔÏÒΊצÄËÒÉÔÔÑ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ..."
 
@@ -2812,7 +2871,7 @@ msgid "Invalid index number."
 msgstr "îÅצÒÎÉÊ ÎÏÍÅÒ ÐÅÒÅ̦ËÕ."
 
 #: 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:1058
+#: menu.c:603 menu.c:614 menu.c:627 menu.c:640 menu.c:1051
 msgid "No entries."
 msgstr "öÏÄÎϧ ÐÏÚÉç§."
 
@@ -2840,49 +2899,45 @@ msgstr "
 msgid "You are on the first entry."
 msgstr "ãÅ ÐÅÒÛÁ ÐÏÚÉæÑ."
 
-#: menu.c:731 pattern.c:1404
+#: menu.c:733 pager.c:2086 pattern.c:1417
 msgid "Search for: "
 msgstr "ûÕËÁÔÉ ×ÉÒÁÚ:"
 
-#: menu.c:732 pattern.c:1405
+#: menu.c:733 pager.c:2086 pattern.c:1417
 msgid "Reverse search for: "
 msgstr "ú×ÏÒÏÔÎ¦Ê ÐÏÛÕË ×ÉÒÁÚÕ: "
 
-#: menu.c:746 pattern.c:1437
-msgid "No search pattern."
-msgstr "îÅÍÁ¤ ×ÉÒÁÚÕ ÐÏÛÕËÕ."
-
-#: menu.c:784 pager.c:1983 pager.c:2005 pager.c:2120 pattern.c:1520
+#: menu.c:777 pager.c:2039 pager.c:2061 pager.c:2181 pattern.c:1531
 msgid "Not found."
 msgstr "îÅ ÚÎÁÊÄÅÎÏ."
 
-#: menu.c:910
+#: menu.c:903
 msgid "No tagged entries."
 msgstr "öÏÄÎϧ ÐÏÚÉæ§ ÎÅ ×ÉÂÒÁÎÏ."
 
-#: menu.c:1015
+#: menu.c:1008
 msgid "Search is not implemented for this menu."
 msgstr "ðÏÛÕË Õ ÃØÏÍÕ ÍÅÎÀ ΊЦÄÔÒÉÍÕ¤ÔØÓÑ."
 
-#: menu.c:1020
+#: menu.c:1013
 msgid "Jumping is not implemented for dialogs."
 msgstr "ðÅÒÅÈ¦Ä Õ ÃØÏÍÕ Ä¦ÁÌÏÚ¦ ΊЦÄÒÉÍÕ¤ÔØÓÑ."
 
-#: menu.c:1061
+#: menu.c:1054
 msgid "Tagging is not supported."
 msgstr "÷ÉĦÌÅÎÎÑ ÎŠЦÄÔÒÉÍÕ¤ÔØÓÑ."
 
-#: mh.c:1114
+#: mh.c:1131
 #, fuzzy, c-format
 msgid "Scanning %s..."
 msgstr "÷ÉÂ¦Ò %s..."
 
-#: mh.c:1314 mh.c:1392
+#: mh.c:1332 mh.c:1410
 #, fuzzy
 msgid "Could not flush message to disk"
 msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄÐÒÁ×ÉÔÉ ÌÉÓÔ."
 
-#: mh.c:1359
+#: mh.c:1377
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
@@ -2950,203 +3005,207 @@ msgstr "
 msgid "Could not connect to %s (%s)."
 msgstr "îÅ ×ÉÊÛÌÏ Ú'¤ÄÎÁÔÉÓÑ Ú %s (%s)."
 
-#: mutt_ssl.c:183
+#: mutt_ssl.c:187
 msgid "Failed to find enough entropy on your system"
 msgstr "îÅ ×ÄÁÌÏÓÑ ÚÎÁÊÔÉ ÄÏÓÔÑÔÎØÏ ÅÎÔÒÏЦ§ ÎÁ ×ÁÛ¦Ê ÓÉÓÔÅͦ"
 
-#: mutt_ssl.c:207
+#: mutt_ssl.c:211
 #, c-format
 msgid "Filling entropy pool: %s...\n"
 msgstr "úÁÐÏ×ÎÅÎÎÑ ÐÕÌÕ ÅÎÔÒÏЦ§: %s...\n"
 
-#: mutt_ssl.c:215
+#: mutt_ssl.c:219
 #, c-format
 msgid "%s has insecure permissions!"
 msgstr "%s ÍÁ¤ ÎÅÓÅËÒÅÔΦ ÐÒÁ×Á ÄÏÓÔÕÐÕ!"
 
-#: mutt_ssl.c:234
+#: mutt_ssl.c:238
 msgid "SSL disabled due the lack of entropy"
 msgstr "SSL ÎÅÄÏÓÑÖÎÅ ÚÁ×ÄÑËÉ ×ÔÒÁÔ¦ ÅÎÔÒÏЦ§"
 
-#: mutt_ssl.c:331
+#: mutt_ssl.c:352
 msgid "I/O error"
 msgstr "ÐÏÍÉÌËÁ ××ÏÄÕ-×É×ÏÄÕ"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:361
 #, c-format
 msgid "SSL failed: %s"
 msgstr "ðÏÍÉÌËÁ SSL: %s"
 
-#: mutt_ssl.c:349 mutt_ssl_gnutls.c:880 mutt_ssl_gnutls.c:889
-#: mutt_ssl_gnutls.c:912
+#: 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 "îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ÓÅÒÔÉƦËÁÔ"
 
-#: mutt_ssl.c:357
+#: mutt_ssl.c:378
 #, c-format
 msgid "SSL connection using %s (%s)"
 msgstr "ú'¤ÄÎÁÎÎÑ SSL Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ %s (%s)"
 
-#: mutt_ssl.c:401
+#: mutt_ssl.c:480
 msgid "Unknown"
 msgstr "îÅצÄÏÍÅ"
 
-#: mutt_ssl.c:426 mutt_ssl_gnutls.c:457
+#: mutt_ssl.c:505 mutt_ssl_gnutls.c:473
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[ÎÅÍÏÖÌÉ×Ï ÏÂÞÉÓÌÉÔÉ]"
 
-#: mutt_ssl.c:444 mutt_ssl_gnutls.c:480
+#: mutt_ssl.c:523 mutt_ssl_gnutls.c:496
 msgid "[invalid date]"
 msgstr "[ÐÏÍÉÌËÏ×Á ÄÁÔÁ]"
 
-#: mutt_ssl.c:570
+#: mutt_ssl.c:651
 msgid "Server certificate is not yet valid"
 msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ÝŠΊĦÊÓÎÉÊ"
 
-#: mutt_ssl.c:577
+#: mutt_ssl.c:658
 msgid "Server certificate has expired"
 msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ×ÉÄÁÌÅÎÏ ÚÁ ÄÁ×ΦÓÔÀ"
 
-#: mutt_ssl.c:696
+#: mutt_ssl.c:780
 #, fuzzy
 msgid "cannot get certificate subject"
 msgstr "îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ÓÅÒÔÉƦËÁÔ"
 
-#: mutt_ssl.c:708
+#: mutt_ssl.c:790 mutt_ssl.c:799
 #, fuzzy
 msgid "cannot get certificate common name"
 msgstr "îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ÓÅÒÔÉƦËÁÔ"
 
-#: mutt_ssl.c:717
+#: mutt_ssl.c:813
 #, c-format
 msgid "certificate owner does not match hostname %s"
 msgstr ""
 
-#: mutt_ssl.c:754
+#: mutt_ssl.c:854
 #, fuzzy, c-format
 msgid "Certificate host check failed: %s"
 msgstr "óÅÒÔÉƦËÁÔ ÚÂÅÒÅÖÅÎÏ"
 
-#: mutt_ssl.c:845 mutt_ssl_gnutls.c:664
+#: mutt_ssl.c:932 mutt_ssl_gnutls.c:732
 msgid "This certificate belongs to:"
 msgstr "ãÅÊ ÓÅÒÔÉƦËÁÔ ÎÁÌÅÖÉÔØ:"
 
-#: mutt_ssl.c:858 mutt_ssl_gnutls.c:703
+#: mutt_ssl.c:945 mutt_ssl_gnutls.c:771
 msgid "This certificate was issued by:"
 msgstr "ãÅÊ ÓÅÒÔÉƦËÁÔ ×ÉÄÁÎÏ:"
 
-#: mutt_ssl.c:869 mutt_ssl_gnutls.c:742
+#: mutt_ssl.c:956 mutt_ssl_gnutls.c:810
 #, c-format
 msgid "This certificate is valid"
 msgstr "ãÅÊ ÓÅÒÔÉƦËÁÔ Ä¦ÊÓÎÉÊ"
 
-#: mutt_ssl.c:870 mutt_ssl_gnutls.c:745
+#: mutt_ssl.c:957 mutt_ssl_gnutls.c:813
 #, c-format
 msgid "   from %s"
 msgstr "   ×¦Ä %s"
 
-#: mutt_ssl.c:872 mutt_ssl_gnutls.c:749
+#: mutt_ssl.c:959 mutt_ssl_gnutls.c:817
 #, c-format
 msgid "     to %s"
 msgstr "     ÄÏ %s"
 
-#: mutt_ssl.c:878
+#: mutt_ssl.c:965
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "÷¦ÄÂÉÔÏË: %s"
 
-#: mutt_ssl.c:881 mutt_ssl_gnutls.c:786
+#: mutt_ssl.c:968 mutt_ssl_gnutls.c:854
 #, c-format
 msgid "SSL Certificate check (certificate %d of %d in chain)"
 msgstr ""
 
-#: mutt_ssl.c:887 mutt_ssl_gnutls.c:793
+#: mutt_ssl.c:976 mutt_ssl_gnutls.c:863
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)ÎÅ ÐÒÉÊÍÁÔÉ, ÐÒÉÊÎÑÔÉ (o)ÏÄÎÏÒÁÚÏ×Ï ÁÂÏ (a)ÚÁ×ÖÄÉ"
 
-#: mutt_ssl.c:888 mutt_ssl_gnutls.c:794
+#: mutt_ssl.c:977 mutt_ssl_gnutls.c:864
 msgid "roa"
 msgstr ""
 
-#: mutt_ssl.c:892 mutt_ssl_gnutls.c:798
+#: mutt_ssl.c:981 mutt_ssl_gnutls.c:868
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)ÎÅ ÐÒÉÊÍÁÔÉ, (o)ÐÒÉÊÎÑÔÉ ÏÄÎÏÒÁÚÏ×Ï"
 
-#: mutt_ssl.c:893 mutt_ssl_gnutls.c:799
+#: mutt_ssl.c:982 mutt_ssl_gnutls.c:869
 msgid "ro"
 msgstr ""
 
-#: mutt_ssl.c:924 mutt_ssl_gnutls.c:848
+#: mutt_ssl.c:1013 mutt_ssl_gnutls.c:918
 msgid "Warning: Couldn't save certificate"
 msgstr "ðÏÐÅÒÅÄÖÅÎÎÑ: ÎÅÍÏÖÌÉ×Ï ÚÂÅÒÅÇÔÉ ÓÅÒÔÉƦËÁÔ"
 
-#: mutt_ssl.c:929 mutt_ssl_gnutls.c:853
+#: mutt_ssl.c:1018 mutt_ssl_gnutls.c:923
 msgid "Certificate saved"
 msgstr "óÅÒÔÉƦËÁÔ ÚÂÅÒÅÖÅÎÏ"
 
-#: mutt_ssl_gnutls.c:96 mutt_ssl_gnutls.c:123
+#: mutt_ssl_gnutls.c:106 mutt_ssl_gnutls.c:133
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:276
+#: mutt_ssl_gnutls.c:292
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:340
+#: mutt_ssl_gnutls.c:356
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "ú'¤ÄÎÁÎÎÑ SSL Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ %s (%s)"
 
-#: mutt_ssl_gnutls.c:567
+#: mutt_ssl_gnutls.c:563 mutt_ssl_gnutls.c:712
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "ðÏÍÉÌËÁ ¦Î¦Ã¦Á̦ÚÁæ§ ÔÅÒͦÎÁÌÕ."
 
-#: mutt_ssl_gnutls.c:574
+#: mutt_ssl_gnutls.c:570 mutt_ssl_gnutls.c:719
 msgid "Error processing certificate data"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:754
+#: mutt_ssl_gnutls.c:703
+msgid "Warning: Server certificate was signed using an insecure algorithm"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:822
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "÷¦ÄÂÉÔÏË: %s"
 
-#: mutt_ssl_gnutls.c:757
+#: mutt_ssl_gnutls.c:825
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "÷¦ÄÂÉÔÏË: %s"
 
-#: mutt_ssl_gnutls.c:762
+#: mutt_ssl_gnutls.c:830
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
 msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ÝŠΊĦÊÓÎÉÊ"
 
-#: mutt_ssl_gnutls.c:767
+#: mutt_ssl_gnutls.c:835
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
 msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ×ÉÄÁÌÅÎÏ ÚÁ ÄÁ×ΦÓÔÀ"
 
-#: mutt_ssl_gnutls.c:772
+#: mutt_ssl_gnutls.c:840
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
 msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ×ÉÄÁÌÅÎÏ ÚÁ ÄÁ×ΦÓÔÀ"
 
-#: mutt_ssl_gnutls.c:777
+#: mutt_ssl_gnutls.c:845
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:782
+#: mutt_ssl_gnutls.c:850
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ÝŠΊĦÊÓÎÉÊ"
 
-#: mutt_ssl_gnutls.c:895
+#: mutt_ssl_gnutls.c:956
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:904
+#: mutt_ssl_gnutls.c:965
 #, fuzzy
 msgid "Certificate is not X.509"
 msgstr "óÅÒÔÉƦËÁÔ ÚÂÅÒÅÖÅÎÏ"
@@ -3166,41 +3225,41 @@ msgstr ""
 msgid "Tunnel error talking to %s: %s"
 msgstr "ðÏÍÉÌËÁ Õ Ú'¤ÄÎÁÎΦ Ú ÓÅÒ×ÅÒÏÍ %s (%s)"
 
-#: muttlib.c:923
+#: muttlib.c:976
 #, fuzzy
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr "æÁÊÌ ¤ ËÁÔÁÌÏÇÏÍ, ÚÂÅÒÅÇÔÉ Õ ÎØÏÍÕ?"
 
-#: muttlib.c:923
+#: muttlib.c:976
 msgid "yna"
 msgstr ""
 
-#: muttlib.c:939
+#: muttlib.c:992
 msgid "File is a directory, save under it?"
 msgstr "æÁÊÌ ¤ ËÁÔÁÌÏÇÏÍ, ÚÂÅÒÅÇÔÉ Õ ÎØÏÍÕ?"
 
-#: muttlib.c:945
+#: muttlib.c:998
 msgid "File under directory: "
 msgstr "æÁÊÌ Õ ËÁÔÁÌÏÚ¦: "
 
-#: muttlib.c:957
+#: muttlib.c:1010
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "æÁÊÌ ¦ÓÎÕ¤, (o)ÐÅÒÅÐÉÓÁÔÉ, (a)ÄÏÄÁÔÉ ÄÏ ÎØÏÇÏ ÞÉ (c)צÄÍÏ×ÉÔÉ?"
 
-#: muttlib.c:957
+#: muttlib.c:1010
 msgid "oac"
 msgstr ""
 
-#: muttlib.c:1441
+#: muttlib.c:1511
 msgid "Can't save message to POP mailbox."
 msgstr "îÅÍÏÖÌÉ×Ï ÚÁÐÉÓÁÔÉ ÌÉÓÔ ÄÏ ÓËÒÉÎØËÉ POP."
 
-#: muttlib.c:1450
+#: muttlib.c:1520
 #, c-format
 msgid "Append messages to %s?"
 msgstr "äÏÄÁÔÉ ÌÉÓÔÉ ÄÏ %s?"
 
-#: muttlib.c:1462
+#: muttlib.c:1532
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s ÎÅ ¤ ÐÏÛÔÏ×ÏÀ ÓËÒÉÎØËÏÀ!"
@@ -3233,118 +3292,110 @@ msgstr "
 msgid "Waiting for flock attempt... %d"
 msgstr "þÅËÁÎÎÑ ÂÌÏËÕ×ÁÎÎÑ ÞÅÒÅÚ flock... %d"
 
-#: mx.c:586
+#: mx.c:555
 #, c-format
 msgid "Couldn't lock %s\n"
 msgstr "îÅ ×ÉÊÛÌÏ ÚÁÂÌÏËÕ×ÁÔÉ %s\n"
 
-#: mx.c:798
+#: mx.c:771
 #, c-format
 msgid "Could not synchronize mailbox %s!"
 msgstr "îÅ ×ÉÊÛÌÏ Ó¦ÎÈÒÏΦÚÕ×ÁÔÉ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ %s!"
 
-#: mx.c:862
+#: mx.c:835
 #, c-format
 msgid "Move read messages to %s?"
 msgstr "ðÅÒÅÎÅÓÔÉ ÞÉÔÁΦ ÌÉÓÔÉ ÄÏ %s?"
 
-#: mx.c:878 mx.c:1130
+#: mx.c:851 mx.c:1111
 #, c-format
 msgid "Purge %d deleted message?"
 msgstr "úÎÉÝÉÔÉ %d ×ÉÄÁÌÅÎÉÊ ÌÉÓÔ?"
 
-#: mx.c:878 mx.c:1130
+#: mx.c:851 mx.c:1111
 #, c-format
 msgid "Purge %d deleted messages?"
 msgstr "úÎÉÝÉÔÉ %d ×ÉÄÁÌÅÎÉÈ ÌÉÓÔ¦×?"
 
-#: mx.c:898
+#: mx.c:872
 #, c-format
 msgid "Moving read messages to %s..."
 msgstr "ðÅÒÅÎÏÓ ÞÉÔÁÎÉÈ ÌÉÓÔ¦× ÄÏ %s..."
 
-#: mx.c:957 mx.c:1121
+#: mx.c:932 mx.c:1102
 msgid "Mailbox is unchanged."
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÎÅ ÚͦÎÅÎÏ."
 
-#: mx.c:993
+#: mx.c:972
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d ÚÂÅÒÅÖÅÎÏ, %d ÐÅÒÅÎÅÓÅÎÏ, %d ÚÎÉÝÅÎÏ."
 
-#: mx.c:996 mx.c:1170
+#: mx.c:975 mx.c:1154
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d ÚÂÅÒÅÖÅÎÏ, %d ÚÎÉÝÅÎÏ."
 
-#: mx.c:1106
+#: mx.c:1086
 #, c-format
 msgid " Press '%s' to toggle write"
 msgstr "îÁÔÉÓΦÔØ '%s' ÄÌÑ ÚͦÎÉ ÍÏÖÌÉ×ÏÓÔ¦ ÚÁÐÉÓÕ"
 
-#: mx.c:1108
+#: mx.c:1088
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "úÒϦÔØ 'toggle-write' ÄÌÑ ×צÍËÎÅÎÎÑ ÚÁÐÉÓÕ!"
 
-#: mx.c:1110
+#: mx.c:1090
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
 msgstr "óËÒÉÎØËÕ ÐÏͦÞÅÎÏ ÎÅÚͦÎÀ×ÁÎÏÀ. %s"
 
-#: mx.c:1167
+#: mx.c:1148
 msgid "Mailbox checkpointed."
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÐÅÒÅצÒÅÎÏ."
 
-#: mx.c:1479
+#: mx.c:1466
 msgid "Can't write message"
 msgstr "îÅÍÏÖÌÉ×Ï ÚÁÐÉÓÁÔÉ ÌÉÓÔ"
 
-#: mx.c:1524
+#: mx.c:1505
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
-#: pager.c:1480
+#: pager.c:1531
 msgid "PrevPg"
 msgstr "ðÏÐóÔ"
 
-#: pager.c:1481
+#: pager.c:1532
 msgid "NextPg"
 msgstr "îÁÓÔóÔ"
 
-#: pager.c:1485
+#: pager.c:1536
 msgid "View Attachm."
 msgstr "äÏÄÁÔËÉ"
 
-#: pager.c:1488
+#: pager.c:1539
 msgid "Next"
 msgstr "îÁÓÔ"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1889 pager.c:1920 pager.c:1952 pager.c:2208
+#: pager.c:1940 pager.c:1971 pager.c:2003 pager.c:2279
 msgid "Bottom of message is shown."
 msgstr "÷É ÂÁÞÉÔŠ˦ÎÅÃØ ÌÉÓÔÁ."
 
-#: pager.c:1905 pager.c:1927 pager.c:1934 pager.c:1941
+#: pager.c:1956 pager.c:1978 pager.c:1985 pager.c:1992
 msgid "Top of message is shown."
 msgstr "÷É ÂÁÞÉÔÅ ÐÏÞÁÔÏË ÌÉÓÔÁ."
 
-#: pager.c:2024
-msgid "Reverse search: "
-msgstr "ú×ÏÒÏÔÎ¦Ê ÐÏÛÕË: "
-
-#: pager.c:2025
-msgid "Search: "
-msgstr "ðÏÛÕË: "
-
-#: pager.c:2146
+#: pager.c:2217
 msgid "Help is currently being shown."
 msgstr "ð¦ÄËÁÚËÕ ÚÁÒÁÚ ÐÏËÁÚÁÎÏ."
 
-#: pager.c:2175
+#: pager.c:2246
 msgid "No more quoted text."
 msgstr "ãÉÔÏ×ÁÎÏÇÏ ÔÅËÓÔÕ Â¦ÌØÛ ÎÅÍÁ¤."
 
-#: pager.c:2188
+#: pager.c:2259
 msgid "No more unquoted text after quoted text."
 msgstr "ð¦ÓÌÑ ÃÉÔÏ×ÁÎÏÇÏ ÔÅËÓÔÕ Î¦ÞÏÇÏ ÎÅÍÁ¤."
 
@@ -3352,101 +3403,106 @@ msgstr "
 msgid "multipart message has no boundary parameter!"
 msgstr "âÁÇÁÔÏÞÁÓÔÉÎÎÉÊ ÌÉÓÔ ÎÅ ÍÁ¤ ÐÁÒÁÍÅÔÒÕ ÍÅÖ¦!"
 
-#: pattern.c:262
+#: pattern.c:264
 #, c-format
 msgid "Error in expression: %s"
 msgstr "ðÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
 
-#: pattern.c:267
+#: pattern.c:269
 #, fuzzy, c-format
 msgid "Empty expression"
 msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ"
 
-#: pattern.c:398
+#: pattern.c:402
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "äÅÎØ '%s' × Í¦ÓÑæ ÎÅ ¦ÓÎÕ¤"
 
-#: pattern.c:412
+#: pattern.c:416
 #, c-format
 msgid "Invalid month: %s"
 msgstr "í¦ÓÑÃØ '%s' ÎÅ ¦ÓÎÕ¤"
 
 #. getDate has its own error message, don't overwrite it here
-#: pattern.c:564
+#: pattern.c:568
 #, c-format
 msgid "Invalid relative date: %s"
 msgstr "îÅÍÏÖÌÉ×Á צÄÎÏÓÎÁ ÄÁÔÁ: %s"
 
-#: pattern.c:578
+#: pattern.c:582
 msgid "error in expression"
 msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ"
 
-#: pattern.c:799 pattern.c:945
+#: pattern.c:804 pattern.c:956
 #, c-format
 msgid "error in pattern at: %s"
 msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
 
-#: pattern.c:829
+#: pattern.c:830
+#, fuzzy, c-format
+msgid "missing pattern: %s"
+msgstr "צÄÓÕÔÎ¦Ê ÐÁÒÁÍÅÔÒ"
+
+#: pattern.c:840
 #, fuzzy, c-format
 msgid "mismatched brackets: %s"
 msgstr "צÄÓÕÔÎÑ ÄÕÖËÁ: %s"
 
-#: pattern.c:885
+#: pattern.c:896
 #, fuzzy, c-format
 msgid "%c: invalid pattern modifier"
 msgstr "%c: ÎÅצÒÎÁ ËÏÍÁÎÄÁ"
 
-#: pattern.c:891
+#: pattern.c:902
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr "× ÃØÏÍÕ ÒÅÖÉÍÏצ '%c' ΊЦÄÔÒÉÍÕ¤ÔØÓÑ"
 
-#: pattern.c:904
+#: pattern.c:915
 #, c-format
 msgid "missing parameter"
 msgstr "צÄÓÕÔÎ¦Ê ÐÁÒÁÍÅÔÒ"
 
-#: pattern.c:920
+#: pattern.c:931
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "צÄÓÕÔÎÑ ÄÕÖËÁ: %s"
 
-#: pattern.c:952
+#: pattern.c:963
 msgid "empty pattern"
 msgstr "ÐÏÒÏÖÎ¦Ê ×ÉÒÁÚ"
 
-#: pattern.c:1205
+#: pattern.c:1217
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "ÐÏÍÉÌËÁ: ÎÅצÄÏÍÅ op %d (ÐÏצÄÏÍØÔÅ ÃÀ ÐÏÍÉÌËÕ)."
 
-#: pattern.c:1288 pattern.c:1423
+#: pattern.c:1300 pattern.c:1438
 msgid "Compiling search pattern..."
 msgstr "ëÏÍЦÌÑÃ¦Ñ ×ÉÒÁÚÕ ÐÏÛÕËÕ..."
 
-#: pattern.c:1307
+#: pattern.c:1320
 msgid "Executing command on matching messages..."
 msgstr "÷ÉËÏÎÁÎÎÑ ËÏÍÁÎÄÉ ÄÏ ×¦ÄÐÏצÄÎÉÈ ÌÉÓÔ¦×..."
 
-#: pattern.c:1374
+#: pattern.c:1387
 msgid "No messages matched criteria."
 msgstr "ìÉÓÔ¦×, ÝÏ ×¦ÄÐÏצÄÁÀÔØ ËÒÉÔÅÒ¦À, ÎÅ ÚÎÁÊÄÅÎÏ."
 
-#: pattern.c:1456
+#: pattern.c:1467
 #, fuzzy
 msgid "Searching..."
 msgstr "úÂÅÒÅÖÅÎÎÑ..."
 
-#: pattern.c:1469
+#: pattern.c:1480
 msgid "Search hit bottom without finding match"
 msgstr "ðÏÛÕË Ä¦ÊÛÏ× ÄÏ Ë¦ÎÃÑ, ÁÌÅ ÎÅ ÚÎÁÊÄÅÎÏ Î¦ÞÏÇÏ"
 
-#: pattern.c:1480
+#: pattern.c:1491
 msgid "Search hit top without finding match"
 msgstr "ðÏÛÕË Ä¦ÊÛÏ× ÄÏ ÐÏÞÁÔËÕ, ÁÌÅ ÎÅ ÚÎÁÊÄÅÎÏ Î¦ÞÏÇÏ"
 
-#: pattern.c:1512
+#: pattern.c:1523
 msgid "Search interrupted."
 msgstr "ðÏÛÕË ÐÅÒÅÒ×ÁÎÏ."
 
@@ -3458,11 +3514,11 @@ msgstr "
 msgid "PGP passphrase forgotten."
 msgstr "ëÏÄÏ×Õ ÆÒÁÚÕ PGP ÚÁÂÕÔÏ."
 
-#: pgp.c:357
+#: pgp.c:368
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- ðÏÍÉÌËÁ: ÎÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Ð¦ÄÐÒÏÃÅÓ PGP! --]\n"
 
-#: pgp.c:391 pgp.c:643 pgp.c:847
+#: pgp.c:402 pgp.c:659 pgp.c:863
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3470,23 +3526,23 @@ msgstr ""
 "[-- ë¦ÎÅÃØ ÔÅËÓÔÕ ÎÁ ×ÉÈÏĦ PGP --]\n"
 "\n"
 
-#: pgp.c:411 pgp.c:459 pgp.c:982
+#: pgp.c:424 pgp.c:475 pgp.c:998
 #, fuzzy
 msgid "Could not decrypt PGP message"
 msgstr "îÅ ×ÉÊÛÌÏ ÓËÏЦÀ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
 
 #. clear 'Invoking...' message, since there's no error
-#: pgp.c:461 pgp.c:978
+#: pgp.c:477 pgp.c:994
 #, fuzzy
 msgid "PGP message successfully decrypted."
 msgstr "ð¦ÄÐÉÓ PGP ÐÅÒÅצÒÅÎÏ."
 
-#: pgp.c:751
+#: pgp.c:767
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "÷ÎÕÔÒ¦ÛÎÑ ÐÏÍÉÌËÁ. ðÏצÄÏÍØÔÅ <roessler@does-not-exist.org>."
 
-#: pgp.c:812
+#: pgp.c:828
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3494,35 +3550,52 @@ msgstr ""
 "[-- ðÏÍÉÌËÁ: ÎÅ ×ÉÊÛÌÏ ÓÔ×ÏÒÉÔÉ Ð¦ÄÐÒÏÃÅÓ PGP! --]\n"
 "\n"
 
-#: pgp.c:859
+#: pgp.c:875
 #, fuzzy
 msgid "Decryption failed"
 msgstr "ðÏÍÉÌËÁ ÒŤÓÔÒÁæ§."
 
-#: pgp.c:1034
+#: pgp.c:1050
 msgid "Can't open PGP subprocess!"
 msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ Ð¦ÄÐÒÏÃÅÓÓ PGP!"
 
-#: pgp.c:1471
+#: pgp.c:1487
 msgid "Can't invoke PGP"
 msgstr "îÅ ×ÉÊÛÌÏ ×ÉËÌÉËÁÔÉ PGP"
 
-#: pgp.c:1572
+#: pgp.c:1592
 #, fuzzy, 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 "ÛÉÆÒ.(e), ЦÄÐ.(s), ЦÄÐ. ÑË(a), ÕÓÅ(b), (i)nline ÞÉ ×¦ÄͦÎÁ(f)? "
 
-#: pgp.c:1573
+#: pgp.c:1593
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1573
+#: pgp.c:1593
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1575
+#. 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
+#, fuzzy
+msgid "esabfci"
+msgstr "esabif"
+
+#. 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
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (c)lear? "
+msgstr "ÛÉÆÒ.(e), ЦÄÐ.(s), ЦÄÐ. ÑË(a), ÕÓÅ(b), (i)nline ÞÉ ×¦ÄͦÎÁ(f)? "
+
+#: pgp.c:1607
 #, fuzzy
-msgid "esabifc"
+msgid "esabfc"
 msgstr "esabif"
 
 #: pgpinvoke.c:308
@@ -3557,7 +3630,7 @@ msgstr "
 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 "ëÏÍÁÎÄÁ TOP ΊЦÄÔÒÉÍÕ¤ÔØÓÑ ÓÅÒ×ÅÒÏÍ."
@@ -3566,60 +3639,65 @@ 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 "ëÏÍÁÎÄÁ UIDL ΊЦÄÔÒÉÍÕ¤ÔØÓÑ ÓÅÒ×ÅÒÏÍ."
 
-#: pop.c:391 pop.c:761
+#: pop.c:287
+#, fuzzy, 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 "%s - ÎÅÐÒÉÐÕÓÔÉÍÉÊ ÛÌÑÈ POP"
 
-#: pop.c:429
+#: pop.c:445
 msgid "Fetching list of messages..."
 msgstr "ïÔÒÉÍÁÎÎÑ ÐÅÒÅ̦ËÕ ÐÏצÄÏÍÌÅÎØ..."
 
-#: pop.c:587
+#: pop.c:603
 msgid "Can't write message to temporary file!"
 msgstr "îÅÍÏÖÌÉ×Ï ÚÁÐÉÓÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÄÏ ÔÉÍÞÁÓÏ×ÏÇÏ ÆÁÊÌÕ!"
 
-#: pop.c:646
+#: pop.c:662
 #, fuzzy
 msgid "Marking messages deleted..."
 msgstr "íÁÒËÕ×ÁÎÎÑ %d ÎÏ×ÉÈ ÐÏצÄÏÍÌÅÎØ ×ÉÄÁÌÅÎÉÍÉ..."
 
-#: pop.c:716 pop.c:781
+#: pop.c:740 pop.c:805
 msgid "Checking for new messages..."
 msgstr "ðÅÒÅצÒËÁ ÎÁÑ×ÎÏÓÔ¦ ÎÏ×ÉÈ ÐÏצÄÏÍÌÅÎØ..."
 
-#: pop.c:745
+#: pop.c:769
 msgid "POP host is not defined."
 msgstr "POP host ÎÅ ×ÉÚÎÁÞÅÎÏ."
 
-#: pop.c:809
+#: pop.c:833
 msgid "No new mail in POP mailbox."
 msgstr "÷ ÐÏÛÔÏ×¦Ê ÓËÒÉÎØæ POP ÎÅÍÁ¤ ÎÏ×ÉÈ ÌÉÓÔ¦×."
 
-#: pop.c:816
+#: pop.c:840
 msgid "Delete messages from server?"
 msgstr "÷ÉÄÁÌÉÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú ÓÅÒ×ÅÒÕ?"
 
-#: pop.c:818
+#: pop.c:842
 #, c-format
 msgid "Reading new messages (%d bytes)..."
 msgstr "þÉÔÁÎÎÑ ÎÏ×ÉÈ ÐÏצÄÏÍÌÅÎØ (%d ÂÁÊÔ)..."
 
-#: pop.c:860
+#: pop.c:884
 msgid "Error while writing mailbox!"
 msgstr "ðÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÚÁÐÉÓÕ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ!"
 
-#: pop.c:864
+#: pop.c:888
 #, c-format
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d Ú %d ÌÉÓÔ¦× ÐÒÏÞÉÔÁÎÏ]"
 
-#: pop.c:887 pop_lib.c:369
+#: pop.c:911 pop_lib.c:378
 msgid "Server closed connection!"
 msgstr "óÅÒ×ÅÒ ÚÁËÒÉ× Ú'¤ÄÎÁÎÎÑ!"
 
@@ -3644,51 +3722,56 @@ msgstr "
 msgid "Command USER is not supported by server."
 msgstr "ëÏÍÁÎÄÁ USER ΊЦÄÔÒÉÍÕ¤ÔØÓÑ ÓÅÒ×ÅÒÏÍ."
 
-#: pop_lib.c:199
+#: pop_lib.c:55
+#, fuzzy, c-format
+msgid "Invalid POP URL: %s\n"
+msgstr "í¦ÓÑÃØ '%s' ÎÅ ¦ÓÎÕ¤"
+
+#: pop_lib.c:208
 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 "ðÏÍÉÌËÁ Ú'¤ÄÎÁÎÎÑ Ú ÓÅÒ×ÅÒÏÍ: %s"
 
-#: pop_lib.c:383
+#: pop_lib.c:392
 msgid "Closing connection to POP server..."
 msgstr "úÁËÒÉÔÔÑ Ú'¤ÄÎÁÎÎÑ Ú ÓÅÒ×ÅÒÏÍ POP..."
 
-#: pop_lib.c:553
+#: pop_lib.c:563
 msgid "Verifying message indexes..."
 msgstr "ðÅÒÅצÒËÁ ¦ÎÄÅËÓ¦× ÐÏצÄÏÍÌÅÎØ..."
 
-#: pop_lib.c:575
+#: pop_lib.c:585
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "ú'¤ÄÎÁÎÎÑ ÚÁÇÕÂÌÅÎÏ. ÷¦ÄÎÏ×ÉÔÉ Ú×'ÑÚÏË Ú ÓÅÒ×ÅÒÏÍ POP?"
 
-#: postpone.c:164
+#: postpone.c:165
 msgid "Postponed Messages"
 msgstr "úÁÌÉÛÅΦ ÌÉÓÔÉ"
 
-#: postpone.c:244 postpone.c:253
+#: postpone.c:245 postpone.c:254
 msgid "No postponed messages."
 msgstr "öÏÄÎÏÇÏ ÌÉÓÔÁ ÎÅ ÚÁÌÉÛÅÎÏ."
 
-#: postpone.c:441 postpone.c:462 postpone.c:496
+#: postpone.c:442 postpone.c:463 postpone.c:497
 #, fuzzy
 msgid "Illegal crypto header"
 msgstr "îÅצÒÎÉÊ ÚÁÇÏÌÏ×ÏË PGP"
 
-#: postpone.c:482
+#: postpone.c:483
 #, fuzzy
 msgid "Illegal S/MIME header"
 msgstr "îÅצÒÎÉÊ ÚÁÇÏÌÏ×ÏË S/MIME"
 
-#: postpone.c:562
+#: postpone.c:563
 #, fuzzy
 msgid "Decrypting message..."
 msgstr "ïÔÒÉÍÁÎÎÑ ÌÉÓÔÁ..."
 
-#: postpone.c:571
+#: postpone.c:572
 #, fuzzy
 msgid "Decryption failed."
 msgstr "ðÏÍÉÌËÁ ÒŤÓÔÒÁæ§."
@@ -3736,67 +3819,67 @@ msgstr "
 msgid "Print"
 msgstr "äÒÕË"
 
-#: recvattach.c:472
+#: recvattach.c:484
 msgid "Saving..."
 msgstr "úÂÅÒÅÖÅÎÎÑ..."
 
-#: recvattach.c:475 recvattach.c:566
+#: recvattach.c:487 recvattach.c:578
 msgid "Attachment saved."
 msgstr "äÏÄÁÔÏË ÚÁÐÉÓÁÎÏ."
 
-#: recvattach.c:578
+#: recvattach.c:590
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "ïâåòåöîï! ÷É ÚÎÉÝÉÔÅ ¦ÓÎÕÀÞÉÊ %s ÐÒÉ ÚÁÐÉÓÕ. ÷É ÐÅ×Φ?"
 
-#: recvattach.c:596
+#: recvattach.c:608
 msgid "Attachment filtered."
 msgstr "äÏÄÁÔÏË ÏÔƦÌØÔÒÏ×ÁÎÏ."
 
-#: recvattach.c:663
+#: recvattach.c:675
 msgid "Filter through: "
 msgstr "æ¦ÌØÔÒÕ×ÁÔÉ ÞÅÒÅÚ: "
 
-#: recvattach.c:663
+#: recvattach.c:675
 msgid "Pipe to: "
 msgstr "ðÅÒÅÄÁÔÉ Õ ËÏÎ×Å¤Ò ËÏÍÁÎĦ: "
 
-#: recvattach.c:698
+#: recvattach.c:710
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "ñ ÎÅ ÚÎÁÀ, ÑË ÄÒÕËÕ×ÁÔÉ ÄÏÄÁÔËÉ ÔÉÐÕ %s!"
 
-#: recvattach.c:763
+#: recvattach.c:775
 msgid "Print tagged attachment(s)?"
 msgstr "äÒÕËÕ×ÁÔÉ ×ÉĦÌÅΦ ÄÏÄÁÔËÉ?"
 
-#: recvattach.c:763
+#: recvattach.c:775
 msgid "Print attachment?"
 msgstr "äÒÕËÕ×ÁÔÉ ÄÏÄÁÔÏË?"
 
-#: recvattach.c:996
+#: recvattach.c:1008
 #, fuzzy
 msgid "Can't decrypt encrypted message!"
 msgstr "îÅ ÚÎÁÊÄÅÎÏ ×ÉĦÌÅÎÉÈ ÌÉÓÔ¦×."
 
-#: recvattach.c:1008
+#: recvattach.c:1020
 msgid "Attachments"
 msgstr "äÏÄÁÔËÉ"
 
-#: recvattach.c:1044
+#: recvattach.c:1056
 msgid "There are no subparts to show!"
 msgstr "îÅÍÁ¤ ЦÄÞÁÓÔÉÎ ÄÌÑ ÐÒÏÇÌÑÄÁÎÎÑ!"
 
-#: recvattach.c:1105
+#: recvattach.c:1117
 msgid "Can't delete attachment from POP server."
 msgstr "îÅÍÏÖÌÉ×Ï ×ÉÄÁÌÉÔÉ ÄÏÄÁÔÏË Ú ÓÅÒ×ÅÒÁ POP."
 
-#: recvattach.c:1113
+#: recvattach.c:1125
 #, fuzzy
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr "÷ÉÄÁÌÅÎÎÑ ÄÏÄÁÔË¦× Ú ÌÉÓÔ¦× Ú PGP ΊЦÄÔÒÉÍÕ¤ÔØÓÑ."
 
-#: recvattach.c:1132 recvattach.c:1149
+#: recvattach.c:1144 recvattach.c:1161
 msgid "Only deletion of multipart attachments is supported."
 msgstr "ð¦ÄÔÒÉÍÕ¤ÔØÓÑ Ô¦ÌØËÉ ×ÉÄÁÌÅÎÎÑ × ÂÁÇÁÔÏÞÁÓÔÉÎÎÉÈ ÌÉÓÔÁÈ."
 
@@ -3804,47 +3887,51 @@ msgstr "
 msgid "You may only bounce message/rfc822 parts."
 msgstr "÷É ÍÏÖÅÔÅ ÎÁÄÓÉÌÁÔÉ Ô¦ÌØËÉ ËÏЦ§ ÞÁÓÔÉÎ message/rfc822."
 
-#: recvcmd.c:213
+#: recvcmd.c:148 recvcmd.c:161
+msgid "Warning: message contains no From: header"
+msgstr ""
+
+#: recvcmd.c:241
 #, fuzzy
 msgid "Error bouncing message!"
 msgstr "ðÏÍÉÌËÁ ÐÒÉ ×¦ÄÐÒÁ×æ."
 
-#: recvcmd.c:213
+#: recvcmd.c:241
 #, fuzzy
 msgid "Error bouncing messages!"
 msgstr "ðÏÍÉÌËÁ ÐÒÉ ×¦ÄÐÒÁ×æ."
 
-#: recvcmd.c:413
+#: recvcmd.c:441
 #, c-format
 msgid "Can't open temporary file %s."
 msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ %s."
 
-#: recvcmd.c:444
+#: recvcmd.c:472
 msgid "Forward as attachments?"
 msgstr "ðÅÒÅÓÌÁÔÉ ÑË ÄÏÄÁÔËÉ?"
 
-#: recvcmd.c:458
+#: recvcmd.c:486
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr "îÅÍÏÖÌÉ×Ï ÄÅËÏÄÕ×ÁÔÉ ×Ó¦ ×ÉĦÌÅΦ ÄÏÄÁÔËÉ. ðÅÒÅÓÉÌÁÔÉ §È MIME?"
 
-#: recvcmd.c:583
+#: recvcmd.c:611
 msgid "Forward MIME encapsulated?"
 msgstr "ðÅÒÅÓÌÁÔÉ ÅÎËÁÐÓÕÌØÏ×ÁÎÉÍ Õ ×¦ÄÐÏצÄÎÏÓÔ¦ ÄÏ MIME?"
 
-#: recvcmd.c:591 recvcmd.c:841
+#: recvcmd.c:619 recvcmd.c:869
 #, c-format
 msgid "Can't create %s."
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ %s."
 
-#: recvcmd.c:724
+#: recvcmd.c:752
 msgid "Can't find any tagged messages."
 msgstr "îÅ ÚÎÁÊÄÅÎÏ ×ÉĦÌÅÎÉÈ ÌÉÓÔ¦×."
 
-#: recvcmd.c:745 send.c:727
+#: recvcmd.c:773 send.c:738
 msgid "No mailing lists found!"
 msgstr "îÅ ÚÎÁÊÄÅÎÏ ÓÐÉÓË¦× ÒÏÚÓÉÌËÉ!"
 
-#: recvcmd.c:820
+#: recvcmd.c:848
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr "îÅÍÏÖÌÉ×Ï ÄÅËÏÄÕ×ÁÔÉ ×Ó¦ ×ÉĦÌÅΦ ÄÏÄÁÔËÉ. ëÁÐÓÕÌÀ×ÁÔÉ §È Õ MIME?"
 
@@ -3913,16 +4000,16 @@ 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 "îÅצÒÎÏ ÆÏÒÍÁÔÏ×ÁÎÉÊ ÚÁÐÉÓ ÄÌÑ ÔÉÐÕ %s × \"%s\", ÒÑÄÏË %d"
 
-#: rfc1524.c:395
+#: rfc1524.c:396
 msgid "No mailcap path specified"
 msgstr "ûÌÑÈ ÄÏ mailcap ÎÅ ×ËÁÚÁÎÏ"
 
-#: rfc1524.c:423
+#: rfc1524.c:424
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "ÚÁÐÉÓÕ ÄÌÑ ÔÉÐÕ %s × mailcap ÎÅ ÚÎÁÊÄÅÎÏ"
@@ -3935,6 +4022,10 @@ msgstr "score: 
 msgid "score: too many arguments"
 msgstr "score: ÄÕÖÅ ÂÁÇÁÔÏ ÁÒÇÕÍÅÎÔ¦×"
 
+#: score.c:122
+msgid "Error: score: invalid number"
+msgstr ""
+
 #: send.c:252
 msgid "No subject, abort?"
 msgstr "ôÅÍÉ ÎÅÍÁ¤, צÄͦÎÉÔÉ?"
@@ -3948,12 +4039,12 @@ msgstr "
 #. * to send a message to only the sender of the message.  This
 #. * provides a way to do that.
 #.
-#: send.c:496
+#: send.c:501
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "÷¦ÄÐÏצÓÔÉ %s%s?"
 
-#: send.c:530
+#: send.c:535
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "ðÅÒÅÓÌÁÔÉ %s%s?"
@@ -3961,115 +4052,121 @@ msgstr "
 #. This could happen if the user tagged some messages and then did
 #. * a limit such that none of the tagged message are visible.
 #.
-#: send.c:702
+#: send.c:713
 msgid "No tagged messages are visible!"
 msgstr "îÅ ×ÉÄÎÏ ×ÉĦÌÅÎÉÈ ÌÉÓÔ¦×!"
 
-#: send.c:753
+#: send.c:764
 msgid "Include message in reply?"
 msgstr "äÏÄÁÔÉ ÌÉÓÔ ÄÏ ×¦ÄÐÏצĦ?"
 
-#: send.c:758
+#: send.c:769
 msgid "Including quoted message..."
 msgstr "ãÉÔÕ¤ÔØÓÑ ÐÏצÄÏÍÌÅÎÎÑ..."
 
-#: send.c:768
+#: send.c:779
 msgid "Could not include all requested messages!"
 msgstr "îÅ ×ÉÊÛÌÏ ÄÏÄÁÔÉ ×Ó¦ ÂÁÖÁΦ ÌÉÓÔÉ!"
 
-#: send.c:782
+#: send.c:793
 msgid "Forward as attachment?"
 msgstr "ðÅÒÅÓÌÁÔÉ ÑË ÄÏÄÁÔÏË?"
 
-#: send.c:786
+#: 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.
 #.
-#: send.c:1116
+#: send.c:1147
 msgid "Recall postponed message?"
 msgstr "÷ÉËÌÉËÁÔÉ ÚÁÌÉÛÅÎÉÊ ÌÉÓÔ?"
 
-#: send.c:1428
+#: send.c:1379
 #, fuzzy
 msgid "Edit forwarded message?"
 msgstr "ð¦ÄÇÏÔÕ×ÁÎÎÑ ÌÉÓÔÁ ÄÌÑ ÐÅÒÅÓÉÌÁÎÎÑ..."
 
-#: send.c:1468
+#: send.c:1419
 msgid "Abort unmodified message?"
 msgstr "÷¦ÄͦÎÉÔÉ ×¦ÄÐÒÁ×ËÕ ÎÅ ÚͦÎÅÎÏÇÏ ÌÉÓÔÁ?"
 
-#: send.c:1470
+#: send.c:1421
 msgid "Aborted unmodified message."
 msgstr "ìÉÓÔ ÎÅ ÚͦÎÅÎÏ, ÔÏÍÕ ×¦ÄÐÒÁ×ËÕ ×¦ÄͦÎÅÎÏ."
 
-#: send.c:1539
+#: send.c:1564
 msgid "Message postponed."
 msgstr "ìÉÓÔ ÚÁÌÉÛÅÎÏ ÄÌÑ ÐÏÄÁÌØÛϧ צÄÐÒÁ×ËÉ.."
 
-#: send.c:1548
+#: send.c:1574
 msgid "No recipients are specified!"
 msgstr "îÅ ×ËÁÚÁÎÏ ÏÔÒÉÍÕ×ÁÞ¦×!"
 
-#: send.c:1553
+#: send.c:1579
 msgid "No recipients were specified."
 msgstr "ïÔÒÉÍÕ×ÁÞ¦× ÎÅ ÂÕÌÏ ×ËÁÚÁÎÏ."
 
-#: send.c:1569
+#: send.c:1595
 msgid "No subject, abort sending?"
 msgstr "ôÅÍÉ ÎÅÍÁ¤, צÄͦÎÉÔÉ ×¦ÄÐÒÁ×ËÕ?"
 
-#: send.c:1573
+#: send.c:1599
 msgid "No subject specified."
 msgstr "ôÅÍÉ ÎÅ ×ËÁÚÁÎÏ."
 
-#: send.c:1635 smtp.c:161
+#: send.c:1661 smtp.c:185
 msgid "Sending message..."
 msgstr "ìÉÓÔ ×¦ÄÐÒÁ×ÌѤÔØÓÑ..."
 
-#: send.c:1776
+#. check to see if the user wants copies of all attachments
+#: send.c:1694
+#, fuzzy
+msgid "Save attachments in Fcc?"
+msgstr "ÄÉ×ÉÔÉÓØ ÄÏÄÁÔÏË ÑË ÔÅËÓÔ"
+
+#: send.c:1803
 msgid "Could not send the message."
 msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄÐÒÁ×ÉÔÉ ÌÉÓÔ."
 
-#: send.c:1781
+#: send.c:1808
 msgid "Mail sent."
 msgstr "ìÉÓÔ ÐÏÓÌÁÎÏ."
 
-#: send.c:1781
+#: send.c:1808
 msgid "Sending in background."
 msgstr "æÏÎÏ×Á צÄÐÒÁ×ËÁ."
 
-#: sendlib.c:410
+#: sendlib.c:425
 msgid "No boundary parameter found! [report this error]"
 msgstr "îÅÍÁ¤ ÐÁÒÁÍÅÔÒÕ ÍÅÖ¦! [ÓÐÏצÓÔ¦ÔØ ÐÒÏ ÃÀ ÐÏÍÉÌËÕ]"
 
-#: sendlib.c:440
+#: sendlib.c:455
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s ¦ÌØÛÅ ÎÅ ¦ÓÎÕ¤!"
 
-#: sendlib.c:863
+#: sendlib.c:878
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s ÎÅ ¤ Ú×ÉÞÁÊÎÉÍ ÆÁÊÌÏÍ."
 
-#: sendlib.c:1035
+#: sendlib.c:1050
 #, c-format
 msgid "Could not open %s"
 msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ %s"
 
-#: sendlib.c:2226
+#: sendlib.c:2414
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "ðÏÍÉÌËÁ צÄÐÒÁ×ËÉ, ËÏÄ ÐÏ×ÅÒÎÅÎÎÑ %d (%s)."
 
-#: sendlib.c:2232
+#: sendlib.c:2420
 msgid "Output of the delivery process"
 msgstr "÷ÉÈ¦Ä ÐÒÏÃÅÓÕ ÄÏÓÔÁ×ËÉ"
 
-#: sendlib.c:2396
+#: sendlib.c:2594
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
@@ -4125,80 +4222,80 @@ msgstr "
 msgid "Unknown   "
 msgstr "îÅצÄÏÍÅ"
 
-#: smime.c:369
+#: smime.c:368
 #, fuzzy
 msgid "Enter keyID: "
 msgstr "÷×ÅĦÔØ keyID ÄÌÑ %s: "
 
-#: smime.c:392
+#: smime.c:378
 #, fuzzy, c-format
 msgid "S/MIME certificates matching \"%s\"."
 msgstr "S/MIME ËÌÀÞ¦, ÝÏ ×¦ÄÐÏצÄÁÀÔØ \"%s\"."
 
-#: smime.c:540 smime.c:610 smime.c:628
+#: 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 ""
 
-#: smime.c:544 smime.c:614
+#: smime.c:530 smime.c:600
 #, fuzzy, c-format
 msgid "Use (untrusted!) ID %s for %s ?"
 msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ keyID = \"%s\" ÄÌÑ %s?"
 
-#: smime.c:547 smime.c:617
+#: smime.c:533 smime.c:603
 #, fuzzy, c-format
 msgid "Use ID %s for %s ?"
 msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ keyID = \"%s\" ÄÌÑ %s?"
 
-#: smime.c:636
+#: smime.c:622
 #, c-format
 msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
 msgstr ""
 
-#: smime.c:795
+#: smime.c:781
 #, c-format
 msgid "No (valid) certificate found for %s."
 msgstr ""
 
-#: smime.c:850 smime.c:878 smime.c:943 smime.c:987 smime.c:1052 smime.c:1127
+#: smime.c:836 smime.c:864 smime.c:929 smime.c:973 smime.c:1038 smime.c:1113
 #, fuzzy
 msgid "Error: unable to create OpenSSL subprocess!"
 msgstr "[-- ðÏÍÉÌËÁ: ÎÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Ð¦ÄÐÒÏÃÅÓ OpenSSL! --]\n"
 
-#: smime.c:1205
+#: smime.c:1191
 #, fuzzy
 msgid "no certfile"
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Æ¦ÌØÔÒ"
 
-#: smime.c:1208
+#: smime.c:1194
 #, fuzzy
 msgid "no mbox"
 msgstr "(ÓËÒÉÎØËÉ ÎÅÍÁ¤)"
 
 #. fatal error while trying to encrypt message
-#: smime.c:1351
+#: smime.c:1337
 msgid "No output from OpenSSL.."
 msgstr ""
 
-#: smime.c:1389
+#: smime.c:1375
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
-#: smime.c:1395
+#: smime.c:1382
 #, fuzzy
 msgid "Warning: Intermediate certificate not found."
 msgstr "ðÏÐÅÒÅÄÖÅÎÎÑ: ÎÅÍÏÖÌÉ×Ï ÚÂÅÒÅÇÔÉ ÓÅÒÔÉƦËÁÔ"
 
-#: smime.c:1438
+#: smime.c:1429
 #, fuzzy
 msgid "Can't open OpenSSL subprocess!"
 msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ Ð¦ÄÐÒÏÃÅÓÓ OpenSSL!"
 
-#: smime.c:1476
+#: smime.c:1469
 msgid "No output from OpenSSL..."
 msgstr ""
 
-#: smime.c:1641 smime.c:1766
+#: smime.c:1634 smime.c:1759
 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"
@@ -4207,125 +4304,129 @@ msgstr ""
 "[-- ë¦ÎÅÃØ ÔÅËÓÔÕ ÎÁ ×ÉÈÏĦ OpenSSL --]\n"
 "\n"
 
-#: smime.c:1725 smime.c:1736
+#: smime.c:1718 smime.c:1729
 #, fuzzy
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- ðÏÍÉÌËÁ: ÎÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Ð¦ÄÐÒÏÃÅÓ OpenSSL! --]\n"
 
-#: smime.c:1770
+#: smime.c:1763
 #, fuzzy
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- îÁÓÔÕÐΦ ÄÁΦ ÚÁÛÉÆÒÏ×ÁÎÏ S/MIME --]\n"
 "\n"
 
-#: smime.c:1773
+#: smime.c:1766
 #, fuzzy
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- îÁÓÔÕÐΦ ÄÁΦ ЦÄÐÉÓÁÎÏ --]\n"
 "\n"
 
-#: smime.c:1837
+#: smime.c:1830
 #, fuzzy
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
 msgstr "[-- ë¦ÎÅÃØ ÄÁÎÉÈ, ÚÁÛÉÆÒÏ×ÁÎÉÈ S/MIME --]\n"
 
-#: smime.c:1839
+#: smime.c:1832
 #, fuzzy
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
 msgstr "[-- ë¦ÎÅÃØ Ð¦ÄÐÉÓÁÎÉÈ ÄÁÎÉÈ --]\n"
 
-#: smime.c:1950
+#: smime.c:1943
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr "ÛÉÆÒ.(e), ЦÄÐ.(s), ЦÄÐ. ÑË(a), ÕÓÅ(b) ÞÉ ×¦ÄͦÎÁ(f)? "
 
-#: smime.c:1951
+#: smime.c:1944
 #, fuzzy
 msgid "eswabfc"
 msgstr "esabif"
 
 #. I use "dra" because "123" is recognized anyway
-#: smime.c:1966
+#: smime.c:1959
 msgid "Choose algorithm family: 1: DES, 2: RC2, 3: AES, or (c)lear? "
 msgstr ""
 
-#: smime.c:1969
+#: smime.c:1962
 msgid "drac"
 msgstr ""
 
-#: smime.c:1972
+#: smime.c:1965
 msgid "1: DES, 2: Triple-DES "
 msgstr ""
 
-#: smime.c:1973
+#: smime.c:1966
 msgid "dt"
 msgstr ""
 
-#: smime.c:1985
+#: smime.c:1978
 msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 "
 msgstr ""
 
-#: smime.c:1986
+#: smime.c:1979
 msgid "468"
 msgstr ""
 
-#: smime.c:2001
+#: smime.c:1994
 msgid "1: AES128, 2: AES192, 3: AES256 "
 msgstr ""
 
-#: smime.c:2002
+#: smime.c:1995
 msgid "895"
 msgstr ""
 
-#: smtp.c:116
+#: smtp.c:134
 #, fuzzy, c-format
 msgid "SMTP session failed: %s"
 msgstr "ðÏÍÉÌËÁ SSL: %s"
 
-#: smtp.c:156
+#: smtp.c:180
 #, fuzzy, c-format
 msgid "SMTP session failed: unable to open %s"
 msgstr "ðÏÍÉÌËÁ SSL: %s"
 
-#: smtp.c:228
+#: smtp.c:258
 msgid "No from address given"
 msgstr ""
 
-#: smtp.c:284
+#: smtp.c:314
 msgid "SMTP session failed: read error"
 msgstr ""
 
-#: smtp.c:286
+#: smtp.c:316
 msgid "SMTP session failed: write error"
 msgstr ""
 
-#: smtp.c:309
+#: smtp.c:318
+msgid "Invalid server response"
+msgstr ""
+
+#: smtp.c:341
 #, fuzzy, c-format
 msgid "Invalid SMTP URL: %s"
 msgstr "í¦ÓÑÃØ '%s' ÎÅ ¦ÓÎÕ¤"
 
-#: smtp.c:419
+#: smtp.c:451
 msgid "SMTP server does not support authentication"
 msgstr ""
 
-#: smtp.c:427
+#: smtp.c:459
 #, fuzzy
 msgid "SMTP authentication requires SASL"
 msgstr "ðÏÍÉÌËÁ ÁÕÔÅÎÔÉƦËÁæ§ GSSAPI."
 
-#: smtp.c:461
+#: smtp.c:493
 #, fuzzy, c-format
 msgid "%s authentication failed, trying next method"
 msgstr "ðÏÍÉÌËÁ ÁÕÔÅÎÔÉƦËÁæ§ SASL."
 
-#: smtp.c:478
+#: smtp.c:510
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "ðÏÍÉÌËÁ ÁÕÔÅÎÔÉƦËÁæ§ SASL."
@@ -4342,11 +4443,11 @@ msgstr "
 msgid "(no mailbox)"
 msgstr "(ÓËÒÉÎØËÉ ÎÅÍÁ¤)"
 
-#: thread.c:1093
+#: thread.c:1096
 msgid "Parent message is not visible in this limited view."
 msgstr "\"âÁÔØ˦×ÓØËÉÊ\" ÌÉÓÔ ÎÅ ÍÏÖÎÁ ÐÏÂÁÞÉÔÉ ÐÒÉ ÃØÏÍÕ ÏÂÍÅÖÅÎΦ."
 
-#: thread.c:1099
+#: thread.c:1102
 msgid "Parent message is not available."
 msgstr "\"âÁÔØ˦×ÓØËÉÊ\" ÌÉÓÔ ÎÅ ÍÏÖÎÁ ÐÏÂÁÞÉÔÉ."
 
@@ -4770,391 +4871,412 @@ msgid "force retrieval of mail from IMAP server"
 msgstr "ÐÒÉÍÕÓÏ×Ï ÏÔÒÉÍÁÔÉ ÐÏÛÔÕ Ú ÓÅÒ×ÅÒÁ IMAP"
 
 #: ../keymap_alldefs.h:109
+msgid "logout from all IMAP servers"
+msgstr ""
+
+#: ../keymap_alldefs.h:110
 msgid "retrieve mail from POP server"
 msgstr "ÏÔÒÉÍÁÔÉ ÐÏÛÔÕ Ú ÓÅÒ×ÅÒÁ POP"
 
-#: ../keymap_alldefs.h:110
+#: ../keymap_alldefs.h:111
 msgid "move to the first message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÅÒÛÏÇÏ ÌÉÓÔÁ"
 
-#: ../keymap_alldefs.h:111
+#: ../keymap_alldefs.h:112
 msgid "move to the last message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÏÓÔÁÎÎØÏÇÏ ÌÉÓÔÁ"
 
-#: ../keymap_alldefs.h:112
+#: ../keymap_alldefs.h:113
 msgid "show only messages matching a pattern"
 msgstr "ÐÏËÁÚÁÔÉ ÌÉÛÅ ÌÉÓÔÉ, ÝÏ Í¦ÓÔÑÔØ ×ÉÒÁÚ"
 
-#: ../keymap_alldefs.h:113
+#: ../keymap_alldefs.h:114
 #, fuzzy
 msgid "link tagged message to the current one"
 msgstr "îÁĦÓÌÁÔÉ ËÏЦ§ ×ÉĦÌÅÎÉÈ ÌÉÓÔ¦×: "
 
-#: ../keymap_alldefs.h:114
+#: ../keymap_alldefs.h:115
 #, fuzzy
 msgid "open next mailbox with new mail"
 msgstr "îÅÍÁ¤ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ Ú ÎÏ×ÏÀ ÐÏÛÔÏÀ."
 
-#: ../keymap_alldefs.h:115
+#: ../keymap_alldefs.h:116
 msgid "jump to the next new message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ÎÏ×ÏÇÏ ÌÉÓÔÁ"
 
-#: ../keymap_alldefs.h:116
+#: ../keymap_alldefs.h:117
 #, fuzzy
 msgid "jump to the next new or unread message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ÎÅÞÉÔÁÎÏÇÏ ÌÉÓÔÁ"
 
-#: ../keymap_alldefs.h:117
+#: ../keymap_alldefs.h:118
 msgid "jump to the next subthread"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎϧ ЦÄÂÅÓ¦ÄÉ"
 
-#: ../keymap_alldefs.h:118
+#: ../keymap_alldefs.h:119
 msgid "jump to the next thread"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎϧ ÂÅÓ¦ÄÉ"
 
-#: ../keymap_alldefs.h:119
+#: ../keymap_alldefs.h:120
 msgid "move to the next undeleted message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ÎÅ×ÉÄÁÌÅÎÏÇÏ ÌÉÓÔÁ"
 
-#: ../keymap_alldefs.h:120
+#: ../keymap_alldefs.h:121
 msgid "jump to the next unread message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ÎÅÞÉÔÁÎÏÇÏ ÌÉÓÔÁ"
 
-#: ../keymap_alldefs.h:121
+#: ../keymap_alldefs.h:122
 msgid "jump to parent message in thread"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ \"ÂÁÔØ˦×ÓØËÏÇÏ\" ÌÉÓÔÁ Õ ÂÅӦĦ"
 
-#: ../keymap_alldefs.h:122
+#: ../keymap_alldefs.h:123
 msgid "jump to previous thread"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØϧ ÂÅÓ¦ÄÉ"
 
-#: ../keymap_alldefs.h:123
+#: ../keymap_alldefs.h:124
 msgid "jump to previous subthread"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØϧ ЦÄÂÅÓ¦ÄÉ"
 
-#: ../keymap_alldefs.h:124
+#: ../keymap_alldefs.h:125
 msgid "move to the previous undeleted message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ÎÅ×ÉÄÁÌÅÎÏÇÏ ÌÉÓÔÁ"
 
-#: ../keymap_alldefs.h:125
+#: ../keymap_alldefs.h:126
 msgid "jump to the previous new message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ÎÏ×ÏÇÏ ÌÉÓÔÁ"
 
-#: ../keymap_alldefs.h:126
+#: ../keymap_alldefs.h:127
 #, fuzzy
 msgid "jump to the previous new or unread message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ÎÅÞÉÔÁÎÏÇÏ ÌÉÓÔÁ"
 
-#: ../keymap_alldefs.h:127
+#: ../keymap_alldefs.h:128
 msgid "jump to the previous unread message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ÎÅÞÉÔÁÎÏÇÏ ÌÉÓÔÁ"
 
-#: ../keymap_alldefs.h:128
+#: ../keymap_alldefs.h:129
 msgid "mark the current thread as read"
 msgstr "צÄͦÔÉÔÉ ÐÏÔÏÞÎÕ ÂÅÓ¦ÄÕ ÑË ÞÉÔÁÎÕ"
 
-#: ../keymap_alldefs.h:129
+#: ../keymap_alldefs.h:130
 msgid "mark the current subthread as read"
 msgstr "צÄͦÔÉÔÉ ÐÏÔÏÞÎÕ Ð¦ÄÂÅÓ¦ÄÕ ÑË ÞÉÔÁÎÕ"
 
-#: ../keymap_alldefs.h:130
+#: ../keymap_alldefs.h:131
 msgid "set a status flag on a message"
 msgstr "×ÓÔÁÎÏ×ÉÔÉ ÆÌÁÇ ÓÔÁÔÕÓÕ ÌÉÓÔÁ"
 
-#: ../keymap_alldefs.h:131
+#: ../keymap_alldefs.h:132
 msgid "save changes to mailbox"
 msgstr "ÚÁÐÉÓÁÔÉ ÚͦÎÉ ÄÏ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ"
 
-#: ../keymap_alldefs.h:132
+#: ../keymap_alldefs.h:133
 msgid "tag messages matching a pattern"
 msgstr "×ÉĦÌÉÔÉ ÌÉÓÔÉ, ÝÏ Í¦ÓÔÑÔØ ×ÉÒÁÚ"
 
-#: ../keymap_alldefs.h:133
+#: ../keymap_alldefs.h:134
 msgid "undelete messages matching a pattern"
 msgstr "צÄÎÏ×ÉÔÉ ÌÉÓÔÉ, ÝÏ Í¦ÓÔÑÔØ ×ÉÒÁÚ"
 
-#: ../keymap_alldefs.h:134
+#: ../keymap_alldefs.h:135
 msgid "untag messages matching a pattern"
 msgstr "ÚÎÑÔÉ ×ÉĦÌÅÎÎÑ Ú ÌÉÓÔ¦×, ÝÏ Í¦ÓÔÑÔØ ×ÉÒÁÚ"
 
-#: ../keymap_alldefs.h:135
+#: ../keymap_alldefs.h:136
 msgid "move to the middle of the page"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÓÅÒÅÄÉÎÉ ÓÔÏÒ¦ÎËÉ"
 
-#: ../keymap_alldefs.h:136
+#: ../keymap_alldefs.h:137
 msgid "move to the next entry"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎϧ ÐÏÚÉæ§"
 
-#: ../keymap_alldefs.h:137
+#: ../keymap_alldefs.h:138
 msgid "scroll down one line"
 msgstr "ÐÒÏÇÏÒÎÕÔÉ ÎÁ ÒÑÄÏË ÄÏÎÉÚÕ"
 
-#: ../keymap_alldefs.h:138
+#: ../keymap_alldefs.h:139
 msgid "move to the next page"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎϧ ÓÔÏÒ¦ÎËÉ"
 
-#: ../keymap_alldefs.h:139
+#: ../keymap_alldefs.h:140
 msgid "jump to the bottom of the message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ Ë¦ÎÃÑ ÌÉÓÔÁ"
 
-#: ../keymap_alldefs.h:140
+#: ../keymap_alldefs.h:141
 msgid "toggle display of quoted text"
 msgstr "×ÉÍË./×צÍËÎ. צÄÏÂÒÁÖÅÎÎÑ ÃÉÔÏ×ÁÎÏÇÏ ÔÅËÓÔÕ"
 
-#: ../keymap_alldefs.h:141
+#: ../keymap_alldefs.h:142
 msgid "skip beyond quoted text"
 msgstr "ÐÒÏÐÕÓÔÉÔÉ ÃÉÔÏ×ÁÎÉÊ ÔÅËÓÔ Ã¦ÌËÏÍ"
 
-#: ../keymap_alldefs.h:142
+#: ../keymap_alldefs.h:143
 msgid "jump to the top of the message"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÞÁÔËÕ ÌÉÓÔÁ"
 
-#: ../keymap_alldefs.h:143
+#: ../keymap_alldefs.h:144
 msgid "pipe message/attachment to a shell command"
 msgstr "צÄÄÁÔÉ ÌÉÓÔ/ÄÏÄÁÔÏË Õ ËÏÎ×Å¤Ò ËÏÍÁÎĦ shell"
 
-#: ../keymap_alldefs.h:144
+#: ../keymap_alldefs.h:145
 msgid "move to the previous entry"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØϧ ÐÏÚÉç§"
 
-#: ../keymap_alldefs.h:145
+#: ../keymap_alldefs.h:146
 msgid "scroll up one line"
 msgstr "ÐÒÏÇÏÒÎÕÔÉ ÎÁ ÒÑÄÏË ÄÏÇÏÒÉ"
 
-#: ../keymap_alldefs.h:146
+#: ../keymap_alldefs.h:147
 msgid "move to the previous page"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØϧ ÓÔÏÒ¦ÎËÉ"
 
-#: ../keymap_alldefs.h:147
+#: ../keymap_alldefs.h:148
 msgid "print the current entry"
 msgstr "ÄÒÕËÕ×ÁÔÉ ÐÏÔÏÞÎÕ ÐÏÚÉæÀ"
 
-#: ../keymap_alldefs.h:148
+#: ../keymap_alldefs.h:149
 msgid "query external program for addresses"
 msgstr "ÚÁÐÉÔ ÚÏ×ΦÛÎØϧ ÐÒÏÇÒÁÍÉ ÐÏ ÁÄÒÅÓÉ"
 
-#: ../keymap_alldefs.h:149
+#: ../keymap_alldefs.h:150
 msgid "append new query results to current results"
 msgstr "ÄÏÄÁÔÉ ÒÅÚÕÌØÔÁÔÉ ÎÏ×ÏÇÏ ÚÁÐÉÔÕ ÄÏ ÐÏÔÏÞÎÉÈ"
 
-#: ../keymap_alldefs.h:150
+#: ../keymap_alldefs.h:151
 msgid "save changes to mailbox and quit"
 msgstr "ÚÂÅÒÅÇÔÉ ÚͦÎÉ ÓËÒÉÎØËÉ ÔÁ ×ÉÊÔÉ"
 
-#: ../keymap_alldefs.h:151
+#: ../keymap_alldefs.h:152
 msgid "recall a postponed message"
 msgstr "×ÉËÌÉËÁÔÉ ÚÁÌÉÛÅÎÉÊ ÌÉÓÔ"
 
-#: ../keymap_alldefs.h:152
+#: ../keymap_alldefs.h:153
 msgid "clear and redraw the screen"
 msgstr "ÏÞÉÓÔÉÔÉ ÔÁ ÐÅÒÅÍÁÌÀ×ÁÔÉ ÅËÒÁÎ"
 
-#: ../keymap_alldefs.h:153
+#: ../keymap_alldefs.h:154
 msgid "{internal}"
 msgstr "{×ÎÕÔÒ¦ÛÎÑ}"
 
-#: ../keymap_alldefs.h:154
+#: ../keymap_alldefs.h:155
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "×ÉÄÁÌÉÔÉ ÐÏÔÏÞÎÕ ÓËÒÉÎØËÕ (ÌÉÛÅ IMAP)"
 
-#: ../keymap_alldefs.h:155
+#: ../keymap_alldefs.h:156
 msgid "reply to a message"
 msgstr "צÄÐÏצÓÔÉ ÎÁ ÌÉÓÔ"
 
-#: ../keymap_alldefs.h:156
+#: ../keymap_alldefs.h:157
 msgid "use the current message as a template for a new one"
 msgstr "×ÚÑÔÉ ÃÅÊ ÌÉÓÔ × ÑËÏÓÔ¦ ÛÁÂÌÏÎÕ ÄÌÑ ÎÏ×ÏÇÏ"
 
-#: ../keymap_alldefs.h:157
-msgid "save message/attachment to a file"
+#: ../keymap_alldefs.h:158
+#, fuzzy
+msgid "save message/attachment to a mailbox/file"
 msgstr "ÚÂÅÒÅÇÔÉ ÌÉÓÔ/ÄÏÄÁÔÏË Õ ÆÁÊ̦"
 
-#: ../keymap_alldefs.h:158
+#: ../keymap_alldefs.h:159
 msgid "search for a regular expression"
 msgstr "ÐÏÛÕË ×ÉÒÁÚÕ × ÎÁÐÒÑÍËÕ ÕÐÅÒÅÄ"
 
-#: ../keymap_alldefs.h:159
+#: ../keymap_alldefs.h:160
 msgid "search backwards for a regular expression"
 msgstr "ÐÏÛÕË ×ÉÒÁÚÕ × ÎÁÐÒÑÍËÕ ÎÁÚÁÄ"
 
-#: ../keymap_alldefs.h:160
+#: ../keymap_alldefs.h:161
 msgid "search for next match"
 msgstr "ÐÏÛÕË ÎÁÓÔÕÐÎϧ צÄÐÏצÄÎÏÓÔ¦"
 
-#: ../keymap_alldefs.h:161
+#: ../keymap_alldefs.h:162
 msgid "search for next match in opposite direction"
 msgstr "ÐÏÛÕË ÎÁÓÔÕÐÎÏÇÏ × Ú×ÏÒÏÔÎØÏÍÕ ÎÁÐÒÑÍËÕ"
 
-#: ../keymap_alldefs.h:162
+#: ../keymap_alldefs.h:163
 msgid "toggle search pattern coloring"
 msgstr "×ÉÍË./×צÍËÎÕÔÉ ×ÉĦÌÅÎÎÑ ×ÉÒÁÚÕ ÐÏÛÕËÕ"
 
-#: ../keymap_alldefs.h:163
+#: ../keymap_alldefs.h:164
 msgid "invoke a command in a subshell"
 msgstr "×ÉËÌÉËÁÔÉ ËÏÍÁÎÄÕ × shell"
 
-#: ../keymap_alldefs.h:164
+#: ../keymap_alldefs.h:165
 msgid "sort messages"
 msgstr "ÓÏÒÔÕ×ÁÔÉ ÌÉÓÔÉ"
 
-#: ../keymap_alldefs.h:165
+#: ../keymap_alldefs.h:166
 msgid "sort messages in reverse order"
 msgstr "ÓÏÒÔÕ×ÁÔÉ ÌÉÓÔÉ × Ú×ÏÒÏÔÎØÏÍÕ ÎÁÐÒÑÍËÕ"
 
-#: ../keymap_alldefs.h:166
+#: ../keymap_alldefs.h:167
 msgid "tag the current entry"
 msgstr "×ÉĦÌÉÔÉ ÐÏÔÏÞÎÕ ÐÏÚÉæÀ"
 
-#: ../keymap_alldefs.h:167
+#: ../keymap_alldefs.h:168
 msgid "apply next function to tagged messages"
 msgstr "×ÉËÏÒÉÓÔÁÔÉ ÎÁÓÔÕÐÎÕ ÆÕÎËæÀ ÄÏ ×ÉĦÌÅÎÏÇÏ"
 
-#: ../keymap_alldefs.h:168
+#: ../keymap_alldefs.h:169
 #, fuzzy
 msgid "apply next function ONLY to tagged messages"
 msgstr "×ÉËÏÒÉÓÔÁÔÉ ÎÁÓÔÕÐÎÕ ÆÕÎËæÀ ÄÏ ×ÉĦÌÅÎÏÇÏ"
 
-#: ../keymap_alldefs.h:169
+#: ../keymap_alldefs.h:170
 msgid "tag the current subthread"
 msgstr "×ÉĦÌÉÔÉ ÐÏÔÏÞÎÕ Ð¦ÄÂÅÓ¦ÄÕ"
 
-#: ../keymap_alldefs.h:170
+#: ../keymap_alldefs.h:171
 msgid "tag the current thread"
 msgstr "×ÉĦÌÉÔÉ ÐÏÔÏÞÎÕ ÂÅÓ¦ÄÕ"
 
-#: ../keymap_alldefs.h:171
+#: ../keymap_alldefs.h:172
 msgid "toggle a message's 'new' flag"
 msgstr "ÚͦÎÉÔÉ ÆÌÁÇ ÎÏ×ÏÇÏ ÌÉÓÔÁ"
 
-#: ../keymap_alldefs.h:172
+#: ../keymap_alldefs.h:173
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "×ÉÍËÎÕÔÉ/×צÍËÎÕÔÉ ÐÅÒÅÚÁÐÉÓÕ×ÁÎÎÑ ÓËÒÉÎØËÉ"
 
-#: ../keymap_alldefs.h:173
+#: ../keymap_alldefs.h:174
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "×ÉÂ¦Ò ÐÒÏÇÌÑÄÁÎÎÑ ÓËÒÉÎØÏË/×Ó¦È ÆÁÊ̦×"
 
-#: ../keymap_alldefs.h:174
+#: ../keymap_alldefs.h:175
 msgid "move to the top of the page"
 msgstr "ÐÅÒÅÊÔÉ ÄÏ ÐÏÞÁÔËÕ ÓÔÏÒ¦ÎËÉ"
 
-#: ../keymap_alldefs.h:175
+#: ../keymap_alldefs.h:176
 msgid "undelete the current entry"
 msgstr "צÄÎÏ×ÉÔÉ ÐÏÔÏÞÎÕ ÐÏÚÉæÀ"
 
-#: ../keymap_alldefs.h:176
+#: ../keymap_alldefs.h:177
 msgid "undelete all messages in thread"
 msgstr "צÄÎÏ×ÉÔÉ ×Ó¦ ÌÉÓÔÉ ÂÅÓ¦ÄÉ"
 
-#: ../keymap_alldefs.h:177
+#: ../keymap_alldefs.h:178
 msgid "undelete all messages in subthread"
 msgstr "צÄÎÏ×ÉÔÉ ×Ó¦ ÌÉÓÔÉ Ð¦ÄÂÅÓ¦ÄÉ"
 
-#: ../keymap_alldefs.h:178
+#: ../keymap_alldefs.h:179
 msgid "show the Mutt version number and date"
 msgstr "ÐÏËÁÚÁÔÉ ×ÅÒÓ¦À ÔÁ ÄÁÔÕ Mutt"
 
-#: ../keymap_alldefs.h:179
+#: ../keymap_alldefs.h:180
 msgid "view attachment using mailcap entry if necessary"
 msgstr "ÐÒÏÇÌÑÎÕÔÉ ÚÁ ÄÏÐÏÍÏÇÏÀ mailcap ÐÒÉ ÐÏÔÒŦ"
 
-#: ../keymap_alldefs.h:180
+#: ../keymap_alldefs.h:181
 msgid "show MIME attachments"
 msgstr "ÐÏËÁÚÁÔÉ ÄÏÄÁÔËÉ MIME"
 
-#: ../keymap_alldefs.h:181
+#: ../keymap_alldefs.h:182
 msgid "display the keycode for a key press"
 msgstr ""
 
-#: ../keymap_alldefs.h:182
+#: ../keymap_alldefs.h:183
 msgid "show currently active limit pattern"
 msgstr "ÐÏËÁÚÁÔÉ ÐÏÔÏÞÎÉÊ ×ÉÒÁÚ ÏÂÍÅÖÅÎÎÑ"
 
-#: ../keymap_alldefs.h:183
+#: ../keymap_alldefs.h:184
 msgid "collapse/uncollapse current thread"
 msgstr "ÚÇÏÒÎÕÔÉ/ÒÏÚÇÏÒÎÕÔÉ ÐÏÔÏÞÎÕ ÂÅÓ¦ÄÕ"
 
-#: ../keymap_alldefs.h:184
+#: ../keymap_alldefs.h:185
 msgid "collapse/uncollapse all threads"
 msgstr "ÚÇÏÒÎÕÔÉ/ÒÏÚÇÏÒÎÕÔÉ ×Ó¦ ÂÅÓ¦ÄÉ"
 
-#: ../keymap_alldefs.h:185
+#: ../keymap_alldefs.h:186
 msgid "attach a PGP public key"
 msgstr "ÐÒɤÄÎÁÔÉ ÚÁÇÁÌØÎÉÊ ËÌÀÞ PGP"
 
-#: ../keymap_alldefs.h:186
+#: ../keymap_alldefs.h:187
 msgid "show PGP options"
 msgstr "ÐÏËÁÚÁÔÉ ÐÁÒÁÍÅÔÒÉ PGP"
 
-#: ../keymap_alldefs.h:187
+#: ../keymap_alldefs.h:188
 msgid "mail a PGP public key"
 msgstr "צĦÓÌÁÔÉ ÚÁÇÁÌØÎÉÊ ËÌÀÞ PGP"
 
-#: ../keymap_alldefs.h:188
+#: ../keymap_alldefs.h:189
 msgid "verify a PGP public key"
 msgstr "ÐÅÒÅצÒÉÔÉ ÚÁÇÁÌØÎÉÊ ËÌÀÞ PGP"
 
-#: ../keymap_alldefs.h:189
+#: ../keymap_alldefs.h:190
 msgid "view the key's user id"
 msgstr "ÐÏÂÁÞÉÔÉ ¦ÄÅÎԦƦËÁÔÏÒ ËÏÒÉÓÔÕ×ÁÞÁ ËÌÀÞÁ"
 
-#: ../keymap_alldefs.h:190
+#: ../keymap_alldefs.h:191
 #, fuzzy
 msgid "check for classic PGP"
 msgstr "ÐÅÒÅצÒËÁ ÎÁ ËÌÁÓÉÞÎÅ pgp"
 
-#: ../keymap_alldefs.h:191
+#: ../keymap_alldefs.h:192
 msgid "Accept the chain constructed"
 msgstr "ðÒÉÊÎÑÔÉ ÓËÏÓÔÒÕÊÏ×ÁÎÉÊ ÌÁÎÃÀÖÏË"
 
-#: ../keymap_alldefs.h:192
+#: ../keymap_alldefs.h:193
 msgid "Append a remailer to the chain"
 msgstr "äÏÄÁÔÉ remailer ÄÏ ÌÁÎÃÀÖËÕ"
 
-#: ../keymap_alldefs.h:193
+#: ../keymap_alldefs.h:194
 msgid "Insert a remailer into the chain"
 msgstr "÷ÓÔÁ×ÉÔÉ remailer × ÌÁÎÃÀÖÏË"
 
-#: ../keymap_alldefs.h:194
+#: ../keymap_alldefs.h:195
 msgid "Delete a remailer from the chain"
 msgstr "÷ÉÄÁÌÉÔÉ remailer Ú ÌÁÎÃÀÖËÕ"
 
-#: ../keymap_alldefs.h:195
+#: ../keymap_alldefs.h:196
 msgid "Select the previous element of the chain"
 msgstr "÷ÉÂÒÁÔÉ ÐÏÐÅÒÅÄÎ¦Ê ÅÌÅÍÅÎÔ ÌÁÎÃÀÖËÕ"
 
-#: ../keymap_alldefs.h:196
+#: ../keymap_alldefs.h:197
 msgid "Select the next element of the chain"
 msgstr "÷ÉÂÒÁÔÉ ÎÁÓÔÕÐÎÉÊ ÅÌÅÍÅÎÔ ÌÁÎÃÀÖËÕ"
 
-#: ../keymap_alldefs.h:197
+#: ../keymap_alldefs.h:198
 msgid "send the message through a mixmaster remailer chain"
 msgstr "צĦÓÌÁÔÉ ÌÉÓÔ ÞÅÒÅÚ ÌÁÎËÕ mixmaster remailer"
 
-#: ../keymap_alldefs.h:198
+#: ../keymap_alldefs.h:199
 msgid "make decrypted copy and delete"
 msgstr "ÚÒÏÂÉÔÉ ÒÏÚÛÉÆÒÏ×ÁÎÕ ËÏЦÀ ÔÁ ×ÉÄÁÌÉÔÉ"
 
-#: ../keymap_alldefs.h:199
+#: ../keymap_alldefs.h:200
 msgid "make decrypted copy"
 msgstr "ÚÒÏÂÉÔÉ ÒÏÚÛÉÆÒÏ×ÁÎÕ ËÏЦÀ"
 
-#: ../keymap_alldefs.h:200
+#: ../keymap_alldefs.h:201
 #, fuzzy
 msgid "wipe passphrase(s) from memory"
 msgstr "ÚÎÉÝÉÔÉ ÐÁÒÏÌØ PGP Õ ÐÁÍ'ÑÔ¦"
 
-#: ../keymap_alldefs.h:201
+#: ../keymap_alldefs.h:202
 #, fuzzy
 msgid "extract supported public keys"
 msgstr "ÒÏÚÐÁËÕ×ÁÔÉ ÚÁÇÁÌØÎÉÊ ËÌÀÞ PGP"
 
-#: ../keymap_alldefs.h:202
+#: ../keymap_alldefs.h:203
 #, fuzzy
 msgid "show S/MIME options"
 msgstr "ÐÏËÁÚÁÔÉ ÐÁÒÁÍÅÔÒÉ PGP"
 
+#~ msgid "Clear"
+#~ msgstr "îÅ ÚÁÓÔÏÓÏ×Õ×ÁÔÉ"
+
+#, fuzzy
+#~ msgid "esabifc"
+#~ msgstr "esabif"
+
+#~ msgid "No search pattern."
+#~ msgstr "îÅÍÁ¤ ×ÉÒÁÚÕ ÐÏÛÕËÕ."
+
+#~ msgid "Reverse search: "
+#~ msgstr "ú×ÏÒÏÔÎ¦Ê ÐÏÛÕË: "
+
+#~ msgid "Search: "
+#~ msgstr "ðÏÛÕË: "
+
 #, fuzzy
 #~ msgid "Error checking signature"
 #~ msgstr "ðÏÍÉÌËÁ ÐÒÉ ×¦ÄÐÒÁ×æ."
@@ -5251,9 +5373,6 @@ msgstr "
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "óÔ×ÏÒÉÔÉ application/pgp ÌÉÓÔ?"
 
-#~ msgid "Closing connection to IMAP server..."
-#~ msgstr "úÁËÒÉÔÔÑ Ú'¤ÄÎÁÎÎÑ Ú ÓÅÒ×ÅÒÏÍ IMAP..."
-
 #, fuzzy
 #~ msgid "%s: stat: %s"
 #~ msgstr "îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ÄÁΦ %s: %s"