X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=po%2Fet.po;h=81389b41a6977a6893a7aa19a1a4ba4585209d75;hb=2b2f17c2b838911949a6e8665ef3131382099a62;hp=7549a72afb37f9a038ec1e82732a711c58d26db4;hpb=8b255111bb546b00ed51806dee7104f224496f21;p=apps%2Fmadmutt.git

diff --git a/po/et.po b/po/et.po
index 7549a72..81389b4 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutt 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-27 03:09+0000\n"
+"POT-Creation-Date: 2006-10-29 13:26+0100\n"
 "PO-Revision-Date: 2002-12-09 17:19+02:00\n"
 "Last-Translator: Toomas Soome <tsoome@muhv.pri.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -14,186 +14,182 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: account.c:160
+#: account.c:163
 #, c-format
 msgid "Username at %s: "
 msgstr "Kasutajanimi serveril %s: "
 
-#: account.c:213
+#: account.c:220
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s parool: "
 
-#: addrbook.c:32 browser.c:45 browser.c:54 pager.c:1343 postpone.c:39
-#: query.c:42 recvattach.c:49
+#: alias.c:36 browser.c:49 browser.c:58 pager.c:1373 postpone.c:44 query.c:43
+#: recvattach.c:56
 msgid "Exit"
 msgstr "Välju"
 
-#: addrbook.c:33 curs_main.c:372 curs_main.c:385 pager.c:1350 pager.c:1360
-#: postpone.c:40
+#: alias.c:37 curs_main.c:381 curs_main.c:394 pager.c:1380 pager.c:1390
+#: postpone.c:45
 msgid "Del"
 msgstr "Kustuta"
 
-#: addrbook.c:34 curs_main.c:373 curs_main.c:386 postpone.c:41
+#: alias.c:38 curs_main.c:382 curs_main.c:395 postpone.c:46
 msgid "Undel"
 msgstr "Taasta"
 
-#: addrbook.c:35
+#: alias.c:39
 msgid "Select"
 msgstr "Vali"
 
-#. __STRCAT_CHECKED__
-#: addrbook.c:36 browser.c:48 browser.c:60 compose.c:114 compose.c:126
-#: crypt-gpgme.c:3304 curs_main.c:378 curs_main.c:391 mutt_ssl.c:607
-#: mutt_ssl_gnutls.c:746 pager.c:1455 pgpkey.c:493 postpone.c:42 query.c:47
-#: recvattach.c:53 smime.c:425
+#: alias.c:40 browser.c:52 browser.c:64 compose.c:118 compose.c:130
+#: crypt-gpgme.c:3305 curs_main.c:387 curs_main.c:400 mutt_ssl.c:640
+#: mutt_ssl_gnutls.c:748 pager.c:1485 pgpkey.c:497 postpone.c:47 query.c:48
+#: recvattach.c:60 smime.c:428
 msgid "Help"
 msgstr "Appi"
 
-#: addrbook.c:140
-msgid "You have no aliases!"
-msgstr "Tei pole hüüdnimesid!"
-
-#: addrbook.c:152
-msgid "Aliases"
-msgstr "Hüüdnimed"
-
-#. add a new alias
-#: alias.c:220
+#: alias.c:237
 msgid "Alias as: "
 msgstr "Hüüdnimeks: "
 
-#: alias.c:225
+#: alias.c:242
 msgid "You already have an alias defined with that name!"
 msgstr "Teil on juba selle nimeline hüüdnimi!"
 
-#: alias.c:232
+#: alias.c:249
 msgid "Warning: This alias name may not work.  Fix it?"
 msgstr "Hoiatus: See hüüdnimi ei pruugi toimida. Parandan?"
 
-#: alias.c:255
+#: alias.c:272
 msgid "Address: "
 msgstr "Aadress: "
 
-#: alias.c:263 send.c:192
+#: alias.c:280 send.c:197
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
 
-#: alias.c:275
+#: alias.c:292
 msgid "Personal name: "
 msgstr "Isiku nimi: "
 
-#: alias.c:283
+#: alias.c:300
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] Nõus?"
 
-#: alias.c:298 recvattach.c:413 recvattach.c:437 recvattach.c:450
-#: recvattach.c:465 recvattach.c:490
+#: alias.c:315 recvattach.c:437 recvattach.c:461 recvattach.c:474
+#: recvattach.c:489 recvattach.c:514
 msgid "Save to file: "
 msgstr "Salvestan faili: "
 
-#: alias.c:312
+#: alias.c:329
 msgid "Alias added."
 msgstr "Hüüdnimi on lisatud."
 
-#: attach.c:103 attach.c:224 attach.c:434 attach.c:900
+#: alias.c:643
+msgid "You have no aliases!"
+msgstr "Tei pole hüüdnimesid!"
+
+#: alias.c:655
+msgid "Aliases"
+msgstr "Hüüdnimed"
+
+#: attach.c:107 attach.c:228 attach.c:441 attach.c:907
 msgid "Can't match nametemplate, continue?"
 msgstr "Nimemuster ei sobi, jätkan?"
 
-#. For now, editing requires a file, no piping
-#: attach.c:116
+#: attach.c:120
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap koostamise kirje nõuab %%s"
 
-#: attach.c:123 attach.c:242 commands.c:215 compose.c:1313 curs_lib.c:180
-#: curs_lib.c:414
+#: attach.c:127 attach.c:247 commands.c:228 compose.c:1317 curs_lib.c:168
+#: curs_lib.c:431
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Viga \"%s\" käivitamisel!"
 
-#: attach.c:131
+#: attach.c:135
 msgid "Failure to open file to parse headers."
 msgstr "Faili avamine päiste analüüsiks ebaõnnestus."
 
-#: attach.c:159
+#: attach.c:163
 msgid "Failure to open file to strip headers."
 msgstr "Faili avamine päiste eemaldamiseks ebaõnnestus."
 
-#: attach.c:168
+#: attach.c:172
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "Faili avamine päiste analüüsiks ebaõnnestus."
 
-#: attach.c:181
+#: attach.c:185
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "Mailcap koostamise kirjet %s jaoks puudub, loon tühja faili."
 
-#. For now, editing requires a file, no piping
-#: attach.c:237
+#: attach.c:241
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Mailcap toimeta kirje nõuab %%s"
 
-#: attach.c:252
+#: attach.c:259
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Mailcap toimeta kirjet %s jaoks ei ole."
 
-#: attach.c:404
+#: attach.c:411
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Sobivat mailcap kirjet pole. Käsitlen tekstina."
 
-#: attach.c:416
+#: attach.c:423
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME tüüp ei ole defineeritud. Lisa ei saa vaadata."
 
-#: attach.c:500
+#: attach.c:507
 msgid "Cannot create filter"
 msgstr "Filtri loomine ebaõnnestus"
 
-#: attach.c:624 attach.c:653 attach.c:931 attach.c:985 handler.c:1629
-#: pgpkey.c:542 pgpkey.c:727
+#: attach.c:631 attach.c:660 attach.c:938 attach.c:992 handler.c:1139
+#: pgpkey.c:546 pgpkey.c:731
 msgid "Can't create filter"
 msgstr "Ei õnnestu luua filtrit"
 
-#: attach.c:782
+#: attach.c:789
 msgid "Write fault!"
 msgstr "Viga kirjutamisel!"
 
-#: attach.c:1008
+#: attach.c:1015
 msgid "I don't know how to print that!"
 msgstr "Ma ei tea, kuidas seda trükkida!"
 
-#: browser.c:46
+#: browser.c:50
 msgid "Chdir"
 msgstr "Chdir"
 
-#: browser.c:47 browser.c:59
+#: browser.c:51 browser.c:63
 msgid "Mask"
 msgstr "Mask"
 
-#: browser.c:55
+#: browser.c:59
 msgid "List"
 msgstr ""
 
-#: browser.c:56
+#: browser.c:60
 msgid "Subscribe"
 msgstr ""
 
-#: browser.c:57
+#: browser.c:61
 #, fuzzy
 msgid "Unsubscribe"
 msgstr "Loobun kaustast %s..."
 
-#: browser.c:58 curs_main.c:390
+#: browser.c:62 curs_main.c:399
 msgid "Catchup"
 msgstr ""
 
-#: browser.c:519 browser.c:1170
+#: browser.c:519 browser.c:1175
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ei ole kataloog."
@@ -226,84 +222,84 @@ msgstr "Kataloog [%s], failimask: %s"
 msgid "Can't attach a directory!"
 msgstr "Kataloogi ei saa lisada!"
 
-#: browser.c:858 browser.c:1231 browser.c:1327
+#: browser.c:859 browser.c:1237 browser.c:1336
 msgid "No files match the file mask"
 msgstr "Maskile vastavaid faile ei ole"
 
-#: browser.c:1043
+#: browser.c:1045
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Luua saab ainult IMAP postkaste"
 
-#: browser.c:1062
+#: browser.c:1065
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Luua saab ainult IMAP postkaste"
 
-#: browser.c:1082
+#: browser.c:1086
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Kustutada saab ainult IMAP postkaste"
 
-#: browser.c:1089
+#: browser.c:1093
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Kas tõesti kustutada postkast \"%s\"?"
 
-#: browser.c:1102
+#: browser.c:1106
 msgid "Mailbox deleted."
 msgstr "Postkast on kustutatud."
 
-#: browser.c:1109
+#: browser.c:1113
 msgid "Mailbox not deleted."
 msgstr "Postkasti ei kustutatud."
 
-#: browser.c:1134
+#: browser.c:1138
 msgid "Chdir to: "
 msgstr "Mine kataloogi: "
 
-#: browser.c:1158 browser.c:1224
+#: browser.c:1163 browser.c:1230
 msgid "Error scanning directory."
 msgstr "Viga kataloogi skaneerimisel."
 
-#: browser.c:1181
+#: browser.c:1186
 msgid "File Mask: "
 msgstr "Failimask: "
 
-#: browser.c:1249
+#: browser.c:1255
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Järjestan tagurpidi (k)uup., (t)ähest., (s)uuruse järgi või (e)i järjesta? "
 
-#: browser.c:1252
+#: browser.c:1258
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Järjestan (k)uup., (t)ähest., (s)uuruse järgi või (e)i järjesta? "
 
-#: browser.c:1253
+#: browser.c:1259
 msgid "dazn"
 msgstr "ktse"
 
-#: browser.c:1315
+#: browser.c:1324
 msgid "New file name: "
 msgstr "Uus failinimi: "
 
-#: browser.c:1344
+#: browser.c:1353
 msgid "Can't view a directory"
 msgstr "Kataloogi ei saa vaadata"
 
-#: browser.c:1361
+#: browser.c:1370
 msgid "Error trying to view file"
 msgstr "Viga faili vaatamisel"
 
-#: browser.c:1443
+#: browser.c:1452
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:1445
+#: browser.c:1454
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
 msgstr "Loobun kaustast %s..."
 
-#: browser.c:1462
+#: browser.c:1471
 #, fuzzy
 msgid "No newsgroups match the mask"
 msgstr "Maskile vastavaid faile ei ole"
@@ -312,187 +308,186 @@ msgstr "Maskile vastavaid faile ei ole"
 msgid "New mail in "
 msgstr "Uus kiri kaustas "
 
-#: color.c:309
+#: color.c:312
 #, c-format
 msgid "%s: color not supported by term"
 msgstr "%s: terminal ei toeta värve"
 
-#: color.c:315
+#: color.c:318
 #, c-format
 msgid "%s: no such color"
 msgstr "%s. sellist värvi ei ole"
 
-#: color.c:360 color.c:541 color.c:551
+#: color.c:363 color.c:544 color.c:554
 #, c-format
 msgid "%s: no such object"
 msgstr "%s: sellist objekti ei ole"
 
-#: color.c:366
+#: color.c:369
 #, c-format
 msgid "%s: command valid only for index object"
 msgstr "%s: käsk kehtib ainult indekseeritud objektiga"
 
-#: color.c:373
+#: color.c:376
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s: liiga vähe argumente"
 
-#: color.c:532
+#: color.c:535
 msgid "Missing arguments."
 msgstr "Puuduvad argumendid."
 
-#: color.c:568 color.c:578
+#: color.c:571 color.c:581
 msgid "color: too few arguments"
 msgstr "color: liiga vähe argumente"
 
-#: color.c:603
+#: color.c:606
 msgid "mono: too few arguments"
 msgstr "mono: liiga vähe argumente"
 
-#: color.c:622
+#: color.c:625
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s. sellist atribuuti pole"
 
-#: color.c:661 hook.c:67 hook.c:77 keymap.c:707
+#: color.c:664 hook.c:71 hook.c:81 keymap.c:712
 msgid "too few arguments"
 msgstr "liiga vähe argumente"
 
-#: color.c:669 hook.c:82
+#: color.c:672 hook.c:86
 msgid "too many arguments"
 msgstr "liiga palju argumente"
 
-#: color.c:685
+#: color.c:688
 msgid "default colors not supported"
 msgstr "vaikimisi värve ei toetata"
 
-#: commands.c:76 mbox.c:610
+#: commands.c:80 mbox.c:612
 msgid "Could not create temporary file!"
 msgstr "Ei õnnestu luua ajutist faili!"
 
-#: commands.c:88
+#: commands.c:92
 msgid "Cannot create display filter"
 msgstr "Filtri loomine ebaõnnestus"
 
-#. find out whether or not the verify signature
-#: commands.c:119
+#: commands.c:123
 msgid "Verify PGP signature?"
 msgstr "Kontrollin PGP allkirja?"
 
-#: commands.c:150
+#: commands.c:154
 msgid "Could not copy message"
 msgstr "Teadet ei õnnestu kopeerida."
 
-#: commands.c:181
+#: commands.c:194
 msgid "S/MIME signature successfully verified."
 msgstr "S/MIME allkiri on edukalt kontrollitud."
 
-#: commands.c:183
+#: commands.c:196
 msgid "S/MIME certificate owner does not match sender."
 msgstr "S/MIME sertifikaadi omanik ei ole kirja saatja."
 
-#: commands.c:187 commands.c:198
+#: commands.c:200 commands.c:211
 msgid "Warning: Part of this message has not been signed."
 msgstr ""
 
-#: commands.c:189
+#: commands.c:202
 msgid "S/MIME signature could NOT be verified."
 msgstr "S/MIME allkirja EI ÕNNESTU kontrollida."
 
-#: commands.c:195
+#: commands.c:208
 msgid "PGP signature successfully verified."
 msgstr "PGP allkiri on edukalt kontrollitud."
 
-#: commands.c:200
+#: commands.c:213
 msgid "PGP signature could NOT be verified."
 msgstr "PGP allkirja EI ÕNNESTU kontrollida."
 
-#: commands.c:221
+#: commands.c:234
 msgid "Command: "
 msgstr "Käsklus: "
 
-#: commands.c:240 recvcmd.c:133
+#: commands.c:253 recvcmd.c:138
 msgid "Bounce message to: "
 msgstr "Peegelda teade aadressile: "
 
-#: commands.c:242 recvcmd.c:135
+#: commands.c:255 recvcmd.c:140
 msgid "Bounce tagged messages to: "
 msgstr "Peegelda märgitud teated aadressile: "
 
-#: commands.c:255 recvcmd.c:143
+#: commands.c:268 recvcmd.c:148
 msgid "Error parsing address!"
 msgstr "Viga aadressi analüüsimisel!"
 
-#: commands.c:263 recvcmd.c:151
+#: commands.c:276 recvcmd.c:156
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 
-#: commands.c:274 recvcmd.c:165
+#: commands.c:287 recvcmd.c:170
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Peegelda teade aadressile %s"
 
-#: commands.c:274 recvcmd.c:165
+#: commands.c:287 recvcmd.c:170
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Peegelda teated aadressile %s"
 
-#: commands.c:289 recvcmd.c:180
+#: commands.c:302 recvcmd.c:185
 #, fuzzy
 msgid "Message not bounced."
 msgstr "Teade on peegeldatud."
 
-#: commands.c:289 recvcmd.c:180
+#: commands.c:302 recvcmd.c:185
 #, fuzzy
 msgid "Messages not bounced."
 msgstr "Teated on peegeldatud."
 
-#: commands.c:299 recvcmd.c:197
+#: commands.c:312 recvcmd.c:202
 msgid "Message bounced."
 msgstr "Teade on peegeldatud."
 
-#: commands.c:299 recvcmd.c:197
+#: commands.c:312 recvcmd.c:202
 msgid "Messages bounced."
 msgstr "Teated on peegeldatud."
 
-#: commands.c:367 commands.c:398 commands.c:415
+#: commands.c:380 commands.c:411 commands.c:428
 msgid "Can't create filter process"
 msgstr "Filterprotsessi loomine ebaõnnestus"
 
-#: commands.c:445
+#: commands.c:458
 msgid "Pipe to command: "
 msgstr "Toruga käsule: "
 
-#: commands.c:459
+#: commands.c:472
 msgid "No printing command has been defined."
 msgstr "Trükkimise käsklust ei ole defineeritud."
 
-#: commands.c:464
+#: commands.c:477
 msgid "Print message?"
 msgstr "Trükin teate?"
 
-#: commands.c:464
+#: commands.c:477
 msgid "Print tagged messages?"
 msgstr "Trükin märgitud teated?"
 
-#: commands.c:471
+#: commands.c:484
 msgid "Message printed"
 msgstr "Teade on trükitud"
 
-#: commands.c:471
+#: commands.c:484
 msgid "Messages printed"
 msgstr "Teated on trükitud"
 
-#: commands.c:473
+#: commands.c:486
 msgid "Message could not be printed"
 msgstr "Teadet ei saa trükkida"
 
-#: commands.c:474
+#: commands.c:487
 msgid "Messages could not be printed"
 msgstr "Teateid ei saa trükkida"
 
-#: commands.c:484
+#: commands.c:497
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -500,7 +495,7 @@ msgid ""
 msgstr ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 
-#: commands.c:487
+#: commands.c:500
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
@@ -508,211 +503,186 @@ msgid ""
 msgstr ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 
-#: commands.c:488
+#: commands.c:501
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzc"
 
-#: commands.c:544
+#: commands.c:557
 msgid "Shell command: "
 msgstr "Käsurea käsk: "
 
-#: commands.c:684
+#: commands.c:698
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Dekodeeri-salvesta%s postkasti"
 
-#: commands.c:685
+#: commands.c:699
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Dekodeeri-kopeeri%s postkasti"
 
-#: commands.c:686
+#: commands.c:700
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Dekrüpti-salvesta%s postkasti"
 
-#: commands.c:687
+#: commands.c:701
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Dekrüpti-kopeeri%s postkasti"
 
-#: commands.c:688
+#: commands.c:702
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Salvesta%s postkasti"
 
-#: commands.c:688
+#: commands.c:702
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Kopeeri%s postkasti"
 
-#: commands.c:689
+#: commands.c:703
 msgid " tagged"
 msgstr " märgitud"
 
-#: commands.c:754
+#: commands.c:768
 #, c-format
 msgid "Copying to %s..."
 msgstr "Kopeerin kausta %s..."
 
-#: commands.c:832
-#, fuzzy
-msgid "Unable to create backup file"
-msgstr "%s: faili lisamine ebaõnnestus"
-
-#: commands.c:838
-#, fuzzy
-msgid "Unable to open backup file for reading"
-msgstr "Ajutise faili avamine ebaõnnestus!"
-
-#: commands.c:845
-#, fuzzy
-msgid "Unable to open new file for writing"
-msgstr "Ajutise faili avamine ebaõnnestus!"
-
-#: commands.c:852
-#, c-format
-msgid "Unable to lock %s, old file saved as %s"
-msgstr ""
-
-#: commands.c:929
-#, c-format
-msgid "Cannot write new %s, old file saved as %s"
-msgstr ""
-
-#: commands.c:990
+#: commands.c:890
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Teisendan saatmisel kooditabelisse %s?"
 
-#: commands.c:1000
+#: commands.c:900
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Sisu tüübiks on nüüd %s."
 
-#: commands.c:1004
+#: commands.c:904
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Kooditabeliks on nüüd %s; %s."
 
-#: commands.c:1006
+#: commands.c:906
 msgid "not converting"
 msgstr "ei teisenda"
 
-#: commands.c:1006
+#: commands.c:906
 msgid "converting"
 msgstr "teisendan"
 
-#: compose.c:51
+#: compose.c:54
 msgid "There are no attachments."
 msgstr "Lisasid ei ole."
 
-#: compose.c:107 compose.c:120
+#: compose.c:111 compose.c:124
 msgid "Send"
 msgstr "Saada"
 
-#: compose.c:108 compose.c:121 remailer.c:458
+#: compose.c:112 compose.c:125 remailer.c:463
 msgid "Abort"
 msgstr "Katkesta"
 
-#: compose.c:112 compose.c:124 compose.c:781
+#: compose.c:116 compose.c:128 compose.c:783
 msgid "Attach file"
 msgstr "Lisa fail"
 
-#: compose.c:113 compose.c:125
+#: compose.c:117 compose.c:129
 msgid "Descrip"
 msgstr "Kirjeldus"
 
-#: compose.c:162
+#: compose.c:164
 msgid "Sign, Encrypt"
 msgstr "Allkirjasta, krüpti"
 
-#: compose.c:164
+#: compose.c:166
 msgid "Encrypt"
 msgstr "Krüpti"
 
-#: compose.c:166
+#: compose.c:168
 msgid "Sign"
 msgstr "Allkirjasta"
 
-#: compose.c:168
+#: compose.c:170
 msgid "Clear"
 msgstr "Puhas"
 
-#: compose.c:174
+#: compose.c:176
 #, fuzzy
 msgid " (inline)"
 msgstr "(jätka)\n"
 
-#: compose.c:176
+#: compose.c:178
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:184 compose.c:189
+#: compose.c:186 compose.c:191
 #, fuzzy
 msgid "     sign as: "
 msgstr " allkirjasta kui: "
 
-#: compose.c:185 compose.c:190
+#: compose.c:187 compose.c:192
 msgid "<default>"
 msgstr "<vaikimisi>"
 
-#: compose.c:197
+#: compose.c:199
 msgid "Encrypt with: "
 msgstr "Krüpti kasutades: "
 
-#: compose.c:246
+#: compose.c:248
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] ei eksisteeri!"
 
-#: compose.c:252
+#: compose.c:254
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "%s [#%d] muudeti. Uuendan kodeerimist?"
 
-#: compose.c:311
+#: compose.c:313
 msgid "-- Attachments"
 msgstr "-- Lisad"
 
-#: compose.c:338
+#: compose.c:340
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
 
-#: compose.c:360
+#: compose.c:362
 msgid "You may not delete the only attachment."
 msgstr "Ainukest lisa ei saa kustutada."
 
-#: compose.c:716 send.c:1558
+#: compose.c:718 send.c:1580
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
 
-#: compose.c:798
+#: compose.c:799
 msgid "Attaching selected files..."
 msgstr "Lisan valitud failid..."
 
-#: compose.c:809
+#: compose.c:811
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "%s ei õnnestu lisada!"
 
-#: compose.c:832
+#: compose.c:834
 msgid "Open mailbox to attach message from"
 msgstr "Avage postkast, millest lisada teade"
 
-#: compose.c:840
+#: compose.c:842
 #, fuzzy
 msgid "Open newsgroup to attach message from"
 msgstr "Avage postkast, millest lisada teade"
 
-#: compose.c:891
+#: compose.c:893
 msgid "No messages in that folder."
 msgstr "Selles kaustas ei ole teateid."
 
-#: compose.c:902
+#: compose.c:904
 msgid "Tag the messages you want to attach!"
 msgstr "Märkige teada, mida soovite lisada!"
 
@@ -720,83 +690,83 @@ msgstr "M
 msgid "Unable to attach!"
 msgstr "Ei õnnestu lisada!"
 
-#: compose.c:980
+#: compose.c:982
 msgid "Recoding only affects text attachments."
 msgstr "Ümberkodeerimine puudutab ainult tekstilisasid."
 
-#: compose.c:985
+#: compose.c:987
 msgid "The current attachment won't be converted."
 msgstr "Käesolevat lisa ei teisendata."
 
-#: compose.c:987
+#: compose.c:989
 msgid "The current attachment will be converted."
 msgstr "Käesolev lisa teisendatakse."
 
-#: compose.c:1058
+#: compose.c:1060
 msgid "Invalid encoding."
 msgstr "Vigane kodeering."
 
-#: compose.c:1082
+#: compose.c:1084
 msgid "Save a copy of this message?"
 msgstr "Salvestan sellest teatest koopia?"
 
-#: compose.c:1138
+#: compose.c:1140
 msgid "Rename to: "
 msgstr "Uus nimi: "
 
-#: compose.c:1141 editmsg.c:107 sendlib.c:888
+#: compose.c:1143 editmsg.c:108 sendlib.c:821
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Ei saa lugeda %s atribuute: %s"
 
-#: compose.c:1168
+#: compose.c:1170
 msgid "New file: "
 msgstr "Uus fail: "
 
-#: compose.c:1180
+#: compose.c:1182
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type on kujul baas/alam"
 
-#: compose.c:1186
+#: compose.c:1188
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Tundmatu Content-Type %s"
 
-#: compose.c:1197
+#: compose.c:1199
 #, c-format
 msgid "Can't create file %s"
 msgstr "Faili %s ei saa luua"
 
-#: compose.c:1205
+#: compose.c:1207
 msgid "What we have here is a failure to make an attachment"
 msgstr "See mis siin nüüd on, on viga lisa loomisel"
 
-#: compose.c:1276
+#: compose.c:1278
 msgid "Postpone this message?"
 msgstr "Panen teate postitusootele?"
 
-#: compose.c:1330
+#: compose.c:1334
 msgid "Write message to mailbox"
 msgstr "Kirjuta teade postkasti"
 
-#: compose.c:1332
+#: compose.c:1336
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Kirjutan teate faili %s ..."
 
-#: compose.c:1341
+#: compose.c:1345
 msgid "Message written."
 msgstr "Teade on kirjutatud."
 
-#: compose.c:1352
+#: compose.c:1356
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "S/MIME on juba valitud. Puhasta ja jätka ? "
 
-#: compose.c:1376
+#: compose.c:1380
 msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP on juba valitud. Puhasta ja jätka ? "
 
-#: compress.c:202 mbox.c:518
+#: compress.c:202 mbox.c:520
 msgid "Mailbox was corrupted!"
 msgstr "Postkast oli riknenud!"
 
@@ -805,7 +775,7 @@ msgstr "Postkast oli riknenud!"
 msgid "Decompressing %s..."
 msgstr "Valin %s..."
 
-#: compress.c:245 compress.c:363 compress.c:438 mbox.c:583
+#: compress.c:245 compress.c:363 compress.c:438 mbox.c:587
 msgid "Unable to lock mailbox!"
 msgstr "Postkasti ei saa lukustada!"
 
@@ -851,46 +821,45 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: crypt.c:63
+#: crypt.c:66
 #, c-format
 msgid " (current time: %c)"
 msgstr " (praegune aeg: %c)"
 
-#: crypt.c:69
+#: crypt.c:72
 #, c-format
 msgid "[-- %s output follows%s --]\n"
 msgstr "[-- järgneb %s väljund%s --]\n"
 
-#: crypt.c:85
+#: crypt.c:88
 msgid "Passphrase(s) forgotten."
 msgstr "Parool(id) on unustatud."
 
-#: crypt.c:142 cryptglue.c:102 pgpkey.c:533
+#: crypt.c:145 cryptglue.c:103 pgpkey.c:537
 msgid "Invoking PGP..."
 msgstr "Käivitan PGP..."
 
-#: crypt.c:154
+#: crypt.c:157
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
-#: crypt.c:156 send.c:1505
+#: crypt.c:159 send.c:1527 send.c:1625
 msgid "Mail not sent."
 msgstr "Kirja ei saadetud."
 
-#: crypt.c:383
+#: crypt.c:386
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "Sisu vihjeta S/MIME teateid ei toetata."
 
-#: crypt.c:586 crypt.c:625
+#: crypt.c:589 crypt.c:628
 msgid "Trying to extract PGP keys...\n"
 msgstr "Proovin eraldada PGP võtmed...\n"
 
-#. else ?
-#: crypt.c:608 crypt.c:644
+#: crypt.c:611 crypt.c:647
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Proovin eraldada S/MIME sertifikaadid...\n"
 
-#: crypt.c:759
+#: crypt.c:763
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -898,7 +867,7 @@ msgstr ""
 "[-- Viga: Vigane multipart/signed struktuur! --]\n"
 "\n"
 
-#: crypt.c:777
+#: crypt.c:780
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -907,7 +876,7 @@ msgstr ""
 "[-- Viga: Tundmatu multipart/signed protokoll %s! --]\n"
 "\n"
 
-#: crypt.c:813
+#: crypt.c:815
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -916,8 +885,7 @@ msgstr ""
 "[-- Hoiatus: Me ai saa kontrollida %s/%s allkirju. --]\n"
 "\n"
 
-#. Now display the signed body
-#: crypt.c:825
+#: crypt.c:827
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -925,7 +893,7 @@ msgstr ""
 "[-- Järgnev info on allkirjastatud --]\n"
 "\n"
 
-#: crypt.c:831
+#: crypt.c:833
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -933,7 +901,7 @@ msgstr ""
 "[-- Hoiatus: Ei leia ühtegi allkirja. --]\n"
 "\n"
 
-#: crypt.c:838
+#: crypt.c:840
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -941,177 +909,169 @@ msgstr ""
 "\n"
 "[-- Allkirjastatud info lõpp --]\n"
 
-#: cryptglue.c:81
+#: cryptglue.c:82
 msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
 msgstr ""
 
-#: cryptglue.c:105
+#: cryptglue.c:106
 #, fuzzy
-msgid "Invoking SMIME..."
+msgid "Invoking S/MIME..."
 msgstr "Käivitan PGP..."
 
-#: crypt-gpgme.c:322
+#: crypt-gpgme.c:325
 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
 msgstr "viga mustris: %s"
 
-#: crypt-gpgme.c:330
+#: crypt-gpgme.c:333
 #, c-format
 msgid "error enabling CMS protocol: %s\n"
 msgstr ""
 
-#: crypt-gpgme.c:348
+#: crypt-gpgme.c:351
 #, c-format
 msgid "error creating gpgme data object: %s\n"
 msgstr ""
 
-#: crypt-gpgme.c:407 crypt-gpgme.c:424 crypt-gpgme.c:1241
+#: crypt-gpgme.c:410 crypt-gpgme.c:427 crypt-gpgme.c:1244
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
 msgstr "viga mustris: %s"
 
-#: crypt-gpgme.c:441
+#: crypt-gpgme.c:444
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
 msgstr "viga mustris: %s"
 
-#: crypt-gpgme.c:459 crypt-gpgme.c:501
+#: crypt-gpgme.c:462 crypt-gpgme.c:504
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
 msgstr "viga mustris: %s"
 
-#: crypt-gpgme.c:557
+#: crypt-gpgme.c:560
 #, fuzzy, c-format
 msgid "error adding recipient `%s': %s\n"
 msgstr "viga mustris: %s"
 
-#: crypt-gpgme.c:594
+#: crypt-gpgme.c:597
 #, c-format
 msgid "secret key `%s' not found: %s\n"
 msgstr ""
 
-#: crypt-gpgme.c:603
+#: crypt-gpgme.c:606
 #, c-format
-msgid "ambiguous specfication of secret key `%s'\n"
+msgid "ambiguous specification of secret key `%s'\n"
 msgstr ""
 
-#: crypt-gpgme.c:613
+#: crypt-gpgme.c:616
 #, c-format
 msgid "error setting secret key `%s': %s\n"
 msgstr ""
 
-#: crypt-gpgme.c:654
+#: crypt-gpgme.c:657
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
 msgstr "viga mustris: %s"
 
-#: crypt-gpgme.c:747
+#: crypt-gpgme.c:750
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
 msgstr "viga mustris: %s"
 
-#: crypt-gpgme.c:935
+#: crypt-gpgme.c:938
 msgid "Warning: One of the keys has been revoked\n"
 msgstr ""
 
-#: crypt-gpgme.c:943
+#: crypt-gpgme.c:946
 msgid "Warning: The key used to create the signature expired at: "
 msgstr ""
 
-#: crypt-gpgme.c:949
+#: crypt-gpgme.c:952
 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
 msgstr "Serveri sertifikaat on aegunud"
 
-#: crypt-gpgme.c:963
+#: crypt-gpgme.c:966
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: crypt-gpgme.c:969
+#: crypt-gpgme.c:972
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: crypt-gpgme.c:973
+#: crypt-gpgme.c:976
 #, fuzzy
 msgid "The CRL is not available\n"
 msgstr "SSL ei ole kasutatav."
 
-#: crypt-gpgme.c:978
+#: crypt-gpgme.c:981
 msgid "Available CRL is too old\n"
 msgstr ""
 
-#: crypt-gpgme.c:983
+#: crypt-gpgme.c:986
 msgid "A policy requirement was not met\n"
 msgstr ""
 
-#: crypt-gpgme.c:991
-msgid "A system error occured"
+#: crypt-gpgme.c:994
+msgid "A system error occurred"
 msgstr ""
 
-#: crypt-gpgme.c:1024 crypt-gpgme.c:2823
+#: crypt-gpgme.c:1027 crypt-gpgme.c:2824
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "Sõrmejälg: %s"
 
-#: crypt-gpgme.c:1079
+#: crypt-gpgme.c:1082
 msgid ""
 "WARNING: We have NO indication whether the key belongs to the person named "
 "as shown above\n"
 msgstr ""
 
-#: crypt-gpgme.c:1085
+#: crypt-gpgme.c:1088
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
 msgstr ""
 
-#: crypt-gpgme.c:1089
+#: crypt-gpgme.c:1092
 msgid ""
 "WARNING: It is NOT certain that the key belongs to the person named as shown "
 "above\n"
 msgstr ""
 
-#: crypt-gpgme.c:1157
+#: crypt-gpgme.c:1160
 msgid "Error getting key information: "
 msgstr ""
 
-#. We can't decide (yellow) but this is a PGP key with a good
-#. signature, so we display what a PGP user expects: The name,
-#. fingerprint and the key validity (which is neither fully or
-#. ultimate).
-#: crypt-gpgme.c:1163 crypt-gpgme.c:1193
+#: crypt-gpgme.c:1166 crypt-gpgme.c:1196
 msgid "Good signature from: "
 msgstr ""
 
-#: crypt-gpgme.c:1172
+#: crypt-gpgme.c:1175
 msgid "                aka: "
 msgstr ""
 
-#: crypt-gpgme.c:1176 crypt-gpgme.c:1196
+#: crypt-gpgme.c:1179 crypt-gpgme.c:1199
 msgid "            created: "
 msgstr ""
 
-#: crypt-gpgme.c:1184
+#: crypt-gpgme.c:1187
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#. can't decide (yellow)
-#: crypt-gpgme.c:1206
+#: crypt-gpgme.c:1209
 #, fuzzy
 msgid "Error checking signature"
 msgstr "Viga teate saatmisel."
 
-#. Note: We don't need a current time output because GPGME avoids
-#. such an attack by separating the meta information from the
-#. data.
-#: crypt-gpgme.c:1249 crypt-gpgme.c:1433 crypt-gpgme.c:1896
+#: crypt-gpgme.c:1252 crypt-gpgme.c:1436 crypt-gpgme.c:1900
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
-#: crypt-gpgme.c:1257
+#: crypt-gpgme.c:1260
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
 msgstr "Viga käsureal: %s\n"
 
-#: crypt-gpgme.c:1314 crypt-gpgme.c:1444 crypt-gpgme.c:1909
+#: crypt-gpgme.c:1317 crypt-gpgme.c:1447 crypt-gpgme.c:1913
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
@@ -1120,23 +1080,23 @@ msgstr ""
 "\n"
 "[-- Allkirjastatud info lõpp --]\n"
 
-#: crypt-gpgme.c:1403
+#: crypt-gpgme.c:1406
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr "[-- Viga: ajutise faili loomine ebaõnnestus! --]\n"
 
-#: crypt-gpgme.c:1873
+#: crypt-gpgme.c:1877
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
-#: crypt-gpgme.c:1916
+#: crypt-gpgme.c:1920
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt-gpgme.c:1934 pgp.c:376
+#: crypt-gpgme.c:1938 pgp.c:408
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -1144,11 +1104,11 @@ msgstr ""
 "[-- PGP TEATE ALGUS --]\n"
 "\n"
 
-#: crypt-gpgme.c:1936 pgp.c:378
+#: crypt-gpgme.c:1940 pgp.c:410
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP AVALIKU VÕTME BLOKI ALGUS --]\n"
 
-#: crypt-gpgme.c:1938 pgp.c:380
+#: crypt-gpgme.c:1942 pgp.c:412
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -1156,19 +1116,19 @@ msgstr ""
 "[-- PGP ALLKIRJASTATUD TEATE ALGUS --]\n"
 "\n"
 
-#: crypt-gpgme.c:1961 pgp.c:403
+#: crypt-gpgme.c:1965 pgp.c:435
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr "[-- PGP TEATE LÕPP --]\n"
 
-#: crypt-gpgme.c:1963 pgp.c:405
+#: crypt-gpgme.c:1967 pgp.c:442
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP AVALIKU VÕTME BLOKI LÕPP --]\n"
 
-#: crypt-gpgme.c:1965 pgp.c:407
+#: crypt-gpgme.c:1969 pgp.c:444
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr "[-- PGP ALLKIRJASTATUD TEATE LÕPP --]\n"
 
-#: crypt-gpgme.c:1983 pgp.c:431
+#: crypt-gpgme.c:1987 pgp.c:472
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -1176,7 +1136,7 @@ msgstr ""
 "[-- Viga: ei suuda leida PGP teate algust! --]\n"
 "\n"
 
-#: crypt-gpgme.c:2010 pgp.c:828
+#: crypt-gpgme.c:2016 pgp.c:878
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -1184,11 +1144,11 @@ msgstr ""
 "[-- Viga: vigane PGP/MIME teade! --]\n"
 "\n"
 
-#: crypt-gpgme.c:2021 crypt-gpgme.c:2086 pgp.c:842
+#: crypt-gpgme.c:2027 crypt-gpgme.c:2090 pgp.c:892
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- Viga: ajutise faili loomine ebaõnnestus! --]\n"
 
-#: crypt-gpgme.c:2033
+#: crypt-gpgme.c:2039
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
@@ -1197,7 +1157,7 @@ msgstr ""
 "[-- Järgneb PGP/MIME krüptitud info --]\n"
 "\n"
 
-#: crypt-gpgme.c:2036 pgp.c:853
+#: crypt-gpgme.c:2040 pgp.c:903
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
@@ -1205,37 +1165,37 @@ msgstr ""
 "[-- Järgneb PGP/MIME krüptitud info --]\n"
 "\n"
 
-#: crypt-gpgme.c:2059
+#: crypt-gpgme.c:2062
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr "[-- PGP/MIME krüptitud info lõpp --]\n"
 
-#: crypt-gpgme.c:2060 pgp.c:873
+#: crypt-gpgme.c:2063 pgp.c:923
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr "[-- PGP/MIME krüptitud info lõpp --]\n"
 
-#: crypt-gpgme.c:2097
+#: crypt-gpgme.c:2101
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr "[-- Järgneb S/MIME allkirjastatud info --]\n"
 
-#: crypt-gpgme.c:2100
+#: crypt-gpgme.c:2102
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr "[-- Järgneb S/MIME krüptitud info --]\n"
 
-#: crypt-gpgme.c:2128
+#: crypt-gpgme.c:2129
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
 "[-- S/MIME Allkirjastatud info lõpp --]\n"
 
-#: crypt-gpgme.c:2129
+#: crypt-gpgme.c:2130
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
@@ -1255,521 +1215,559 @@ msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
 #: crypt-gpgme.c:2756
-msgid " aka"
+msgid " aka ......: "
 msgstr ""
 
 #: crypt-gpgme.c:2756
-msgid "Name"
+msgid "Name ......: "
 msgstr ""
 
-#: crypt-gpgme.c:2758 crypt-gpgme.c:2879
+#: crypt-gpgme.c:2759 crypt-gpgme.c:2880
 #, fuzzy
 msgid "[Invalid]"
 msgstr "Vigane    "
 
-#: crypt-gpgme.c:2808 crypt-gpgme.c:2931
+#: crypt-gpgme.c:2778 crypt-gpgme.c:2901
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "Vigane kuu: %s"
+
+#: crypt-gpgme.c:2790 crypt-gpgme.c:2913
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "Vigane kuu: %s"
+
+#: crypt-gpgme.c:2803 crypt-gpgme.c:2926
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2805 crypt-gpgme.c:2928
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:2809 crypt-gpgme.c:2932
 #, fuzzy
 msgid "encryption"
 msgstr "Krüpti"
 
-#: crypt-gpgme.c:2812 crypt-gpgme.c:2935
+#: crypt-gpgme.c:2810 crypt-gpgme.c:2814 crypt-gpgme.c:2818 crypt-gpgme.c:2933
+#: crypt-gpgme.c:2937 crypt-gpgme.c:2941
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:2813 crypt-gpgme.c:2936
 msgid "signing"
 msgstr ""
 
-#: crypt-gpgme.c:2816 crypt-gpgme.c:2939
+#: crypt-gpgme.c:2817 crypt-gpgme.c:2940
 msgid "certification"
 msgstr ""
 
-#: crypt-gpgme.c:2875
+#: crypt-gpgme.c:2851
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2857
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#: crypt-gpgme.c:2873
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Võtme ID: 0x%s"
+
+#: crypt-gpgme.c:2876
 #, fuzzy
 msgid "[Revoked]"
 msgstr "Tühistatud "
 
-#: crypt-gpgme.c:2883
+#: crypt-gpgme.c:2884
 #, fuzzy
 msgid "[Expired]"
 msgstr "Aegunud   "
 
-#: crypt-gpgme.c:2887
+#: crypt-gpgme.c:2888
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt-gpgme.c:2964 pgpkey.c:528 pgpkey.c:707
+#: crypt-gpgme.c:2965 pgpkey.c:532 pgpkey.c:711
 msgid "Can't create temporary file"
 msgstr "Ei õnnestu avada ajutist faili"
 
-#: crypt-gpgme.c:2968
+#: crypt-gpgme.c:2969
 #, fuzzy
 msgid "Collecting data..."
 msgstr "Ühendus serverisse %s..."
 
-#: crypt-gpgme.c:2991
+#: crypt-gpgme.c:2992
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "Viga serveriga ühenduse loomisel: %s"
 
-#: crypt-gpgme.c:2999
+#: crypt-gpgme.c:3000
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt-gpgme.c:3009 pgpkey.c:553
+#: crypt-gpgme.c:3010 pgpkey.c:557
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "Võtme ID: 0x%s"
 
-#: crypt-gpgme.c:3085
+#: crypt-gpgme.c:3086
 #, fuzzy, c-format
 msgid "gpgme_new failed: %s"
 msgstr "SSL ebaõnnestus: %s"
 
-#: crypt-gpgme.c:3120 crypt-gpgme.c:3176
+#: crypt-gpgme.c:3121 crypt-gpgme.c:3177
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 
-#: crypt-gpgme.c:3165 crypt-gpgme.c:3201
+#: crypt-gpgme.c:3166 crypt-gpgme.c:3202
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt-gpgme.c:3267
+#: crypt-gpgme.c:3268
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
 msgstr "Kõik sobivad võtmed on märgitud aegunuks/tühistatuks."
 
-#: crypt-gpgme.c:3296 mutt_ssl.c:605 mutt_ssl_gnutls.c:744 pgpkey.c:485
-#: smime.c:420
+#: crypt-gpgme.c:3297 mutt_ssl.c:638 mutt_ssl_gnutls.c:746 pgpkey.c:489
+#: smime.c:423
 msgid "Exit  "
 msgstr "Välju  "
 
-#. __STRCAT_CHECKED__
-#: crypt-gpgme.c:3298 pgpkey.c:487 smime.c:422
+#: crypt-gpgme.c:3299 pgpkey.c:491 smime.c:425
 msgid "Select  "
 msgstr "Vali  "
 
-#. __STRCAT_CHECKED__
-#: crypt-gpgme.c:3301 pgpkey.c:490
+#: crypt-gpgme.c:3302 pgpkey.c:494
 msgid "Check key  "
 msgstr "Võtme kontroll  "
 
-#: crypt-gpgme.c:3318
+#: crypt-gpgme.c:3319
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "PGP võtmed, mis sisaldavad <%s>."
 
-#: crypt-gpgme.c:3320
+#: crypt-gpgme.c:3321
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "PGP võtmed, mis sisaldavad <%s>."
 
-#: crypt-gpgme.c:3322
+#: crypt-gpgme.c:3323
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "S/MIME sertifikaadid, mis sisaldavad \"%s\"."
 
-#: crypt-gpgme.c:3324
+#: crypt-gpgme.c:3325
 #, fuzzy
 msgid "keys matching"
 msgstr "PGP võtmed, mis sisaldavad <%s>."
 
-#: crypt-gpgme.c:3327
+#: crypt-gpgme.c:3328
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt-gpgme.c:3329
+#: crypt-gpgme.c:3330
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: crypt-gpgme.c:3352 pgpkey.c:573
+#: crypt-gpgme.c:3353 pgpkey.c:577
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr "Seda võtit ei saa kasutada: aegunud/blokeeritud/tühistatud."
 
-#: crypt-gpgme.c:3365 pgpkey.c:585
+#: crypt-gpgme.c:3366 pgpkey.c:589
 msgid "ID is expired/disabled/revoked."
 msgstr "ID on aegunud/blokeeritud/tühistatud."
 
-#: crypt-gpgme.c:3382 pgpkey.c:589
+#: crypt-gpgme.c:3383 pgpkey.c:593
 msgid "ID has undefined validity."
 msgstr "ID kehtivuse väärtus ei ole defineeritud."
 
-#: crypt-gpgme.c:3385 pgpkey.c:592
+#: crypt-gpgme.c:3386 pgpkey.c:596
 msgid "ID is not valid."
 msgstr "ID ei ole kehtiv."
 
-#: crypt-gpgme.c:3388 pgpkey.c:595
+#: crypt-gpgme.c:3389 pgpkey.c:599
 msgid "ID is only marginally valid."
 msgstr "ID on ainult osaliselt kehtiv."
 
-#: crypt-gpgme.c:3396 pgpkey.c:600
+#: crypt-gpgme.c:3397 pgpkey.c:604
 #, c-format
 msgid "%s Do you really want to use the key?"
 msgstr "%s Kas te soovite seda võtit tõesti kasutada?"
 
-#: crypt-gpgme.c:3451 crypt-gpgme.c:3553 pgpkey.c:807 pgpkey.c:912
+#: crypt-gpgme.c:3452 crypt-gpgme.c:3554 pgpkey.c:811 pgpkey.c:916
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "Otsin võtmeid, mis sisaldavad \"%s\"..."
 
-#: crypt-gpgme.c:3709 pgp.c:1068
+#: crypt-gpgme.c:3710 pgp.c:1126
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "Kasutan kasutajat = \"%s\" teatel %s?"
 
-#: crypt-gpgme.c:3740 pgp.c:1101 smime.c:642 smime.c:762
+#: crypt-gpgme.c:3741 pgp.c:1159 smime.c:645 smime.c:765
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "Sisestage kasutaja teatele %s: "
 
-#: crypt-gpgme.c:3830
+#: crypt-gpgme.c:3831
 #, fuzzy
-msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)oggle or (f)orget it?"
+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
 "PGP (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad, k(e)hasse, või (u)nusta? "
 
-#: crypt-gpgme.c:3831 crypt-gpgme.c:3836
+#: crypt-gpgme.c:3832
 #, fuzzy
-msgid "esabtf"
-msgstr "kaimu"
+msgid "esabpfc"
+msgstr "kaimeu"
 
-#: crypt-gpgme.c:3835
+#: crypt-gpgme.c:3836
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)oggle or (f)orget it?"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
 "PGP (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad, k(e)hasse, või (u)nusta? "
 
-#. sign (a)s
-#. unset_option(OPTCRYPTCHECKTRUST);
-#. sign (a)s
-#: crypt-gpgme.c:3849 pgp.c:1457 smime.c:1923
+#: crypt-gpgme.c:3837
+#, fuzzy
+msgid "esabmfc"
+msgstr "kaimeu"
+
+#: crypt-gpgme.c:3852 pgp.c:1519 smime.c:1961
 msgid "Sign as: "
 msgstr "Allkirjasta kui: "
 
-#: curs_lib.c:189
+#: curs_lib.c:176
 msgid "yes"
 msgstr "jah"
 
-#: curs_lib.c:190
+#: curs_lib.c:177
 msgid "no"
 msgstr "ei"
 
-#. restore blocking operation
-#: curs_lib.c:279
+#: curs_lib.c:266
 #, fuzzy
 msgid "Exit Mutt-ng?"
 msgstr "Väljuda Muttist?"
 
-#: curs_lib.c:370 mutt_socket.c:492 mutt_ssl.c:313
+#: curs_lib.c:387 mutt_socket.c:491 mutt_ssl.c:314
 msgid "unknown error"
 msgstr "tundmatu viga"
 
-#: curs_lib.c:390
+#: curs_lib.c:407
 msgid "Press any key to continue..."
 msgstr "Jätkamiseks vajutage klahvi..."
 
-#: curs_lib.c:432
+#: curs_lib.c:449
 msgid " ('?' for list): "
 msgstr " ('?' annab loendi): "
 
-#: curs_main.c:55 curs_main.c:615 curs_main.c:643 imap/command.c:172
+#: curs_main.c:62 curs_main.c:626 curs_main.c:654 imap/command.c:178
 msgid "No mailbox is open."
 msgstr "Avatud postkaste pole."
 
-#: curs_main.c:56 curs_main.c:2144
+#: curs_main.c:63 curs_main.c:2195
 msgid "There are no messages."
 msgstr "Teateid ei ole."
 
-#: curs_main.c:57 mx.c:1009 pager.c:61 recvattach.c:38
+#: curs_main.c:64 mx.c:1018 pager.c:66 recvattach.c:43
 msgid "Mailbox is read-only."
 msgstr "Postkast on ainult lugemiseks."
 
-#: curs_main.c:59 pager.c:63 recvattach.c:870
+#: curs_main.c:66 pager.c:68 recvattach.c:894
 msgid "Function not permitted in attach-message mode."
 msgstr "Funktsioon ei ole teate lisamise moodis lubatud."
 
-#: curs_main.c:60
+#: curs_main.c:67
 msgid "No visible messages."
 msgstr "Nähtavaid teateid pole."
 
-#: curs_main.c:233
+#: curs_main.c:248
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Ainult lugemiseks postkastil ei saa kirjutamist lülitada!"
 
-#: curs_main.c:240
+#: curs_main.c:255
 msgid "Changes to folder will be written on folder exit."
 msgstr "Muudatused kaustas salvestatakse kaustast väljumisel."
 
-#: curs_main.c:244
+#: curs_main.c:259
 msgid "Changes to folder will not be written."
 msgstr "Muudatusi kaustas ei kirjutata."
 
-#: curs_main.c:371 curs_main.c:384
+#: curs_main.c:380 curs_main.c:393
 msgid "Quit"
 msgstr "Välju"
 
-#: curs_main.c:374 curs_main.c:387 recvattach.c:50
+#: curs_main.c:383 curs_main.c:396 recvattach.c:57
 msgid "Save"
 msgstr "Salvesta"
 
-#: curs_main.c:375 query.c:43
+#: curs_main.c:384 query.c:44
 msgid "Mail"
 msgstr "Kiri"
 
-#: curs_main.c:376 pager.c:1351
+#: curs_main.c:385 pager.c:1381
 msgid "Reply"
 msgstr "Vasta"
 
-#: curs_main.c:377
+#: curs_main.c:386
 msgid "Group"
 msgstr "Grupp"
 
-#: curs_main.c:388 pager.c:1358
+#: curs_main.c:397 pager.c:1388
 msgid "Post"
 msgstr ""
 
-#: curs_main.c:389 pager.c:1359
+#: curs_main.c:398 pager.c:1389
 #, fuzzy
 msgid "Followup"
 msgstr "Vastus aadressile %s%s?"
 
-#: curs_main.c:488
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Postkasti on väliselt muudetud. Lipud võivad olla valed."
 
-#: curs_main.c:492
+#: curs_main.c:501
 msgid "New mail in this mailbox."
 msgstr "Selles postkastis on uus kiri."
 
-#: curs_main.c:498
+#: curs_main.c:507
 msgid "Mailbox was externally modified."
 msgstr "Postkasti on väliselt muudetud."
 
-#: curs_main.c:621
+#: curs_main.c:632
 msgid "No tagged messages."
 msgstr "Märgitud teateid pole."
 
-#: curs_main.c:656 menu.c:871
+#: curs_main.c:667 menu.c:858
 #, fuzzy
 msgid "Nothing to do."
 msgstr "Ühendus serverisse %s..."
 
-#: curs_main.c:747
+#: curs_main.c:758
 #, fuzzy
-msgid "Enter Message-Id: "
+msgid "Enter Message-ID: "
 msgstr "Sisestage võtme ID: "
 
-#: curs_main.c:755
+#: curs_main.c:766
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: curs_main.c:775
+#: curs_main.c:786
 #, fuzzy
 msgid "Message not visible in limited view."
 msgstr "Vanem teade ei ole selles piiratud vaates nähtav."
 
-#: curs_main.c:785
+#: curs_main.c:796
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: curs_main.c:798
-msgid "No Message-Id. Unable to perform operation"
+#: curs_main.c:809
+msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: curs_main.c:818
+#: curs_main.c:829
 #, fuzzy
 msgid "Check for children of message..."
 msgstr "Kontrollin, kas on uusi teateid..."
 
-#: curs_main.c:849
+#: curs_main.c:860
 msgid "Jump to message: "
 msgstr "Hüppa teatele: "
 
-#: curs_main.c:854
+#: curs_main.c:865
 msgid "Argument must be a message number."
 msgstr "Argument peab olema teate number."
 
-#: curs_main.c:882
+#: curs_main.c:893
 msgid "That message is not visible."
 msgstr "See teate ei ole nähtav."
 
-#: curs_main.c:885
+#: curs_main.c:896
 msgid "Invalid message number."
 msgstr "Vigane teate number."
 
-#: curs_main.c:899 curs_main.c:1897 curs_main.c:1937 pager.c:2093 pager.c:2112
+#: curs_main.c:910 curs_main.c:1918 curs_main.c:1958 pager.c:2137 pager.c:2156
 #, fuzzy
 msgid "Deletion"
 msgstr "Kustuta"
 
-#: curs_main.c:902
+#: curs_main.c:913
 msgid "Delete messages matching: "
 msgstr "Kustuta teated mustriga: "
 
-#: curs_main.c:924
+#: curs_main.c:935
 msgid "No limit pattern is in effect."
 msgstr "Kehtivat piirangumustrit ei ole."
 
-#. i18n: ask for a limit to apply
-#: curs_main.c:930
+#: curs_main.c:941
 #, c-format
 msgid "Limit: %s"
 msgstr "Piirang: %s"
 
-#: curs_main.c:961
+#: curs_main.c:972
 msgid "Limit to messages matching: "
 msgstr "Piirdu teadetega mustriga: "
 
-#: curs_main.c:991
+#: curs_main.c:993
+msgid "To view all messages, limit to \"all\"."
+msgstr ""
+
+#: curs_main.c:1004
 #, fuzzy
 msgid "Quit Mutt-ng?"
 msgstr "Väljun Muttist?"
 
-#: curs_main.c:1067
+#: curs_main.c:1080
 msgid "Tag messages matching: "
 msgstr "Märgi teated mustriga: "
 
-#: curs_main.c:1077 curs_main.c:2215 curs_main.c:2242 pager.c:2460
-#: pager.c:2476
+#: curs_main.c:1090 curs_main.c:2271 curs_main.c:2298 pager.c:2504
+#: pager.c:2520
 #, fuzzy
 msgid "Undeletion"
 msgstr "Taasta"
 
-#: curs_main.c:1079
+#: curs_main.c:1092
 msgid "Undelete messages matching: "
 msgstr "Taasta teated mustriga: "
 
-#: curs_main.c:1088
+#: curs_main.c:1101
 msgid "Untag messages matching: "
 msgstr "Võta märk teadetelt mustriga: "
 
-#: curs_main.c:1171
+#: curs_main.c:1184
 msgid "Open mailbox in read-only mode"
 msgstr "Avan postkasti ainult lugemiseks"
 
-#: curs_main.c:1173
+#: curs_main.c:1186
 msgid "Open mailbox"
 msgstr "Avan postkasti"
 
-#: curs_main.c:1183
+#: curs_main.c:1196
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
 msgstr "Avan postkasti ainult lugemiseks"
 
-#: curs_main.c:1185
+#: curs_main.c:1198
 msgid "Open newsgroup"
 msgstr ""
 
-#: curs_main.c:1217 mx.c:414 mx.c:554
+#: curs_main.c:1234 mx.c:415 mx.c:555
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s ei ole postkast."
 
-#: curs_main.c:1317
+#: curs_main.c:1338
 #, fuzzy
 msgid "Exit Mutt-ng without saving?"
 msgstr "Väljun Muttist salvestamata?"
 
-#: curs_main.c:1349 curs_main.c:1379 curs_main.c:1787 curs_main.c:1817
-#: flags.c:293 thread.c:930 thread.c:977 thread.c:1032
+#: curs_main.c:1370 curs_main.c:1400 curs_main.c:1808 curs_main.c:1838
+#: flags.c:294 thread.c:932 thread.c:979 thread.c:1034
 msgid "Threading is not enabled."
 msgstr "Teemad ei ole lubatud."
 
-#: curs_main.c:1361
+#: curs_main.c:1382
 msgid "Thread broken"
 msgstr ""
 
-#: curs_main.c:1382
+#: curs_main.c:1403
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: curs_main.c:1385
+#: curs_main.c:1406
 #, fuzzy
 msgid "First, please tag a message to be linked here"
 msgstr "salvesta teade hilisemaks saatmiseks"
 
-#: curs_main.c:1396
+#: curs_main.c:1417
 msgid "Threads linked"
 msgstr ""
 
-#: curs_main.c:1399
+#: curs_main.c:1420
 msgid "No thread linked"
 msgstr ""
 
-#: curs_main.c:1416 curs_main.c:1439
+#: curs_main.c:1437 curs_main.c:1460
 msgid "You are on the last message."
 msgstr "Te olete viimasel teatel."
 
-#: curs_main.c:1423 curs_main.c:1464
+#: curs_main.c:1444 curs_main.c:1485
 msgid "No undeleted messages."
 msgstr "Kustutamata teateid pole."
 
-#: curs_main.c:1457 curs_main.c:1480
+#: curs_main.c:1478 curs_main.c:1501
 msgid "You are on the first message."
 msgstr "Te olete esimesel teatel."
 
-#: curs_main.c:1553 pattern.c:1300
+#: curs_main.c:1574 pattern.c:1369
 msgid "Search wrapped to top."
 msgstr "Otsing pööras algusest tagasi."
 
-#: curs_main.c:1561 pattern.c:1311
+#: curs_main.c:1582 pattern.c:1380
 msgid "Search wrapped to bottom."
 msgstr "Otsing pööras lõpust tagasi."
 
-#: curs_main.c:1606
+#: curs_main.c:1627
 msgid "No new messages"
 msgstr "Uusi teateid pole"
 
-#: curs_main.c:1607
+#: curs_main.c:1628
 msgid "No unread messages"
 msgstr "Lugemata teateid pole"
 
-#: curs_main.c:1608
+#: curs_main.c:1629
 msgid " in this limited view"
 msgstr " selles piiratud vaates"
 
-#: curs_main.c:1624 pager.c:2224
+#: curs_main.c:1645 pager.c:2268
 msgid "Flagging"
 msgstr ""
 
-#: curs_main.c:1657 pager.c:2441
+#: curs_main.c:1678 pager.c:2485
 msgid "Toggling"
 msgstr ""
 
-#: curs_main.c:1728
+#: curs_main.c:1749
 msgid "No more threads."
 msgstr "Rohkem teemasid pole."
 
-#: curs_main.c:1731
+#: curs_main.c:1752
 msgid "You are on the first thread."
 msgstr "Te olete esimesel teemal."
 
-#: curs_main.c:1803
+#: curs_main.c:1824
 msgid "Thread contains unread messages."
 msgstr "Teema sisaldab lugemata teateid."
 
-#: curs_main.c:1988
+#: curs_main.c:2009
 msgid "Editing"
 msgstr ""
 
-#: curs_main.c:2094
+#: curs_main.c:2145
 msgid "Marking as read"
 msgstr ""
 
-#: curs_main.c:2150 pager.c:2303 recvattach.c:1181
+#: curs_main.c:2201 pager.c:2347 recvattach.c:1205
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: curs_main.c:2156 pager.c:2266 pager.c:2280 pager.c:2308
+#: curs_main.c:2207 pager.c:2310 pager.c:2324 pager.c:2352
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#.
-#. * SLcurses_waddnstr() can't take a "const char *", so this is only
-#. * declared "static" (sigh)
-#.
-#: edit.c:36
+#: edit.c:39
 msgid ""
 "~~\t\tinsert a line begining with a single ~\n"
 "~b users\tadd users to the Bcc: field\n"
@@ -1809,209 +1807,209 @@ msgstr ""
 "~?\t\tsee teade\n"
 ".\t\tüksinda real lõpetab sisendi\n"
 
-#: edit.c:175
+#: edit.c:178
 #, c-format
 msgid "%d: invalid message number.\n"
 msgstr "%d: vigane teate number.\n"
 
-#: edit.c:305
+#: edit.c:308
 msgid "(End message with a . on a line by itself)\n"
 msgstr "(Teate lõpetab rida, milles on ainult .)\n"
 
-#: edit.c:359
+#: edit.c:362
 msgid "No mailbox.\n"
 msgstr "Postkasti pole.\n"
 
-#: edit.c:363
+#: edit.c:366
 msgid "Message contains:\n"
 msgstr "Teade sisaldab:\n"
 
-#: edit.c:367 edit.c:421
+#: edit.c:370 edit.c:424
 msgid "(continue)\n"
 msgstr "(jätka)\n"
 
-#: edit.c:379
+#: edit.c:382
 msgid "missing filename.\n"
 msgstr "failinimi puudub.\n"
 
-#: edit.c:398
+#: edit.c:401
 msgid "No lines in message.\n"
 msgstr "Teates pole ridu.\n"
 
-#: edit.c:414
+#: edit.c:417
 #, c-format
 msgid "Bad IDN in %s: '%s'\n"
 msgstr ""
 
-#: edit.c:432
+#: edit.c:435
 #, c-format
 msgid "%s: unknown editor command (~? for help)\n"
 msgstr "%s: tundmatu toimeti käsk (~? annab abiinfot)\n"
 
-#: editmsg.c:68
+#: editmsg.c:69
 #, c-format
 msgid "could not create temporary folder: %s"
 msgstr "ajutise kausta loomine ebaõnnestus: %s"
 
-#: editmsg.c:80
+#: editmsg.c:81
 #, c-format
 msgid "could not write temporary mail folder: %s"
 msgstr "ei õnnestu kirjutada ajutisse kausta: %s"
 
-#: editmsg.c:99
+#: editmsg.c:100
 #, c-format
 msgid "could not truncate temporary mail folder: %s"
 msgstr "ajutist kausta ei õnnestu lühendada: %s"
 
-#: editmsg.c:112
+#: editmsg.c:113
 msgid "Message file is empty!"
 msgstr "Teate fail on tühi!"
 
-#: editmsg.c:118
+#: editmsg.c:119
 msgid "Message not modified!"
 msgstr "Teadet ei muudetud!"
 
-#: editmsg.c:125
+#: editmsg.c:126
 #, c-format
 msgid "Can't open message file: %s"
 msgstr "Teate faili ei saa avada: %s"
 
-#: editmsg.c:131 editmsg.c:159
+#: editmsg.c:132 editmsg.c:160
 #, c-format
 msgid "Can't append to folder: %s"
 msgstr "Kausta ei saa lisada: %s"
 
-#: editmsg.c:191
+#: editmsg.c:192
 #, c-format
 msgid "Error. Preserving temporary file: %s"
 msgstr "Viga. Säilitan ajutise faili: %s"
 
-#: flags.c:335
+#: flags.c:336
 msgid "Set flag"
 msgstr "Sea lipp"
 
-#: flags.c:335
+#: flags.c:336
 msgid "Clear flag"
 msgstr "Eemalda lipp"
 
-#: handler.c:1424
+#: handler.c:925
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- Viga:  Multipart/Alternative osasid ei saa näidata! --]\n"
 
-#: handler.c:1532
+#: handler.c:1039
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Lisa #%d"
 
-#: handler.c:1543
+#: handler.c:1050
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Tüüp: %s/%s, Kodeering: %s, Maht: %s --]\n"
 
-#: handler.c:1604
+#: handler.c:1114
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Autovaade kasutades %s --]\n"
 
-#: handler.c:1605
+#: handler.c:1115
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Käivitan autovaate käskluse: %s"
 
-#: handler.c:1633
+#: handler.c:1143
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- %s ei saa käivitada.--]\n"
 
-#: handler.c:1647 handler.c:1664
+#: handler.c:1158 handler.c:1175
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Autovaate %s stderr --]\n"
 
-#: handler.c:1699
+#: handler.c:1210
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr "[-- Viga: message/external-body juurdepääsu parameeter puudub --]\n"
 
-#: handler.c:1717
+#: handler.c:1227
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- See %s/%s lisa "
 
-#: handler.c:1723
+#: handler.c:1233
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(maht %s baiti) "
 
-#: handler.c:1725
+#: handler.c:1235
 msgid "has been deleted --]\n"
 msgstr "on kustutatud --]\n"
 
-#: handler.c:1729
+#: handler.c:1239
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- %s --]\n"
 
-#: handler.c:1733
+#: handler.c:1243
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- nimi: %s --]\n"
 
-#: handler.c:1744 handler.c:1758
+#: handler.c:1254 handler.c:1268
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Seda %s/%s lisa ei ole kaasatud, --]\n"
 
-#: handler.c:1746
+#: handler.c:1256
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr "[-- ja näidatud väline allikas on aegunud --]\n"
 
-#: handler.c:1763
+#: handler.c:1273
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- ja näidatud juurdepääsu tüüpi %s ei toetata --]\n"
 
-#: handler.c:1875
+#: handler.c:1395
 msgid "Error: multipart/signed has no protocol."
 msgstr "Viga: multipart/signed teatel puudub protokoll."
 
-#: handler.c:1886
+#: handler.c:1406
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Viga: multipart/encrypted teatel puudub protokolli parameeter!"
 
-#: handler.c:1920
+#: handler.c:1440
 msgid "Unable to open temporary file!"
 msgstr "Ajutise faili avamine ebaõnnestus!"
 
-#: handler.c:1978
+#: handler.c:1498
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s ei toetata "
 
-#: handler.c:1983
+#: handler.c:1503
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(selle osa vaatamiseks kasutage '%s')"
 
-#: handler.c:1985
+#: handler.c:1505
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "('view-attachments' peab olema klahviga seotud!)"
 
-#: headers.c:159
+#: headers.c:161
 #, c-format
 msgid "%s: unable to attach file"
 msgstr "%s: faili lisamine ebaõnnestus"
 
-#: help.c:253
+#: help.c:254
 msgid "ERROR: please report this bug"
 msgstr "VIGA: Palun teatage sellest veast"
 
-#: help.c:293
+#: help.c:294
 msgid "<UNKNOWN>"
 msgstr "<TUNDMATU>"
 
-#: help.c:303
+#: help.c:304
 msgid ""
 "\n"
 "Generic bindings:\n"
@@ -2021,7 +2019,7 @@ msgstr ""
 "Üldised seosed:\n"
 "\n"
 
-#: help.c:307
+#: help.c:308
 msgid ""
 "\n"
 "Unbound functions:\n"
@@ -2031,31 +2029,31 @@ msgstr ""
 "Sidumata funktsioonid:\n"
 "\n"
 
-#: help.c:315
+#: help.c:316
 #, c-format
 msgid "Help for %s"
 msgstr "%s abiinfo"
 
-#: hook.c:96
+#: hook.c:100
 msgid "bad formatted command string"
 msgstr ""
 
-#: hook.c:246
+#: hook.c:250
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
 msgstr "unhook: seose sees ei saa unhook * kasutada."
 
-#: hook.c:256
+#: hook.c:260
 #, c-format
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook: tundmatu seose tüüp: %s"
 
-#: hook.c:261
+#: hook.c:265
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
 msgstr "unhook: %s ei saa %s seest kustutada."
 
-#: imap/auth.c:97 pop/pop_auth.c:390
+#: imap/auth.c:99 pop/pop_auth.c:385
 msgid "No authenticators available"
 msgstr "Autentikaatoreid pole"
 
@@ -2075,7 +2073,6 @@ msgstr "Autentimine (CRAM-MD5)..."
 msgid "CRAM-MD5 authentication failed."
 msgstr "CRAM-MD5 autentimine ebaõnnestus."
 
-#. now begin login
 #: imap/auth_gss.c:98
 msgid "Authenticating (GSSAPI)..."
 msgstr "Autentimine (GSSAPI)..."
@@ -2088,405 +2085,430 @@ msgstr "GSSAPI autentimine eba
 msgid "LOGIN disabled on this server."
 msgstr "LOGIN on sellel serveril blokeeritud."
 
-#: imap/auth_login.c:41 nntp/nntp.c:56 pop/pop_auth.c:237
+#: imap/auth_login.c:41 nntp/nntp.c:100 pop/pop_auth.c:228
 msgid "Logging in..."
 msgstr "Meldin..."
 
-#: imap/auth_login.c:61 nntp/nntp.c:79 nntp/nntp.c:151 pop/pop_auth.c:275
+#: imap/auth_login.c:52 nntp/nntp.c:123 nntp/nntp.c:195 pop/pop_auth.c:270
 msgid "Login failed."
 msgstr "Meldimine ebaõnnestus."
 
-#: imap/auth_sasl.c:108
+#: imap/auth_sasl.c:90
 #, fuzzy, c-format
 msgid "Authenticating (%s)..."
 msgstr "Autentimine (APOP)..."
 
-#: imap/auth_sasl.c:195 pop/pop_auth.c:164
+#: imap/auth_sasl.c:170 pop/pop_auth.c:152
 msgid "SASL authentication failed."
 msgstr "SASL autentimine ebaõnnestus."
 
-#: imap/browse.c:66 imap/imap.c:529
+#: imap/browse.c:70 imap/imap.c:544
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s on vigane IMAP tee"
 
-#: imap/browse.c:82
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "Laen nimeruumid..."
 
-#: imap/browse.c:92
+#: imap/browse.c:97
 msgid "Getting folder list..."
 msgstr "Laen kaustade nimekirja..."
 
-#: imap/browse.c:208
+#: imap/browse.c:213
 msgid "No such folder"
 msgstr "Sellist värvi ei ole"
 
-#: imap/browse.c:262
+#: imap/browse.c:272
 msgid "Create mailbox: "
 msgstr "Loon postkasti: "
 
-#: imap/browse.c:266 imap/browse.c:309
+#: imap/browse.c:276 imap/browse.c:319
 msgid "Mailbox must have a name."
 msgstr "Postkastil peab olema nimi."
 
-#: imap/browse.c:274
+#: imap/browse.c:284
 msgid "Mailbox created."
 msgstr "Postkast on loodud."
 
-#: imap/browse.c:303
+#: imap/browse.c:313
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Loon postkasti: "
 
-#: imap/browse.c:315
+#: imap/browse.c:325
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "SSL ebaõnnestus: %s"
 
-#: imap/browse.c:320
+#: imap/browse.c:330
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "Postkast on loodud."
 
-#. mx_fastclose_mailbox (idata->ctx);
-#: imap/command.c:284
+#: imap/command.c:290
 msgid "Mailbox closed"
 msgstr "Postkast on suletud"
 
-#. something is wrong because the server reported fewer messages
-#. * than we previously saw
-#.
-#: imap/command.c:325
+#: imap/command.c:331
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Fataalne viga. Teadete arv ei ole sünkroonis!"
 
-#: imap/imap.c:169 nntp/nntp.c:1045
+#: imap/imap.c:172 nntp/nntp.c:1096
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Sulen ühendust serveriga %s..."
 
-#: imap/imap.c:318
+#: imap/imap.c:323
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "See IMAP server on iganenud. Mutt ei tööta sellega."
 
-#: imap/imap.c:402
-#, c-format
-msgid "Unexpected response received from server: %s"
+#: imap/imap.c:396
+msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: imap/imap.c:421 pop/pop_lib.c:268
+#: imap/imap.c:432 pop/pop_lib.c:271
 msgid "Secure connection with TLS?"
 msgstr "Turvan ühenduse TLS protokolliga?"
 
-#: imap/imap.c:433 pop/pop_lib.c:290
+#: imap/imap.c:442 pop/pop_lib.c:291
 msgid "Could not negotiate TLS connection"
 msgstr "TLS ühendust ei õnnestu kokku leppida"
 
-#: imap/imap.c:560 nntp/nntp.c:826
+#: imap/imap.c:456 pop/pop_lib.c:309
+msgid "Encrypted connection unavailable"
+msgstr ""
+
+#: imap/imap.c:575 nntp/nntp.c:877
 #, c-format
 msgid "Selecting %s..."
 msgstr "Valin %s..."
 
-#: imap/imap.c:683
+#: imap/imap.c:698
 msgid "Error opening mailbox"
 msgstr "Viga postkasti avamisel!"
 
-#: imap/imap.c:732 imap/message.c:692 muttlib.c:1256
+#: imap/imap.c:747 imap/message.c:708 muttlib.c:1224
 #, c-format
 msgid "Create %s?"
 msgstr "Loon %s?"
 
-#: imap/imap.c:973 pop/pop.c:438
+#: imap/imap.c:987 pop/pop.c:447
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "märgin %d teadet kustutatuks..."
 
-#: imap/imap.c:981
+#: imap/imap.c:995
 msgid "Expunge failed"
 msgstr "Kustutamine ebaõnnestus."
 
-#: imap/imap.c:993
+#: imap/imap.c:1007
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Salvestan teadete olekud... [%d/%d]"
 
-#: imap/imap.c:1022
+#: imap/imap.c:1036
 msgid "Expunging messages from server..."
 msgstr "Kustutan serveril teateid..."
 
-#: imap/imap.c:1027
+#: imap/imap.c:1041
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE ebaõnnestus"
 
-#: imap/imap.c:1035 imap/imap.c:1066
+#: imap/imap.c:1049 imap/imap.c:1080
 msgid "CLOSE failed"
 msgstr "CLOSE ebaõnnestus."
 
-#: imap/imap.c:1297
+#: imap/imap.c:1304
+#, c-format
+msgid "Header search without header name: %s"
+msgstr ""
+
+#: imap/imap.c:1448
 msgid "Bad mailbox name"
 msgstr "Halb nimi postkastile"
 
-#: imap/imap.c:1309
+#: imap/imap.c:1471
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Tellin %s..."
 
-#: imap/imap.c:1311
+#: imap/imap.c:1473
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Loobun kaustast %s..."
 
-#: imap/imap.c:1438
+#: imap/imap.c:1652
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
 msgstr "Ühendus katkes. Taastan ühenduse POP serveriga?"
 
-#. Unable to fetch headers for lower versions
-#: imap/message.c:92
+#: imap/message.c:96
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Sellest IMAP serverist ei saa päiseid laadida."
 
-#: imap/message.c:102
+#: imap/message.c:106
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Ajutise faili %s loomine ebaõnnestus"
 
-#: imap/message.c:127
+#: imap/message.c:131
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "Laen teadete päiseid... [%d/%d]"
 
-#: imap/message.c:193 pop/pop.c:196
+#: imap/message.c:198 pop/pop.c:203
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Laen teadete päiseid... [%d/%d]"
 
-#: imap/message.c:354 nntp/nntp.c:889 pop/pop.c:324
+#: imap/message.c:354 imap/message.c:402 nntp/nntp.c:972 pop/pop.c:370
 msgid "Fetching message..."
 msgstr "Laen teadet..."
 
-#: imap/message.c:392 pop/pop.c:357
+#: imap/message.c:392 pop/pop.c:364
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "Teadete indeks on vigane. Proovige postkasti uuesti avada."
 
-#: imap/message.c:548
-msgid "Uploading message ..."
+#: imap/message.c:530
+#, fuzzy
+msgid "Uploading message..."
 msgstr "Saadan teadet ..."
 
-#: imap/message.c:660
+#: imap/message.c:676
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Kopeerin %d teadet kausta %s..."
 
-#: imap/message.c:663
+#: imap/message.c:679
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Kopeerin teadet %d kausta %s..."
 
-#: imap/util.c:182
+#: imap/util.c:179
 msgid "Continue?"
 msgstr "Jätkan?"
 
-#: init.c:371
+#: init.c:228 init.c:1575 init.c:1713 init.c:1738
+#, fuzzy, c-format
+msgid "'%s' is invalid for $%s"
+msgstr "%s on vigane POP tee"
+
+#: init.c:404
+#, fuzzy, c-format
+msgid "%s: Unknown type."
+msgstr "%s: tundmatu tüüp"
+
+#: init.c:689
 #, c-format
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:550
+#: init.c:867
 #, fuzzy, c-format
 msgid "ifdef: too few arguments"
 msgstr "%s: liiga vähe argumente"
 
-#: init.c:552
+#: init.c:869
 #, fuzzy, c-format
 msgid "ifndef: too few arguments"
 msgstr "mono: liiga vähe argumente"
 
-#: init.c:664
+#: init.c:982
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "märgi mustrile vastavad teated"
 
-#: init.c:666
+#: init.c:984
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "eemalda märk mustrile vastavatelt teadetelt"
 
-#: init.c:857
+#: init.c:1235
+#, fuzzy
+msgid "attachments: no disposition"
+msgstr "toimeta lisa kirjeldust"
+
+#: init.c:1272
+#, fuzzy
+msgid "attachments: invalid disposition"
+msgstr "toimeta lisa kirjeldust"
+
+#: init.c:1285
+#, fuzzy
+msgid "unattachments: no disposition"
+msgstr "toimeta lisa kirjeldust"
+
+#: init.c:1308
+msgid "unattachments: invalid disposition"
+msgstr ""
+
+#: init.c:1416
 msgid "alias: no address"
 msgstr "alias: aadress puudub"
 
-#: init.c:898
+#: init.c:1457
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: init.c:968
+#: init.c:1528
 msgid "invalid header field"
 msgstr "vigane päiseväli"
 
-#: init.c:1015
+#: init.c:1684
+#, c-format
+msgid ""
+"Invalid default setting for $%s found: \"%s\".\n"
+"Please report this error: \"%s\"\n"
+msgstr ""
+
+#: init.c:1751 init.c:1765
 #, c-format
-msgid "%s: unknown sorting method"
-msgstr "%s: tundmatu järjestamise meetod"
+msgid "'%d' is invalid for $%s"
+msgstr ""
 
-#: init.c:1118
+#: init.c:1820 init.c:1895 pager.c:65
 #, c-format
-msgid "mutt_restore_default(%s): error in regexp: %s\n"
-msgstr "mutt_restore_default(%s): vigane regexp: %s\n"
+msgid "Not available in this menu."
+msgstr "Ei ole selles menüüs kasutatav."
 
-#: init.c:1180
+#: init.c:1877
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: tundmatu muutuja"
 
-#: init.c:1187
+#: init.c:1884
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "reset käsuga ei ole prefiks lubatud"
 
-#: init.c:1192
+#: init.c:1889
 #, c-format
 msgid "value is illegal with reset"
 msgstr "reset käsuga ei ole väärtus lubatud"
 
-#: init.c:1225
-#, c-format
-msgid "%s is set"
-msgstr "%s on seatud"
-
-#: init.c:1225
-#, c-format
-msgid "%s is unset"
-msgstr "%s ei ole seatud"
-
-#: init.c:1396
-#, c-format
-msgid "%s: invalid mailbox type"
-msgstr "%s: vigane postkasti tüüp"
-
-#: init.c:1419 init.c:1458
-#, c-format
-msgid "%s: invalid value"
-msgstr "%s: vigane väärtus"
+#: init.c:1908 init.c:1969 init.c:1993
+#, fuzzy, c-format
+msgid "$%s is read-only"
+msgstr "Postkast on ainult lugemiseks."
 
-#: init.c:1495
+#: init.c:2026
 #, fuzzy, c-format
-msgid "%s: Unknown type."
-msgstr "%s: tundmatu tüüp"
+msgid "'%s' is invalid for $%s\n"
+msgstr "%s on vigane POP tee"
 
-#: init.c:1523
+#: init.c:2042
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: tundmatu tüüp"
 
-#: init.c:1582
+#: init.c:2101
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Viga failis %s, real %d: %s"
 
-#: init.c:1604
+#: init.c:2123
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: vead failis %s"
 
-#: init.c:1605
+#: init.c:2124
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: lugemine katkestati, kuna %s on liialt vigane"
 
-#: init.c:1622
+#: init.c:2141
 #, c-format
 msgid "source: error at %s"
 msgstr "source: viga kohal %s"
 
-#: init.c:1674
+#: init.c:2195
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: tundmatu käsk"
 
-#: init.c:2025
+#: init.c:2561
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Viga käsureal: %s\n"
 
-#: init.c:2071
+#: init.c:2621
 msgid "unable to determine home directory"
 msgstr "ei leia kodukataloogi"
 
-#: init.c:2078
+#: init.c:2628
 msgid "unable to determine username"
 msgstr "ei suuda tuvastada kasutajanime"
 
-#: init.c:2296
+#: init.c:2847
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: init.c:2303
+#: init.c:2858
 #, c-format
-msgid "Warning: Synonym variables are scheduled for removal.\n"
+msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: keymap.c:429
+#: keymap.c:434
 msgid "Macro loop detected."
 msgstr "Tuvastasin makros tsükli."
 
-#: keymap.c:635 keymap.c:643
+#: keymap.c:640 keymap.c:648
 msgid "Key is not bound."
 msgstr "Klahv ei ole seotud."
 
-#: keymap.c:648
+#: keymap.c:653
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Klahv ei ole seotud. Abiinfo saamiseks vajutage '%s'."
 
-#: keymap.c:659
+#: keymap.c:664
 msgid "push: too many arguments"
 msgstr "push: liiga palju argumente"
 
-#: keymap.c:687
+#: keymap.c:692
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s: sellist menüüd ei ole"
 
-#: keymap.c:701
+#: keymap.c:706
 msgid "null key sequence"
 msgstr "tühi klahvijärjend"
 
-#: keymap.c:786
+#: keymap.c:791
 msgid "bind: too many arguments"
 msgstr "bind: iiga palju argumente"
 
-#: keymap.c:803
+#: keymap.c:808
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s: sellist funktsiooni tabelis ei ole"
 
-#: keymap.c:831
+#: keymap.c:836
 msgid "macro: empty key sequence"
 msgstr "makro: tühi klahvijärjend"
 
-#: keymap.c:839
+#: keymap.c:844
 msgid "macro: too many arguments"
 msgstr "makro: liiga palju argumente"
 
-#: keymap.c:871
+#: keymap.c:876
 msgid "exec: no arguments"
 msgstr "exec: argumente pole"
 
-#: keymap.c:889
+#: keymap.c:894
 #, c-format
 msgid "%s: no such function"
 msgstr "%s: sellist funktsiooni pole"
 
-#: keymap.c:910
+#: keymap.c:915
 #, fuzzy
 msgid "Enter keys (^G to abort): "
 msgstr "Sisestage kasutaja teatele %s: "
 
-#: keymap.c:914
+#: keymap.c:919
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
@@ -2969,454 +2991,458 @@ msgid "delete messages matching a pattern"
 msgstr "kustuta mustrile vastavad teated"
 
 #: keymap_alldefs.h:121
+msgid "rebuild header caching databases"
+msgstr ""
+
+#: keymap_alldefs.h:122
 #, fuzzy
 msgid "reconstruct thread containing current message"
 msgstr "Teema sisaldab lugemata teateid."
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:123
 msgid "force retrieval of mail from IMAP server"
 msgstr "lae kiri IMAP serverilt"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:124
 msgid "retrieve mail from POP server"
 msgstr "lae kiri POP serverilt"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:125
 msgid "move to the first message"
 msgstr "liigu esimesele teatele"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:126
 msgid "move to the last message"
 msgstr "liigu viimasele teatele"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:127
 msgid "show only messages matching a pattern"
 msgstr "näita ainult mustrile vastavaid teateid"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:128
 #, fuzzy
 msgid "link tagged message to the current one"
 msgstr "Peegelda märgitud teated aadressile: "
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:129
 msgid "jump to the next new message"
 msgstr "hüppa järgmisele uuele teatele"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:130
 #, fuzzy
 msgid "jump to the next new or unread message"
 msgstr "hüppa järgmisele lugemata teatele"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:131
 msgid "jump to the next subthread"
 msgstr "hüppa järgmisele alamteemale"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:132
 msgid "jump to the next thread"
 msgstr "hüppa järgmisele teemale"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:133
 msgid "move to the next undeleted message"
 msgstr "liigu järgmisele kustutamata teatele"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:134
 msgid "jump to the next unread message"
 msgstr "hüppa järgmisele lugemata teatele"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:135
 msgid "jump to parent message in thread"
 msgstr "hüppa teema vanemteatele"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:136
 msgid "jump to previous thread"
 msgstr "hüppa eelmisele teemale"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:137
 msgid "jump to previous subthread"
 msgstr "hüppa eelmisele alamteemale"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:138
 msgid "move to the previous undeleted message"
 msgstr "liigu eelmisele kustutamata teatele"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:139
 msgid "jump to the previous new message"
 msgstr "hüppa eelmisele uuele teatele"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:140
 #, fuzzy
 msgid "jump to the previous new or unread message"
 msgstr "hüppa eelmisele lugemata teatele"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:141
 msgid "jump to the previous unread message"
 msgstr "hüppa eelmisele lugemata teatele"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:142
 msgid "mark the current thread as read"
 msgstr "märgi jooksev teema loetuks"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:143
 msgid "mark the current subthread as read"
 msgstr "märgi jooksev alamteema loetuks"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:144
 msgid "set a status flag on a message"
 msgstr "sea teate olekulipp"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:145
 msgid "save changes to mailbox"
 msgstr "salvesta postkasti muutused"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:146
 msgid "tag messages matching a pattern"
 msgstr "märgi mustrile vastavad teated"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:147
 msgid "undelete messages matching a pattern"
 msgstr "taasta mustrile vastavad teated"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:148
 msgid "untag messages matching a pattern"
 msgstr "eemalda märk mustrile vastavatelt teadetelt"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:149
 msgid "move to the middle of the page"
 msgstr "liigu lehe keskele"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:150
 msgid "move to the next entry"
 msgstr "liigu järgmisele kirjele"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:151
 msgid "scroll down one line"
 msgstr "keri üks rida alla"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:152
 msgid "move to the next page"
 msgstr "liigu järgmisele lehele"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:153
 msgid "jump to the bottom of the message"
 msgstr "hüppa teate lõppu"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:154
 msgid "toggle display of quoted text"
 msgstr "lülita tsiteeritud teksti näitamist"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:155
 msgid "skip beyond quoted text"
 msgstr "liigu tsiteeritud teksti lõppu"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:156
 msgid "jump to the top of the message"
 msgstr "hüppa teate algusse"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:157
 msgid "pipe message/attachment to a shell command"
 msgstr "saada teade/lisa käsu sisendisse"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:158
 #, fuzzy
 msgid "post message to newsgroup"
 msgstr "Peegelda teade aadressile %s"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:159
 msgid "move to the previous entry"
 msgstr "liigu eelmisele kirjele"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:160
 msgid "scroll up one line"
 msgstr "keri üks rida üles"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:161
 msgid "move to the previous page"
 msgstr "liigu eelmisele lehele"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:162
 msgid "print the current entry"
 msgstr "trüki jooksev kirje"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:163
 msgid "really delete the current entry, bypassing the trash folder"
 msgstr ""
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:164
 msgid "query external program for addresses"
 msgstr "otsi aadresse välise programmiga"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:165
 msgid "append new query results to current results"
 msgstr "lisa uue päringu tulemused olemasolevatele"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:166
 msgid "save changes to mailbox and quit"
 msgstr "salvesta postkasti muutused ja välju"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:167
 msgid "recall a postponed message"
 msgstr "võta postitusootel teade"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:168
 msgid "clear and redraw the screen"
 msgstr "puhasta ja joonista ekraan uuesti"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:169
 msgid "{internal}"
 msgstr "{sisemine}"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:170
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "kustuta jooksev postkast (ainult IMAP)"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:171
 msgid "reply to a message"
 msgstr "vasta teatele"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:172
 msgid "use the current message as a template for a new one"
 msgstr "võta teade aluseks uuele"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:173
 msgid "save message/attachment to a file"
 msgstr "salvesta teade/lisa faili"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:174
 msgid "search for a regular expression"
 msgstr "otsi regulaaravaldist"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:175
 msgid "search backwards for a regular expression"
 msgstr "otsi regulaaravaldist tagaspidi"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:176
 msgid "search for next match"
 msgstr "otsi järgmist"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:177
 msgid "search for next match in opposite direction"
 msgstr "otsi järgmist vastasuunas"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:178
 msgid "toggle search pattern coloring"
 msgstr "lülita otsingumustri värvimine"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:179
 msgid "invoke a command in a subshell"
 msgstr "käivita käsk käsuinterpretaatoris"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:180
 msgid "sort messages"
 msgstr "järjesta teated"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:181
 msgid "sort messages in reverse order"
 msgstr "järjesta teated tagurpidi"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:182
 #, fuzzy
 msgid "subscribe to newsgroups matching a pattern"
 msgstr "eemalda märk mustrile vastavatelt teadetelt"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:183
 msgid "tag the current entry"
 msgstr "märgi jooksev kirje"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:184
 msgid "apply next function to tagged messages"
 msgstr "kasuta funktsiooni märgitud teadetel"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:185
 #, fuzzy
 msgid "apply next function ONLY to tagged messages"
 msgstr "kasuta funktsiooni märgitud teadetel"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:186
 msgid "tag the current subthread"
 msgstr "märgi jooksev alamteema"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:187
 msgid "tag the current thread"
 msgstr "märgi jooksev teema"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:188
 msgid "toggle a message's 'new' flag"
 msgstr "lülita teate 'värskuse' lippu"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:189
 #, fuzzy
 msgid "toggle view of read messages"
 msgstr "hüppa eelmisele lugemata teatele"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:190
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "lülita postkasti ülekirjutatamist"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:191
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "lülita kas brausida ainult postkaste või kõiki faile"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:192
 msgid "move to the top of the page"
 msgstr "liigu lehe algusse"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:193
 msgid "mark all articles in newsgroup as unread"
 msgstr ""
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:194
 msgid "undelete the current entry"
 msgstr "taasta jooksev kirje"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:195
 msgid "undelete all messages in thread"
 msgstr "taasta kõik teema teated"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:196
 msgid "undelete all messages in subthread"
 msgstr "taasta kõik alamteema teated"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:197
 #, fuzzy
 msgid "unsubscribe from newsgroups matching a pattern"
 msgstr "eemalda märk mustrile vastavatelt teadetelt"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:198
 msgid "show the Mutt version number and date"
 msgstr "näita Mutti versiooni ja kuupäeva"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:199
 msgid "view attachment using mailcap entry if necessary"
 msgstr "vaata lisa kasutades vajadusel mailcap kirjet"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:200
 msgid "show MIME attachments"
 msgstr "näita MIME lisasid"
 
-#: keymap_alldefs.h:200
+#: keymap_alldefs.h:201
 msgid "display the keycode for a key press"
 msgstr ""
 
-#: keymap_alldefs.h:201
+#: keymap_alldefs.h:202
 msgid "show currently active limit pattern"
 msgstr "näita praegu kehtivat piirangu mustrit"
 
-#: keymap_alldefs.h:202
+#: keymap_alldefs.h:203
 msgid "collapse/uncollapse current thread"
 msgstr "ava/sule jooksev teema"
 
-#: keymap_alldefs.h:203
+#: keymap_alldefs.h:204
 msgid "collapse/uncollapse all threads"
 msgstr "ava/sule kõik teemad"
 
-#: keymap_alldefs.h:204
+#: keymap_alldefs.h:205
 #, fuzzy
 msgid "scroll the mailbox pane up 1 page"
 msgstr "keri pool lehekülge üles"
 
-#: keymap_alldefs.h:205
+#: keymap_alldefs.h:206
 #, fuzzy
 msgid "scroll the mailbox pane down 1 page"
 msgstr "keri pool lehekülge alla"
 
-#: keymap_alldefs.h:206
+#: keymap_alldefs.h:207
 msgid "go down to next mailbox"
 msgstr ""
 
-#: keymap_alldefs.h:207
+#: keymap_alldefs.h:208
 #, fuzzy
 msgid "go down to next mailbox with new mail"
 msgstr "Uute teadetega postkaste ei ole."
 
-#: keymap_alldefs.h:208
+#: keymap_alldefs.h:209
 #, fuzzy
 msgid "go to previous mailbox"
 msgstr "Viga postkasti avamisel!"
 
-#: keymap_alldefs.h:209
+#: keymap_alldefs.h:210
 #, fuzzy
 msgid "go to previous mailbox with new mail"
 msgstr "Uute teadetega postkaste ei ole."
 
-#: keymap_alldefs.h:210
+#: keymap_alldefs.h:211
 #, fuzzy
 msgid "open hilighted mailbox"
 msgstr "Avan postkasti uuesti..."
 
-#: keymap_alldefs.h:211
+#: keymap_alldefs.h:212
 msgid "attach a PGP public key"
 msgstr "lisa PGP avalik võti"
 
-#: keymap_alldefs.h:212
+#: keymap_alldefs.h:213
 msgid "show PGP options"
 msgstr "näita PGP võtmeid"
 
-#: keymap_alldefs.h:213
+#: keymap_alldefs.h:214
 msgid "mail a PGP public key"
 msgstr "saada PGP avalik võti"
 
-#: keymap_alldefs.h:214
+#: keymap_alldefs.h:215
 msgid "verify a PGP public key"
 msgstr "kontrolli PGP avalikku võtit"
 
-#: keymap_alldefs.h:215
+#: keymap_alldefs.h:216
 msgid "view the key's user id"
 msgstr "vaata võtme kasutaja identifikaatorit"
 
-#: keymap_alldefs.h:216
+#: keymap_alldefs.h:217
 msgid "check for classic pgp"
 msgstr "kontrolli klassikalise pgp olemasolu"
 
-#: keymap_alldefs.h:217
+#: keymap_alldefs.h:218
 msgid "Accept the chain constructed"
 msgstr "Aktsepteeri koostatud ahelaga"
 
-#: keymap_alldefs.h:218
+#: keymap_alldefs.h:219
 msgid "Append a remailer to the chain"
 msgstr "Lisa edasisaatja ahela lõppu"
 
-#: keymap_alldefs.h:219
+#: keymap_alldefs.h:220
 msgid "Insert a remailer into the chain"
 msgstr "Lisa edasisaatja ahelasse"
 
-#: keymap_alldefs.h:220
+#: keymap_alldefs.h:221
 msgid "Delete a remailer from the chain"
 msgstr "Eemalda edasisaatja ahelast"
 
-#: keymap_alldefs.h:221
+#: keymap_alldefs.h:222
 msgid "Select the previous element of the chain"
 msgstr "Vali ahela eelmine element"
 
-#: keymap_alldefs.h:222
+#: keymap_alldefs.h:223
 msgid "Select the next element of the chain"
 msgstr "Vali ahela järgmine element"
 
-#: keymap_alldefs.h:223
+#: keymap_alldefs.h:224
 msgid "send the message through a mixmaster remailer chain"
 msgstr "saada teade läbi mixmaster vahendajate ahela"
 
-#: keymap_alldefs.h:224
+#: keymap_alldefs.h:225
 msgid "make decrypted copy and delete"
 msgstr "loo avateksti koopia ja kustuta"
 
-#: keymap_alldefs.h:225
+#: keymap_alldefs.h:226
 msgid "make decrypted copy"
 msgstr "loo avateksti koopia"
 
-#: keymap_alldefs.h:226
+#: keymap_alldefs.h:227
 msgid "wipe passphrase(s) from memory"
 msgstr "eemalda parool(id) mälust"
 
-#: keymap_alldefs.h:227
+#: keymap_alldefs.h:228
 msgid "extract supported public keys"
 msgstr "eralda toetatud avalikud võtmed"
 
-#: keymap_alldefs.h:228
+#: keymap_alldefs.h:229
 msgid "show S/MIME options"
 msgstr "näita S/MIME võtmeid"
 
-#: main.c:55
+#: main.c:85
 #, fuzzy
 msgid ""
 "To contact the developers, please mail to <mutt-ng-devel@lists.berlios.de>.\n"
@@ -3427,7 +3453,7 @@ msgstr ""
 "org>.\n"
 "Veast teatamiseks kasutage palun käsku flea(1).\n"
 
-#: main.c:60
+#: main.c:90
 #, fuzzy
 msgid ""
 "Copyright (C) 1996-2002 Michael R. Elkins and others.\n"
@@ -3440,8 +3466,7 @@ msgstr ""
 "Mutt on vaba tarkvara ja te võite seda teatud tingimustel levitada;\n"
 "detailsemat infot saate käsuga `mutt -vv'.\n"
 
-#: main.c:66
-#, fuzzy
+#: main.c:96
 msgid ""
 "Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3450,7 +3475,10 @@ msgid ""
 "Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
-"\n"
+msgstr ""
+
+#: main.c:105
+msgid ""
 "Copyright (C) 2005:\n"
 "  Parts were written/modified by:\n"
 "     Andreas Krennmair <ak@synflood.at>\n"
@@ -3458,48 +3486,35 @@ msgid ""
 "     Rocco Rutte <pdmef@cs.tu-berlin.de>\n"
 "\n"
 "Lots of others not mentioned here contributed lots of code,\n"
-"fixes, and suggestions.\n"
-"\n"
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License as published by\n"
-"    the Free Software Foundation; either version 2 of the License, or\n"
-"    (at your option) any later version.\n"
-"\n"
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-"\n"
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
-msgstr ""
-"Autoriõigus (C) 1996-2002 Michael R. Elkins <me@cs.hmc.edu>\n"
-"Autoriõigus (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Autoriõigus (C) 1997-2002 Thomas Roessler <roessler@guug.de>\n"
-"Autoriõigus (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Autoriõigus (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
-"Autoriõigus (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
-"Autoriõigus (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
-"\n"
-"Paljud siin mainimata inimesed on saatnud koodi, parandusi ja soovitusi.\n"
+"fixes, and suggestions."
+msgstr ""
+
+#: main.c:115
+msgid ""
 "\n"
 "    This program is free software; you can redistribute it and/or modify\n"
 "    it under the terms of the GNU General Public License as published by\n"
 "    the Free Software Foundation; either version 2 of the License, or\n"
 "    (at your option) any later version.\n"
-"\n"
+msgstr ""
+
+#: main.c:122
+msgid ""
 "    This program is distributed in the hope that it will be useful,\n"
 "    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
 "    GNU General Public License for more details.\n"
-"\n"
+msgstr ""
+
+#: main.c:128
+msgid ""
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
+"1301, USA.\n"
+msgstr ""
 
-#: main.c:110
-#, fuzzy
+#: main.c:145
 msgid ""
 "usage: muttng [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
@@ -3507,7 +3522,13 @@ msgid ""
 "[...]\n"
 "       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
-"       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
+msgstr ""
+
+#: main.c:150
+#, fuzzy
+msgid ""
+"       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -T\n"
 "       muttng [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
 "[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       muttng [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
@@ -3517,27 +3538,7 @@ msgid ""
 "  -A <alias>\texpand the given alias\n"
 "  -a <file>\tattach a file to the message\n"
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
-"  -D\t\tprint the value of all variables to stdout\n"
-"  -e <command>\tspecify a command to be executed after initialization\n"
-"  -f <file>\tspecify which mailbox to read\n"
-"  -F <file>\tspecify an alternate muttrc file\n"
-"  -g <server>\tspecify a newsserver (if compiled with NNTP)\n"
-"  -G\t\tselect a newsgroup (if compiled with NNTP)\n"
-"  -H <file>\tspecify a draft file to read header and body from\n"
-"  -i <file>\tspecify a file which Mutt-ng should include in the body\n"
-"  -m <type>\tspecify a default mailbox type\n"
-"  -n\t\tcauses Mutt-ng not to read the system Muttngrc\n"
-"  -p\t\trecall a postponed message\n"
-"  -Q <variable>\tquery a configuration variable\n"
-"  -R\t\topen mailbox in read-only mode\n"
-"  -s <subj>\tspecify a subject (must be in quotes if it has spaces)\n"
-"  -v\t\tshow version and compile-time definitions\n"
-"  -x\t\tsimulate the mailx send mode\n"
-"  -y\t\tselect a mailbox specified in your `mailboxes' list\n"
-"  -z\t\texit immediately if there are no messages in the mailbox\n"
-"  -Z\t\topen the first folder with new message, exit immediately if none\n"
-"  -h\t\tthis help message"
+"  -c <address>\tspecify a carbon-copy (CC) address"
 msgstr ""
 "kasutage: mutt [ -nRyzZ ] [ -e <käsk> ] [ -F <fail> ] [ -m <tüüp> ]\n"
 "               [ -f <fail> ]\n"
@@ -3575,528 +3576,529 @@ msgstr ""
 "  -Z\t\tava esimene kaust uue teatega, välju kohe, kui pole\n"
 "  -h\t\tesita see abiinfo"
 
-#: main.c:182
+#: main.c:162
+msgid "  -d <level>\tlog debugging output to ~/.muttngdebug0"
+msgstr ""
+
+#: main.c:164
 msgid ""
-"\n"
-"Compile options:"
+"  -e <command>\tspecify a command to be executed after initialization\n"
+"  -f <file>\tspecify which mailbox to read\n"
+"  -F <file>\tspecify an alternate muttrngc file\n"
+"  -g <server>\tspecify a newsserver (if compiled with NNTP)\n"
+"  -G\t\tselect a newsgroup (if compiled with NNTP)\n"
+"  -H <file>\tspecify a draft file to read header and body from\n"
+"  -i <file>\tspecify a file which Mutt-ng should include in the body"
+msgstr ""
+
+#: main.c:172
+msgid ""
+"  -d <level>\t specify debugging level of Mutt-ng\n"
+"  -m <type>\tspecify a default mailbox type\n"
+"  -n\t\tcauses Mutt-ng not to read the system Muttngrc\n"
+"  -p\t\trecall a postponed message\n"
+"  -Q <variable>\tquery a configuration variable\n"
+"  -R\t\topen mailbox in read-only mode\n"
+"  -s <subj>\tspecify a subject (must be in quotes if it has spaces)"
+msgstr ""
+
+#: main.c:180
+msgid ""
+"  -t\t\tprint the value of all variables to stdout\n"
+"  -T\t\tprint the value of all changed variables to stdout\n"
+"  -v\t\tshow version and compile-time definitions\n"
+"  -x\t\tsimulate the mailx send mode\n"
+"  -y\t\tselect a mailbox specified in your `mailboxes' list\n"
+"  -z\t\texit immediately if there are no messages in the mailbox\n"
+"  -Z\t\topen the first folder with new message, exit immediately if none\n"
+"  -h\t\tthis help message"
+msgstr ""
+
+#: main.c:259
+#, fuzzy
+msgid "Compile Options:"
 msgstr ""
 "\n"
 "Kompileerimise võtmed:"
 
-#: main.c:441
-msgid "Mutt-ng is based on the following patches written for mutt:\n"
+#: main.c:486
+msgid "Built-In Defaults:"
+msgstr ""
+
+#: main.c:514
+msgid "MadMutt is based on Mutt-ng wich was based on Mutt before\n"
 msgstr ""
 
-#: main.c:461
+#: main.c:533
 msgid "Error initializing terminal."
 msgstr "Viga terminali initsialiseerimisel."
 
-#: main.c:583
-#, c-format
-msgid "Debugging at level %d.\n"
-msgstr "Silumise tase %d.\n"
-
-#: main.c:585
-msgid "DEBUG was not defined during compilation.  Ignored.\n"
-msgstr "DEBUG ei ole kompileerimise ajal defineeritud. Ignoreerin.\n"
-
-#: main.c:746
+#: main.c:826
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s ei ole. Loon selle?"
 
-#: main.c:750
+#: main.c:830
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "%s ei saa luua: %s."
 
-#: main.c:790
+#: main.c:870
 msgid "No recipients specified.\n"
 msgstr "Saajaid ei ole määratud.\n"
 
-#: main.c:866
+#: main.c:946
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: faili ei saa lisada.\n"
 
-#: main.c:883
+#: main.c:963
 msgid "No mailbox with new mail."
 msgstr "Uute teadetega postkaste ei ole."
 
-#: main.c:902
+#: main.c:982
 msgid "No incoming mailboxes defined."
 msgstr "Sissetulevate kirjade postkaste ei ole määratud."
 
-#: main.c:937
+#: main.c:1017
 msgid "Mailbox is empty."
 msgstr "Postkast on tühi."
 
-#: mbox.c:134 mbox.c:283
+#: mbox.c:136 mbox.c:285
 #, c-format
 msgid "Reading %s... %d (%d%%)"
 msgstr "Loen %s... %d (%d%%)"
 
-#: mbox.c:155 mbox.c:209
+#: mbox.c:157 mbox.c:211
 msgid "Mailbox is corrupt!"
 msgstr "Postkast on riknenud!"
 
-#: mbox.c:574 mbox.c:813
+#: mbox.c:578 mbox.c:815
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Fataalne viga! Postkasti ei õnnestu uuesti avada!"
 
-#: mbox.c:627
+#: mbox.c:629
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: mbox on muudetud, aga muudetud teateid ei ole! (teatage sellest veast)"
 
-#: mbox.c:664
+#: mbox.c:666
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Kirjutan teateid... %d (%d%%)"
 
-#. copy the temp mailbox back into place starting at the first
-#. * change/deleted message
-#.
-#: mbox.c:767
+#: mbox.c:769
 msgid "Committing changes..."
 msgstr "Kinnitan muutused..."
 
-#: mbox.c:798
+#: mbox.c:800
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Kirjutamine ebaõnnestus! Osaline postkast salvestatud faili %s"
 
-#: mbox.c:859
+#: mbox.c:858
 msgid "Could not reopen mailbox!"
 msgstr "Postkasti ei õnnestu uuesti avada!"
 
-#: mbox.c:916
+#: mbox.c:913
 msgid "Reopening mailbox..."
 msgstr "Avan postkasti uuesti..."
 
-#: mbox.c:1130
+#: mbox.c:1127
 msgid "Can't write message"
 msgstr "Teadet ei õnnestu kirjutada"
 
-#: menu.c:410
+#: menu.c:417
 msgid "Jump to: "
 msgstr "Hüppa: "
 
-#: menu.c:417
+#: menu.c:424
 msgid "Invalid index number."
 msgstr "Vigane indeksi number."
 
-#: menu.c:421 menu.c:442 menu.c:476 menu.c:515 menu.c:530 menu.c:540
-#: menu.c:550 menu.c:587 menu.c:597 menu.c:609 menu.c:621 menu.c:1003
+#: menu.c:428 menu.c:449 menu.c:507 menu.c:542 menu.c:556 menu.c:565
+#: menu.c:574 menu.c:584 menu.c:596 menu.c:608 menu.c:990
 msgid "No entries."
 msgstr "Kirjeid pole."
 
-#: menu.c:439
+#: menu.c:446
 msgid "You cannot scroll down farther."
 msgstr "Enam allapoole ei saa kerida."
 
-#: menu.c:456
+#: menu.c:463
 msgid "You cannot scroll up farther."
 msgstr "Enam ülespoole ei saa kerida."
 
-#: menu.c:473
-msgid "You are on the last page."
-msgstr "Te olete viimasel lehel."
-
-#: menu.c:495
+#: menu.c:500
 msgid "You are on the first page."
 msgstr "Te olete esimesel lehel."
 
-#: menu.c:567
-msgid "First entry is shown."
-msgstr "Esimene kirje on näidatud."
-
-#: menu.c:584
-msgid "Last entry is shown."
-msgstr "Viimane kirje on näidatud."
+#: menu.c:501
+msgid "You are on the last page."
+msgstr "Te olete viimasel lehel."
 
-#: menu.c:631
+#: menu.c:618
 msgid "You are on the last entry."
 msgstr "Te olete viimasel kirjel."
 
-#: menu.c:641
+#: menu.c:628
 msgid "You are on the first entry."
 msgstr "Te olete esimesel kirjel."
 
-#: menu.c:699 pattern.c:1249
+#: menu.c:686 pattern.c:1314
 msgid "Search for: "
 msgstr "Otsi: "
 
-#: menu.c:700 pattern.c:1250
+#: menu.c:687 pattern.c:1315
 msgid "Reverse search for: "
 msgstr "Otsi tagurpidi: "
 
-#: menu.c:708 pattern.c:1281
+#: menu.c:695 pattern.c:1346
 msgid "No search pattern."
 msgstr "Otsingumuster puudub."
 
-#: menu.c:738 pager.c:1822 pager.c:1836 pager.c:1938 pattern.c:1345
+#: menu.c:725 pager.c:1866 pager.c:1880 pager.c:1982 pattern.c:1414
 msgid "Not found."
 msgstr "Ei leitud."
 
-#: menu.c:858
+#: menu.c:845
 msgid "No tagged entries."
 msgstr "Märgitud kirjeid pole."
 
-#: menu.c:963
+#: menu.c:950
 msgid "Search is not implemented for this menu."
 msgstr "Selles menüüs ei ole otsimist realiseeritud."
 
-#: menu.c:968
+#: menu.c:955
 msgid "Jumping is not implemented for dialogs."
 msgstr "hüppamine ei ole dialoogidele realiseeritud."
 
-#: menu.c:1006
+#: menu.c:993
 msgid "Tagging is not supported."
 msgstr "Märkimist ei toetata."
 
-#: mh.c:635 mh.c:872
+#: mh.c:638 mh.c:880
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Loen %s... %d"
 
-#: mh.c:1144
+#: mh.c:1152
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): ei õnnestu seada faili aegu"
 
-#: muttlib.c:851
+#: muttlib.c:828
 #, fuzzy
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr "Fail on kataloog, salvestan sinna?"
 
-#: muttlib.c:852
+#: muttlib.c:829
 msgid "yna"
 msgstr ""
 
-#: muttlib.c:869
+#: muttlib.c:846
 msgid "File is a directory, save under it?"
 msgstr "Fail on kataloog, salvestan sinna?"
 
-#: muttlib.c:875
+#: muttlib.c:852
 msgid "File under directory: "
 msgstr "Fail kataloogis: "
 
-#: muttlib.c:886
+#: muttlib.c:863
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "Fail on olemas, (k)irjutan üle, (l)isan või ka(t)kestan?"
 
-#: muttlib.c:886
+#: muttlib.c:863
 msgid "oac"
 msgstr "klt"
 
-#: muttlib.c:1214
+#: muttlib.c:1182
 msgid "Can't save message to POP mailbox."
 msgstr "Teadet ei saa POP postkasti salvestada."
 
-#: muttlib.c:1222
+#: muttlib.c:1190
 #, fuzzy
 msgid "Can't save message to newsserver."
 msgstr "POP serveril ei saa teadet toimetada."
 
-#. if we're appending to the trash, there's no point in asking
-#: muttlib.c:1232
+#: muttlib.c:1200
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Lisan teated kausta %s?"
 
-#: muttlib.c:1242
+#: muttlib.c:1210
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s ei ole postkast!"
 
-#: mutt_socket.c:85 mutt_socket.c:134
+#: mutt_socket.c:86 mutt_socket.c:135
 #, c-format
 msgid "Connection to %s closed"
 msgstr "Ühendus serveriga %s suleti"
 
-#: mutt_socket.c:250
+#: mutt_socket.c:247
 msgid "SSL is unavailable."
 msgstr "SSL ei ole kasutatav."
 
-#: mutt_socket.c:279
+#: mutt_socket.c:276
 msgid "Preconnect command failed."
 msgstr "Preconnect käsklus ebaõnnestus"
 
-#: mutt_socket.c:347 mutt_socket.c:360
+#: mutt_socket.c:344 mutt_socket.c:357
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Viga serveriga %s suhtlemisel (%s)"
 
-#: mutt_socket.c:398 mutt_socket.c:450
+#: mutt_socket.c:395 mutt_socket.c:448
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: mutt_socket.c:405 mutt_socket.c:457
+#: mutt_socket.c:402 mutt_socket.c:455
 #, c-format
 msgid "Looking up %s..."
 msgstr "Otsin serverit %s..."
 
-#: mutt_socket.c:415 mutt_socket.c:463
+#: mutt_socket.c:412 mutt_socket.c:461
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Ei leia masina \"%s\" aadressi"
 
-#: mutt_socket.c:419 mutt_socket.c:472
+#: mutt_socket.c:417 mutt_socket.c:470
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Ühendus serverisse %s..."
 
-#: mutt_socket.c:491
+#: mutt_socket.c:490
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Serveriga %s ei õnnestu ühendust luua (%s)."
 
-#: mutt_ssl.c:165
+#: mutt_ssl.c:166
 msgid "Failed to find enough entropy on your system"
 msgstr "Teie süsteemis ei ole piisavalt entroopiat"
 
-#: mutt_ssl.c:190
+#: mutt_ssl.c:191
 #, c-format
 msgid "Filling entropy pool: %s...\n"
 msgstr "Kogun entroopiat: %s...\n"
 
-#: mutt_ssl.c:196
+#: mutt_ssl.c:197
 #, c-format
 msgid "%s has insecure permissions!"
 msgstr "%s omab ebaturvalisi õigusi!"
 
-#: mutt_ssl.c:216
+#: mutt_ssl.c:217
 msgid "SSL disabled due the lack of entropy"
 msgstr "Entroopia nappuse tõttu on SSL kasutamine blokeeritud"
 
-#: mutt_ssl.c:307
+#: mutt_ssl.c:308
 msgid "I/O error"
 msgstr "S/V viga"
 
-#: mutt_ssl.c:316
+#: mutt_ssl.c:317
 #, c-format
 msgid "SSL failed: %s"
 msgstr "SSL ebaõnnestus: %s"
 
-#: mutt_ssl.c:324 mutt_ssl_gnutls.c:468 mutt_ssl_gnutls.c:476
-#: mutt_ssl_gnutls.c:502
+#: mutt_ssl.c:325 mutt_ssl_gnutls.c:470 mutt_ssl_gnutls.c:478
+#: mutt_ssl_gnutls.c:504
 msgid "Unable to get certificate from peer"
 msgstr "Ei õnnestu saada partneri sertifikaati"
 
-#: mutt_ssl.c:332
+#: mutt_ssl.c:333
 #, c-format
 msgid "SSL connection using %s (%s)"
 msgstr "SSL ühendus kasutades %s (%s)"
 
-#: mutt_ssl.c:373
+#: mutt_ssl.c:415
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: mutt_ssl.c:396 mutt_ssl_gnutls.c:359
+#: mutt_ssl.c:438 mutt_ssl_gnutls.c:362
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[arvutamine ei õnnestu]"
 
-#: mutt_ssl.c:413 mutt_ssl_gnutls.c:381
+#: mutt_ssl.c:455 mutt_ssl_gnutls.c:384
 msgid "[invalid date]"
 msgstr "[vigane kuupäev]"
 
-#: mutt_ssl.c:484
+#: mutt_ssl.c:526
 msgid "Server certificate is not yet valid"
 msgstr "Serveri sertifikaat ei ole veel kehtiv"
 
-#: mutt_ssl.c:490
+#: mutt_ssl.c:532
 msgid "Server certificate has expired"
 msgstr "Serveri sertifikaat on aegunud"
 
-#: mutt_ssl.c:558 mutt_ssl_gnutls.c:592
+#: mutt_ssl.c:591 mutt_ssl_gnutls.c:594
 msgid "This certificate belongs to:"
 msgstr "Selle serveri omanik on:"
 
-#: mutt_ssl.c:569 mutt_ssl_gnutls.c:637
+#: mutt_ssl.c:602 mutt_ssl_gnutls.c:639
 msgid "This certificate was issued by:"
 msgstr "Selle sertifikaadi väljastas:"
 
-#: mutt_ssl.c:581 mutt_ssl_gnutls.c:683
+#: mutt_ssl.c:614 mutt_ssl_gnutls.c:685
 #, c-format
 msgid "This certificate is valid"
 msgstr "See sertifikaat on kehtiv"
 
-#: mutt_ssl.c:582 mutt_ssl_gnutls.c:686
+#: mutt_ssl.c:615 mutt_ssl_gnutls.c:688
 #, c-format
 msgid "   from %s"
 msgstr "   alates %s"
 
-#: mutt_ssl.c:584 mutt_ssl_gnutls.c:690
+#: mutt_ssl.c:617 mutt_ssl_gnutls.c:692
 #, c-format
 msgid "     to %s"
 msgstr "     kuni %s"
 
-#: mutt_ssl.c:590
+#: mutt_ssl.c:623
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Sõrmejälg: %s"
 
-#: mutt_ssl.c:592
+#: mutt_ssl.c:625
 msgid "SSL Certificate check"
 msgstr "SSL Sertifikaadi kontroll"
 
-#: mutt_ssl.c:596 mutt_ssl_gnutls.c:735
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:737
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(k)eeldu, (n)õustu korra, nõustu (a)alati"
 
-#: mutt_ssl.c:597 mutt_ssl_gnutls.c:736
+#: mutt_ssl.c:630 mutt_ssl_gnutls.c:738
 msgid "roa"
 msgstr "kna"
 
-#: mutt_ssl.c:600 mutt_ssl_gnutls.c:739
+#: mutt_ssl.c:633 mutt_ssl_gnutls.c:741
 msgid "(r)eject, accept (o)nce"
 msgstr "(k)eeldu, (n)õustu korra"
 
-#: mutt_ssl.c:601 mutt_ssl_gnutls.c:740
+#: mutt_ssl.c:634 mutt_ssl_gnutls.c:742
 msgid "ro"
 msgstr "kn"
 
-#: mutt_ssl.c:628 mutt_ssl_gnutls.c:780
+#: mutt_ssl.c:661 mutt_ssl_gnutls.c:783
 msgid "Warning: Couldn't save certificate"
 msgstr "Hoiatus: Sertifikaati ei saa salvestada"
 
-#: mutt_ssl.c:632 mutt_ssl_gnutls.c:784
+#: mutt_ssl.c:665 mutt_ssl_gnutls.c:787
 msgid "Certificate saved"
 msgstr "Sertifikaat on salvestatud"
 
-#: mutt_ssl_gnutls.c:59
+#: mutt_ssl_gnutls.c:62
 #, c-format
 msgid "gnutls_global_init: %s"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:87 mutt_ssl_gnutls.c:107
+#: mutt_ssl_gnutls.c:90 mutt_ssl_gnutls.c:110
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:94
+#: mutt_ssl_gnutls.c:97
 #, c-format
 msgid "tls_socket_read (%s)"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:114
+#: mutt_ssl_gnutls.c:117
 #, c-format
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:163
+#: mutt_ssl_gnutls.c:166
 #, c-format
 msgid "gnutls_certificate_allocate_credentials: %s"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:190
+#: mutt_ssl_gnutls.c:193
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:228
+#: mutt_ssl_gnutls.c:231
 #, c-format
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:232
+#: mutt_ssl_gnutls.c:235
 #, c-format
 msgid "gnutls_handshake: %s"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:246
+#: mutt_ssl_gnutls.c:249
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "SSL ühendus kasutades %s (%s)"
 
-#: mutt_ssl_gnutls.c:481
+#: mutt_ssl_gnutls.c:483
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:489
+#: mutt_ssl_gnutls.c:491
 #, fuzzy
-msgid "Error certificate is not X.509"
+msgid "Certificate is not X.509"
 msgstr "Serveri sertifikaat ei ole veel kehtiv"
 
-#: mutt_ssl_gnutls.c:495
+#: mutt_ssl_gnutls.c:497
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "Viga terminali initsialiseerimisel."
 
-#: mutt_ssl_gnutls.c:509
+#: mutt_ssl_gnutls.c:511
 msgid "Error processing certificate data"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:695
+#: mutt_ssl_gnutls.c:697
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "Sõrmejälg: %s"
 
-#: mutt_ssl_gnutls.c:699
+#: mutt_ssl_gnutls.c:701
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "Sõrmejälg: %s"
 
-#: mutt_ssl_gnutls.c:705
+#: mutt_ssl_gnutls.c:707
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
 msgstr "Serveri sertifikaat ei ole veel kehtiv"
 
-#: mutt_ssl_gnutls.c:709
+#: mutt_ssl_gnutls.c:711
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
 msgstr "Serveri sertifikaat on aegunud"
 
-#: mutt_ssl_gnutls.c:715
+#: mutt_ssl_gnutls.c:717
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
 msgstr "Serveri sertifikaat on aegunud"
 
-#: mutt_ssl_gnutls.c:720
+#: mutt_ssl_gnutls.c:722
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:726
+#: mutt_ssl_gnutls.c:728
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr "Serveri sertifikaat ei ole veel kehtiv"
 
-#: mutt_ssl_gnutls.c:730
+#: mutt_ssl_gnutls.c:732
 #, fuzzy
 msgid "TLS/SSL Certificate check"
 msgstr "SSL Sertifikaadi kontroll"
 
-#: mutt_ssl_nss.c:51
-#, c-format
-msgid "%s failed (error %d)"
-msgstr ""
-
-#: mutt_ssl_nss.c:121
-#, c-format
-msgid "SSL_AuthCertificate failed (error %d)"
-msgstr ""
-
-#: mutt_ssl_nss.c:234
-#, c-format
-msgid "Unable to find ip for host %s"
-msgstr ""
-
-#: mutt_ssl_nss.c:244
-msgid "PR_NewTCPSocket failed."
-msgstr ""
-
-#: mutt_ssl_nss.c:287
-#, fuzzy, c-format
-msgid "Unable to connect to host %s"
-msgstr "%s ei õnnestu lisada!"
-
-#: mutt_tunnel.c:65
+#: mutt_tunnel.c:66
 #, fuzzy, c-format
 msgid "Connecting with \"%s\"..."
 msgstr "Ühendus serverisse %s..."
 
-#: mutt_tunnel.c:137 mutt_tunnel.c:153
+#: mutt_tunnel.c:128
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:144 mutt_tunnel.c:160
 #, fuzzy, c-format
 msgid "Tunnel error talking to %s: %s"
 msgstr "Viga serveriga %s suhtlemisel (%s)"
@@ -4111,409 +4113,436 @@ msgstr "Lukustamise arv on 
 msgid "Can't dotlock %s.\n"
 msgstr "%s punktfailiga lukustamine ei õnnestu.\n"
 
-#: mx.c:221
+#: mx.c:222
 msgid "Timeout exceeded while attempting fcntl lock!"
 msgstr "fcntl luku seadmine aegus!"
 
-#: mx.c:228
+#: mx.c:229
 #, c-format
 msgid "Waiting for fcntl lock... %d"
 msgstr "Ootan fcntl lukku... %d"
 
-#: mx.c:255
+#: mx.c:256
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "flock luku seadmine aegus!"
 
-#: mx.c:263
+#: mx.c:264
 #, c-format
 msgid "Waiting for flock attempt... %d"
 msgstr "Ootan flock lukku... %d"
 
-#: mx.c:485
+#: mx.c:486
 #, c-format
 msgid "Couldn't lock %s\n"
 msgstr "%s ei saa lukustada\n"
 
-#: mx.c:574
+#: mx.c:575
 #, c-format
 msgid "Reading %s..."
 msgstr "Loen %s..."
 
-#: mx.c:636
+#: mx.c:637
 #, c-format
 msgid "Writing %s..."
 msgstr "Kirjutan %s..."
 
-#: mx.c:667
+#: mx.c:668
 #, fuzzy
 msgid "message(s) not deleted"
 msgstr "Teated on peegeldatud."
 
-#: mx.c:688
+#: mx.c:689
 #, fuzzy
 msgid "Can't open trash folder"
 msgstr "Kausta ei saa lisada: %s"
 
-#: mx.c:755
+#: mx.c:756
 #, c-format
 msgid "Move read messages to %s?"
 msgstr "Tõstan loetud teated postkasti %s?"
 
-#: mx.c:769 mx.c:1024
+#: mx.c:770 mx.c:1033
 #, c-format
 msgid "Purge %d deleted message?"
 msgstr "Eemaldan %d kustutatud teate?"
 
-#: mx.c:770 mx.c:1025
+#: mx.c:771 mx.c:1034
 #, c-format
 msgid "Purge %d deleted messages?"
 msgstr "Eemaldan %d kustutatud teadet?"
 
-#: mx.c:789
+#: mx.c:790
 #, c-format
 msgid "Moving read messages to %s..."
 msgstr "Tõstan loetud teated kausta %s..."
 
-#: mx.c:842 mx.c:1015
+#: mx.c:843 mx.c:1024
 msgid "Mailbox is unchanged."
 msgstr "Postkasti ei muudetud."
 
-#: mx.c:881
+#: mx.c:882
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d säilitatud, %d tõstetud, %d kustutatud."
 
-#: mx.c:884 mx.c:1068
+#: mx.c:885 mx.c:1077
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d säilitatud, %d kustutatud."
 
-#: mx.c:1000
+#: mx.c:1009
 #, c-format
 msgid " Press '%s' to toggle write"
 msgstr "Kirjutamise lülitamiseks vajutage '%s'"
 
-#: mx.c:1002
+#: mx.c:1011
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "Kirjutamise uuesti lubamiseks kasutage 'toggle-write'!"
 
-#: mx.c:1005
+#: mx.c:1014
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Postkast on märgitud mittekirjutatavaks. %s"
 
-#: mx.c:1064
+#: mx.c:1073
 msgid "Mailbox checkpointed."
 msgstr "Postkast on kontrollitud."
 
-#: mx.c:1293
+#: mx.c:1305
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
-#: nntp/newsrc.c:189
+#: mx.c:1451
+msgid "Support for header caching was not build in."
+msgstr ""
+
+#: mx.c:1459
+#, fuzzy
+msgid "No mailboxes defined."
+msgstr "Sissetulevate kirjade postkaste ei ole määratud."
+
+#: nntp/newsrc.c:190
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
 msgstr "%s ei ole. Loon selle?"
 
-#: nntp/newsrc.c:193
+#: nntp/newsrc.c:194
 msgid "Cache directory not created!"
 msgstr ""
 
-#: nntp/newsrc.c:341
+#: nntp/newsrc.c:342
 msgid "No newsserver defined!"
 msgstr ""
 
-#: nntp/newsrc.c:355
+#: nntp/newsrc.c:356
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr "%s on vigane POP tee"
 
-#: nntp/nntp.c:92 pop/pop.c:648 pop/pop_lib.c:342
+#: nntp/newsrc.c:645
+#, fuzzy, c-format
+msgid "Unable to open %s for reading"
+msgstr "Ajutise faili avamine ebaõnnestus!"
+
+#: nntp/newsrc.c:650
+#, fuzzy, c-format
+msgid "Unable to lock %s"
+msgstr "%s ei õnnestu lisada!"
+
+#: nntp/newsrc.c:664
+#, fuzzy, c-format
+msgid "Unable to open %s for writing"
+msgstr "Ajutise faili avamine ebaõnnestus!"
+
+#: nntp/newsrc.c:729
+#, fuzzy, c-format
+msgid "Can't write %s"
+msgstr "%s loomine ebaõnnestus."
+
+#: nntp/newsrc.c:738
+#, fuzzy, c-format
+msgid "Can't rename %s to %s"
+msgstr "%s ei saa luua: %s."
+
+#: nntp/nntp.c:136 pop/pop.c:657 pop/pop_lib.c:349
 msgid "Server closed connection!"
 msgstr "Server sulges ühenduse!"
 
-#: nntp/nntp.c:113
+#: nntp/nntp.c:157
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
 msgstr "Ühendus serverisse %s..."
 
-#: nntp/nntp.c:115
+#: nntp/nntp.c:159
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp/nntp.c:222
+#: nntp/nntp.c:268
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
 msgstr "Ühendus serveriga %s suleti"
 
-#: nntp/nntp.c:330
+#: nntp/nntp.c:381
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: nntp/nntp.c:643
+#: nntp/nntp.c:695
 #, fuzzy
 msgid "Fetching message headers..."
 msgstr "Laen teadete päiseid... [%d/%d]"
 
-#. fetch list of articles
-#: nntp/nntp.c:657
+#: nntp/nntp.c:696
+#, fuzzy
+msgid "Fetching headers from cache..."
+msgstr "Laen teadet..."
+
+#: nntp/nntp.c:710
 #, fuzzy
 msgid "Fetching list of articles..."
 msgstr "Laen teadete nimekirja..."
 
-#: nntp/nntp.c:667
+#: nntp/nntp.c:721
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: nntp/nntp.c:682
-#, fuzzy, c-format
-msgid "GROUP command failed: %s"
-msgstr "Preconnect käsklus ebaõnnestus"
-
-#: nntp/nntp.c:696
-#, fuzzy
-msgid "Fetching headers from cache..."
-msgstr "Laen teadet..."
-
-#: nntp/nntp.c:743
+#: nntp/nntp.c:792
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
 msgstr "Viga käsureal: %s\n"
 
-#: nntp/nntp.c:803
+#: nntp/nntp.c:854
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr "%s on vigane POP tee"
 
-#: nntp/nntp.c:847
+#: nntp/nntp.c:898
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: nntp/nntp.c:926
+#: nntp/nntp.c:979
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: nntp/nntp.c:977
+#: nntp/nntp.c:1030
 #, fuzzy
 msgid "Can't post article. No connection to news server."
 msgstr "Sulen ühenduse POP serveriga..."
 
-#: nntp/nntp.c:984
+#: nntp/nntp.c:1037
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp/nntp.c:990 nntp/nntp.c:1020
+#: nntp/nntp.c:1043 nntp/nntp.c:1073
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
 msgstr "Ühendus serveriga %s suleti"
 
-#: nntp/nntp.c:995 nntp/nntp.c:1025
+#: nntp/nntp.c:1048 nntp/nntp.c:1078
 #, fuzzy, c-format
 msgid "Can't post article: %s"
 msgstr "Ei saa lugeda %s atribuute: %s"
 
-#: nntp/nntp.c:1116
+#: nntp/nntp.c:1167
 #, fuzzy
 msgid "Quitting newsgroup..."
 msgstr "Laen nimeruumid..."
 
-#: nntp/nntp.c:1123
+#: nntp/nntp.c:1174
 msgid "Mark all articles read?"
 msgstr ""
 
-#: nntp/nntp.c:1276 pop/pop.c:485 pop/pop.c:548
+#: nntp/nntp.c:1328 pop/pop.c:494 pop/pop.c:557
 msgid "Checking for new messages..."
 msgstr "Kontrollin, kas on uusi teateid..."
 
-#: nntp/nntp.c:1287
+#: nntp/nntp.c:1340
 #, fuzzy
 msgid "Checking for new newsgroups..."
 msgstr "Kontrollin, kas on uusi teateid..."
 
-#: nntp/nntp.c:1301
+#: nntp/nntp.c:1354
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: nntp/nntp.c:1309 nntp/nntp.c:1380
+#: nntp/nntp.c:1362 nntp/nntp.c:1433
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "Meldin..."
 
-#: nntp/nntp.c:1340
+#: nntp/nntp.c:1393
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp/nntp.c:1366
+#: nntp/nntp.c:1419
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
 
-#: nntp/nntp.c:1415
+#: nntp/nntp.c:1468
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
 msgstr "Kustutan serveril teateid..."
 
-#: nntp/nntp.c:1467
+#: nntp/nntp.c:1520
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: pager.c:60
-msgid "Not available in this menu."
-msgstr "Ei ole selles menüüs kasutatav."
-
-#: pager.c:1344
+#: pager.c:1374
 msgid "PrevPg"
 msgstr "EelmLk"
 
-#: pager.c:1345
+#: pager.c:1375
 msgid "NextPg"
 msgstr "JärgmLm"
 
-#: pager.c:1349
+#: pager.c:1379
 msgid "View Attachm."
 msgstr "Vaata lisa"
 
-#: pager.c:1352 pager.c:1361
+#: pager.c:1382 pager.c:1391
 msgid "Next"
 msgstr "Järgm."
 
-#. emulate "less -q" and don't go on to the next message.
-#: pager.c:1739 pager.c:1767 pager.c:1797 pager.c:2031
+#: pager.c:1783 pager.c:1811 pager.c:1841 pager.c:2075
 msgid "Bottom of message is shown."
 msgstr "Teate lõpp on näidatud."
 
-#: pager.c:1754 pager.c:1774 pager.c:1781 pager.c:1788
+#: pager.c:1798 pager.c:1818 pager.c:1825 pager.c:1832
 msgid "Top of message is shown."
 msgstr "Teate algus on näidatud."
 
-#: pager.c:1849
+#: pager.c:1893
 msgid "Reverse search: "
 msgstr "tagurpidi otsing: "
 
-#: pager.c:1850
+#: pager.c:1894
 msgid "Search: "
 msgstr "Otsing: "
 
-#: pager.c:1962
+#: pager.c:2006
 msgid "Help is currently being shown."
 msgstr "Te loete praegu abiinfot."
 
-#: pager.c:1992
+#: pager.c:2036
 msgid "No more quoted text."
 msgstr "Rohkem tsiteetitud teksti pole."
 
-#: pager.c:2009
+#: pager.c:2053
 msgid "No more unquoted text after quoted text."
 msgstr "Tsiteeritud teksiti järel rohkem teksti ei ole."
 
-#: parse.c:580
+#: parse.c:587
 msgid "multipart message has no boundary parameter!"
 msgstr "mitmeosalisel teatel puudub eraldaja!"
 
-#: pattern.c:229
+#: pattern.c:253
 #, c-format
 msgid "Error in expression: %s"
 msgstr "Viga avaldises: %s"
 
-#: pattern.c:328
+#: pattern.c:258
+#, fuzzy, c-format
+msgid "Empty expression"
+msgstr "viga avaldises"
+
+#: pattern.c:374
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "Vigane kuupäev: %s"
 
-#: pattern.c:340
+#: pattern.c:386
 #, c-format
 msgid "Invalid month: %s"
 msgstr "Vigane kuu: %s"
 
-#. getDate has its own error message, don't overwrite it here
-#: pattern.c:483
+#: pattern.c:529
 #, c-format
 msgid "Invalid relative date: %s"
 msgstr "Vigane suhteline kuupäev: %s"
 
-#: pattern.c:496
+#: pattern.c:542
 msgid "error in expression"
 msgstr "viga avaldises"
 
-#: pattern.c:686 pattern.c:788
+#: pattern.c:733 pattern.c:838
 #, c-format
 msgid "error in pattern at: %s"
 msgstr "viga mustris: %s"
 
-#: pattern.c:732
+#: pattern.c:782
 #, c-format
 msgid "%c: invalid command"
 msgstr "%c: vigane käsklus"
 
-#: pattern.c:737
+#: pattern.c:787
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr "%c: ei toetata selles moodis"
 
-#: pattern.c:749
+#: pattern.c:799
 #, c-format
 msgid "missing parameter"
 msgstr "parameeter puudub"
 
-#: pattern.c:763
+#: pattern.c:813
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "sulud ei klapi: %s"
 
-#: pattern.c:794
+#: pattern.c:844
 msgid "empty pattern"
 msgstr "tühi muster"
 
-#: pattern.c:1072
+#: pattern.c:1144
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "viga: tundmatu op %d (teatage sellest veast)."
 
-#: pattern.c:1144 pattern.c:1267
+#: pattern.c:1210 pattern.c:1332
 msgid "Compiling search pattern..."
 msgstr "Kompileerin otsingumustrit..."
 
-#: pattern.c:1157
+#: pattern.c:1228
 msgid "Executing command on matching messages..."
 msgstr "Käivitan leitud teadetel käsu..."
 
-#: pattern.c:1215
+#: pattern.c:1287
 msgid "No messages matched criteria."
 msgstr "Ühtegi mustrile vastavat teadet ei leitud."
 
-#: pattern.c:1303
+#: pattern.c:1372
 msgid "Search hit bottom without finding match"
 msgstr "Otsing jõudis midagi leidmata lõppu"
 
-#: pattern.c:1314
+#: pattern.c:1383
 msgid "Search hit top without finding match"
 msgstr "Otsing jõudis midagi leidmata algusse"
 
-#: pattern.c:1336
+#: pattern.c:1405
 msgid "Search interrupted."
 msgstr "Otsing katkestati."
 
-#: pgp.c:86
+#: pgp.c:90
 msgid "Enter PGP passphrase:"
 msgstr "Sisestage PGP parool:"
 
-#: pgp.c:99
+#: pgp.c:104
 msgid "PGP passphrase forgotten."
 msgstr "PGP parool on unustatud."
 
-#: pgp.c:326
+#: pgp.c:340
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Viga: ei õnnestu luua PGP alamprotsessi! --]\n"
 
-#: pgp.c:362 pgp.c:567 pgp.c:755
+#: pgp.c:376 pgp.c:610 pgp.c:801
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -4521,12 +4550,27 @@ msgstr ""
 "[-- PGP väljundi lõpp --]\n"
 "\n"
 
-#: pgp.c:665
+#: pgp.c:393 pgp.c:930
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "Teadet ei õnnestu kopeerida."
+
+#: pgp.c:437
+#, fuzzy
+msgid "Could not decrypt PGP message."
+msgstr "Teadet ei õnnestu kopeerida."
+
+#: pgp.c:439 pgp.c:928
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "PGP allkiri on edukalt kontrollitud."
+
+#: pgp.c:708
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
-msgstr "Sisemine viga. Informeerige <roessler@guug.de>."
+msgstr "Sisemine viga. Informeerige <roessler@does-not-exist.org>."
 
-#: pgp.c:723
+#: pgp.c:767
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -4534,591 +4578,592 @@ msgstr ""
 "[-- Viga: PGP alamprotsessi loomine ei õnnestu! --]\n"
 "\n"
 
-#: pgp.c:920
+#: pgp.c:809 postpone.c:556
+msgid "Decryption failed."
+msgstr "Dekrüptimine ebaõnnestus."
+
+#: pgp.c:978
 msgid "Can't open PGP subprocess!"
 msgstr "PGP protsessi loomine ebaõnnestus!"
 
-#: pgp.c:1340
+#: pgp.c:1400
 msgid "Can't invoke PGP"
 msgstr "PGP käivitamine ei õnnestu"
 
-#: pgp.c:1439
+#: pgp.c:1501
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr ""
 "PGP (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad, k(e)hasse, või (u)nusta? "
 
-#: pgp.c:1440
+#: pgp.c:1502
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1440
+#: pgp.c:1502
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1442
+#: pgp.c:1504
 #, fuzzy
 msgid "esabifc"
 msgstr "kaimeu"
 
-#: pgpinvoke.c:298
+#: pgpinvoke.c:299
 msgid "Fetching PGP key..."
 msgstr "Laen PGP võtit..."
 
-#: pgpkey.c:461
+#: pgpkey.c:465
 #, fuzzy
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Kõik sobivad võtmed on märgitud aegunuks/tühistatuks."
 
-#: pgpkey.c:504
+#: pgpkey.c:508
 #, c-format
 msgid "PGP keys matching <%s>."
 msgstr "PGP võtmed, mis sisaldavad <%s>."
 
-#: pgpkey.c:506
+#: pgpkey.c:510
 #, c-format
 msgid "PGP keys matching \"%s\"."
 msgstr "PGP võtmed, mis sisaldavad \"%s\"."
 
-#. __FOPEN_CHECKED__
-#: pgpkey.c:522 pgpkey.c:713
+#: pgpkey.c:526 pgpkey.c:717
 msgid "Can't open /dev/null"
 msgstr "/dev/null ei saa avada"
 
-#: pgpkey.c:693
+#: pgpkey.c:697
 msgid "Please enter the key ID: "
 msgstr "Palun sisestage võtme ID: "
 
-#: pgpkey.c:721
+#: pgpkey.c:725
 msgid "Invoking pgp..."
 msgstr "Käivitan pgp..."
 
-#: pgpkey.c:746
+#: pgpkey.c:750
 #, c-format
 msgid "PGP Key %s."
 msgstr "PGP Võti %s."
 
-#: pop/pop.c:82 pop/pop_lib.c:191
+#: pop/pop.c:84 pop/pop_lib.c:192
 #, c-format
 msgid "Command TOP is not supported by server."
 msgstr "Server ei toeta käsklust TOP."
 
-#: pop/pop.c:107
+#: pop/pop.c:109
 msgid "Can't write header to temporary file!"
 msgstr "Päist ei õnnestu ajutissse faili kirjutada!"
 
-#: pop/pop.c:186 pop/pop_lib.c:193
+#: pop/pop.c:115
+msgid "Can't fetch header: Not connected!"
+msgstr ""
+
+#: pop/pop.c:193 pop/pop_lib.c:194
 #, c-format
 msgid "Command UIDL is not supported by server."
 msgstr "Server ei toeta UIDL käsklust."
 
-#: pop/pop.c:231 pop/pop.c:529
+#: pop/pop.c:238 pop/pop.c:538
 #, c-format
 msgid "%s is an invalid POP path"
 msgstr "%s on vigane POP tee"
 
-#: pop/pop.c:261
+#: pop/pop.c:268
 msgid "Fetching list of messages..."
 msgstr "Laen teadete nimekirja..."
 
-#: pop/pop.c:388
+#: pop/pop.c:397
 msgid "Can't write message to temporary file!"
 msgstr "Teadet ei õnnestu ajutisse faili kirjutada!"
 
-#: pop/pop.c:514
+#: pop/pop.c:523
 msgid "POP host is not defined."
 msgstr "POP serverit ei ole määratud."
 
-#: pop/pop.c:573
+#: pop/pop.c:582
 msgid "No new mail in POP mailbox."
 msgstr "Uusi teateid POP postkastis pole."
 
-#: pop/pop.c:582
+#: pop/pop.c:591
 msgid "Delete messages from server?"
 msgstr "Kustutan teated serverist?"
 
-#: pop/pop.c:584
+#: pop/pop.c:593
 #, c-format
 msgid "Reading new messages (%d bytes)..."
 msgstr "Loen uusi teateid (%d baiti)..."
 
-#. this is -3 when ret != 0, because it will keep the value from before *gna*
-#: pop/pop.c:620
+#: pop/pop.c:629
 msgid "Error while writing mailbox!"
 msgstr "Viga postkasti kirjutamisel!"
 
-#: pop/pop.c:625
+#: pop/pop.c:634
 #, c-format
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d/%d teadet loetud]"
 
-#: pop/pop_auth.c:87
+#: pop/pop_auth.c:78
 msgid "Authenticating (SASL)..."
 msgstr "Autentimine (SASL)..."
 
-#: pop/pop_auth.c:197
+#: pop/pop_auth.c:185
 msgid "Authenticating (APOP)..."
 msgstr "Autentimine (APOP)..."
 
-#: pop/pop_auth.c:221
+#: pop/pop_auth.c:213
 msgid "APOP authentication failed."
 msgstr "APOP autentimine ebaõnnestus."
 
-#: pop/pop_auth.c:254
+#: pop/pop_auth.c:245
 #, c-format
 msgid "Command USER is not supported by server."
 msgstr "Server ei toeta käsklust USER."
 
-#: pop/pop_lib.c:189
+#: pop/pop_lib.c:190
 msgid "Unable to leave messages on server."
 msgstr "Teateid ei õnnestu sererile jätta."
 
-#: pop/pop_lib.c:217
+#: pop/pop_lib.c:218
 #, c-format
 msgid "Error connecting to server: %s"
 msgstr "Viga serveriga ühenduse loomisel: %s"
 
-#: pop/pop_lib.c:356
+#: pop/pop_lib.c:363
 msgid "Closing connection to POP server..."
 msgstr "Sulen ühenduse POP serveriga..."
 
-#: pop/pop_lib.c:512
+#: pop/pop_lib.c:523
 msgid "Verifying message indexes..."
 msgstr "Kontrollin teadete indekseid ..."
 
-#: pop/pop_lib.c:535
+#: pop/pop_lib.c:545
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Ühendus katkes. Taastan ühenduse POP serveriga?"
 
-#: postpone.c:165
+#: postpone.c:170
 msgid "Postponed Messages"
 msgstr "Postitusootel teated"
 
-#: postpone.c:243 postpone.c:252
+#: postpone.c:248 postpone.c:257
 msgid "No postponed messages."
 msgstr "Postitusootel teateid pole"
 
-#: postpone.c:426 postpone.c:445 postpone.c:480
+#: postpone.c:431 postpone.c:450 postpone.c:485
 msgid "Illegal PGP header"
 msgstr "Vigane PGP päis"
 
-#: postpone.c:465
+#: postpone.c:470
 msgid "Illegal S/MIME header"
 msgstr "Vigane S/MIME päis"
 
-#: postpone.c:540
+#: postpone.c:545
 #, fuzzy
 msgid "Decrypting message..."
 msgstr "Laen teadet..."
 
-#: postpone.c:551
-msgid "Decryption failed."
-msgstr "Dekrüptimine ebaõnnestus."
-
-#: query.c:44
+#: query.c:45
 msgid "New Query"
 msgstr "Uus päring"
 
-#: query.c:45
+#: query.c:46
 msgid "Make Alias"
 msgstr "Loo alias"
 
-#: query.c:46
+#: query.c:47
 msgid "Search"
 msgstr "Otsi"
 
-#: query.c:93
+#: query.c:94
 msgid "Waiting for response..."
 msgstr "Ootan vastust..."
 
-#: query.c:213 query.c:239
+#: query.c:214 query.c:240
 msgid "Query command not defined."
 msgstr "Päringukäsku ei ole defineeritud."
 
-#: query.c:265
+#: query.c:266
 #, c-format
 msgid "Query"
 msgstr "Päring"
 
-#. Prompt for Query
-#: query.c:278 query.c:300
+#: query.c:279 query.c:300
 msgid "Query: "
 msgstr "Päring: "
 
-#: query.c:284 query.c:307
+#: query.c:285 query.c:307
 #, c-format
 msgid "Query '%s'"
 msgstr "Päring '%s'"
 
-#: recvattach.c:51
+#: recvattach.c:58
 msgid "Pipe"
 msgstr "Toru"
 
-#: recvattach.c:52
+#: recvattach.c:59
 msgid "Print"
 msgstr "Trüki"
 
-#: recvattach.c:400
+#: recvattach.c:424
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: recvattach.c:455
+#: recvattach.c:479
 msgid "Saving..."
 msgstr "Salvestan..."
 
-#: recvattach.c:460 recvattach.c:540
+#: recvattach.c:484 recvattach.c:564
 msgid "Attachment saved."
 msgstr "Lisa on salvestatud."
 
-#: recvattach.c:551
+#: recvattach.c:575
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "HOIATUS: Te olete üle kirjutamas faili %s, jätkan?"
 
-#: recvattach.c:567
+#: recvattach.c:591
 msgid "Attachment filtered."
 msgstr "Lisa on filtreeritud."
 
-#: recvattach.c:628
+#: recvattach.c:652
 msgid "Filter through: "
 msgstr "Filtreeri läbi: "
 
-#: recvattach.c:628
+#: recvattach.c:652
 msgid "Pipe to: "
 msgstr "Toru käsule: "
 
-#: recvattach.c:657
+#: recvattach.c:681
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "Ma ei tea, kuidas trükkida %s lisasid!"
 
-#: recvattach.c:722
+#: recvattach.c:746
 msgid "Print tagged attachment(s)?"
 msgstr "Trükin märgitud lisa(d)?"
 
-#: recvattach.c:722
+#: recvattach.c:746
 msgid "Print attachment?"
 msgstr "Trükin lisa?"
 
-#: recvattach.c:950
+#: recvattach.c:974
 msgid "Can't decrypt encrypted message!"
 msgstr "Krüpteeritud teadet ei õnnestu lahti krüpteerida!"
 
-#: recvattach.c:963
+#: recvattach.c:987
 msgid "Attachments"
 msgstr "Lisad"
 
-#: recvattach.c:999
+#: recvattach.c:1023
 msgid "There are no subparts to show!"
 msgstr "Osasid, mida näidata, ei ole!"
 
-#: recvattach.c:1065
+#: recvattach.c:1089
 msgid "Can't delete attachment from POP server."
 msgstr "Lisasid ei saa POP serverilt kustutada."
 
-#: recvattach.c:1074
+#: recvattach.c:1098
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
 msgstr "Lisasid ei saa POP serverilt kustutada."
 
-#: recvattach.c:1083
+#: recvattach.c:1107
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr "Krüpteeritud teadetest ei saa lisasid eemaldada."
 
-#: recvattach.c:1098 recvattach.c:1111
+#: recvattach.c:1122 recvattach.c:1135
 msgid "Only deletion of multipart attachments is supported."
 msgstr "Kustutada saab ainult mitmeosalise teate lisasid."
 
-#: recvcmd.c:37
+#: recvcmd.c:42
 msgid "You may only bounce message/rfc822 parts."
 msgstr "Peegeldada saab ainult message/rfc822 osi."
 
-#: recvcmd.c:199
+#: recvcmd.c:204
 #, fuzzy
 msgid "Error bouncing message!"
 msgstr "Viga teate saatmisel."
 
-#: recvcmd.c:200
+#: recvcmd.c:205
 #, fuzzy
 msgid "Error bouncing messages!"
 msgstr "Viga teate saatmisel."
 
-#: recvcmd.c:390
+#: recvcmd.c:395
 #, c-format
 msgid "Can't open temporary file %s."
 msgstr "Ajutist faili %s ei saa avada."
 
-#: recvcmd.c:419
+#: recvcmd.c:424
 msgid "Forward as attachments?"
 msgstr "Edasta lisadena?"
 
-#: recvcmd.c:433
+#: recvcmd.c:438
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
 "Kõiki märgitud lisasid ei saa dekodeerida. Edastan ülejäänud MIME formaadis?"
 
-#: recvcmd.c:552
+#: recvcmd.c:557
 msgid "Forward MIME encapsulated?"
 msgstr "Edastan MIME pakina?"
 
-#: recvcmd.c:558 recvcmd.c:809
+#: recvcmd.c:563 recvcmd.c:814
 #, c-format
 msgid "Can't create %s."
 msgstr "%s loomine ebaõnnestus."
 
-#: recvcmd.c:677
+#: recvcmd.c:682
 msgid "Can't find any tagged messages."
 msgstr "Ei leia ühtegi märgitud teadet."
 
-#: recvcmd.c:706 send.c:780
+#: recvcmd.c:711 send.c:771
 msgid "No mailing lists found!"
 msgstr "Postiloendeid pole!"
 
-#: recvcmd.c:787
+#: recvcmd.c:792
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
 "Kõiki märgitud lisasid ei saa dekodeerida. Kapseldan ülejäänud MIME formaati?"
 
-#: remailer.c:455
+#: remailer.c:460
 msgid "Append"
 msgstr "Lõppu"
 
-#: remailer.c:456
+#: remailer.c:461
 msgid "Insert"
 msgstr "Lisa"
 
-#: remailer.c:457
+#: remailer.c:462
 msgid "Delete"
 msgstr "Kustuta"
 
-#: remailer.c:459
+#: remailer.c:464
 msgid "OK"
 msgstr "OK"
 
-#: remailer.c:486
+#: remailer.c:491
 msgid "Can't get mixmaster's type2.list!"
 msgstr "Mixmaster type2.list laadimine ei õnnestu!"
 
-#: remailer.c:512
+#: remailer.c:517
 msgid "Select a remailer chain."
 msgstr "Valige vahendajate ahel."
 
-#: remailer.c:568
+#: remailer.c:573
 #, c-format
 msgid "Error: %s can't be used as the final remailer of a chain."
 msgstr "Viga: %s ei saa ahela viimase vahendajana kasutada."
 
-#: remailer.c:596
+#: remailer.c:601
 #, c-format
 msgid "Mixmaster chains are limited to %d elements."
 msgstr "Mixmaster ahelad on piiratud %d lüliga."
 
-#: remailer.c:617
+#: remailer.c:622
 msgid "The remailer chain is already empty."
 msgstr "Vahendajate ahel on juba tühi."
 
-#: remailer.c:627
+#: remailer.c:632
 msgid "You already have the first chain element selected."
 msgstr "Te olete ahela esimese lüli juba valinud."
 
-#: remailer.c:637
+#: remailer.c:642
 msgid "You already have the last chain element selected."
 msgstr "Te olete ahela viimase lüli juba valinud."
 
-#: remailer.c:673
+#: remailer.c:678
 msgid "Mixmaster doesn't accept Cc or Bcc headers."
 msgstr "Mixmaster ei toeta Cc või Bcc päiseid."
 
-#: remailer.c:696
+#: remailer.c:701
 msgid ""
 "Please set the hostname variable to a proper value when using mixmaster!"
 msgstr ""
 "Mixmaster kasutamisel omistage palun hostname muutujale korrektne väärtus!"
 
-#: remailer.c:728
+#: remailer.c:733
 #, c-format
 msgid "Error sending message, child exited %d.\n"
 msgstr "Viga teate saatmisel, alamprotsess lõpetas koodiga %d.\n"
 
-#: remailer.c:731
+#: remailer.c:736
 msgid "Error sending message."
 msgstr "Viga teate saatmisel."
 
-#: rfc1524.c:148
+#: rfc1524.c:151
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr "Vigaselt formaaditud kirje tüübile %s faili \"%s\" real %d"
 
-#: rfc1524.c:358
+#: rfc1524.c:361
 msgid "No mailcap path specified"
 msgstr "Mailcap tee ei ole määratud"
 
-#: rfc1524.c:385
+#: rfc1524.c:388
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "Tüübil %s puudub mailcap kirje"
 
-#: score.c:66
+#: score.c:67
 msgid "score: too few arguments"
 msgstr "score: liiga vähe argumente"
 
-#: score.c:74
+#: score.c:75
 msgid "score: too many arguments"
 msgstr "score: liiga palju argumente"
 
-#: send.c:279
+#: send.c:284
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: send.c:288
+#: send.c:293
 msgid "No subject, abort?"
 msgstr "Teema puudub, katkestan?"
 
-#: send.c:290
+#: send.c:295
 msgid "No subject, aborting."
 msgstr "Teema puudub, katkestan."
 
-#: send.c:508
-msgid "Message came from a mailing list. Reply to author only?"
+#: send.c:494
+msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
-#. There are quite a few mailing lists which set the Reply-To:
-#. * header field to the list address, which makes it quite impossible
-#. * to send a message to only the sender of the message.  This
-#. * provides a way to do that.
-#.
-#: send.c:547
+#: send.c:533
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "Vastan aadressile %s%s?"
 
-#: send.c:578
+#: send.c:564
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "Vastus aadressile %s%s?"
 
-#. 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:749
+#: send.c:740
 msgid "No tagged messages are visible!"
 msgstr "Märgitud teateid ei ole näha!"
 
-#: send.c:807
+#: send.c:798
 msgid "Include message in reply?"
 msgstr "Kaasan vastuses teate?"
 
-#: send.c:811
+#: send.c:802
 msgid "Including quoted message..."
 msgstr "Tsiteerin teadet..."
 
-#: send.c:818
+#: send.c:809
 msgid "Could not include all requested messages!"
 msgstr "Kõiki soovitud teateid ei õnnestu kaasata!"
 
-#: send.c:834
+#: send.c:825
 msgid "Forward as attachment?"
 msgstr "Edasta lisadena?"
 
-#: send.c:837
+#: send.c:828
 msgid "Preparing forwarded message..."
 msgstr "Valmistan edastatavat teadet..."
 
-#: send.c:1129
+#: send.c:1133
 msgid "Recall postponed message?"
 msgstr "Laen postitusootel teate?"
 
-#: send.c:1436
+#: send.c:1447
 msgid "Edit forwarded message?"
 msgstr "Toimetan edastatavat teadet?"
 
-#: send.c:1459
+#: send.c:1481
 msgid "Abort unmodified message?"
 msgstr "Katkestan muutmata teate?"
 
-#: send.c:1460
+#: send.c:1482
 msgid "Aborted unmodified message."
 msgstr "Katkestasin muutmata teate saatmise."
 
-#: send.c:1501
+#: send.c:1523
 #, fuzzy
 msgid "Article not posted."
 msgstr "Lisa on salvestatud."
 
-#: send.c:1535
+#: send.c:1557
 msgid "Message postponed."
 msgstr "Teade jäeti postitusootele."
 
-#: send.c:1546
+#: send.c:1568
 msgid "No recipients are specified!"
 msgstr "Kirja saajaid pole määratud!"
 
-#: send.c:1551
+#: send.c:1573
 msgid "No recipients were specified."
 msgstr "Kirja saajaid ei määratud!"
 
-#: send.c:1569
+#: send.c:1591
 msgid "No subject, abort sending?"
 msgstr "Teema puudub, katkestan saatmise?"
 
-#: send.c:1572 send.c:1578
+#: send.c:1594 send.c:1600
 msgid "No subject specified."
 msgstr "Teema puudub."
 
-#: send.c:1584
+#: send.c:1606
 #, fuzzy
 msgid "No newsgroup specified."
 msgstr "Teema puudub."
 
-#: send.c:1645
+#: send.c:1618
+msgid "No attachments made but indicator found in text. Cancel sending?"
+msgstr ""
+
+#: send.c:1621
+msgid "No attachments made but indicator found in text. Abort sending."
+msgstr ""
+
+#: send.c:1681
 msgid "Sending message..."
 msgstr "Saadan teadet..."
 
-#: send.c:1769
+#: send.c:1805
 msgid "Could not send the message."
 msgstr "Teadet ei õnnestu saata."
 
-#: send.c:1775
+#: send.c:1811
 msgid "Sending in background."
 msgstr "Saadan taustal."
 
-#: send.c:1777
+#: send.c:1813
 msgid "Article posted."
 msgstr ""
 
-#: send.c:1778 send.c:1780
+#: send.c:1814 send.c:1816
 msgid "Mail sent."
 msgstr "Teade on saadetud."
 
-#: sendlib.c:461
+#: sendlib.c:394
 msgid "No boundary parameter found! [report this error]"
 msgstr "Eraldaja puudub! [teatage sellest veast]"
 
-#: sendlib.c:489
+#: sendlib.c:422
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s ei ole enam!"
 
-#: sendlib.c:893
+#: sendlib.c:826
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s ei ole tavaline fail."
 
-#: sendlib.c:1057
+#: sendlib.c:993
 #, c-format
 msgid "Could not open %s"
 msgstr "%s ei saa avada"
 
-#: sendlib.c:2128
+#: sendlib.c:2063
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Viga teate saatmisel, alamprotsess lõpetas %d (%s)."
 
-#: sendlib.c:2134
+#: sendlib.c:2069
 msgid "Output of the delivery process"
 msgstr "Väljund saatmise protsessist"
 
-#: sendlib.c:2355
+#: sendlib.c:2293
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
@@ -5138,102 +5183,103 @@ msgstr "Sain %s...  V
 msgid "Caught signal %d...  Exiting.\n"
 msgstr "Sain signaali %d...  Väljun.\n"
 
-#: smime.c:108
-msgid "Enter SMIME passphrase:"
+#: smime.c:110
+#, fuzzy
+msgid "Enter S/MIME passphrase:"
 msgstr "Sisestage SMIME parool:"
 
-#: smime.c:308
+#: smime.c:311
 msgid "Trusted   "
 msgstr "Usaldatud "
 
-#: smime.c:311
+#: smime.c:314
 msgid "Verified  "
 msgstr "Kontrollitud "
 
-#: smime.c:314
+#: smime.c:317
 msgid "Unverified"
 msgstr "Kontrollimata"
 
-#: smime.c:317
+#: smime.c:320
 msgid "Expired   "
 msgstr "Aegunud   "
 
-#: smime.c:320
+#: smime.c:323
 msgid "Revoked   "
 msgstr "Tühistatud "
 
-#: smime.c:323
+#: smime.c:326
 msgid "Invalid   "
 msgstr "Vigane    "
 
-#: smime.c:326
+#: smime.c:329
 msgid "Unknown   "
 msgstr "Tundmatu  "
 
-#: smime.c:358
+#: smime.c:361
 msgid "Enter keyID: "
 msgstr "Sisestage võtme ID: "
 
-#: smime.c:380
+#: smime.c:383
 #, c-format
 msgid "S/MIME certificates matching \"%s\"."
 msgstr "S/MIME sertifikaadid, mis sisaldavad \"%s\"."
 
-#: smime.c:530 smime.c:591 smime.c:606
+#: smime.c:533 smime.c:594 smime.c:609
 #, c-format
 msgid "ID %s is unverified. Do you want to use it for %s ?"
 msgstr "ID %s pole kontrollitud. Kas soovite seda ikka %s jaoks kasutada ?"
 
-#: smime.c:534 smime.c:595
+#: smime.c:537 smime.c:598
 #, c-format
 msgid "Use (untrusted!) ID %s for %s ?"
 msgstr "Kasutan (mitteusaldatavat!) ID %s %s jaoks?"
 
-#: smime.c:537 smime.c:597
+#: smime.c:540 smime.c:600
 #, c-format
 msgid "Use ID %s for %s ?"
 msgstr "Kasutan ID %s %s jaoks?"
 
-#: smime.c:614
+#: smime.c:617
 #, c-format
 msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
 msgstr ""
 "Hoiatus: Te pole veel otsustanud usaldada ID %s. (jätkamiseks suvaline klahv)"
 
-#: smime.c:766
+#: smime.c:769
 #, c-format
 msgid "No (valid) certificate found for %s."
 msgstr "%s jaoks puudub kehtiv sertifikaat."
 
-#: smime.c:818 smime.c:845 smime.c:908 smime.c:950 smime.c:1012 smime.c:1082
+#: smime.c:821 smime.c:848 smime.c:910 smime.c:952 smime.c:1014 smime.c:1084
 msgid "Error: unable to create OpenSSL subprocess!"
 msgstr "Viga: ei õnnestu luua OpenSSL alamprotsessi!"
 
-#: smime.c:1154
+#: smime.c:1156
 msgid "no certfile"
 msgstr "sertifikaadi faili pole"
 
-#: smime.c:1157
+#: smime.c:1159
 msgid "no mbox"
 msgstr "pole postkast"
 
-#: smime.c:1297
+#: smime.c:1299
 msgid "No output from OpenSSL.."
 msgstr "OpenSSL väljundit pole..."
 
-#: smime.c:1335
+#: smime.c:1337
 msgid "Warning: Intermediate certificate not found."
 msgstr "Hoiatus: vahepealset sertifikaati pole."
 
-#: smime.c:1376
+#: smime.c:1378
 msgid "Can't open OpenSSL subprocess!"
 msgstr "OpenSSL protsessi avamine ebaõnnestus!"
 
-#: smime.c:1413
+#: smime.c:1415
 msgid "No output from OpenSSL..."
 msgstr "OpenSSL väljundit pole..."
 
-#: smime.c:1577 smime.c:1701
+#: smime.c:1579 smime.c:1703
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -5241,19 +5287,19 @@ msgstr ""
 "[-- OpenSSL väljundi lõpp --]\n"
 "\n"
 
-#: smime.c:1663 smime.c:1675
+#: smime.c:1665 smime.c:1677
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Viga: ei õnnestu luua OpenSSL alamprotsessi! --]\n"
 
-#: smime.c:1705
+#: smime.c:1707
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- Järgneb S/MIME krüptitud info --]\n"
 
-#: smime.c:1708
+#: smime.c:1710
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- Järgneb S/MIME allkirjastatud info --]\n"
 
-#: smime.c:1766
+#: smime.c:1768
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -5261,7 +5307,7 @@ msgstr ""
 "\n"
 "[-- S/MIME krüptitud info lõpp --]\n"
 
-#: smime.c:1768
+#: smime.c:1770
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -5280,45 +5326,67 @@ msgstr "S/MIME (k)r
 msgid "eswabfc"
 msgstr "kaimu"
 
-#: smime.c:1887
-msgid ""
-"1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
-msgstr "1: DES, 2: 3DES, 3: RC2-40, 4: RC2-64, 5: RC2-128 või (u)nusta? "
+#: smime.c:1892
+msgid "Choose algorithm family: 1: DES, 2: RC2, 3: AES, or (c)lear? "
+msgstr ""
+
+#: smime.c:1894
+msgid "drac"
+msgstr ""
+
+#: smime.c:1896
+msgid "1: DES, 2: Triple-DES "
+msgstr ""
+
+#: smime.c:1897
+msgid "dt"
+msgstr ""
 
-#: smime.c:1889
-msgid "12345f"
-msgstr "12345u"
+#: smime.c:1908
+msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 "
+msgstr ""
+
+#: smime.c:1909
+msgid "468"
+msgstr ""
+
+#: smime.c:1923
+msgid "1: AES128, 2: AES192, 3: AES256 "
+msgstr ""
 
-#: smime.c:1913
+#: smime.c:1924
+msgid "895"
+msgstr ""
+
+#: smime.c:1951
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
-#: sort.c:280
+#: sort.c:282
 msgid "Sorting mailbox..."
 msgstr "Järjestan teateid..."
 
-#: sort.c:312
+#: sort.c:314
 msgid "Could not find sorting function! [report this bug]"
 msgstr "Ei leia järjestamisfunktsiooni! [teatage sellest veast]"
 
-#: status.c:96
+#: status.c:100
 #, fuzzy
 msgid "no mailbox"
 msgstr "(pole postkast)"
 
-#: status.c:128
+#: status.c:132
 msgid "(no mailbox)"
 msgstr "(pole postkast)"
 
-#: thread.c:987
+#: thread.c:989
 msgid "Parent message is not visible in this limited view."
 msgstr "Vanem teade ei ole selles piiratud vaates nähtav."
 
-#: thread.c:994
+#: thread.c:996
 msgid "Parent message is not available."
 msgstr "Vanem teade ei ole kättesaadav."
 
-#. mutt_endwin (NULL);
 #: lib/exit.c:15
 #, c-format
 msgid ""
@@ -5326,14 +5394,186 @@ msgid ""
 "(please report this error to <mutt-ng-devel@lists.berlios.de>\n"
 msgstr ""
 
-#: lib/mem.c:20
-msgid "Integer overflow -- can't allocate memory!"
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
+#~ "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
+#~ "Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+#~ "Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+#~ "Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
+#~ "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
+#~ "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
+#~ "\n"
+#~ "Copyright (C) 2005:\n"
+#~ "  Parts were written/modified by:\n"
+#~ "     Andreas Krennmair <ak@synflood.at>\n"
+#~ "     Nico Golde <nico@ngolde.de>\n"
+#~ "     Rocco Rutte <pdmef@cs.tu-berlin.de>\n"
+#~ "\n"
+#~ "Lots of others not mentioned here contributed lots of code,\n"
+#~ "fixes, and suggestions.\n"
+#~ "\n"
+#~ "    This program is free software; you can redistribute it and/or modify\n"
+#~ "    it under the terms of the GNU General Public License as published by\n"
+#~ "    the Free Software Foundation; either version 2 of the License, or\n"
+#~ "    (at your option) any later version.\n"
+#~ "\n"
+#~ "    This program is distributed in the hope that it will be useful,\n"
+#~ "    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "    GNU General Public License for more details.\n"
+#~ "\n"
+#~ "    You should have received a copy of the GNU General Public License\n"
+#~ "    along with this program; if not, write to the Free Software\n"
+#~ "    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
+#~ "1301, USA.\n"
+#~ msgstr ""
+#~ "Autoriõigus (C) 1996-2002 Michael R. Elkins <me@cs.hmc.edu>\n"
+#~ "Autoriõigus (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
+#~ "Autoriõigus (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
+#~ "Autoriõigus (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
+#~ "Autoriõigus (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+#~ "Autoriõigus (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
+#~ "Autoriõigus (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
+#~ "\n"
+#~ "Paljud siin mainimata inimesed on saatnud koodi, parandusi ja soovitusi.\n"
+#~ "\n"
+#~ "    This program is free software; you can redistribute it and/or modify\n"
+#~ "    it under the terms of the GNU General Public License as published by\n"
+#~ "    the Free Software Foundation; either version 2 of the License, or\n"
+#~ "    (at your option) any later version.\n"
+#~ "\n"
+#~ "    This program is distributed in the hope that it will be useful,\n"
+#~ "    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "    GNU General Public License for more details.\n"
+#~ "\n"
+#~ "    You should have received a copy of the GNU General Public License\n"
+#~ "    along with this program; if not, write to the Free Software\n"
+#~ "    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, "
+#~ "USA.\n"
 
-#. __MEM_CHECKED__
-#: lib/mem.c:26 lib/mem.c:38 lib/mem.c:64
-msgid "Out of memory!"
-msgstr "Mälu on otsas!"
+#, fuzzy
+#~ msgid ""
+#~ "  -e <command>\tspecify a command to be executed after initialization\n"
+#~ "  -f <file>\tspecify which mailbox to read\n"
+#~ "  -F <file>\tspecify an alternate muttrngc file\n"
+#~ "  -g <server>\tspecify a newsserver (if compiled with NNTP)\n"
+#~ "  -G\t\tselect a newsgroup (if compiled with NNTP)\n"
+#~ "  -H <file>\tspecify a draft file to read header and body from\n"
+#~ "  -i <file>\tspecify a file which Mutt-ng should include in the body\n"
+#~ "  -d <level>\t specify debugging level of Mutt-ng\n"
+#~ "  -m <type>\tspecify a default mailbox type\n"
+#~ "  -n\t\tcauses Mutt-ng not to read the system Muttngrc\n"
+#~ "  -p\t\trecall a postponed message\n"
+#~ "  -Q <variable>\tquery a configuration variable\n"
+#~ "  -R\t\topen mailbox in read-only mode\n"
+#~ "  -s <subj>\tspecify a subject (must be in quotes if it has spaces)\n"
+#~ "  -t\t\tprint the value of all variables to stdout\n"
+#~ "  -T\t\tprint the value of all changed variables to stdout\n"
+#~ "  -v\t\tshow version and compile-time definitions\n"
+#~ "  -x\t\tsimulate the mailx send mode\n"
+#~ "  -y\t\tselect a mailbox specified in your `mailboxes' list\n"
+#~ "  -z\t\texit immediately if there are no messages in the mailbox\n"
+#~ "  -Z\t\topen the first folder with new message, exit immediately if none\n"
+#~ "  -h\t\tthis help message"
+#~ msgstr ""
+#~ "kasutage: mutt [ -nRyzZ ] [ -e <käsk> ] [ -F <fail> ] [ -m <tüüp> ]\n"
+#~ "               [ -f <fail> ]\n"
+#~ "          mutt [ -nR ] [ -e <käsk> ] [ -F <fail> ] -Q <päring>\n"
+#~ "               [ -Q <päring> ] [...]\n"
+#~ "          mutt [ -nR ] [ -e <käsk> ] [ -F <fail> ] -A <hüüdnimi>\n"
+#~ "               [ -A <hüüdnimi> ] [...]\n"
+#~ "          mutt [ -nx ] [ -e <käsk> ] [ -a <fail> ] [ -F <fail> ] [ -H "
+#~ "<fail> ]\n"
+#~ "               [ -i <fail> ] [ -s <teema> ] [ -b <aadr> ] [ -c <aadr> ]\n"
+#~ "               <aadr> [ ... ]\n"
+#~ "          mutt [ -n ] [ -e <käsk> ] [ -F <fail> ] -p\n"
+#~ "          mutt -v[v]\n"
+#~ "\n"
+#~ "võtmed:\n"
+#~ "  -A <hüüdnimi>\tavalda antud hüüdnimi\n"
+#~ "  -a <fail>\tlisa teatele fail\n"
+#~ "  -b <aadress>\tmäära pimekoopia (BCC) aadress\n"
+#~ "  -c <aadress>\tmäära koopia (CC) aadress\n"
+#~ "  -e <käsk>\tkäivita peale algväärtutamist käsk\n"
+#~ "  -f <fail>\tmillist postkasti lugeda\n"
+#~ "  -F <fail>\tmäära alternatiivne muttrc fail\n"
+#~ "  -H <fail>\tmäära päiste mustandi fail\n"
+#~ "  -i <fail>\tfail mida mutt peab vastamisel lisama\n"
+#~ "  -m <tüüp>\tmääta vaikimisi postkasti tüüp\n"
+#~ "  -n\t\tära loe süsteemset Muttrc faili\n"
+#~ "  -p\t\tlae postitusootel teade\n"
+#~ "  -Q <muutuja>\tloe seadete muutuja\n"
+#~ "  -R\t\tava postkast ainult lugemiseks\n"
+#~ "  -s <teema>\tmäära teate teema (jutumärkides, kui on mitmesõnaline)\n"
+#~ "  -v\t\tnäita versiooni ja kompileerimis-aegseid määranguid\n"
+#~ "  -x\t\tsimuleeri mailx saatmise moodi\n"
+#~ "  -y\t\tvali postkast teie 'postkastide' loendist\n"
+#~ "  -z\t\tvälju kohe, kui postkastis pole uusi teateid\n"
+#~ "  -Z\t\tava esimene kaust uue teatega, välju kohe, kui pole\n"
+#~ "  -h\t\tesita see abiinfo"
+
+#~ msgid "DEBUG was not defined during compilation.  Ignored.\n"
+#~ msgstr "DEBUG ei ole kompileerimise ajal defineeritud. Ignoreerin.\n"
+
+#~ msgid ""
+#~ "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
+#~ msgstr "1: DES, 2: 3DES, 3: RC2-40, 4: RC2-64, 5: RC2-128 või (u)nusta? "
+
+#~ msgid "12345f"
+#~ msgstr "12345u"
+
+#~ msgid "Out of memory!"
+#~ msgstr "Mälu on otsas!"
+
+#, fuzzy
+#~ msgid "Unable to create backup file"
+#~ msgstr "%s: faili lisamine ebaõnnestus"
+
+#~ msgid "%s: unknown sorting method"
+#~ msgstr "%s: tundmatu järjestamise meetod"
+
+#~ msgid "mutt_restore_default(%s): error in regexp: %s\n"
+#~ msgstr "mutt_restore_default(%s): vigane regexp: %s\n"
+
+#~ msgid "%s is set"
+#~ msgstr "%s on seatud"
+
+#~ msgid "%s is unset"
+#~ msgstr "%s ei ole seatud"
+
+#~ msgid "%s: invalid mailbox type"
+#~ msgstr "%s: vigane postkasti tüüp"
+
+#~ msgid "%s: invalid value"
+#~ msgstr "%s: vigane väärtus"
+
+#~ msgid "Debugging at level %d.\n"
+#~ msgstr "Silumise tase %d.\n"
+
+#~ msgid "First entry is shown."
+#~ msgstr "Esimene kirje on näidatud."
+
+#~ msgid "Last entry is shown."
+#~ msgstr "Viimane kirje on näidatud."
+
+#, fuzzy
+#~ msgid "GROUP command failed: %s"
+#~ msgstr "Preconnect käsklus ebaõnnestus"
+
+#, fuzzy
+#~ msgid "esabtf"
+#~ msgstr "kaimu"
+
+#, fuzzy
+#~ msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)oggle or (f)orget it?"
+#~ msgstr ""
+#~ "PGP (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad, k(e)hasse, või (u)nusta? "
+
+#, fuzzy
+#~ msgid "Unable to connect to host %s"
+#~ msgstr "%s ei õnnestu lisada!"
 
 #~ msgid "Can't change 'important' flag on POP server."
 #~ msgstr "POP serveril ei saa muuta lippu 'important' (tähtis)."