From: Thomas Roessler <roessler@does-not-exist.org>
Date: Tue, 22 Feb 2000 19:22:19 +0000 (+0000)
Subject: update-po.
X-Git-Tag: mutt-1-1-5-rel~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=375b031899b5145b2a9dc609ff3e151925c9c763;p=mutt

update-po.
---

diff --git a/po/cs.po b/po/cs.po
index 7cc51eed..e8896e2d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.4i\n"
-"POT-Creation-Date: 2000-02-16 12:32+0100\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: 2000-02-16 12:35+0100\n"
 "Last-Translator: Jiøí Pavlovský <pavlovsk@ff.cuni.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -74,7 +74,7 @@ msgid "Alias added."
 msgstr "Pøezdívka zavedena."
 
 #
-#: attach.c:111 attach.c:238 attach.c:431 attach.c:887
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "Shodu pro jmenný vzor nelze nalézt, pokraèovat?"
 
@@ -135,17 +135,17 @@ msgid "Cannot create filter"
 msgstr "Nelze vytvoøit filtr"
 
 #
-#: attach.c:706 recvattach.c:427
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "Pøíloha ulo¾ena."
 
 #
-#: attach.c:762
+#: attach.c:764
 msgid "Write fault!"
 msgstr "Chyba pøi zápisu!"
 
 #
-#: attach.c:971
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "Nevím, jak mám toto vytisknout!"
 
@@ -160,7 +160,7 @@ msgid "Mask"
 msgstr "Maska"
 
 #
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s není adresáøem."
@@ -189,77 +189,77 @@ msgid "Can't attach a directory!"
 msgstr "Adresáø nelze pøipojit!"
 
 #
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "Souborové masce nevyhovuje ¾ádný soubor."
 
 #
-#: browser.c:816
+#: browser.c:820
 msgid "Creating mailboxes is not yet supported."
 msgstr "Vytváøení schránek není zatím podporováno."
 
 #
-#: browser.c:821
+#: browser.c:825
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Mazání funguje pouze u IMAP schránek."
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Skuteènì chcete smazat schránku \"%s\"?"
 
 #
-#: browser.c:843
+#: browser.c:847
 msgid "Mailbox deleted."
 msgstr "Schránka byla smazána."
 
 #
-#: browser.c:849
+#: browser.c:853
 msgid "Mailbox not deleted."
 msgstr "Schránka nebyla smazána."
 
 #
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "Nastavit pracovní adresáø na: "
 
 #
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "Chyba pøi naèítání adresáøe."
 
 #
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "Souborová maska: "
 
 #
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Obrácené øazení dle (d)ata, (p)ísmena, (v)elikosti èi (n)eøadit?"
 
 #
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Øadit dle (d)ata, (p)ísmena, (v)elikosti èi (n)eøadit?"
 
 #
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr "dpvn"
 
 #
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "Nové jméno souboru: "
 
 #
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "Adresáø nelze zobrazit"
 
 #
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "Chyba pøi zobrazování souboru"
 
@@ -972,12 +972,12 @@ msgid "You are on the first message."
 msgstr "Jste na první zprávì."
 
 #
-#: curs_main.c:1166 pattern.c:1112
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "Hledání pokraèuje od zaèátku."
 
 #
-#: curs_main.c:1175 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "Hledání pokraèuje od konce."
 
@@ -1379,8 +1379,15 @@ msgstr "Prob
 msgid "Login failed."
 msgstr "Pøihlá¹ení se nezdaøilo."
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "Stahuji zprávu..."
+
+#: imap/browse.c:120
+#, fuzzy
+msgid "Getting folder list..."
 msgstr "Spojení se serverem navázáno: stahuji seznam schránek..."
 
 #. something is wrong because the server reported fewer messages
@@ -1418,7 +1425,7 @@ msgstr "Ke schr
 
 #
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "Vytvoøit %s?"
@@ -1597,112 +1604,106 @@ msgid "invalid header field"
 msgstr "neplatná hlavièka"
 
 #
-#: init.c:589
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "ignoruji prázdnou hlavièku: %s"
-
-#
-#: init.c:641
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "metoda %s pro øazení není známa"
 
 #
-#: init.c:717
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr "mutt_restore_default: chybný regulární výraz %s\n"
 
 #
-#: init.c:777
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "Promìnná %s není známa."
 
 #
-#: init.c:786
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "Prefix není s 'reset' povolen."
 
 #
-#: init.c:792
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "Hodnota není s 'reset' povolena."
 
 #
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "%s je nastaveno"
 
 #
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "%s není nastaveno"
 
 #
-#: init.c:1035
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s je nesprávný typ schránky."
 
 #
-#: init.c:1060 init.c:1105
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "Hodnota %s je nesprávná."
 
 #
-#: init.c:1160
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "neznámý typ %s"
 
 #
-#: init.c:1199
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Chyba v %s na øádku %d: %s"
 
 #
 #. the muttrc source keyword
-#: init.c:1210
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: chyby v %s"
 
 #
-#: init.c:1220
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "source: chyba na %s"
 
 #
-#: init.c:1225
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "source: pøíli¹ mnoho argumentù"
 
 #
-#: init.c:1276
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "Pøíkaz %s není znám."
 
 #
-#: init.c:1633
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Chyba %s na pøíkazovém øádku\n"
 
 #
-#: init.c:1676
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "domovský adresáø nelze urèit"
 
 #
-#: init.c:1684
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "u¾ivatelské jméno nelze urèit"
 
@@ -2285,8 +2286,9 @@ msgstr "p
 
 #
 #: keymap_alldefs.h:110
-msgid "move to the previous undelete message"
-msgstr "pøeskoèit na pøedchozí obnovenou zprávu"
+#, fuzzy
+msgid "move to the last undelete message"
+msgstr "pøeskoèit na následující obnovenou zprávu"
 
 #
 #: keymap_alldefs.h:111
@@ -2364,285 +2366,290 @@ msgstr "p
 
 #
 #: keymap_alldefs.h:126
+msgid "return to the main-menu"
+msgstr "návrat do hlavního menu"
+
+#
+#: keymap_alldefs.h:127
 msgid "toggle display of quoted text"
 msgstr "pøepnout zobrazování citovaného textu"
 
 #
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:128
 msgid "skip beyond quoted text"
 msgstr "pøeskoèit za citovaný text"
 
 #
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:129
 msgid "jump to the top of the message"
 msgstr "pøeskoèit na zaèátek zprávy"
 
 #
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:130
 msgid "pipe message/attachment to a shell command"
 msgstr "poslat zprávu/pøílohu rourou do pøíkazu shellu"
 
 #
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:131
 msgid "move to the previous entry"
 msgstr "pøeskoèit na pøedchozí polo¾ku"
 
 #
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:132
 msgid "scroll up one line"
 msgstr "rolovat o øádek nahoru"
 
 #
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:133
 msgid "move to the previous page"
 msgstr "pøeskoèit na pøedchozí stránku"
 
 #
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:134
 msgid "print the current entry"
 msgstr "vytisknout aktuální polo¾ku"
 
 #
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:135
 msgid "query external program for addresses"
 msgstr "dotázat se externího programu na adresy"
 
 #
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:136
 msgid "append new query results to current results"
 msgstr "pøidat výsledky nového dotazu k ji¾ existujícím"
 
 #
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:137
 msgid "save changes to mailbox and quit"
 msgstr "ulo¾it zmìny do schránky a skonèit"
 
 #
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:138
 msgid "recall a postponed message"
 msgstr "vrátit se k odlo¾ené zprávì"
 
 #
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:139
 msgid "clear and redraw the screen"
 msgstr "smazat a pøekreslit obrazovku"
 
 #
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:140
 msgid "{internal}"
 msgstr "<vnitøní>"
 
 #
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:141
 msgid "reply to a message"
 msgstr "odepsat na zprávu"
 
 #
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:142
 msgid "use the current message as a template for a new one"
 msgstr "pou¾ít aktuální zprávu jako ¹ablonu pro novou"
 
 #
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:143
 msgid "save message/attachment to a file"
 msgstr "ulo¾it zprávu/pøílohu do souboru"
 
 #
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:144
 msgid "search for a regular expression"
 msgstr "vyhledat regulární výraz"
 
 #
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:145
 msgid "search backwards for a regular expression"
 msgstr "vyhledat regulární výraz opaèným smìrem"
 
 #
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:146
 msgid "search for next match"
 msgstr "vyhledat následující shodu"
 
 #
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:147
 msgid "search for next match in opposite direction"
 msgstr "vyhledat následující shodu opaèným smìrem"
 
 #
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:148
 msgid "toggle search pattern coloring"
 msgstr "pøepnout obarvování hledaných vzorù"
 
 #
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:149
 msgid "invoke a command in a subshell"
 msgstr "spustit pøíkaz v podshellu"
 
 #
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:150
 msgid "sort messages"
 msgstr "seøadit zprávy"
 
 #
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:151
 msgid "sort messages in reverse order"
 msgstr "seøadit zprávy v opaèném poøadí"
 
 #
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:152
 msgid "tag the current entry"
 msgstr "oznaèit aktuální polo¾ku"
 
 #
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:153
 msgid "apply next function to tagged messages"
 msgstr "prefix funkce, která má být pou¾ita pouze pro oznaèené zprávy"
 
 #
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:154
 msgid "tag the current subthread"
 msgstr "oznaèit toto podvlákno"
 
 #
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:155
 msgid "tag the current thread"
 msgstr "oznaèit toto vlákno"
 
 #
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:156
 msgid "toggle a message's 'new' flag"
 msgstr "pøepnout zprávì pøíznak 'nová'"
 
 #
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:157
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "pøepnout, zda bude schránka pøepsána"
 
 #
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:158
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "pøepnout, zda procházet schránky nebo v¹echny soubory"
 
 #
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:159
 msgid "move to the top of the page"
 msgstr "pøeskoèit na zaèátek stránky"
 
 #
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:160
 msgid "undelete the current entry"
 msgstr "obnovit aktuální polo¾ku"
 
 #
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:161
 msgid "undelete all messages in thread"
 msgstr "obnovit v¹echny zprávy ve vláknu"
 
 #
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:162
 msgid "undelete all messages in subthread"
 msgstr "obnovit v¹echny zprávy v podvláknu"
 
 #
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:163
 msgid "show the Mutt version number and date"
 msgstr "Vypí¹e oznaèení verze a datum"
 
 #
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:164
 msgid "view attachment using mailcap entry if necessary"
 msgstr "pokud je to nezbytné, zobrazit pøílohy pomocí mailcapu"
 
 #
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:165
 msgid "show MIME attachments"
 msgstr "zobrazit MIME pøílohy"
 
 #
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:166
 msgid "show currently active limit pattern"
 msgstr "zobrazit aktivní omezující vzor"
 
 #
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:167
 msgid "collapse/uncollapse current thread"
 msgstr "zavinout/rozvinout toto vlákno"
 
 #
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:168
 msgid "collapse/uncollapse all threads"
 msgstr "zavinout/rozvinout v¹echna vlákna"
 
 #
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:169
 msgid "attach a PGP public key"
 msgstr "pøipojit veøejný PGP klíè"
 
 #
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:170
 msgid "show PGP options"
 msgstr "zobrazit menu PGP"
 
 #
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:171
 msgid "extract PGP public keys"
 msgstr "vypsat veøejné klíèe PGP"
 
 #
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:172
 msgid "wipe PGP passphrase from memory"
 msgstr "odstranit v¹echna PGP hesla z pamìti"
 
 #
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:173
 msgid "mail a PGP public key"
 msgstr "odeslat veøejný klíè PGP"
 
 #
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:174
 msgid "verify a PGP public key"
 msgstr "ovìøit veøejný klíè PGP"
 
 #
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:175
 msgid "view the key's user id"
 msgstr "zobrazit u¾ivatelské ID klíèe"
 
 #
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:176
 msgid "make decrypted copy and delete"
 msgstr "vytvoøit de¹ifrovanou kopii a smazat"
 
 #
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:177
 msgid "make decrypted copy"
 msgstr "vytvoøit de¹ifrovanou kopii"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:178
 msgid "Accept the chain constructed"
 msgstr "Akceptovat øetìz."
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:179
 msgid "Append a remailer to the chain"
 msgstr "Pøipojit k øetìzu remailer"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:180
 msgid "Insert a remailer into the chain"
 msgstr "Vlo¾it do øetìzu remailer"
 
 #
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:181
 msgid "Delete a remailer from the chain"
 msgstr "Odstranit remailer z øetìzu"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:182
 msgid "Select the previous element of the chain"
 msgstr "Vybrat pøedchozí èlánek øetìzu"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:183
 msgid "Select the next element of the chain"
 msgstr "Vybrat dal¹í èlánek øetìzu"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:184
 msgid "send the message through a mixmaster remailer chain"
 msgstr "odeslat zprávu pomocí øetìzu remailerù typu mixmaster"
 
@@ -2835,50 +2842,50 @@ msgstr ""
 "Pøelo¾eno s volbami:"
 
 #
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "Chyba pøi inicializaci terminálu."
 
 #
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Úroveò ladìní je %d.\n"
 
 #
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "pøi pøekladu programu nebylo 'DEBUG' definováno. Ignoruji.\n"
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s neexistuje. Mám ho vytvoøit?"
 
 #
-#: main.c:521
+#: main.c:519
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "%s nelze vytvoøit: %s"
 
 #
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "Nejsou specifikováni ¾ádní pøíjemci.\n"
 
 #
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "Soubor %s nelze pøipojit.\n"
 
 #
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "V ¾ádné schránce není nová po¹ta."
 
 #
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "Schránka je prázdná."
 
@@ -2995,7 +3002,7 @@ msgid "You are on the first entry."
 msgstr "Jste na první polo¾ce."
 
 #
-#: menu.c:657 pattern.c:1058
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "Vyhledat: "
 
@@ -3005,12 +3012,12 @@ msgid "Reverse search for: "
 msgstr "Vyhledat obráceným smìrem: "
 
 #
-#: menu.c:668 pattern.c:1091
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "Není ¾ádný vzor k vyhledání."
 
 #
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1156
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "Nenalezeno."
 
@@ -3040,30 +3047,30 @@ msgstr "Ozna
 msgid "Reading %s... %d"
 msgstr "Ètu %s... %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr "Soubor je adresáøem. Ulo¾it do nìj?"
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr "Zadejte jméno souboru: "
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "Soubor ji¾ existuje: (p)øepsat, pø(i)pojit èi (z)ru¹it?"
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr "piz"
 
 #
-#: muttlib.c:961
+#: muttlib.c:956
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s není schránkou!"
 
 #
-#: muttlib.c:967
+#: muttlib.c:962
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Pøipojit zprávy do %s?"
@@ -3189,6 +3196,12 @@ msgstr "Schr
 msgid "%d kept."
 msgstr "poèet ponechaných zpráv: %d"
 
+#
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "editovat zprávu"
+
 #
 #: pager.c:57
 msgid "Not available in this menu."
@@ -3313,38 +3326,38 @@ msgid "empty pattern"
 msgstr "prázdný vzor"
 
 #
-#: pattern.c:883
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "chyba: neznámý operand %d (ohlaste tuto chybu)."
 
 #
-#: pattern.c:948 pattern.c:1077
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "Pøekládám vzor k vyhledání..."
 
 #
-#: pattern.c:962
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "Spou¹tím pøíkaz pro shodující se zprávy... "
 
 #
-#: pattern.c:1025
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "®ádná ze zpráv nesplòuje daná kritéria."
 
 #
-#: pattern.c:1115
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "Pøi vyhledávání bylo dosa¾eno konce bez nalezení shody."
 
 #
-#: pattern.c:1126
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "Pøi vyhledávání bylo dosa¾eno zaèátku bez nalezení shody."
 
 #
-#: pattern.c:1148
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "Hledání bylo pøeru¹eno."
 
@@ -3690,7 +3703,7 @@ msgid "Connecting to %s"
 msgstr "Pøipojuji se k %s"
 
 #
-#: pop.c:166 pop.c:340
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "Server uzavøel spojení!"
 
@@ -4070,67 +4083,67 @@ msgstr "P
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:973
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "Vrátit se k odlo¾eným zprávám?"
 
 #
-#: send.c:1217
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "Zahodit nezmìnìnou zprávu?"
 
 #
-#: send.c:1219
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "Nezmìnìná zpráva byla zahozena."
 
 #
 #. abort
-#: send.c:1260
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "Zpráva nebyla odeslána."
 
 #
-#: send.c:1281
+#: send.c:1333
 msgid "Message postponed."
 msgstr "Zpráva byla odlo¾ena."
 
 #
-#: send.c:1290
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "Nejsou zadáni pøíjemci!"
 
 #
-#: send.c:1295
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "Nebyli zadání pøíjemci."
 
 #
-#: send.c:1301
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "®ádná vìc, zru¹it odeslání?"
 
 #
-#: send.c:1305
+#: send.c:1357
 msgid "No subject specified."
 msgstr "Vìc nebyla zadána."
 
 #
-#: send.c:1347
+#: send.c:1404
 msgid "Sending message..."
 msgstr "Posílám zprávu..."
 
 #
-#: send.c:1473
+#: send.c:1529
 msgid "Could not send the message."
 msgstr "Zprávu nelze odeslat."
 
 #
-#: send.c:1478
+#: send.c:1534
 msgid "Mail sent."
 msgstr "Zpráva odeslána."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Sending in background."
 msgstr "Zasílám na pozadí."
 
@@ -4152,12 +4165,12 @@ msgid "Could not open %s"
 msgstr "%s nelze otevøít"
 
 #
-#: sendlib.c:1702
+#: sendlib.c:1709
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Chyba pøi zasílání zprávy, potomek ukonèen %d (%s)."
 
-#: sendlib.c:1708
+#: sendlib.c:1715
 msgid "Output of the delivery process"
 msgstr "Výstup doruèovacího programu"
 
@@ -4204,9 +4217,13 @@ msgstr "Rodi
 msgid "Parent message is not available."
 msgstr "Rodièovská zpráva není dostupná."
 
-#~ msgid "Authenticating (GSSAPI)..."
-#~ msgstr "Ovìøuji (GSSAPI)..."
+#
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "ignoruji prázdnou hlavièku: %s"
 
 #
-#~ msgid "return to the main-menu"
-#~ msgstr "návrat do hlavního menu"
+#~ msgid "move to the previous undelete message"
+#~ msgstr "pøeskoèit na pøedchozí obnovenou zprávu"
+
+#~ msgid "Authenticating (GSSAPI)..."
+#~ msgstr "Ovìøuji (GSSAPI)..."
diff --git a/po/de.po b/po/de.po
index b21f7c68..7fcc25b5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.4\n"
-"POT-Creation-Date: 2000-02-16 02:36+0100\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: 2000-02-16 02:38:00+0100\n"
 "Last-Translator: Roland Rosenfeld <roland@spinnaker.de>\n"
 "Language-Team: German <mutt-po@mutt.org>\n"
@@ -63,7 +63,7 @@ msgstr "Speichern in Datei: "
 msgid "Alias added."
 msgstr "Adresse eingetragen."
 
-#: attach.c:111 attach.c:238 attach.c:431 attach.c:887
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "Namensschema kann nicht erfüllt werden, fortfahren?"
 
@@ -114,15 +114,15 @@ msgstr "Undefinierter MIME-Typ. Kann Anhang nicht anzeigen."
 msgid "Cannot create filter"
 msgstr "Kann Filter nicht erzeugen."
 
-#: attach.c:706 recvattach.c:427
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "Anhang gespeichert."
 
-#: attach.c:762
+#: attach.c:764
 msgid "Write fault!"
 msgstr "Schreibfehler!"
 
-#: attach.c:971
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "Ich weiß nicht, wie man dies druckt!"
 
@@ -134,7 +134,7 @@ msgstr "Verzeichnis"
 msgid "Mask"
 msgstr "Maske"
 
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ist kein Verzeichnis."
@@ -158,65 +158,65 @@ msgstr "Verzeichnis [%s], Dateimaske: %s"
 msgid "Can't attach a directory!"
 msgstr "Verzeichnisse können nicht angehängt werden!"
 
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "Es gibt keine zur Maske passenden Dateien"
 
-#: browser.c:816
+#: browser.c:820
 msgid "Creating mailboxes is not yet supported."
 msgstr "Das Erzeugen neuer Mailboxen wird noch nicht unterstützt."
 
-#: browser.c:821
+#: browser.c:825
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Es können nur IMAP Mailboxen gelöscht werden"
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Mailbox \"%s\" wirklich löschen?"
 
-#: browser.c:843
+#: browser.c:847
 msgid "Mailbox deleted."
 msgstr "Mailbox gelöscht."
 
-#: browser.c:849
+#: browser.c:853
 msgid "Mailbox not deleted."
 msgstr "Mailbox nicht gelöscht."
 
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "Verzeichnis wechseln nach: "
 
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "Fehler beim Einlesen des Verzeichnisses."
 
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "Dateimaske: "
 
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Sortiere umgekehrt nach (D)atum, (a)lphabetisch, (G)röße, oder (n)icht? "
 
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Sortiere nach (D)atum, (a)lphabetisch, (G)röße oder (n)icht?"
 
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr "dagn"
 
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "Neuer Dateiname: "
 
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "Verzeichnisse können nicht angezeigt werden."
 
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "Fehler bei der Anzeige einer Datei"
 
@@ -804,11 +804,11 @@ msgstr "Alle Nachrichten gel
 msgid "You are on the first message."
 msgstr "Sie sind bereits auf der ersten Nachricht."
 
-#: curs_main.c:1166 pattern.c:1112
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "Suche von vorne begonnen."
 
-#: curs_main.c:1175 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "Suche von hinten begonnen."
 
@@ -1155,8 +1155,14 @@ msgstr "Anmeldung..."
 msgid "Login failed."
 msgstr "Anmeldung gescheitert..."
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "Hole Nachricht..."
+
+#: imap/browse.c:120
+#, fuzzy
+msgid "Getting folder list..."
 msgstr "Kontaktiere Server, hole Liste der Ordner..."
 
 #. something is wrong because the server reported fewer messages
@@ -1189,7 +1195,7 @@ msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "Kann auf diesem IMAP-Server zu Mailboxen nichts hinzufügen."
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "%s erstellen?"
@@ -1347,94 +1353,89 @@ msgstr "alias: Keine Adresse"
 msgid "invalid header field"
 msgstr "my_hdr: Ungültiges Kopf-Feld"
 
-#: init.c:589
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "my_hdr: Ignoriere leeres Kopf-Feld: %s"
-
-#: init.c:641
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: Unbekannte Sortiermethode"
 
-#: init.c:717
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr "mutt_restore_default: Fehler in regulärem Ausdruck: %s\n"
 
-#: init.c:777
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: Unbekannte Variable."
 
-#: init.c:786
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "Präfix ist bei \"reset\" nicht zulässig."
 
-#: init.c:792
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "Wertzuweisung ist bei \"reset\" nicht zulässig."
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "%s ist gesetzt."
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "%s ist nicht gesetzt."
 
-#: init.c:1035
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: Ungültiger Mailbox-Typ"
 
-#: init.c:1060 init.c:1105
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: Ungültiger Wert"
 
-#: init.c:1160
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: Unbekannter Typ"
 
-#: init.c:1199
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Fehler in %s, Zeile %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1210
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: Fehler in %s"
 
-#: init.c:1220
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "source: Fehler bei %s"
 
-#: init.c:1225
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "source: Zu viele Argumente"
 
-#: init.c:1276
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: Unbekanntes Kommando"
 
-#: init.c:1633
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Fehler in Kommandozeile: %s\n"
 
-#: init.c:1676
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "Kann Home-Verzeichnis nicht bestimmen."
 
-#: init.c:1684
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "Kann Nutzernamen nicht bestimmen."
 
@@ -1907,8 +1908,9 @@ msgid "jump to previous subthread"
 msgstr "Springe zum vorigen Diskussionsfadenteil"
 
 #: keymap_alldefs.h:110
-msgid "move to the previous undelete message"
-msgstr "Springe zur vorigen ungelöschten Nachricht"
+#, fuzzy
+msgid "move to the last undelete message"
+msgstr "Springe zur nächsten ungelöschten Nachricht"
 
 #: keymap_alldefs.h:111
 msgid "jump to the previous new message"
@@ -1971,234 +1973,238 @@ msgid "jump to the bottom of the message"
 msgstr "Springe zum Ende der Nachricht"
 
 #: keymap_alldefs.h:126
+msgid "return to the main-menu"
+msgstr "Kehre zum Hauptmenü zurück"
+
+#: keymap_alldefs.h:127
 msgid "toggle display of quoted text"
 msgstr "Schalte Anzeige von zitiertem Text ein/aus"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:128
 msgid "skip beyond quoted text"
 msgstr "Übergehe zitierten Text"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:129
 msgid "jump to the top of the message"
 msgstr "Springe zum Nachrichtenanfang"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:130
 msgid "pipe message/attachment to a shell command"
 msgstr "Bearbeite (pipe) Nachricht/Anhang mit Shell-Kommando"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:131
 msgid "move to the previous entry"
 msgstr "Gehe zum vorigen Eintrag"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:132
 msgid "scroll up one line"
 msgstr "Gehe eine Zeile nach oben"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:133
 msgid "move to the previous page"
 msgstr "Gehe zur vorigen Seite"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:134
 msgid "print the current entry"
 msgstr "Drucke aktuellen Eintrag"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:135
 msgid "query external program for addresses"
 msgstr "Externe Adressenabfrage"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:136
 msgid "append new query results to current results"
 msgstr "Hänge neue Abfrageergebnisse an"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:137
 msgid "save changes to mailbox and quit"
 msgstr "Speichere Änderungen in Mailbox und beende das Programm"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:138
 msgid "recall a postponed message"
 msgstr "Bearbeite eine zurückgestellte Nachricht"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:139
 msgid "clear and redraw the screen"
 msgstr "Erzeuge Bildschirmanzeige neu"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:140
 msgid "{internal}"
 msgstr "{intern}"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:141
 msgid "reply to a message"
 msgstr "Beantworte Nachricht"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:142
 msgid "use the current message as a template for a new one"
 msgstr "Verwende aktuelle Nachricht als Vorlage für neue Nachricht"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:143
 msgid "save message/attachment to a file"
 msgstr "Speichere Nachricht/Anhang in Datei"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:144
 msgid "search for a regular expression"
 msgstr "Suche nach regulärem Ausdruck"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:145
 msgid "search backwards for a regular expression"
 msgstr "Suche rückwärts nach regulärem Ausdruck"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:146
 msgid "search for next match"
 msgstr "Suche nächsten Treffer"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:147
 msgid "search for next match in opposite direction"
 msgstr "Suche nächsten Treffer in umgekehrter Richtung"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:148
 msgid "toggle search pattern coloring"
 msgstr "Schalte Suchtreffer-Hervorhebung ein/aus"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:149
 msgid "invoke a command in a subshell"
 msgstr "Rufe Kommando in Shell auf"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:150
 msgid "sort messages"
 msgstr "Sortiere Nachrichten"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:151
 msgid "sort messages in reverse order"
 msgstr "Sortiere Nachrichten in umgekehrter Reihenfolge"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:152
 msgid "tag the current entry"
 msgstr "Markiere aktuellen Eintrag"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:153
 msgid "apply next function to tagged messages"
 msgstr "Wende nächste Funktion auf markierte Nachrichten an"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:154
 msgid "tag the current subthread"
 msgstr "Markiere aktuellen Diskussionsfadenteil"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:155
 msgid "tag the current thread"
 msgstr "Markiere aktuellen Diskussionsfaden"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:156
 msgid "toggle a message's 'new' flag"
 msgstr "Setze/entferne den \"neu\"-Indikator einer Nachricht"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:157
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "Schalte Sichern von Änderungen ein/aus"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:158
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "Schalte zwischen Mailboxen und allen Dateien um"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:159
 msgid "move to the top of the page"
 msgstr "Springe zum Anfang der Seite"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:160
 msgid "undelete the current entry"
 msgstr "Entferne Löschmarkierung vom aktuellen Eintrag"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:161
 msgid "undelete all messages in thread"
 msgstr "Entferne Löschmarkierung von allen Nachrichten im Diskussionsfaden"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:162
 msgid "undelete all messages in subthread"
 msgstr "Entferne Löschmarkierung von allen Nachrichten im Diskussionsfadenteil"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:163
 msgid "show the Mutt version number and date"
 msgstr "Zeige Versionsnummer an"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:164
 msgid "view attachment using mailcap entry if necessary"
 msgstr "Zeige Anhang, wenn nötig via Mailcap"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:165
 msgid "show MIME attachments"
 msgstr "Zeige MIME-Anhänge"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:166
 msgid "show currently active limit pattern"
 msgstr "Zeige derzeit aktives Begrenzungsmuster"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:167
 msgid "collapse/uncollapse current thread"
 msgstr "Kollabiere/expandiere aktuellen Diskussionsfaden"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:168
 msgid "collapse/uncollapse all threads"
 msgstr "Kollabiere/expandiere alle Diskussionsfäden"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:169
 msgid "attach a PGP public key"
 msgstr "Hänge öffentlichen PGP-Schlüssel an"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:170
 msgid "show PGP options"
 msgstr "Zeige PGP-Optionen"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:171
 msgid "extract PGP public keys"
 msgstr "Extrahiere öffentliche PGP-Schlüssel"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:172
 msgid "wipe PGP passphrase from memory"
 msgstr "Entferne PGP-Mantra aus Speicher"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:173
 msgid "mail a PGP public key"
 msgstr "Verschicke öffentlichen PGP-Schlüssel"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:174
 msgid "verify a PGP public key"
 msgstr "Prüfe öffentlichen PGP-Schlüssel"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:175
 msgid "view the key's user id"
 msgstr "Zeige Nutzer-ID zu Schlüssel an"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:176
 msgid "make decrypted copy and delete"
 msgstr "Erzeuge dechiffrierte Kopie und lösche"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:177
 msgid "make decrypted copy"
 msgstr "Erzeuge dechiffrierte Kopie"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:178
 msgid "Accept the chain constructed"
 msgstr "Akzeptiere die erstellte Kette"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:179
 msgid "Append a remailer to the chain"
 msgstr "Hänge einen Remailer an die Kette an"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:180
 msgid "Insert a remailer into the chain"
 msgstr "Füge einen Remailer in die Kette ein"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:181
 msgid "Delete a remailer from the chain"
 msgstr "Lösche einen Remailer aus der Kette"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:182
 msgid "Select the previous element of the chain"
 msgstr "Wähle das vorhergehende Element der Kette aus"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:183
 msgid "Select the next element of the chain"
 msgstr "Wähle das nächste Element der Kette aus"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:184
 msgid "send the message through a mixmaster remailer chain"
 msgstr "Verschicke die Nachricht über eine Mixmaster Remailer Kette"
 
@@ -2378,43 +2384,43 @@ msgstr ""
 "\n"
 "Einstellungen bei der Compilierung:"
 
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "Kann Terminal nicht initialisieren."
 
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Debugging auf Ebene %d.\n"
 
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG war beim Kompilieren nicht definiert.  Ignoriert.\n"
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s existiert nicht. Neu anlegen?"
 
-#: main.c:521
+#: main.c:519
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Kann %s nicht anlegen: %s."
 
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "Keine Empfänger angegeben.\n"
 
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: Kann Datei nicht anhängen.\n"
 
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "Keine Mailbox mit neuen Nachrichten."
 
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "Mailbox ist leer."
 
@@ -2509,7 +2515,7 @@ msgstr "Sie sind auf dem letzten Eintrag."
 msgid "You are on the first entry."
 msgstr "Sie sind auf dem ersten Eintrag"
 
-#: menu.c:657 pattern.c:1058
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "Suche nach: "
 
@@ -2517,11 +2523,11 @@ msgstr "Suche nach: "
 msgid "Reverse search for: "
 msgstr "Suche rückwärts nach: "
 
-#: menu.c:668 pattern.c:1091
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "Kein Suchmuster."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1156
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "Nicht gefunden."
 
@@ -2546,28 +2552,28 @@ msgstr "Markieren wird nicht unterst
 msgid "Reading %s... %d"
 msgstr "Lese %s... %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr "Datei ist ein Verzeichnis, darin abspeichern?"
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr "Datei in diesem Verzeichnis: "
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "Datei existiert, (u)eberschreiben, (a)nhängen, a(b)brechen?"
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr "uab"
 
-#: muttlib.c:961
+#: muttlib.c:956
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s ist keine Mailbox!"
 
-#: muttlib.c:967
+#: muttlib.c:962
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Nachricht an %s anhängen?"
@@ -2673,6 +2679,11 @@ msgstr "Mailbox ist als unschreibbar markiert. %s"
 msgid "%d kept."
 msgstr "%d behalten."
 
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "Editiere Nachricht"
+
 #: pager.c:57
 msgid "Not available in this menu."
 msgstr "Funktion ist in diesem Menü nicht verfügbar."
@@ -2773,32 +2784,32 @@ msgstr "Unpassende Klammern: %s"
 msgid "empty pattern"
 msgstr "Leeres Muster"
 
-#: pattern.c:883
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "Fehler: Unbekannter Muster-Operator %d (Bitte Bug melden)."
 
-#: pattern.c:948 pattern.c:1077
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "Compiliere Suchmuster..."
 
-#: pattern.c:962
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "Führe Kommando aus..."
 
-#: pattern.c:1025
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "Keine Nachrichten haben Kriterium erfüllt."
 
-#: pattern.c:1115
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "Suche hat Ende erreicht, ohne Treffer zu erzielen."
 
-#: pattern.c:1126
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "Suche hat Anfang erreicht, ohne Treffer zu erzielen."
 
-#: pattern.c:1148
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "Suche unterbrochen."
 
@@ -3099,7 +3110,7 @@ msgstr "Kann Host %s keine Adresse zuordnen."
 msgid "Connecting to %s"
 msgstr "Verbinde zu %s"
 
-#: pop.c:166 pop.c:340
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "Server hat Verbindung beendet!"
 
@@ -3422,56 +3433,56 @@ msgstr "Bereite Nachricht zum Weiterleiten vor..."
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:973
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "Zurückgestellte Nachricht weiterbearbeiten?"
 
-#: send.c:1217
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "Unveränderte Nachricht verwerfen?"
 
-#: send.c:1219
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "Unveränderte Nachricht verworfen."
 
 #. abort
-#: send.c:1260
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "Nachricht nicht verschickt."
 
-#: send.c:1281
+#: send.c:1333
 msgid "Message postponed."
 msgstr "Nachricht zurückgestellt."
 
-#: send.c:1290
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "Es wurden keine Empfänger angegeben!"
 
-#: send.c:1295
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "Es wurden keine Empfänger angegeben!"
 
-#: send.c:1301
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "Kein Betreff, Versand abbrechen?"
 
-#: send.c:1305
+#: send.c:1357
 msgid "No subject specified."
 msgstr "Kein Betreff."
 
-#: send.c:1347
+#: send.c:1404
 msgid "Sending message..."
 msgstr "Verschicke Nachricht..."
 
-#: send.c:1473
+#: send.c:1529
 msgid "Could not send the message."
 msgstr "Konnte Nachricht nicht verschicken."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Mail sent."
 msgstr "Nachricht verschickt."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Sending in background."
 msgstr "Verschicke im Hintergrund."
 
@@ -3489,12 +3500,12 @@ msgstr "%s existiert nicht mehr!"
 msgid "Could not open %s"
 msgstr "Konnte %s nicht öffnen."
 
-#: sendlib.c:1702
+#: sendlib.c:1709
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Fehler %d beim Versand der Nachricht (%s)."
 
-#: sendlib.c:1708
+#: sendlib.c:1715
 msgid "Output of the delivery process"
 msgstr "Ausgabe des Auslieferungs-Prozesses"
 
@@ -3533,8 +3544,11 @@ msgstr "Bezugsnachricht ist in der begenzten Sicht nicht verf
 msgid "Parent message is not available."
 msgstr "Bezugsnachricht ist nicht verfügbar."
 
-#~ msgid "return to the main-menu"
-#~ msgstr "Kehre zum Hauptmenü zurück"
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "my_hdr: Ignoriere leeres Kopf-Feld: %s"
+
+#~ msgid "move to the previous undelete message"
+#~ msgstr "Springe zur vorigen ungelöschten Nachricht"
 
 #~ msgid "Authenticating (GSSAPI)..."
 #~ msgstr "Authentifiziere (GSSAPI)..."
diff --git a/po/el.po b/po/el.po
index 21b30a69..f7e3e10d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt-1.1.2i\n"
-"POT-Creation-Date: 2000-02-15 09:44+0100\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: 2000-01-19 12:00+0200\n"
 "Last-Translator: ÖÜíçò ÄïêéáíÜêçò <madf@hellug.gr>\n"
 "Language-Team: Greek <el@li.org>\n"
@@ -80,7 +80,7 @@ msgid "Alias added."
 msgstr "Ôï øåõäþíõìï ðñïóôÝèçêå."
 
 #
-#: attach.c:111 attach.c:238 attach.c:431 attach.c:887
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "Áäõíáìßá ôáéñéÜóìáôïò ôïõ nametemplate, íá óõíå÷ßóù;"
 
@@ -141,17 +141,17 @@ msgid "Cannot create filter"
 msgstr "Áäõíáìßá äçìéïõñãßáò ößëôñïõ"
 
 #
-#: attach.c:706 recvattach.c:427
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "Ç ðñïóÜñôçóç áðïèçêåýèçêå."
 
 #
-#: attach.c:762
+#: attach.c:764
 msgid "Write fault!"
 msgstr "ÓöÜëìá åããñáöÞò!"
 
 #
-#: attach.c:971
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "Äå ãíùñßæù ðùò íá ôï ôõðþóù áõôü!"
 
@@ -166,7 +166,7 @@ msgid "Mask"
 msgstr "ÌÜóêá"
 
 #
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "Ôï %s äåí åßíáé êáôÜëïãïò."
@@ -195,84 +195,84 @@ msgid "Can't attach a directory!"
 msgstr "Áäõíáìßá ðñïóÜñôçóçò åíüò êáôÜëïãïõ"
 
 #
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "ÊáíÝíá áñ÷åßï äå ôáéñéÜæåé ìå ôç ìÜóêá áñ÷åßïõ"
 
 #
-#: browser.c:816
+#: browser.c:820
 #, fuzzy
 msgid "Creating mailboxes is not yet supported."
 msgstr "Óçìåéþóåéò äåí õðïóôçñßæïíôáé."
 
 #
 # recvattach.c:1065
-#: browser.c:821
+#: browser.c:825
 #, fuzzy
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "ÁõôÞ ç ëåéôïõñãßá äåí õðïóôçñßæåôáé ðñïò ôï ðáñüí ãéá ìçíýìáôá PGP."
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr ""
 
 #
-#: browser.c:843
+#: browser.c:847
 #, fuzzy
 msgid "Mailbox deleted."
 msgstr "Åíôïðßóôçêå âñüã÷ïò ìáêñïåíôïëÞò."
 
 #
-#: browser.c:849
+#: browser.c:853
 #, fuzzy
 msgid "Mailbox not deleted."
 msgstr "Ôï ãñÜììá äåí åóôÜëç."
 
 #
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "ÁëëáãÞ êáôáëüãïõ óå:"
 
 #
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "ÓöÜëìá êáôÜ ôç äéåñåýíçóç ôïõ êáôáëüãïõ."
 
 #
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "ÌÜóêá áñ÷åßïõ: "
 
 #
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "ÁíÜóôñïöç ôáîéíüìçóç êáôÜ (d)çìåñïìçíßá, (a)áëöáâçôéêÜ, (z)ìÝãåèïò Þ "
 "(n)Üêõñï;"
 
 #
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Ôáîéíüìçóç êáôÜ (d)çìåñïìçíßá, (a)áëöáâçôéêÜ, (z)ìÝãåèïò Þ (n)Üêõñï;"
 
 #
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr "dazn"
 
 #
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "ÍÝï üíïìá áñ÷åßïõ: "
 
 #
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "Áäõíáìßá áíÜãíùóçò åíüò êáôÜëïãïõ"
 
 #
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "ÓöÜëìá êáôÜ ôçí åìöÜíéóç áñ÷åßïõ"
 
@@ -996,12 +996,12 @@ msgid "You are on the first message."
 msgstr "Åßóôå óôï ðñþôï ìÞíõìá."
 
 #
-#: curs_main.c:1166 pattern.c:1112
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "ÁíáæÞôçóç óõíå÷ßóôçêå áðü ôçí êïñõöÞ."
 
 #
-#: curs_main.c:1175 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "ÁíáæÞôçóç óõíå÷ßóôçêå óôç âÜóç."
 
@@ -1410,8 +1410,15 @@ msgstr "
 msgid "Login failed."
 msgstr "ÁðÝôõ÷å ç åßóïäïò óôï óýóôçìá."
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "ËÞøç ìçíýìáôïò..."
+
+#: imap/browse.c:120
+#, fuzzy
+msgid "Getting folder list..."
 msgstr "Óýíäåóç óôï äéá÷åéñéóôÞ, ëÞøç ëßóôáò öáêÝëùí..."
 
 #
@@ -1451,7 +1458,7 @@ msgstr "
 
 #
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "Äçìéïõñãßá ôïõ %s;"
@@ -1637,112 +1644,106 @@ msgid "invalid header field"
 msgstr "ìç Ýãêõñï ðåäßï åðéêåöáëßäáò"
 
 #
-#: init.c:589
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "áãíüçóç Üäåéïõ ðåäßïõ åðéêåöáëßäáò: %s"
-
-#
-#: init.c:641
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: Üãíùóôç ìÝèïäïò ôáîéíüìçóçò"
 
 #
-#: init.c:717
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr "mutt_restore_default: ëÜèïò óôï regexp: %s\n"
 
 #
-#: init.c:777
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: Üãíùóôç ìåôáâëÞôÞ"
 
 #
-#: init.c:786
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "ôï ðñüèåìá åßíáé Üêõñï ìå ôçí åðáíáöïñÜ"
 
 #
-#: init.c:792
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "ç ôéìÞ åßíáé Üêõñç ìå ôçí áíáíÝùóç"
 
 #
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "Ôï %s ôåèåß"
 
 #
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "Ôï %s äåí Ý÷åé ôåèåß"
 
 #
-#: init.c:1035
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: ìç Ýãêõñïò ôýðïò ãñáììáôïêéâùôßïõ"
 
 #
-#: init.c:1060 init.c:1105
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: ìç Ýãêõñç ôéìÞ"
 
 #
-#: init.c:1160
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: Üãíùóôïò ôýðïò"
 
 #
-#: init.c:1199
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "ÓöÜëìá óôï %s, ãñáììÞ %d: %s"
 
 #
 #. the muttrc source keyword
-#: init.c:1210
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: ëÜèç óôï %s"
 
 #
-#: init.c:1220
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "source: ëÜèïò óôï %s"
 
 #
-#: init.c:1225
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "source: ðÜñá ðïëëÜ ïñßóìáôá"
 
 #
-#: init.c:1276
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: Üãíùóôç åíôïëÞ"
 
 #
-#: init.c:1633
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "ËÜèïò óôç ãñáììÞ åíôïëþí: %s\n"
 
 #
-#: init.c:1676
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "áäõíáìßá óôïí åíôïðéóìü ôïõ êáôáëüãïõ ÷ñÞóôç (home directory)"
 
 #
-#: init.c:1684
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "áäõíáìßá óôïí åíôïðéóìü ôïõ ïíüìáôïò ÷ñÞóôç"
 
@@ -2898,50 +2899,50 @@ msgstr ""
 "ÐáñÜìåôñïé ìåôáãëþôôéóçò:"
 
 #
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "ËÜèïò êáôÜ ôçí áñ÷éêïðïßçóç ôïõ ôåñìáôéêïý."
 
 #
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "ÁðïóöáëìÜôùóç óôï åðßðåäï %d.\n"
 
 #
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "Ôï DEBUG äåí ïñßóôçêå êáôÜ ôçí äéÜñêåéá ôïõ compile. ÁãíïÞèçêå.\n"
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "Ôï %s äåí õðÜñ÷åé. Äçìéïõñãßá;"
 
 #
-#: main.c:521
+#: main.c:519
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Áäõíáìßá äçìéïõñãßáò ôïõ %s: %s."
 
 #
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "Äåí Ý÷ïõí ïñéóôåß ðáñáëÞðôåò.\n"
 
 #
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: äå ìðïñþ íá ðñïóáñôÞóù ôï áñ÷åßï.\n"
 
 #
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "Äåí õðÜñ÷åé íÝá áëëçëïãñáößá óå êáíÝíá ãñáììáôïêéâþôéï."
 
 #
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "Ôï ãñáììáôïêéâþôéï åßíáé Üäåéï."
 
@@ -3059,7 +3060,7 @@ msgid "You are on the first entry."
 msgstr "Åßóôå óôçí ðñþôç êáôá÷þñçóç."
 
 #
-#: menu.c:657 pattern.c:1058
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "ÁíáæÞôçóç ãéá: "
 
@@ -3069,12 +3070,12 @@ msgid "Reverse search for: "
 msgstr "ÁíÜóôñïöç áíáæÞôçóç ãéá: "
 
 #
-#: menu.c:668 pattern.c:1091
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "ÊáíÝíá ìïíôÝëï áíáæÞôçóçò."
 
 #
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1156
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "Äå âñÝèçêå."
 
@@ -3105,30 +3106,30 @@ msgstr "
 msgid "Reading %s... %d"
 msgstr "ÁíÜãíùóç %s... %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr ""
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr ""
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr ""
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr ""
 
 #
-#: muttlib.c:961
+#: muttlib.c:956
 #, fuzzy, c-format
 msgid "%s is not a mailbox!"
 msgstr "Ôï %s äåí åßíáé ãñáììáôïêéâþôéï."
 
 #
-#: muttlib.c:967
+#: muttlib.c:962
 #, fuzzy, c-format
 msgid "Append messages to %s?"
 msgstr "Ìåôáêßíçóç áíáãíùóìÝíùí ìçíõìÜôùí óôï %s;"
@@ -3254,6 +3255,12 @@ msgstr "
 msgid "%d kept."
 msgstr ""
 
+#
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "åðåîåñãÜæåôå ôï ìÞíõìá"
+
 #
 #: pager.c:57
 msgid "Not available in this menu."
@@ -3378,38 +3385,38 @@ msgid "empty pattern"
 msgstr "Üäåéï ìïíôÝëï/ìïñöÞ"
 
 #
-#: pattern.c:883
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "ëÜèïò: Üãíùóôç äéåñãáóßá %d (áíÝöåñå áõôü ôï óöÜëìá)."
 
 #
-#: pattern.c:948 pattern.c:1077
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "Óýíôáîç ìïíôÝëïõ áíáæÞôçóçò..."
 
 #
-#: pattern.c:962
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "ÅêôÝëåóç åíôïëÞò óôá ðáñüìïéá ìçíýìáôá..."
 
 #
-#: pattern.c:1025
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "ÊáíÝíá ìÞíõìá äåí ôáéñéÜæåé óôá êñéôÞñéá."
 
 #
-#: pattern.c:1115
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "Ç áíáæÞôçóç Ýöèáóå óôï ôÝëïò ÷ùñßò íá âñåé üìïéï"
 
 #
-#: pattern.c:1126
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "Ç áíáæÞôçóç Ýöèáóå óôçí áñ÷Þ ÷ùñßò íá âñåé üìïéï"
 
 #
-#: pattern.c:1148
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "Ç áíáæÞôçóç äéåêüðçêå."
 
@@ -3789,7 +3796,7 @@ msgid "Connecting to %s"
 msgstr "Óýíäåóç óôï %s"
 
 #
-#: pop.c:166 pop.c:340
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "Ç óýíäåóç ìå ôïí åîõðçñåôçôÞ Ýêëåéóå!"
 
@@ -4176,68 +4183,68 @@ msgstr "
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:973
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "ÁíÜêëçóç áíáâåâëçìÝíïõ ìçíýìáôïò;"
 
 #
-#: send.c:1217
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "Ìáôáßùóç áðïóôïëÞò ìç ôñïðïðïéçìÝíïõ ìçíýìáôïò;"
 
 #
-#: send.c:1219
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "Ìáôáßùóç áðïóôïëÞò ìç ôñïðïðïéçìÝíïõ ìçíýìáôïò."
 
 #
 #. abort
-#: send.c:1260
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "Ôï ãñÜììá äåí åóôÜëç."
 
 #
-#: send.c:1281
+#: send.c:1333
 msgid "Message postponed."
 msgstr "Ôï ìÞíõìá áíåâëÞèç."
 
 #
-#: send.c:1290
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "Äåí Ý÷ïõí êáèïñéóôåß ðáñáëÞðôåò!"
 
 #
-#: send.c:1295
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "Äåí êáèïñßóôçêáí ðáñáëÞðôåò."
 
 #
-#: send.c:1301
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "Äåí õðÜñ÷åé èÝìá, áêýñùóç áðïóôïëÞò;"
 
 #
-#: send.c:1305
+#: send.c:1357
 msgid "No subject specified."
 msgstr "Äåí êáèïñßóôçêå èÝìá."
 
 #
-#: send.c:1347
+#: send.c:1404
 msgid "Sending message..."
 msgstr "ÁðïóôïëÞ ìçíýìáôïò..."
 
 #
-#: send.c:1473
+#: send.c:1529
 msgid "Could not send the message."
 msgstr "Äåí êáôÜöåñá íá óôåßëù ôï ìÞíõìá."
 
 #
-#: send.c:1478
+#: send.c:1534
 msgid "Mail sent."
 msgstr "Ôï ãñÜììá åóôÜëç."
 
 #
-#: send.c:1478
+#: send.c:1534
 msgid "Sending in background."
 msgstr "ÁðïóôïëÞ óôï ðáñáóêÞíéï."
 
@@ -4259,13 +4266,13 @@ msgid "Could not open %s"
 msgstr "Áäõíáìßá áíïßãìáôïò ôïõ %s"
 
 #
-#: sendlib.c:1702
+#: sendlib.c:1709
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "ÓöÜëìá êáôÜ ôçí áðïóôïëÞ ìçíýìáôïò, ôåñìáôéóìüò äéåñãáóßáò ìå %d (%s)."
 
 #
-#: sendlib.c:1708
+#: sendlib.c:1715
 msgid "Output of the delivery process"
 msgstr "¸îïäïò ôçò äéåñãáóßáò áðïóôïëÞò"
 
@@ -4313,6 +4320,10 @@ msgstr "
 msgid "Parent message is not available."
 msgstr "Ôï ôñÝ÷ùí ìÞíõìá äåí åßíáé äéáèÝóéìï."
 
+#
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "áãíüçóç Üäåéïõ ðåäßïõ åðéêåöáëßäáò: %s"
+
 #~ msgid "Authenticating (GSSAPI)..."
 #~ msgstr "Áõèåíôéêïðïßçóç (GSSAPI)..."
 
diff --git a/po/eo.po b/po/eo.po
index 9a00ed24..22a11ca8 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.1\n"
-"POT-Creation-Date: 2000-02-15 09:44+0100\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: 2000-02-15 13:40+00:00\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: eo <eo@li.org>\n"
@@ -64,7 +64,7 @@ msgstr "Skribi al dosiero: "
 msgid "Alias added."
 msgstr "Adreso aldonita."
 
-#: attach.c:111 attach.c:238 attach.c:431 attach.c:887
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "Nomþamblono ne estas plenumebla. Æu daýrigi?"
 
@@ -116,15 +116,15 @@ msgstr "MIME-speco ne difinita. Ne povas vidigi parton."
 msgid "Cannot create filter"
 msgstr "Ne povas krei filtrilon."
 
-#: attach.c:706 recvattach.c:427
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "Parto skribita."
 
-#: attach.c:762
+#: attach.c:764
 msgid "Write fault!"
 msgstr "Skriberaro!"
 
-#: attach.c:971
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "Mi ne scias presi tion!"
 
@@ -136,7 +136,7 @@ msgstr "Listo"
 msgid "Mask"
 msgstr "Masko"
 
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ne estas dosierujo."
@@ -160,64 +160,64 @@ msgstr "Dosierujo [%s], Dosieromasko: %s"
 msgid "Can't attach a directory!"
 msgstr "Ne povas aldoni dosierujon!"
 
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "Neniu dosiero kongruas kun la dosieromasko"
 
-#: browser.c:816
+#: browser.c:820
 msgid "Creating mailboxes is not yet supported."
 msgstr "Kreado de poþtfakoj ankoraý ne funkcias."
 
-#: browser.c:821
+#: browser.c:825
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Forviþado funkcias nur æe IMAP-poþtfakoj"
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Æu vere forviþi la poþtfakon \"%s\"?"
 
-#: browser.c:843
+#: browser.c:847
 msgid "Mailbox deleted."
 msgstr "Poþtfako forviþita."
 
-#: browser.c:849
+#: browser.c:853
 msgid "Mailbox not deleted."
 msgstr "Poþtfako ne forviþita."
 
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "Iri al la dosierujo: "
 
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "Eraro dum legado de dosierujo."
 
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "Dosieromasko: "
 
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Inversa ordigo laý (d)ato, (a)lfabete, (g)rando, aý (n)e ordigu? "
 
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Ordigo laý (d)ato, (a)lfabete, (g)rando, aý (n)e ordigu? "
 
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr "dagn"
 
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "Nova dosieronomo: "
 
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "Ne povas rigardi dosierujon"
 
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "Eraro dum vidigo de dosiero"
 
@@ -805,11 +805,11 @@ msgstr "Mankas neforvi
 msgid "You are on the first message."
 msgstr "Vi estas æe la unua mesaøo."
 
-#: curs_main.c:1166 pattern.c:1112
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "Seræo rekomencis æe la komenco."
 
-#: curs_main.c:1175 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "Seræo rekomencis æe la fino."
 
@@ -1153,8 +1153,14 @@ msgstr "Salutas ..."
 msgid "Login failed."
 msgstr "Saluto malsukcesis."
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "Prenas mesaøon ..."
+
+#: imap/browse.c:120
+#, fuzzy
+msgid "Getting folder list..."
 msgstr "Kontaktis servilon; prenas liston de poþtfakoj ..."
 
 #. something is wrong because the server reported fewer messages
@@ -1187,7 +1193,7 @@ msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "Ne povas aldoni al IMAP-poþtfako æe æi tiu servilo"
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "Æu krei %s?"
@@ -1344,94 +1350,89 @@ msgstr "adresaro: mankas adreso"
 msgid "invalid header field"
 msgstr "nevalida æaplinio"
 
-#: init.c:589
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "ignoras malplenan æaplinion: %s"
-
-#: init.c:641
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: nekonata ordigmaniero"
 
-#: init.c:717
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr "mutt_restore_default: eraro en regula esprimo: %s\n"
 
-#: init.c:777
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: nekonata variablo"
 
-#: init.c:786
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "reset: prefikso ne permesata"
 
-#: init.c:792
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "reset: valoro ne permesata"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "%s estas þaltita"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "%s estas malþaltita"
 
-#: init.c:1035
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: nevalida poþtfakospeco"
 
-#: init.c:1060 init.c:1105
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: nevalida valoro"
 
-#: init.c:1160
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: nekonata speco"
 
-#: init.c:1199
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Eraro en %s, linio %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1210
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: eraroj en %s"
 
-#: init.c:1220
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "source: eraro æe %s"
 
-#: init.c:1225
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "source: tro da argumentoj"
 
-#: init.c:1276
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: nekonata komando"
 
-#: init.c:1633
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Eraro en komandlinio: %s\n"
 
-#: init.c:1676
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "ne povas eltrovi la hejmdosierujon"
 
-#: init.c:1684
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "ne povas eltrovi la uzantonomo"
 
@@ -2374,43 +2375,43 @@ msgstr ""
 "\n"
 "Parametroj de la traduka¼o:"
 
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "Eraro dum startigo de la terminalo."
 
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Sencimigo æe la nivelo %d.\n"
 
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG ne estis difinita por la tradukado. Ignoras.\n"
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s ne ekzistas. Æu krei øin?"
 
-#: main.c:521
+#: main.c:519
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Ne povas krei %s: %s."
 
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "Nenia ricevonto specifita.\n"
 
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: ne povas aldoni dosieron.\n"
 
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "Mankas poþtfako kun nova poþto."
 
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "Poþtfako estas malplena."
 
@@ -2505,7 +2506,7 @@ msgstr "Vi estas 
 msgid "You are on the first entry."
 msgstr "Vi estas æe la lasta registro."
 
-#: menu.c:657 pattern.c:1058
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "Seræi pri: "
 
@@ -2513,11 +2514,11 @@ msgstr "Ser
 msgid "Reverse search for: "
 msgstr "Inversa seræo pri: "
 
-#: menu.c:668 pattern.c:1091
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "Mankas seræþablono."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1156
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "Ne trovita."
 
@@ -2542,28 +2543,28 @@ msgstr "Markado ne funkcias."
 msgid "Reading %s... %d"
 msgstr "Legas %s ... %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr "Tio estas dosierujo; æu skribi dosieron en øi?"
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr "Dosiero en dosierujo: "
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "Dosiero ekzistas; æu (s)urskribi, (a)ldoni, aý (n)uligi?"
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr "san"
 
-#: muttlib.c:961
+#: muttlib.c:956
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s ne estas poþtfako!"
 
-#: muttlib.c:967
+#: muttlib.c:962
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Æu aldoni mesaøojn al %s?"
@@ -2669,6 +2670,11 @@ msgstr "Po
 msgid "%d kept."
 msgstr "%d retenite."
 
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "redakti la mesaøon"
+
 #: pager.c:57
 msgid "Not available in this menu."
 msgstr "Ne disponata en æi tiu menuo."
@@ -2769,32 +2775,32 @@ msgstr "krampoj ne kongruas: %s"
 msgid "empty pattern"
 msgstr "malplena þablono"
 
-#: pattern.c:883
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "eraro: nekonata funkcio %d (raportu æi tiun cimon)"
 
-#: pattern.c:948 pattern.c:1077
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "Tradukas seræþablonon ..."
 
-#: pattern.c:962
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "Ruligas komandon pri trafataj mesaøoj ..."
 
-#: pattern.c:1025
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "Mankas mesaøoj, kiuj plenumas la kondiæojn"
 
-#: pattern.c:1115
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "Seræo atingis la finon sen trovi trafon"
 
-#: pattern.c:1126
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "Seræo atingis la komencon sen trovi trafon"
 
-#: pattern.c:1148
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "Seræo interrompita."
 
@@ -3091,7 +3097,7 @@ msgstr "Ne povis trovi adreson por servilo %s."
 msgid "Connecting to %s"
 msgstr "Konektiøas al %s"
 
-#: pop.c:166 pop.c:340
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "Servilo fermis la konekton!"
 
@@ -3410,56 +3416,56 @@ msgstr "Pretigas plusenditan mesa
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:973
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "Æu revoki prokrastitan mesaøon?"
 
-#: send.c:1217
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "Æu nuligi nemodifitan mesaøon?"
 
-#: send.c:1219
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "Nemodifita mesaøon nuligita"
 
 #. abort
-#: send.c:1260
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "Mesaøo ne sendita."
 
-#: send.c:1281
+#: send.c:1333
 msgid "Message postponed."
 msgstr "Mesaøo prokrastita."
 
-#: send.c:1290
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "Neniu ricevanto estas specifita!"
 
-#: send.c:1295
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "Neniuj ricevantoj estis specifitaj."
 
-#: send.c:1301
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "Mankas temlinio; æu haltigi sendon?"
 
-#: send.c:1305
+#: send.c:1357
 msgid "No subject specified."
 msgstr "Temlinio ne specifita."
 
-#: send.c:1347
+#: send.c:1404
 msgid "Sending message..."
 msgstr "Sendas mesaøon ..."
 
-#: send.c:1473
+#: send.c:1529
 msgid "Could not send the message."
 msgstr "Ne povis sendi la mesaøon."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Mail sent."
 msgstr "Mesaøo sendita."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Sending in background."
 msgstr "Sendas en fono."
 
@@ -3477,12 +3483,12 @@ msgstr "%s ne plu ekzistas!"
 msgid "Could not open %s"
 msgstr "Ne povas malfermi %s"
 
-#: sendlib.c:1702
+#: sendlib.c:1709
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Eraro dum sendado de mesaøo; ido finis per %d (%s)."
 
-#: sendlib.c:1708
+#: sendlib.c:1715
 msgid "Output of the delivery process"
 msgstr "Eligo de la liverprocezo"
 
@@ -3521,5 +3527,8 @@ msgstr "Patra mesa
 msgid "Parent message is not available."
 msgstr "Patra mesaøo ne estas havebla."
 
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "ignoras malplenan æaplinion: %s"
+
 #~ msgid "move to the previous undelete message"
 #~ msgstr "salti al la antaýa neforviþita mesaøo"
diff --git a/po/es.po b/po/es.po
index 9b39491e..63ba6f70 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt\n"
-"POT-Creation-Date: 2000-02-15 09:44+0100\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: 2000-01-31 17:27+01:00\n"
 "Last-Translator: Boris Wesslowski <Boris@Wesslowski.com>\n"
 "Language-Team: -\n"
@@ -61,7 +61,7 @@ msgstr "Guardar en archivo: "
 msgid "Alias added."
 msgstr "Dirección añadida."
 
-#: attach.c:111 attach.c:238 attach.c:431 attach.c:887
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "No se pudo encontrar el nombre, ¿continuar?"
 
@@ -113,15 +113,15 @@ msgstr "Tipo MIME no definido.  No se puede mostrar el archivo adjunto."
 msgid "Cannot create filter"
 msgstr "No se pudo crear el filtro"
 
-#: attach.c:706 recvattach.c:427
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "Archivo adjunto guardado."
 
-#: attach.c:762
+#: attach.c:764
 msgid "Write fault!"
 msgstr "¡Error de escritura!"
 
-#: attach.c:971
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "¡No sé cómo se imprime eso!"
 
@@ -133,7 +133,7 @@ msgstr "Directorio"
 msgid "Mask"
 msgstr "Patrón"
 
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s no es un directorio."
@@ -157,65 +157,65 @@ msgstr "Directorio [%s], patr
 msgid "Can't attach a directory!"
 msgstr "¡No se puede adjuntar un directorio!"
 
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "Ningún archivo coincide con el patrón"
 
-#: browser.c:816
+#: browser.c:820
 msgid "Creating mailboxes is not yet supported."
 msgstr "Crear buzones no está soportado."
 
-#: browser.c:821
+#: browser.c:825
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Suprimir sólo está soportado para buzones IMAP"
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "¿Realmente quiere suprimir el buzón \"%s\"?"
 
-#: browser.c:843
+#: browser.c:847
 msgid "Mailbox deleted."
 msgstr "El buzón fue suprimido."
 
-#: browser.c:849
+#: browser.c:853
 msgid "Mailbox not deleted."
 msgstr "El buzón no fue suprimido."
 
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "Cambiar directorio a:"
 
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "Error leyendo directorio."
 
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "Patrón de archivos: "
 
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "¿Orden inverso por (f)echa, (t)amaño, (a)lfabéticamente o (s)in orden? "
 
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "¿Ordenar por (f)echa, (t)amaño, (a)lfabéticamente o (s)in orden? "
 
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr "fats"
 
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "Nombre del nuevo archivo: "
 
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "No se puede mostrar el directorio"
 
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "Error al tratar de mostrar el archivo"
 
@@ -802,11 +802,11 @@ msgstr "No hay mensajes sin suprimir."
 msgid "You are on the first message."
 msgstr "Está en el primer mensaje."
 
-#: curs_main.c:1166 pattern.c:1112
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "La búsqueda volvió a empezar desde arriba."
 
-#: curs_main.c:1175 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "La búsqueda volvió a empezar desde abajo."
 
@@ -1151,8 +1151,14 @@ msgstr "Entrando..."
 msgid "Login failed."
 msgstr "El login falló."
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "Consiguiendo mensaje..."
+
+#: imap/browse.c:120
+#, fuzzy
+msgid "Getting folder list..."
 msgstr "Contactando servidor, recogiendo lista de carpetas..."
 
 #. something is wrong because the server reported fewer messages
@@ -1185,7 +1191,7 @@ msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "No es posible agregar a buzones IMAP en este servidor."
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "¿Crear %s?"
@@ -1343,94 +1349,89 @@ msgstr "alias: sin direcci
 msgid "invalid header field"
 msgstr "encabezado erróneo"
 
-#: init.c:589
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "ignorando encabezado vacío: %s"
-
-#: init.c:641
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: orden desconocido"
 
-#: init.c:717
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr "mutt_restore_default: error en expresión regular: %s\n"
 
-#: init.c:777
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: varibale desconocida"
 
-#: init.c:786
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "prefijo es ilegal con reset"
 
-#: init.c:792
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "valor es ilegal con reset"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "%s esta activada"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "%s no esta activada"
 
-#: init.c:1035
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: tipo de buzón inválido"
 
-#: init.c:1060 init.c:1105
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: valor inválido"
 
-#: init.c:1160
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: tipo desconocido"
 
-#: init.c:1199
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Error en %s, renglón %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1210
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: errores en %s"
 
-#: init.c:1220
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "source: errores en %s"
 
-#: init.c:1225
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "source: demasiados parámetros"
 
-#: init.c:1276
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: comando desconocido"
 
-#: init.c:1633
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Error en línea de comando: %s\n"
 
-#: init.c:1676
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "imposible determinar el directorio del usuario"
 
-#: init.c:1684
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "imposible determinar nombre del usuario"
 
@@ -2371,43 +2372,43 @@ msgstr ""
 "\n"
 "Opciones especificadas al compilar:"
 
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "Error al inicializar la terminal."
 
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Modo debug a nivel %d.\n"
 
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG no fue definido al compilar.  Ignorado.\n"
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s no existe. ¿Crearlo?"
 
-#: main.c:521
+#: main.c:519
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "No se pudo crear %s: %s."
 
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "No hay destinatario.\n"
 
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: imposible adjuntar archivo.\n"
 
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "Ningún buzón con correo nuevo."
 
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "El buzón esta vacío."
 
@@ -2502,7 +2503,7 @@ msgstr "Est
 msgid "You are on the first entry."
 msgstr "Está en la primera entrada."
 
-#: menu.c:657 pattern.c:1058
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "Buscar por: "
 
@@ -2510,11 +2511,11 @@ msgstr "Buscar por: "
 msgid "Reverse search for: "
 msgstr "Buscar en sentido opuesto: "
 
-#: menu.c:668 pattern.c:1091
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "Nada que buscar."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1156
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "No fue encontrado."
 
@@ -2539,28 +2540,28 @@ msgstr "Marcar no est
 msgid "Reading %s... %d"
 msgstr "Leyendo %s... %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr "Archivo es un directorio, ¿guardar en él?"
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr "Archivo bajo directorio: "
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "El archivo existe, ¿(s)obreescribir, (a)gregar o (c)ancelar?"
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr "sac"
 
-#: muttlib.c:961
+#: muttlib.c:956
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "¡%s no es un buzón!"
 
-#: muttlib.c:967
+#: muttlib.c:962
 #, c-format
 msgid "Append messages to %s?"
 msgstr "¿Agregar mensajes a %s?"
@@ -2666,6 +2667,11 @@ msgstr "Buz
 msgid "%d kept."
 msgstr "Quedaron %d."
 
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "editar el mensaje"
+
 #: pager.c:57
 msgid "Not available in this menu."
 msgstr "No disponible en este menú."
@@ -2767,32 +2773,32 @@ msgstr "par
 msgid "empty pattern"
 msgstr "patrón vacío"
 
-#: pattern.c:883
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "error: op %d desconocida (reporte este error)."
 
-#: pattern.c:948 pattern.c:1077
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "Compilando patrón de búsqueda..."
 
-#: pattern.c:962
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "Ejecutando comando en mensajes que coinciden..."
 
-#: pattern.c:1025
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "Ningún mensaje responde al criterio dado."
 
-#: pattern.c:1115
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "La búsqueda llegó al final sin encontrar nada."
 
-#: pattern.c:1126
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "La búsqueda llegó al principio sin encontrar nada."
 
-#: pattern.c:1148
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "Búsqueda interrumpida."
 
@@ -3093,7 +3099,7 @@ msgstr "No se encontr
 msgid "Connecting to %s"
 msgstr "Conectando con %s"
 
-#: pop.c:166 pop.c:340
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "¡El servidor cerró la conneción!"
 
@@ -3417,56 +3423,56 @@ msgstr "Preparando mensaje reenviado..."
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:973
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "¿Continuar mensaje pospuesto?"
 
-#: send.c:1217
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "¿Cancelar mensaje sin cambios?"
 
-#: send.c:1219
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "Mensaje sin cambios cancelado."
 
 #. abort
-#: send.c:1260
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "Mensaje no enviado."
 
-#: send.c:1281
+#: send.c:1333
 msgid "Message postponed."
 msgstr "Mensaje pospuesto."
 
-#: send.c:1290
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "¡No hay destinatario!"
 
-#: send.c:1295
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "¡No hay destinatario!"
 
-#: send.c:1301
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "Falta el asunto, ¿cancelar envío?"
 
-#: send.c:1305
+#: send.c:1357
 msgid "No subject specified."
 msgstr "Asunto no fue especificado."
 
-#: send.c:1347
+#: send.c:1404
 msgid "Sending message..."
 msgstr "Enviando mensaje..."
 
-#: send.c:1473
+#: send.c:1529
 msgid "Could not send the message."
 msgstr "No se pudo enviar el mensaje."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Mail sent."
 msgstr "Mensaje enviado."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Sending in background."
 msgstr "Enviando en un proceso en segundo plano."
 
@@ -3484,12 +3490,12 @@ msgstr "
 msgid "Could not open %s"
 msgstr "No se pudo abrir %s"
 
-#: sendlib.c:1702
+#: sendlib.c:1709
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Error al enviar mensaje, proceso hijo terminó %d (%s)."
 
-#: sendlib.c:1708
+#: sendlib.c:1715
 msgid "Output of the delivery process"
 msgstr "Salida del proceso de repartición de correo"
 
@@ -3528,5 +3534,8 @@ msgstr "El mensaje anterior no es visible en vista limitada"
 msgid "Parent message is not available."
 msgstr "El mensaje anterior no está disponible."
 
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "ignorando encabezado vacío: %s"
+
 #~ msgid "Authenticating (GSSAPI)..."
 #~ msgstr "Verificando autentidad (GSSAPI)..."
diff --git a/po/fr.po b/po/fr.po
index 513a4155..3b6b4e90 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.1.4\n"
-"POT-Creation-Date: 2000-02-15 09:44+0100\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: 2000-02-15 22:50+0100\n"
 "Last-Translator: Marc Baudoin <babafou@babafou.eu.org>, Vincent Lefevre "
 "<vincent@vinc17.org>\n"
@@ -68,7 +68,7 @@ msgstr "Sauver dans le fichier : "
 msgid "Alias added."
 msgstr "Alias ajouté."
 
-#: attach.c:111 attach.c:238 attach.c:431 attach.c:887
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "Ne correspond pas au nametemplate, continuer ?"
 
@@ -120,15 +120,15 @@ msgstr "Type MIME non d
 msgid "Cannot create filter"
 msgstr "Impossible de créer le filtre"
 
-#: attach.c:706 recvattach.c:427
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "Attachement sauvé."
 
-#: attach.c:762
+#: attach.c:764
 msgid "Write fault!"
 msgstr "Erreur d'écriture !"
 
-#: attach.c:971
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "Je ne sais pas comment imprimer ceci !"
 
@@ -141,7 +141,7 @@ msgid "Mask"
 msgstr "Masque"
 
 # , c-format
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s n'est pas un répertoire."
@@ -168,64 +168,64 @@ msgstr "R
 msgid "Can't attach a directory!"
 msgstr "Impossible d'attacher un répertoire !"
 
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "Aucun fichier ne correspond au masque"
 
-#: browser.c:816
+#: browser.c:820
 msgid "Creating mailboxes is not yet supported."
 msgstr "La création de boîtes aux lettres n'est pas encore supportée."
 
-#: browser.c:821
+#: browser.c:825
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "La suppression n'est supportée que pour les boîtes aux lettres IMAP."
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Voulez-vous vraiment supprimer la boîte aux lettres \"%s\" ?"
 
-#: browser.c:843
+#: browser.c:847
 msgid "Mailbox deleted."
 msgstr "Boîte aux lettres supprimée."
 
-#: browser.c:849
+#: browser.c:853
 msgid "Mailbox not deleted."
 msgstr "Boîte aux lettres non supprimée."
 
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "Changement de répertoire vers : "
 
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "Erreur de lecture du répertoire."
 
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "Masque de fichier : "
 
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Tri inverse par (d)ate, (a)lphabétique, (t)aille ou (n)e pas trier ? "
 
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Tri par (d)ate, (a)lphabétique, (t)aille ou (n)e pas trier ? "
 
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr "datn"
 
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "Nouveau nom de fichier : "
 
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "Impossible de visualiser un répertoire"
 
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "Erreur en essayant de visualiser le fichier"
 
@@ -837,11 +837,11 @@ msgstr "Aucun message r
 msgid "You are on the first message."
 msgstr "Vous êtes sur le premier message."
 
-#: curs_main.c:1166 pattern.c:1112
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "La recherche est repartie du début."
 
-#: curs_main.c:1175 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "La recherche est repartie de la fin."
 
@@ -1211,8 +1211,14 @@ msgstr "Connexion..."
 msgid "Login failed."
 msgstr "La connexion a échoué."
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "Récupération du message..."
+
+#: imap/browse.c:120
+#, fuzzy
+msgid "Getting folder list..."
 msgstr "Serveur contacté, récupération de la liste des dossiers..."
 
 #. something is wrong because the server reported fewer messages
@@ -1247,7 +1253,7 @@ msgstr "Impossible d'ajouter aux bo
 
 # , c-format
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "Créer %s ?"
@@ -1417,107 +1423,101 @@ msgid "invalid header field"
 msgstr "en-tête invalide"
 
 # , c-format
-#: init.c:589
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "En-tête vide ignoré : %s"
-
-# , c-format
-#: init.c:641
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s : méthode de tri inconnue"
 
 # , c-format
-#: init.c:717
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr "mutt_restore_default : erreur dans l'expression rationnelle : %s\n"
 
 # , c-format
-#: init.c:777
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s : variable inconnue"
 
-#: init.c:786
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "ce préfixe est illégal avec reset"
 
-#: init.c:792
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "cette valeur est illégale avec reset"
 
 # , c-format
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "%s est positionné"
 
 # , c-format
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "%s n'est pas positionné"
 
 # , c-format
-#: init.c:1035
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s : type de boîte aux lettres invalide"
 
 # , c-format
-#: init.c:1060 init.c:1105
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s : valeur invalide"
 
 # , c-format
-#: init.c:1160
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s : type inconnu"
 
 # , c-format
-#: init.c:1199
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Erreur dans %s, ligne %d : %s"
 
 # , c-format
 #. the muttrc source keyword
-#: init.c:1210
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "source : erreurs dans %s"
 
 # , c-format
-#: init.c:1220
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "source : erreur dans %s"
 
-#: init.c:1225
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "source : trop d'arguments"
 
 # , c-format
-#: init.c:1276
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s : commande inconnue"
 
 # , c-format
-#: init.c:1633
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Erreur dans la ligne de commande : %s\n"
 
-#: init.c:1676
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "impossible de déterminer le répertoire personnel"
 
-#: init.c:1684
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "impossible de déterminer le nom d'utilisateur"
 
@@ -2473,46 +2473,46 @@ msgstr ""
 "\n"
 "Options de compilation :"
 
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "Erreur d'initialisation du terminal."
 
 # , c-format
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Débuggage au niveau %d.\n"
 
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG n'a pas été défini à la compilation. Ignoré.\n"
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s n'existe pas. Le créer ?"
 
 # , c-format
-#: main.c:521
+#: main.c:519
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Impossible de créer %s : %s."
 
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "Pas de destinataire spécifié.\n"
 
 # , c-format
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s : impossible d'attacher le fichier.\n"
 
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "Pas de boîte aux lettres avec des nouveaux messages."
 
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "La boîte aux lettres est vide."
 
@@ -2607,7 +2607,7 @@ msgstr "Vous 
 msgid "You are on the first entry."
 msgstr "Vous êtes sur la première entrée."
 
-#: menu.c:657 pattern.c:1058
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "Rechercher : "
 
@@ -2615,11 +2615,11 @@ msgstr "Rechercher : "
 msgid "Reverse search for: "
 msgstr "Rechercher en arrière : "
 
-#: menu.c:668 pattern.c:1091
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "Pas de motif de recherche."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1156
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "Non trouvé."
 
@@ -2645,30 +2645,30 @@ msgstr "Le marquage n'est pas support
 msgid "Reading %s... %d"
 msgstr "Lecture de %s... %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr "Le fichier est un répertoire, sauver dans celui-ci ?"
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr "Fichier dans le répertoire : "
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "Le fichier existe, écras(e)r, (c)oncaténer ou (a)nnuler ?"
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr "eca"
 
 # , c-format
-#: muttlib.c:961
+#: muttlib.c:956
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s n'est pas une boîte aux lettres !"
 
 # , c-format
-#: muttlib.c:967
+#: muttlib.c:962
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Ajouter les messages à %s ?"
@@ -2789,6 +2789,11 @@ msgstr "La bo
 msgid "%d kept."
 msgstr "%d gardés."
 
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "éditer le message"
+
 #: pager.c:57
 msgid "Not available in this menu."
 msgstr "Non disponible dans ce menu."
@@ -2897,32 +2902,32 @@ msgid "empty pattern"
 msgstr "motif vide"
 
 # , c-format
-#: pattern.c:883
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "erreur : opération inconnue %d (signalez cette erreur)."
 
-#: pattern.c:948 pattern.c:1077
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "Compilation du motif de recherche..."
 
-#: pattern.c:962
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "Exécution de la commande sur les messages correspondants..."
 
-#: pattern.c:1025
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "Aucun message ne correspond au critère."
 
-#: pattern.c:1115
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "Fin atteinte sans rien avoir trouvé"
 
-#: pattern.c:1126
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "Début atteint sans rien avoir trouvé"
 
-#: pattern.c:1148
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "Recherche interrompue."
 
@@ -3228,7 +3233,7 @@ msgstr "Impossible de trouver l'adresse de la machine %s."
 msgid "Connecting to %s"
 msgstr "Connexion à %s"
 
-#: pop.c:166 pop.c:340
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "Le serveur a fermé la connexion !"
 
@@ -3567,56 +3572,56 @@ msgstr "Pr
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:973
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "Rappeler un message ajourné ?"
 
-#: send.c:1217
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "Message non modifié. Abandonner ?"
 
-#: send.c:1219
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "Message non modifié. Abandon."
 
 #. abort
-#: send.c:1260
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "Message non envoyé."
 
-#: send.c:1281
+#: send.c:1333
 msgid "Message postponed."
 msgstr "Message ajourné."
 
-#: send.c:1290
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "Aucun destinataire spécifié !"
 
-#: send.c:1295
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "Aucun destinataire spécifié."
 
-#: send.c:1301
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "Pas d'objet, abandonner l'envoi ?"
 
-#: send.c:1305
+#: send.c:1357
 msgid "No subject specified."
 msgstr "Pas d'objet spécifié."
 
-#: send.c:1347
+#: send.c:1404
 msgid "Sending message..."
 msgstr "Envoi du message..."
 
-#: send.c:1473
+#: send.c:1529
 msgid "Could not send the message."
 msgstr "Impossible d'envoyer le message."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Mail sent."
 msgstr "Message envoyé."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Sending in background."
 msgstr "Envoi en tâche de fond."
 
@@ -3637,12 +3642,12 @@ msgid "Could not open %s"
 msgstr "Impossible d'ouvrir %s"
 
 # , c-format
-#: sendlib.c:1702
+#: sendlib.c:1709
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Erreur en envoyant le message, fils terminé avec le code %d (%s)."
 
-#: sendlib.c:1708
+#: sendlib.c:1715
 msgid "Output of the delivery process"
 msgstr "Sortie du processus de livraison"
 
@@ -3684,6 +3689,10 @@ msgstr "Le message p
 msgid "Parent message is not available."
 msgstr "Le message père n'est pas disponible."
 
+# , c-format
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "En-tête vide ignoré : %s"
+
 #~ msgid "Authenticating (GSSAPI)..."
 #~ msgstr "Authentification (GSSAPI)..."
 
diff --git a/po/gl.po b/po/gl.po
index 10e82574..52a76bef 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.0i\n"
-"POT-Creation-Date: 2000-02-15 09:44+0100\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: 1999-10-27 14:05+0200\n"
 "Last-Translator: Roberto Suarez Soto <ask4it@bigfoot.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -65,7 +65,7 @@ msgstr "Gardar a ficheiro: "
 msgid "Alias added."
 msgstr "Alias engadido."
 
-#: attach.c:111 attach.c:238 attach.c:431 attach.c:887
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "Non se puido atopa-lo nome, ¿continuar?"
 
@@ -119,15 +119,15 @@ msgstr "Tipo MIME non definido. Non se pode ver-lo ficheiro adxunto."
 msgid "Cannot create filter"
 msgstr "Non se puido crea-lo filtro"
 
-#: attach.c:706 recvattach.c:427
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "Adxunto gardado."
 
-#: attach.c:762
+#: attach.c:764
 msgid "Write fault!"
 msgstr "¡Fallo de escritura!"
 
-#: attach.c:971
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "¡Non lle sei cómo imprimir iso!"
 
@@ -139,7 +139,7 @@ msgstr "Directorio"
 msgid "Mask"
 msgstr "Máscara"
 
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s non é un directorio."
@@ -164,68 +164,68 @@ msgstr "Directorio [%s], m
 msgid "Can't attach a directory!"
 msgstr "Non é posible ver un directorio"
 
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "Non hai ficheiros que coincidan coa máscara"
 
-#: browser.c:816
+#: browser.c:820
 #, fuzzy
 msgid "Creating mailboxes is not yet supported."
 msgstr "O marcado non está soportado."
 
-#: browser.c:821
+#: browser.c:825
 #, fuzzy
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Esta operación non está soportada actualmente para mensaxes PGP."
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr ""
 
-#: browser.c:843
+#: browser.c:847
 #, fuzzy
 msgid "Mailbox deleted."
 msgstr "Bucle de macro detectado."
 
-#: browser.c:849
+#: browser.c:853
 #, fuzzy
 msgid "Mailbox not deleted."
 msgstr "Mensaxe non enviada."
 
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "Cambiar directorio a: "
 
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "Erro lendo directorio."
 
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "Máscara de ficheiro: "
 
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "¿Ordear inversamente por (d)ata, (a)lfabeto, (t)amaño ou (s)en orden?"
 
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "¿Ordear por (d)ata, (a)lfabeto, (t)amaño ou (s)en orden?"
 
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr "dats"
 
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "Novo nome de ficheiro: "
 
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "Non é posible ver un directorio"
 
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "Erro intentando ver ficheiro"
 
@@ -815,11 +815,11 @@ msgstr "Non hai mensaxes recuperadas."
 msgid "You are on the first message."
 msgstr "Está na primeira mensaxe."
 
-#: curs_main.c:1166 pattern.c:1112
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "A búsqueda volveu ó principio."
 
-#: curs_main.c:1175 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "A búsqueda volveu ó final."
 
@@ -1166,8 +1166,13 @@ msgstr "Comezando secuencia de login ..."
 msgid "Login failed."
 msgstr "O login fallou."
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "Recollendo mensaxe..."
+
+#: imap/browse.c:120
+msgid "Getting folder list..."
 msgstr ""
 
 #. something is wrong because the server reported fewer messages
@@ -1200,7 +1205,7 @@ msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "Non é posible engadir ós buzóns IMAP deste servidor"
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "¿Crear %s?"
@@ -1362,94 +1367,89 @@ msgstr "alias: sen enderezo"
 msgid "invalid header field"
 msgstr "campo de cabeceira inválido"
 
-#: init.c:589
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "ignorando campo de cabeceira valeiro: %s"
-
-#: init.c:641
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: método de ordeación descoñecido"
 
-#: init.c:717
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr "mutt_restore_default: erro en regexp: %s\n"
 
-#: init.c:777
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: variable descoñecida"
 
-#: init.c:786
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "prefixo ilegal con reset"
 
-#: init.c:792
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "valor ilegal con reset"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "%s está activada"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "%s non está activada"
 
-#: init.c:1035
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: tipo de buzón inválido"
 
-#: init.c:1060 init.c:1105
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: valor inválido"
 
-#: init.c:1160
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: tipo descoñecido"
 
-#: init.c:1199
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Erro en %s, liña %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1210
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: erros en %s"
 
-#: init.c:1220
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "source: erro en %s"
 
-#: init.c:1225
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "source: demasiados parámetros"
 
-#: init.c:1276
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: comando descoñecido"
 
-#: init.c:1633
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Erro na liña de comando: %s\n"
 
-#: init.c:1676
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "non foi posible determina-lo directorio \"home\""
 
-#: init.c:1684
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "non foi posible determina-lo nome de usuario"
 
@@ -2394,44 +2394,44 @@ msgstr ""
 "\n"
 "Opcións de compilación:"
 
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "Error iniciando terminal."
 
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Depurando a nivel %d.\n"
 
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr ""
 "A opción \"DEBUG\" non foi especificada durante a compilación. Ignorado.\n"
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr ""
 
-#: main.c:521
+#: main.c:519
 #, fuzzy, c-format
 msgid "Can't create %s: %s."
 msgstr "Non fun capaz de crea-lo ficheiro %s"
 
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "Non foi especificado ningún destinatario.\n"
 
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: non foi posible adxuntar ficheiro.\n"
 
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "Non hai buzóns con novo correo."
 
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "O buzón está valeiro."
 
@@ -2527,7 +2527,7 @@ msgstr "Est
 msgid "You are on the first entry."
 msgstr "Está na primeira entrada."
 
-#: menu.c:657 pattern.c:1058
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "Búsqueda de: "
 
@@ -2535,11 +2535,11 @@ msgstr "B
 msgid "Reverse search for: "
 msgstr "Búsqueda inversa de: "
 
-#: menu.c:668 pattern.c:1091
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "Non hai patrón de búsqueda."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1156
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "Non se atopou."
 
@@ -2565,28 +2565,28 @@ msgstr "O marcado non est
 msgid "Reading %s... %d"
 msgstr "Lendo %s... %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr "O ficheiro é un directorio, ¿gardar nel?"
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr "Ficheiro no directorio: "
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "O ficheiro existe, ¿(s)obreescribir, (e)ngadir ou (c)ancelar?"
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr "sec"
 
-#: muttlib.c:961
+#: muttlib.c:956
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "¡%s non é un buzón!"
 
-#: muttlib.c:967
+#: muttlib.c:962
 #, c-format
 msgid "Append messages to %s?"
 msgstr "¿engadir mensaxes a %s?"
@@ -2692,6 +2692,11 @@ msgstr "O buz
 msgid "%d kept."
 msgstr ""
 
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "edita-la mensaxe"
+
 #
 #: pager.c:57
 msgid "Not available in this menu."
@@ -2793,32 +2798,32 @@ msgstr "par
 msgid "empty pattern"
 msgstr "patrón valeiro"
 
-#: pattern.c:883
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "erro: operador descoñecido %d (informe deste erro)."
 
-#: pattern.c:948 pattern.c:1077
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "Compilando patrón de búsqueda..."
 
-#: pattern.c:962
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "Executando comando nas mensaxes coincidintes..."
 
-#: pattern.c:1025
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "Non hai mensaxes que coincidan co criterio."
 
-#: pattern.c:1115
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "A búsqueda cheou ó final sen atopar coincidencias"
 
-#: pattern.c:1126
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "A búsqueda chegou ó comezo sen atopar coincidencia"
 
-#: pattern.c:1148
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "Búsqueda interrompida."
 
@@ -3113,7 +3118,7 @@ msgstr "Non foi posible atopa-lo enderezo do servidor %s."
 msgid "Connecting to %s"
 msgstr "Conectando con %s"
 
-#: pop.c:166 pop.c:340
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "¡O servidor pechou a conexión!"
 
@@ -3439,56 +3444,56 @@ msgstr "Enviando mensaxe ..."
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:973
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "¿Editar mensaxe posposta?"
 
-#: send.c:1217
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "¿Cancelar mensaxe sen modificar?"
 
-#: send.c:1219
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "Mensaxe sen modificar cancelada."
 
 #. abort
-#: send.c:1260
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "Mensaxe non enviada."
 
-#: send.c:1281
+#: send.c:1333
 msgid "Message postponed."
 msgstr "Mensaxe posposta."
 
-#: send.c:1290
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "¡Non se especificaron destinatarios!"
 
-#: send.c:1295
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "Non se especificaron destinatarios."
 
-#: send.c:1301
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "Non hai tema, ¿cancela-lo envío?"
 
-#: send.c:1305
+#: send.c:1357
 msgid "No subject specified."
 msgstr "Non se especificou tema."
 
-#: send.c:1347
+#: send.c:1404
 msgid "Sending message..."
 msgstr "Enviando mensaxe..."
 
-#: send.c:1473
+#: send.c:1529
 msgid "Could not send the message."
 msgstr "Non foi posible envia-la mensaxe."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Mail sent."
 msgstr "Mensaxe enviada."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Sending in background."
 msgstr "Mandando en segundo plano."
 
@@ -3506,12 +3511,12 @@ msgstr "
 msgid "Could not open %s"
 msgstr "Non foi posible abrir %s"
 
-#: sendlib.c:1702
+#: sendlib.c:1709
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Erro enviando mensaxe, o proceso fillo saíu con %d (%s)."
 
-#: sendlib.c:1708
+#: sendlib.c:1715
 msgid "Output of the delivery process"
 msgstr "Saída do proceso de distribución"
 
@@ -3552,6 +3557,9 @@ msgstr "Esa mensaxe non 
 msgid "Parent message is not available."
 msgstr "Esa mensaxe non é visible."
 
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "ignorando campo de cabeceira valeiro: %s"
+
 #~ msgid "imap_error(): unexpected response in %s: %s\n"
 #~ msgstr "imap_erro(): resposta inesperada en %s: %s\n"
 
diff --git a/po/id.po b/po/id.po
index f281c1d9..91f1e336 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.2i\n"
-"POT-Creation-Date: 2000-02-15 09:44+0100\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: 2000-01-30 12:40-0600\n"
 "Last-Translator: Ronny Haryanto <ronny-muttpo@haryan.to>\n"
 "Language-Team: Indonesia <i18n@linux.or.id>\n"
@@ -65,7 +65,7 @@ msgstr "Simpan ke file: "
 msgid "Alias added."
 msgstr "Alias telah ditambahkan."
 
-#: attach.c:111 attach.c:238 attach.c:431 attach.c:887
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "Tidak cocok dengan nametemplate, lanjutkan?"
 
@@ -116,15 +116,15 @@ msgstr "Jenis MIME tidak didefinisikan. Tidak bisa melihat lampiran."
 msgid "Cannot create filter"
 msgstr "Tidak bisa membuat filter"
 
-#: attach.c:706 recvattach.c:427
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "Lampiran telah disimpan."
 
-#: attach.c:762
+#: attach.c:764
 msgid "Write fault!"
 msgstr "Gagal menulis!"
 
-#: attach.c:971
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "Saya tidak tahu bagaimana mencetak itu!"
 
@@ -136,7 +136,7 @@ msgstr "Pindah dir"
 msgid "Mask"
 msgstr "Mask"
 
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s bukan direktori."
@@ -160,65 +160,65 @@ msgstr "Direktori [%s], File mask: %s"
 msgid "Can't attach a directory!"
 msgstr "Tidak bisa melampirkan sebuah direktori"
 
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "Tidak ada file yang sesuai dengan mask"
 
-#: browser.c:816
+#: browser.c:820
 msgid "Creating mailboxes is not yet supported."
 msgstr "Pembuatan kotak surat belum diimplementasikan."
 
-#: browser.c:821
+#: browser.c:825
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Penghapusan hanya didukung untuk kotak surat jenis IMAP."
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Yakin hapus kotak surat \"%s\"?"
 
-#: browser.c:843
+#: browser.c:847
 msgid "Mailbox deleted."
 msgstr "Kotak surat telah dihapus."
 
-#: browser.c:849
+#: browser.c:853
 msgid "Mailbox not deleted."
 msgstr "Kotak surat tidak dihapus."
 
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "Pindah dir ke: "
 
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "Gagal membaca direktori."
 
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "File Mask: "
 
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Urut terbalik berdasarkan (t)anggal, (a)bjad, (u)kuran atau (n)ggak diurut? "
 
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Urut berdasarkan (t)anggal, (a)bjad, (u)kuran atau (n)ggak diurut? "
 
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr "taun"
 
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "Nama file baru: "
 
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "Tidak bisa menampilkan sebuah direktori"
 
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "Gagal menampilkan file"
 
@@ -809,11 +809,11 @@ msgstr "Tidak ada surat yang tidak jadi dihapus."
 msgid "You are on the first message."
 msgstr "Anda sudah di surat yang pertama."
 
-#: curs_main.c:1166 pattern.c:1112
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "Pencarian kembali ke atas."
 
-#: curs_main.c:1175 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "Pencarian kembali ke bawah."
 
@@ -1161,8 +1161,14 @@ msgstr "Sedang login..."
 msgid "Login failed."
 msgstr "Login gagal."
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "Mengirim surat..."
+
+#: imap/browse.c:120
+#, fuzzy
+msgid "Getting folder list..."
 msgstr "Server berhasil dihubungi, mengambil daftar kotak surat..."
 
 #. something is wrong because the server reported fewer messages
@@ -1195,7 +1201,7 @@ msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "Tidak dapat menambah ke kotak surat IMAP di server ini"
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "Buat %s?"
@@ -1358,94 +1364,89 @@ msgstr "alias: tidak ada alamat email"
 msgid "invalid header field"
 msgstr "kolom header tidak dikenali"
 
-#: init.c:589
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "mengacuhkan kolom header kosong: %s"
-
-#: init.c:641
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: metoda pengurutan tidak dikenali"
 
-#: init.c:717
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr "mutt_restore_default: error pada regexp: %s\n"
 
-#: init.c:777
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: variable tidak diketahui"
 
-#: init.c:786
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "prefix tidak diperbolehkan dengan reset"
 
-#: init.c:792
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "nilai tidak diperbolehkan dengan reset"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "%s hidup"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "%s mati"
 
-#: init.c:1035
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: jenis kotak surat tidak dikenali"
 
-#: init.c:1060 init.c:1105
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: nilai tidak betul"
 
-#: init.c:1160
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: jenis tidak dikenali"
 
-#: init.c:1199
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Error di %s, baris %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1210
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: errors di %s"
 
-#: init.c:1220
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "source: error pada %s"
 
-#: init.c:1225
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "source: parameter terlalu banyak"
 
-#: init.c:1276
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: perintah tidak dikenali"
 
-#: init.c:1633
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Error di baris perintah: %s\n"
 
-#: init.c:1676
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "tidak bisa menentukan home direktori"
 
-#: init.c:1684
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "tidak bisa menentukan username"
 
@@ -2375,43 +2376,43 @@ msgstr ""
 "\n"
 "Pilihan sewaktu kompilasi:"
 
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "Gagal menginisialisasi terminal."
 
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Melakukan debug tingkat %d.\n"
 
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG tidak digunakan sewaktu compile. Cuek.\n"
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s tidak ada. Buat?"
 
-#: main.c:521
+#: main.c:519
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Tidak bisa membuat %s: %s."
 
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "Tidak ada penerima yang disebutkan.\n"
 
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: tidak bisa melampirkan file.\n"
 
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "Tidak ada kotak surat dengan surat baru."
 
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "Kotak surat kosong."
 
@@ -2506,7 +2507,7 @@ msgstr "Anda di entry terakhir."
 msgid "You are on the first entry."
 msgstr "Anda di entry pertama."
 
-#: menu.c:657 pattern.c:1058
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "Cari: "
 
@@ -2514,11 +2515,11 @@ msgstr "Cari: "
 msgid "Reverse search for: "
 msgstr "Cari mundur: "
 
-#: menu.c:668 pattern.c:1091
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "Tidak ada kriteria pencarian."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1156
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "Tidak ketemu."
 
@@ -2543,28 +2544,28 @@ msgstr "Penandaan tidak didukung."
 msgid "Reading %s... %d"
 msgstr "Membaca %s... %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr ""
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr ""
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr ""
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr ""
 
-#: muttlib.c:961
+#: muttlib.c:956
 #, fuzzy, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s bukan kotak surat."
 
-#: muttlib.c:967
+#: muttlib.c:962
 #, fuzzy, c-format
 msgid "Append messages to %s?"
 msgstr "Pindahkan surat-surat yang sudah dibaca ke %s?"
@@ -2670,6 +2671,11 @@ msgstr "Kotak surat ditandai tidak boleh ditulisi. %s"
 msgid "%d kept."
 msgstr "%d disimpan."
 
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "edit surat"
+
 #: pager.c:57
 msgid "Not available in this menu."
 msgstr "Tidak ada di menu ini."
@@ -2770,32 +2776,32 @@ msgstr "tanda kurung tidak klop: %s"
 msgid "empty pattern"
 msgstr "kriteria kosong"
 
-#: pattern.c:883
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "error: %d tidak dikenali (laporkan error ini)."
 
-#: pattern.c:948 pattern.c:1077
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "Menyusun kriteria pencarian..."
 
-#: pattern.c:962
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "Menjalankan perintah terhadap surat-surat yang cocok..."
 
-#: pattern.c:1025
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "Tidak ada surat yang memenuhi kriteria."
 
-#: pattern.c:1115
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "Sudah dicari sampe bawah, tapi tidak ketemu"
 
-#: pattern.c:1126
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "Sudah dicari sampe atas, tapi tidak ketemu"
 
-#: pattern.c:1148
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "Pencarian dibatalkan."
 
@@ -3094,7 +3100,7 @@ msgstr "Alamat tidak ditemukan untuk %s."
 msgid "Connecting to %s"
 msgstr "Menghubungi %s"
 
-#: pop.c:166 pop.c:340
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "Server menutup hubungan!"
 
@@ -3418,56 +3424,56 @@ msgstr "Mempersiapkan pesan yg diforward..."
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:973
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "Lanjutkan surat yang ditunda sebelumnya?"
 
-#: send.c:1217
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "Batalkan surat yang tidak diubah?"
 
-#: send.c:1219
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "Surat yang tidak diubah dibatalkan."
 
 #. abort
-#: send.c:1260
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "Surat tidak dikirim."
 
-#: send.c:1281
+#: send.c:1333
 msgid "Message postponed."
 msgstr "Surat ditunda."
 
-#: send.c:1290
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "Tidak ada penerima yang disebutkan!"
 
-#: send.c:1295
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "Tidak ada penerima yang disebutkan."
 
-#: send.c:1301
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "Tidak ada subjek, batalkan pengiriman?"
 
-#: send.c:1305
+#: send.c:1357
 msgid "No subject specified."
 msgstr "Tidak ada subjek."
 
-#: send.c:1347
+#: send.c:1404
 msgid "Sending message..."
 msgstr "Mengirim surat..."
 
-#: send.c:1473
+#: send.c:1529
 msgid "Could not send the message."
 msgstr "Tidak bisa mengirim surat."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Mail sent."
 msgstr "Surat telah dikirim."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Sending in background."
 msgstr "Mengirim di latar belakang."
 
@@ -3485,12 +3491,12 @@ msgstr "%s tidak ada lagi!"
 msgid "Could not open %s"
 msgstr "Tidak bisa membuka %s"
 
-#: sendlib.c:1702
+#: sendlib.c:1709
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Error mengirimkan surat, proses keluar dengan kode %d (%s)."
 
-#: sendlib.c:1708
+#: sendlib.c:1715
 msgid "Output of the delivery process"
 msgstr "Keluaran dari proses pengiriman"
 
@@ -3529,6 +3535,9 @@ msgstr "Surat induk tidak bisa dilihat di tampilan terbatas."
 msgid "Parent message is not available."
 msgstr "Surat induk tidak ada."
 
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "mengacuhkan kolom header kosong: %s"
+
 #~ msgid "Authenticating (GSSAPI)..."
 #~ msgstr "Mengauthentikasi (GSSAPI)..."
 
diff --git a/po/it.po b/po/it.po
index 02d03ff4..fae7c2c6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutt-1.1.3\n"
-"POT-Creation-Date: 2000-02-15 09:44+0100\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: 2000-02-13 19:31+01:00\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: none\n"
@@ -68,7 +68,7 @@ msgid "Alias added."
 msgstr "Alias aggiunto."
 
 # FIXME
-#: attach.c:111 attach.c:238 attach.c:431 attach.c:887
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "Il nametemplate non corrisponde, continuo?"
 
@@ -120,15 +120,15 @@ msgstr "Tipo MIME non definito.  Impossibile visualizzare l'allegato."
 msgid "Cannot create filter"
 msgstr "Impossibile creare il filtro"
 
-#: attach.c:706 recvattach.c:427
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "Allegato salvato."
 
-#: attach.c:762
+#: attach.c:764
 msgid "Write fault!"
 msgstr "Errore di scrittura!"
 
-#: attach.c:971
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "Non so come stamparlo!"
 
@@ -140,7 +140,7 @@ msgstr "CambiaDir"
 msgid "Mask"
 msgstr "Maschera"
 
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s non è una directory."
@@ -164,65 +164,65 @@ msgstr "Directory [%s], Maschera dei file: %s"
 msgid "Can't attach a directory!"
 msgstr "Impossibile allegare una directory!"
 
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "Non ci sono file corrispondenti alla maschera"
 
-#: browser.c:816
+#: browser.c:820
 msgid "Creating mailboxes is not yet supported."
 msgstr "Non è ancora possibile creare mailbox."
 
-#: browser.c:821
+#: browser.c:825
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "È possibile cancellare solo mailbox IMAP"
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Cancello davvero la mailbox \"%s\"?"
 
-#: browser.c:843
+#: browser.c:847
 msgid "Mailbox deleted."
 msgstr "Mailbox cancellata."
 
-#: browser.c:849
+#: browser.c:853
 msgid "Mailbox not deleted."
 msgstr "Mailbox non cancellata."
 
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "Cambia directory:"
 
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "Errore nella lettura della directory."
 
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "Maschera dei file: "
 
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Ordino al contrario per (d)ata, (a)lfabetico, dimensioni(z) o (n)ulla? "
 
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Ordino per (d)ata, (a)lfabetico, dimensioni(z) o (n)ulla? "
 
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr "dazn"
 
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "Nuovo nome del file: "
 
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "Impossibile vedere una directory"
 
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "C'è stato un errore nella visualizzazione del file"
 
@@ -809,11 +809,11 @@ msgstr "Nessun messaggio da de-cancellare."
 msgid "You are on the first message."
 msgstr "Sei al primo messaggio."
 
-#: curs_main.c:1166 pattern.c:1112
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "La ricerca è ritornata all'inizio."
 
-#: curs_main.c:1175 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "La ricerca è ritornata al fondo."
 
@@ -1159,8 +1159,14 @@ msgstr "Faccio il login..."
 msgid "Login failed."
 msgstr "Login fallito."
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "Prendo il messaggio..."
+
+#: imap/browse.c:120
+#, fuzzy
+msgid "Getting folder list..."
 msgstr "Connesso al server, scarico la lista dei folder..."
 
 #. something is wrong because the server reported fewer messages
@@ -1193,7 +1199,7 @@ msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "Impossibile accodare alle mailbox IMAP di questo server"
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "Creo %s?"
@@ -1350,94 +1356,89 @@ msgstr "alias: nessun indirizzo"
 msgid "invalid header field"
 msgstr "Campo dell'header non valido"
 
-#: init.c:589
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "Ignoro il campo dell'header vuoto: %s"
-
-#: init.c:641
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: metodo di ordinamento sconosciuto"
 
-#: init.c:717
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr "mutt_restore_default: errore nella regexp: %s\n"
 
-#: init.c:777
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: variabile sconosciuta"
 
-#: init.c:786
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "prefix non è consentito con reset"
 
-#: init.c:792
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "value non è consentito con reset"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "%s è attivo"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "%s non è attivo"
 
-#: init.c:1035
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: tipo di mailbox non valido"
 
-#: init.c:1060 init.c:1105
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: valore non valido"
 
-#: init.c:1160
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: tipo sconosciuto"
 
-#: init.c:1199
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Errore in %s, linea %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1210
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: errori in %s"
 
-#: init.c:1220
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "source: errore in %s"
 
-#: init.c:1225
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "source: troppi argomenti"
 
-#: init.c:1276
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: comando sconosciuto"
 
-#: init.c:1633
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Errore nella riga di comando: %s\n"
 
-#: init.c:1676
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "impossibile determinare la home directory"
 
-#: init.c:1684
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "impossibile determinare l'username"
 
@@ -2343,43 +2344,43 @@ msgstr ""
 "\n"
 "Opzioni di compilazione:"
 
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "Errore nell'inizializzazione del terminale."
 
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Debugging al livello %d.\n"
 
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG non è stato definito durante la compilazione.  Ignorato.\n"
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s non esiste. Lo creo?"
 
-#: main.c:521
+#: main.c:519
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Impossibile creare %s: %s."
 
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "Nessun destinatario specificato.\n"
 
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: impossibile allegare il file.\n"
 
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "Nessuna mailbox con nuova posta."
 
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "La mailbox è vuota."
 
@@ -2473,7 +2474,7 @@ msgstr "Sei all'ultima voce."
 msgid "You are on the first entry."
 msgstr "Sei alla prima voce."
 
-#: menu.c:657 pattern.c:1058
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "Cerca: "
 
@@ -2481,11 +2482,11 @@ msgstr "Cerca: "
 msgid "Reverse search for: "
 msgstr "Cerca all'indietro: "
 
-#: menu.c:668 pattern.c:1091
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "Nessun modello di ricerca."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1156
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "Non trovato."
 
@@ -2510,28 +2511,28 @@ msgstr "Non 
 msgid "Reading %s... %d"
 msgstr "Leggo %s... %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr "Il file è una directory, salvo lì dentro?"
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr "File nella directory: "
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "Il file esiste, lo s(o)vrascrivo, (a)ccodo, or (c)ancello?"
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr "oac"
 
-#: muttlib.c:961
+#: muttlib.c:956
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s non è una mailbox!"
 
-#: muttlib.c:967
+#: muttlib.c:962
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Accodo i messaggi a %s?"
@@ -2637,6 +2638,11 @@ msgstr "La mailbox 
 msgid "%d kept."
 msgstr "%d tenuti."
 
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "modifica il messaggio"
+
 #: pager.c:57
 msgid "Not available in this menu."
 msgstr "Non disponibile in questo menù."
@@ -2737,32 +2743,32 @@ msgstr "parentesi fuori posto: %s"
 msgid "empty pattern"
 msgstr "modello vuoto"
 
-#: pattern.c:883
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "errore: unknown op %d (segnala questo errore)."
 
-#: pattern.c:948 pattern.c:1077
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "Compilo il modello da cercare..."
 
-#: pattern.c:962
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "Eseguo il comando sui messaggi corrispondenti..."
 
-#: pattern.c:1025
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "Nessun messaggio corrisponde al criterio."
 
-#: pattern.c:1115
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "La ricerca è arrivata in fondo senza trovare una corrispondenza"
 
-#: pattern.c:1126
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "La ricerca è arrivata all'inizio senza trovare una corrispondenza"
 
-#: pattern.c:1148
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "Ricerca interrotta."
 
@@ -3051,7 +3057,7 @@ msgstr "Impossibile trovare l'indirizzo per l'host %s."
 msgid "Connecting to %s"
 msgstr "Mi connetto a %s"
 
-#: pop.c:166 pop.c:340
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "Il server ha chiuso la connessione!"
 
@@ -3373,56 +3379,56 @@ msgstr "Preparo il messaggio inoltrato..."
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:973
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "Richiamo il messaggio rimandato?"
 
-#: send.c:1217
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "Abbandono il messaggio non modificato?"
 
-#: send.c:1219
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "Ho abbandonato il messaggio non modificato."
 
 #. abort
-#: send.c:1260
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "Il messaggio non è stato spedito."
 
-#: send.c:1281
+#: send.c:1333
 msgid "Message postponed."
 msgstr "Il messaggio è stato rimandato."
 
-#: send.c:1290
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "Non sono stati specificati destinatari!"
 
-#: send.c:1295
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "Non sono stati specificati destinatari."
 
-#: send.c:1301
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "Nessun soggetto, abbandono l'invio?"
 
-#: send.c:1305
+#: send.c:1357
 msgid "No subject specified."
 msgstr "Non è stato specificato un soggetto."
 
-#: send.c:1347
+#: send.c:1404
 msgid "Sending message..."
 msgstr "Spedisco il messaggio..."
 
-#: send.c:1473
+#: send.c:1529
 msgid "Could not send the message."
 msgstr "Impossibile spedire il messaggio"
 
-#: send.c:1478
+#: send.c:1534
 msgid "Mail sent."
 msgstr "Messaggio spedito."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Sending in background."
 msgstr "Invio in background."
 
@@ -3440,12 +3446,12 @@ msgstr "%s non esiste pi
 msgid "Could not open %s"
 msgstr "Impossibile aprire %s"
 
-#: sendlib.c:1702
+#: sendlib.c:1709
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Errore nella spedizione del messaggio, il figlio è uscito con %d (%s)."
 
-#: sendlib.c:1708
+#: sendlib.c:1715
 msgid "Output of the delivery process"
 msgstr "Output del processo di consegna"
 
@@ -3484,5 +3490,8 @@ msgstr "Il messaggio padre non 
 msgid "Parent message is not available."
 msgstr "Il messaggio padre non è disponibile"
 
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "Ignoro il campo dell'header vuoto: %s"
+
 #~ msgid "Authenticating (GSSAPI)..."
 #~ msgstr "Autenticazione in corso (GSSAPI)..."
diff --git a/po/ko.po b/po/ko.po
index 3bff5e93..a85dcb68 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.2\n"
-"POT-Creation-Date: 2000-02-18 10:15+0900\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: 2000-02-18 10:47+0900\n"
 "Last-Translator: Byeong-Chan Kim <redhands@linux.sarag.net>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -135,7 +135,7 @@ msgstr "
 msgid "Mask"
 msgstr "¸Å½ºÅ©"
 
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s´Â µð·ºÅ丮°¡ ¾Æ´Õ´Ï´Ù."
@@ -159,64 +159,64 @@ msgstr "
 msgid "Can't attach a directory!"
 msgstr "µð·ºÅ丮¸¦ ÷ºÎÇÒ ¼ö ¾øÀ½!"
 
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "ÆÄÀÏ ¸Å½ºÅ©¿Í ÀÏÄ¡ÇÏ´Â ÆÄÀÏ ¾øÀ½."
 
-#: browser.c:816
+#: browser.c:820
 msgid "Creating mailboxes is not yet supported."
 msgstr "¸ÅÀÏÇÔ »ý¼ºÀ» Áö¿øÄ¡ ¾ÊÀ½."
 
-#: browser.c:821
+#: browser.c:825
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "»èÁ¦´Â IMAP ¸ÞÀÏÇÔ¿¡¼­¸¸ Áö¿øµÊ"
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "\"%s\" ¸ÅÀÏÇÔÀ» Áö¿ï±î¿ä?"
 
-#: browser.c:843
+#: browser.c:847
 msgid "Mailbox deleted."
 msgstr "¸ÅÀÏÇÔ »èÁ¦µÊ."
 
-#: browser.c:849
+#: browser.c:853
 msgid "Mailbox not deleted."
 msgstr "º¸³»Áö »èÁ¦µÇÁö ¾ÊÀ½."
 
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "À̵¿ÇÒ µð·ºÅ丮: "
 
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "µð·ºÅ丮 °Ë»çÁß ¿À·ù."
 
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "ÆÄÀÏ ¸Å½ºÅ©: "
 
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "¿ªÁ¤·Ä ¹æ¹ý ³¯Â¥(d), ³¹¸»(a), Å©±â(z) ¶Ç´Â ¾ÈÇÔ(n)?"
 
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Á¤·Ä ¹æ¹ý ³¯Â¥(d), ±ÛÀÚ(a), Å©±â(z) ¶Ç´Â ¾ÈÇÔ(n)?"
 
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr "dazn"
 
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "»õ ÆÄÀÏ À̸§: "
 
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "µð·ºÅ丮¸¦ º¼ ¼ö ¾øÀ½"
 
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "ÆÄÀÏ º¸±â ½Ãµµ Áß ¿À·ù"
 
@@ -1149,8 +1149,14 @@ msgstr "
 msgid "Login failed."
 msgstr "Á¢¼Ó ½ÇÆÐ."
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "¸Þ¼¼Áö °¡Á®¿À´Â Áß..."
+
+#: imap/browse.c:120
+#, fuzzy
+msgid "Getting folder list..."
 msgstr "¼­¹ö¿¡ ¿¬°á µÊ, Æú´õ ¸ñ·Ï ¹Þ´Â Áß..."
 
 #. something is wrong because the server reported fewer messages
@@ -1183,7 +1189,7 @@ msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "¼­¹öÀÇ IMAP ÆíÁöÇÔ¿¡ Ãß°¡ÇÒ ¼ö ¾øÀ½"
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "%s¸¦ ¸¸µé±î¿ä?"
@@ -2354,43 +2360,43 @@ msgstr ""
 "\n"
 "ÄÄÆÄÀÏ ¼±ÅûçÇ×:"
 
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "Å͹̳ΠÃʱâÈ­ ¿À·ù."
 
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "µð¹ö±ë ·¹º§ %d.\n"
 
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG°¡ ÄÄÆÄÀϽà Á¤ÀǵÇÁö ¾ÊÀ½. ¹«½ÃÇÔ\n"
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s°¡ Á¸ÀçÄ¡ ¾ÊÀ½. ¸¸µé±î¿ä?"
 
-#: main.c:521
+#: main.c:519
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "%s¸¦ ¸¸µé ¼ö ¾øÀ½: %s."
 
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "¼ö½ÅÀÚ°¡ ÁöÁ¤µÇÁö ¾ÊÀ½.\n"
 
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: ÆÄÀÏÀ» ÷ºÎÇÒ ¼ö ¾øÀ½.\n"
 
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "»õ·Î¿î ÆíÁö°¡ µµÂøÇÑ ÆíÁöÇÔ ¾øÀ½."
 
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "ÆíÁöÇÔÀÌ ºñ¾úÀ½"
 
@@ -2521,28 +2527,28 @@ msgstr "
 msgid "Reading %s... %d"
 msgstr "%s Àд Áß... %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr "ÆÄÀÏÀÌ ¾Æ´Ï¶ó µð·ºÅ丮ÀÔ´Ï´Ù, ±× ¾Æ·¡¿¡ ÀúÀåÇÒ±î¿ä?"
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr "µð·ºÅ͸®ÇÏ¿¡ ÀúÀåÇÒ ÆÄÀÏ:"
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "ÆÄÀÏÀÌ Á¸ÀçÇÔ, µ¤¾î¾²±â(o), ÷°¡(a), Ãë¼Ò(c)?"
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr "oac"
 
-#: muttlib.c:961
+#: muttlib.c:956
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s´Â ÆíÁöÇÔÀÌ ¾Æ´Ô!"
 
-#: muttlib.c:967
+#: muttlib.c:962
 #, c-format
 msgid "Append messages to %s?"
 msgstr "%s¿¡ ¸Þ¼¼Áö¸¦ ÷°¡ÇÒ±î¿ä?"
diff --git a/po/nl.po b/po/nl.po
index e0788a93..131d6948 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-02-15 09:44+0100\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,7 +62,7 @@ msgstr "Opslaan als: "
 msgid "Alias added."
 msgstr "Adres toegevoegd."
 
-#: attach.c:111 attach.c:238 attach.c:431 attach.c:887
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "Naamsjabloon kan niet worden ingevuld, doorgaan?"
 
@@ -112,15 +112,15 @@ msgstr "MIME type is niet gedefinieerd. Kan bijlage niet weergeven."
 msgid "Cannot create filter"
 msgstr "Filter kan niet worden aangemaakt."
 
-#: attach.c:706 recvattach.c:427
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "Bijlage opgeslagen."
 
-#: attach.c:762
+#: attach.c:764
 msgid "Write fault!"
 msgstr "Fout bij schrijven!"
 
-#: attach.c:971
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "Ik weet niet hoe dit afgedrukt moet worden!"
 
@@ -132,7 +132,7 @@ msgstr "Wijzig directory"
 msgid "Mask"
 msgstr "Masker"
 
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s is geen directory."
@@ -157,70 +157,70 @@ msgstr "Directory [%s], Bestandsmasker: %s"
 msgid "Can't attach a directory!"
 msgstr "Directory kan niet worden getoond."
 
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "Geen bestanden waarop het masker past gevonden."
 
-#: browser.c:816
+#: browser.c:820
 #, fuzzy
 msgid "Creating mailboxes is not yet supported."
 msgstr "Markeren is niet ondersteund."
 
-#: browser.c:821
+#: browser.c:825
 #, fuzzy
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Deze operatie is op dit moment niet ondersteund voor PGP-berichten."
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr ""
 
-#: browser.c:843
+#: browser.c:847
 #, fuzzy
 msgid "Mailbox deleted."
 msgstr "Macro-lus gedetecteerd!"
 
-#: browser.c:849
+#: browser.c:853
 #, fuzzy
 msgid "Mailbox not deleted."
 msgstr "Bericht niet verstuurd."
 
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "Wisselen naar directory: "
 
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "Fout opgetreden tijdens het analyseren van de directory."
 
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "Bestandsmasker: "
 
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Achteruit sorteren op (d)atum, bestands(g)rootte, (a)lpha of helemaal (n)iet "
 "?"
 
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Sorteren op (d)atum, bestands(g)rootte, (a)lpha of helemaal (n)iet ?"
 
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr "dagn"
 
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "Nieuwe bestandsnaam: "
 
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "Directory kan niet worden getoond."
 
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "Fout opgetreden tijdens het weergeven van bestand"
 
@@ -808,11 +808,11 @@ msgstr "Alle berichten zijn gewist."
 msgid "You are on the first message."
 msgstr "U bent bij het eerste bericht."
 
-#: curs_main.c:1166 pattern.c:1112
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "Zoekopdracht bovenaan begonnen."
 
-#: curs_main.c:1175 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "Zoekopdracht onderaan begonnen."
 
@@ -1160,8 +1160,13 @@ msgstr "Aanmelden..."
 msgid "Login failed."
 msgstr "Aanmelden mislukt..."
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "Bericht wordt gelezen..."
+
+#: imap/browse.c:120
+msgid "Getting folder list..."
 msgstr ""
 
 #. something is wrong because the server reported fewer messages
@@ -1194,7 +1199,7 @@ msgid "Unable to append to IMAP mailboxes at this server"
 msgstr ""
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "%s aanmaken?"
@@ -1355,94 +1360,89 @@ msgstr "alias: Geen adres"
 msgid "invalid header field"
 msgstr "my_hdr: Ongeldig veld in berichtenkop"
 
-#: init.c:589
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "Leeg Kop-veld %s wordt genegeerd."
-
-#: init.c:641
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: Onbekende sorteermethode"
 
-#: init.c:717
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr "mutt_restore_default: Fout in reguliere expressie: %s\n"
 
-#: init.c:777
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: Onbekende variable."
 
-#: init.c:786
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "reset: Prefix is niet toegestaan."
 
-#: init.c:792
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "reset: Toekenning van een waarde is niet toegestaan."
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "%s is gezet."
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "%s is niet gezet."
 
-#: init.c:1035
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: Ongeldig mailbox-type"
 
-#: init.c:1060 init.c:1105
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: ongeldige waarde"
 
-#: init.c:1160
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: onbekend type"
 
-#: init.c:1199
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Fout in %s, regel %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1210
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: fouten in %s"
 
-#: init.c:1220
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "source: fout bij %s"
 
-#: init.c:1225
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "source: Te veel argumenten"
 
-#: init.c:1276
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: onbekend commando"
 
-#: init.c:1633
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Fout in opdrachtregel: %s\n"
 
-#: init.c:1676
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "Kan Home-directory niet achterhalen"
 
-#: init.c:1684
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "Kan gebruikersnaam niet achterhalen"
 
@@ -2327,43 +2327,43 @@ msgid ""
 "Compile options:"
 msgstr ""
 
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "Kan terminal niet initialiseren."
 
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr ""
 
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr ""
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr ""
 
-#: main.c:521
+#: main.c:519
 #, fuzzy, c-format
 msgid "Can't create %s: %s."
 msgstr "Kan bestand %s niet aanmaken."
 
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "Geen ontvangers opgegeven.\n"
 
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: kan bestand niet bijvoegen.\n"
 
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "Geen mailbox met nieuwe berichten."
 
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "Mailbox is leeg."
 
@@ -2459,7 +2459,7 @@ msgstr "U bent op het laatste item."
 msgid "You are on the first entry."
 msgstr "U bent op het eerste item."
 
-#: menu.c:657 pattern.c:1058
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "Zoek naar: "
 
@@ -2467,11 +2467,11 @@ msgstr "Zoek naar: "
 msgid "Reverse search for: "
 msgstr "Zoek achteruit naar: "
 
-#: menu.c:668 pattern.c:1091
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "Geen zoekpatroon."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1156
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "Niet gevonden."
 
@@ -2498,29 +2498,29 @@ msgstr "Markeren is niet ondersteund."
 msgid "Reading %s... %d"
 msgstr "Bezig met het lezen van %s... %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr "Bestand is een directory, daarin opslaan?"
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr "Bestandsnaam in directory: "
 
-#: muttlib.c:675
+#: muttlib.c:670
 #, fuzzy
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "Bestand bestaat, overschrijven?"
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr ""
 
-#: muttlib.c:961
+#: muttlib.c:956
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s is geen mailbox!"
 
-#: muttlib.c:967
+#: muttlib.c:962
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Bericht aan %s toevoegen?"
@@ -2626,6 +2626,11 @@ msgstr "De mailbox is als niet-schrijfbaar gemarkeerd. %s"
 msgid "%d kept."
 msgstr ""
 
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "Bewerk het bericht"
+
 #: pager.c:57
 #, fuzzy
 msgid "Not available in this menu."
@@ -2727,32 +2732,32 @@ msgstr "Haakjes kloppen niet: %s"
 msgid "empty pattern"
 msgstr "Leeg patroon"
 
-#: pattern.c:883
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr ""
 
-#: pattern.c:948 pattern.c:1077
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "Bezig met het compileren van patroon..."
 
-#: pattern.c:962
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "Commando wordt uitgevoerd..."
 
-#: pattern.c:1025
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "Geen berichten voldeden aan de criteria."
 
-#: pattern.c:1115
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "Zoeken heeft einde bereikt zonder iets te vinden"
 
-#: pattern.c:1126
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "Zoeken heeft begin bereikt zonder iets te vinden"
 
-#: pattern.c:1148
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "Zoeken onderbroken."
 
@@ -3050,7 +3055,7 @@ msgstr "Kan adres van host %s niet achterhalen."
 msgid "Connecting to %s"
 msgstr "Verbinding met %s wordt aangelegd."
 
-#: pop.c:166 pop.c:340
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "Server heeft verbinding gesloten!"
 
@@ -3376,57 +3381,57 @@ msgstr "Bericht wordt verstuurd ..."
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:973
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "Uigesteld bericht hervatten?"
 
-#: send.c:1217
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "Uitgesteld bericht afbreken?"
 
-#: send.c:1219
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "Bericht werd niet veranderd. Operatie afgebroken."
 
 #. abort
-#: send.c:1260
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "Bericht niet verstuurd."
 
-#: send.c:1281
+#: send.c:1333
 msgid "Message postponed."
 msgstr "Bericht uitgesteld."
 
-#: send.c:1290
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "Er zijn geen geadresseerden opgegeven!"
 
-#: send.c:1295
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "Er werden geen geadresseerden opgegeven!"
 
-#: send.c:1301
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "Geen onderwerp. Versturen afbreken?"
 
-#: send.c:1305
+#: send.c:1357
 msgid "No subject specified."
 msgstr "Geen onderwerp."
 
-#: send.c:1347
+#: send.c:1404
 msgid "Sending message..."
 msgstr "Verstuur bericht..."
 
-#: send.c:1473
+#: send.c:1529
 #, fuzzy
 msgid "Could not send the message."
 msgstr "Verstuur het bericht"
 
-#: send.c:1478
+#: send.c:1534
 msgid "Mail sent."
 msgstr "Bericht verstuurd."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Sending in background."
 msgstr ""
 
@@ -3444,12 +3449,12 @@ msgstr "%s bestaat niet meer!"
 msgid "Could not open %s"
 msgstr "Kan %s niet openen."
 
-#: sendlib.c:1702
+#: sendlib.c:1709
 #, fuzzy, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Fout %d opgetreden tijdens versturen van bericht.\n"
 
-#: sendlib.c:1708
+#: sendlib.c:1715
 msgid "Output of the delivery process"
 msgstr ""
 
@@ -3490,6 +3495,9 @@ msgstr "Dit bericht is niet zichtbaar."
 msgid "Parent message is not available."
 msgstr "Dit bericht is niet zichtbaar."
 
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "Leeg Kop-veld %s wordt genegeerd."
+
 #~ msgid "imap_error(): unexpected response in %s: %s\n"
 #~ msgstr "imap_error(): Onbekend antwoord in %s:%s\n"
 
diff --git a/po/pl.po b/po/pl.po
index 37aaa3bb..76e7cc53 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutt-1.1.2i\n"
-"POT-Creation-Date: 2000-02-15 09:44+0100\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: 2000-01-19 18:30+0200\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -69,7 +69,7 @@ msgstr "Zapisz do pliku: "
 msgid "Alias added."
 msgstr "Alias dodany."
 
-#: attach.c:111 attach.c:238 attach.c:431 attach.c:887
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "Nie pasuj±cy szablon nazwy, kontynuowaæ?"
 
@@ -120,15 +120,15 @@ msgstr "Typ MIME nie zosta
 msgid "Cannot create filter"
 msgstr "Nie mo¿na utworzyæ filtru"
 
-#: attach.c:706 recvattach.c:427
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "Za³±cznik zapisany."
 
-#: attach.c:762
+#: attach.c:764
 msgid "Write fault!"
 msgstr "B³±d zapisu!"
 
-#: attach.c:971
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "Nie wiem jak to wydrukowaæ!"
 
@@ -140,7 +140,7 @@ msgstr "Zmie
 msgid "Mask"
 msgstr "Wzorzec"
 
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s nie jest katalogiem."
@@ -164,68 +164,68 @@ msgstr "Katalog [%s], wzorzec nazw plik
 msgid "Can't attach a directory!"
 msgstr "Za³±cznikiem nie mo¿e zostaæ katalog!"
 
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "¯aden plik nie pasuje do maski"
 
-#: browser.c:816
+#: browser.c:820
 #, fuzzy
 msgid "Creating mailboxes is not yet supported."
 msgstr "Zaznaczanie nie jest obs³ugiwane."
 
-#: browser.c:821
+#: browser.c:825
 #, fuzzy
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Ten rodzaj operacji nie jest na razie wykonalny na listach PGP."
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr ""
 
-#: browser.c:843
+#: browser.c:847
 #, fuzzy
 msgid "Mailbox deleted."
 msgstr "Wykryto pêtlê w makrze."
 
-#: browser.c:849
+#: browser.c:853
 #, fuzzy
 msgid "Mailbox not deleted."
 msgstr "List nie zosta³ wys³any."
 
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "Zmieñ katalog na: "
 
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "B³±d przegl±dania katalogu."
 
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "Wzorzec nazw plików: "
 
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Sortowanie odwrotne wg (d)aty, (a)lfabetu, (w)ielko¶ci, ¿ad(n)e?"
 
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Sortowanie wg (d)aty, (a)lfabetu, (w)ielko¶ci, ¿ad(n)e?"
 
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr "dawn"
 
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "Nazwa nowego pliku: "
 
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "Nie mo¿na przegl±daæ tego katalogu"
 
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "B³±d podczas próby przegl±dania pliku"
 
@@ -813,11 +813,11 @@ msgstr "Brak odtworzonych list
 msgid "You are on the first message."
 msgstr "To jest pierwszy list."
 
-#: curs_main.c:1166 pattern.c:1112
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "Kontynuacja poszukiwania od pocz±tku."
 
-#: curs_main.c:1175 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "Kontynuacja poszukiwania od koñca."
 
@@ -1167,8 +1167,14 @@ msgstr "Logowanie..."
 msgid "Login failed."
 msgstr "Zalogowanie nie powiod³o siê."
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "Pobieranie listu..."
+
+#: imap/browse.c:120
+#, fuzzy
+msgid "Getting folder list..."
 msgstr "Po³aczenie nawi±zane, pobieranie listy folderów..."
 
 #. something is wrong because the server reported fewer messages
@@ -1201,7 +1207,7 @@ msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "Nie mo¿na dopisaæ do skrzynek IMAP na tym serwerze"
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "Utworzyæ %s?"
@@ -1362,94 +1368,89 @@ msgstr "alias: brak adresu"
 msgid "invalid header field"
 msgstr "nieprawid³owy nag³ówek"
 
-#: init.c:589
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "ignorowanie pustego nag³ówka: %s"
-
-#: init.c:641
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: nieznana metoda sortowania"
 
-#: init.c:717
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr "mutt_restore_default: b³±d w wyra¿eniu regularnym: %s\n"
 
-#: init.c:777
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: nieznana zmienna"
 
-#: init.c:786
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "reset: nieprawid³owy prefiks"
 
-#: init.c:792
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "reset: nieprawid³owa warto¶æ"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "%s ustawiony"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "%s nie jest ustawiony"
 
-#: init.c:1035
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: nieprawid³owy typ skrzynki"
 
-#: init.c:1060 init.c:1105
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: nieprawid³owa warto¶æ"
 
-#: init.c:1160
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: nieprawid³owy typ"
 
-#: init.c:1199
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "B³±d w %s, linia %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1210
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: b³êdy w %s"
 
-#: init.c:1220
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "source: b³êdy w %s"
 
-#: init.c:1225
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "source: zbyt wiele argumentów"
 
-#: init.c:1276
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: nieznane polecenie"
 
-#: init.c:1633
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "B³±d w poleceniu: %s\n"
 
-#: init.c:1676
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "nie mo¿na ustaliæ po³o¿enia katalogu domowego"
 
-#: init.c:1684
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "nie mo¿na ustaliæ nazwy u¿ytkownika"
 
@@ -2409,43 +2410,43 @@ msgstr ""
 "\n"
 "Parametry kompilacji:"
 
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "B³±d inicjalizacji terminala."
 
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Diagnostyka b³êdów na poziomie %d.\n"
 
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "Diagnostyka b³êdów nie zosta³a wkompilowane. Zignorowano.\n"
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s nie istnieje. Utworzyæ?"
 
-#: main.c:521
+#: main.c:519
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Nie mo¿na utworzyæ %s: %s."
 
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "Nie wskazano adresatów listu.\n"
 
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: nie mo¿na do³±czyæ pliku.\n"
 
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "Brak foldera z now± poczt±."
 
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "Folder poczty jest pusty."
 
@@ -2541,7 +2542,7 @@ msgstr "To jest ostatnia pozycja."
 msgid "You are on the first entry."
 msgstr "To jest pierwsza pozycja."
 
-#: menu.c:657 pattern.c:1058
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "Szukaj frazy: "
 
@@ -2549,11 +2550,11 @@ msgstr "Szukaj frazy: "
 msgid "Reverse search for: "
 msgstr "Szukaj frazy w przeciwnym kierunku: "
 
-#: menu.c:668 pattern.c:1091
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "Nie ustalono wzorca poszukiwañ."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1156
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "Nic nie znaleziono."
 
@@ -2579,28 +2580,28 @@ msgstr "Zaznaczanie nie jest obs
 msgid "Reading %s... %d"
 msgstr "Czytanie %s... %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr ""
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr ""
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr ""
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr ""
 
-#: muttlib.c:961
+#: muttlib.c:956
 #, fuzzy, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s nie jest skrzynk±."
 
-#: muttlib.c:967
+#: muttlib.c:962
 #, fuzzy, c-format
 msgid "Append messages to %s?"
 msgstr "Przenie¶æ przeczytane listy do %s?"
@@ -2706,6 +2707,11 @@ msgstr "Skrzynka jest oznaczona jako niezapisywalna. %s"
 msgid "%d kept."
 msgstr ""
 
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "edytuj tre¶æ listu"
+
 #: pager.c:57
 msgid "Not available in this menu."
 msgstr "Nie ma takiego polecenia w tym menu."
@@ -2806,32 +2812,32 @@ msgstr "niesparowane nawiasy: %s"
 msgid "empty pattern"
 msgstr "pusty wzorzec"
 
-#: pattern.c:883
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "b³±d: nieznany op %d (zg³o¶ ten b³±d)."
 
-#: pattern.c:948 pattern.c:1077
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "Kompilacja wzorca poszukiwañ..."
 
-#: pattern.c:962
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "Wykonywanie polecenia na pasuj±cych do wzorca listach..."
 
-#: pattern.c:1025
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "¯aden z listów nie spe³nia kryteriów."
 
-#: pattern.c:1115
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "Poszukiwanie dotar³o do koñca bez znalezienia frazy"
 
-#: pattern.c:1126
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "Poszukiwanie dotar³o do pocz±tku bez znalezienia frazy"
 
-#: pattern.c:1148
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "Przeszukiwanie przerwano."
 
@@ -3131,7 +3137,7 @@ msgstr "Nie mo
 msgid "Connecting to %s"
 msgstr "£±czenie z %s"
 
-#: pop.c:166 pop.c:340
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "Serwer zamkn±³ po³±czenie!"
 
@@ -3456,56 +3462,56 @@ msgstr "Przygotowywanie listu do przes
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:973
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "Wywo³aæ od³o¿ony list?"
 
-#: send.c:1217
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "List nie zosta³ zmieniony. Zaniechaæ wys³ania?"
 
-#: send.c:1219
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "List nie zosta³ zmieniony. Zaniechano wys³ania."
 
 #. abort
-#: send.c:1260
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "List nie zosta³ wys³any."
 
-#: send.c:1281
+#: send.c:1333
 msgid "Message postponed."
 msgstr "List od³o¿ono."
 
-#: send.c:1290
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "Nie wskazano adresatów!"
 
-#: send.c:1295
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "Nie wskazano adresatów!"
 
-#: send.c:1301
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "Brak tematu, zaniechaæ wys³ania?"
 
-#: send.c:1305
+#: send.c:1357
 msgid "No subject specified."
 msgstr "Brak tematu."
 
-#: send.c:1347
+#: send.c:1404
 msgid "Sending message..."
 msgstr "Wysy³anie listu..."
 
-#: send.c:1473
+#: send.c:1529
 msgid "Could not send the message."
 msgstr "Wys³anie listu nie powiod³o siê."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Mail sent."
 msgstr "Poczta wys³ana."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Sending in background."
 msgstr "Wysy³anie w tle."
 
@@ -3523,12 +3529,12 @@ msgstr "%s ju
 msgid "Could not open %s"
 msgstr "Nie mo¿na otworzyæ %s"
 
-#: sendlib.c:1702
+#: sendlib.c:1709
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "B³±d podczas wysy³ania listu, proces potomny opu¶ci³ %d (%s)."
 
-#: sendlib.c:1708
+#: sendlib.c:1715
 msgid "Output of the delivery process"
 msgstr "Wynik procesu dostarczania"
 
@@ -3569,6 +3575,9 @@ msgstr ""
 msgid "Parent message is not available."
 msgstr "Pierwszy list tego w±tku nie jest dostêpny."
 
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "ignorowanie pustego nag³ówka: %s"
+
 #~ msgid "Authenticating (GSSAPI)..."
 #~ msgstr "Uwierzytelnianie (GSSAPI)..."
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7eddc7cd..044bb8e5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,113 +1,17 @@
 # Mutt 0.95.6
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.95.6\n"
-"POT-Creation-Date: 1999-06-10 01:14-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
+"PO-Revision-Date: 1999-06-10 01:14-0300\n"
 "Last-Translator: Marcus Brito <pazu@linuxbr.com.br>\n"
 "Language-Team: LIE-BR (http://lie-br.conectiva.com.br)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding:\n"
 
-##################################
-# EXTRAS ADICIONADOS MANUALMENTE #
-##################################
-
-msgid "Mailcap compose entry requires %%s"
-msgstr "Entrada de composição no mailcap requer %%s"
- 
-msgid "Error running \"%s\"!"
-msgstr "Erro ao executar \"$s\"!"
-
-msgid "Failure to open file to parse headers."
-msgstr "Erro ao abrir o arquivo para interpretar os cabeçalhos."
- 
-msgid " ('?' for list): "
-msgstr " ('?' para uma lista): "
- 
-msgid "No mailbox is open."
-msgstr "Nenhuma caixa aberta."
-
-msgid "There are no messages."
-msgstr "Não há mensagens."
-
-msgid "Mailbox is read-only."
-msgstr "Esta caixa é somente para leitura."
-
-msgid "Function not permitted in attach-message mode."
-msgstr "Função não permitida no modo anexar-mensagem."
-
-msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "Não é possvel ativar escrita em uma caixa somente para leitura!"
- 
-msgid "New mail in this mailbox."
-msgstr "Novas mensagens nesta caixa."
- 
-msgid "No tagged messages."
-msgstr "Nenhuma mensagem marcada."
- 
-msgid "Untag messages matching: "
-msgstr "Desmarcar mensagens que casem com: "
- 
-msgid "Open mailbox in read-only mode"
-msgstr "Abrir caixa somente para leitura"
- 
-msgid "Open mailbox"
-msgstr "Abrir caixa de correio"
- 
-msgid "%s is not a mailbox."
-msgstr "%s não é uma caixa de correio."
-
-msgid "Fetching message..."
-msgstr "Obtendo mensagem..."
- 
-msgid "Sending CREATE command ..."
-msgstr "Enviando o comando CREATE..."
-
-msgid "Sending APPEND command ..."
-msgstr "Enviando o comando APPEND..."
- 
-msgid "Mailbox is marked unwritable. %s"
-msgstr "A caixa está marcada como não gravável. %s"
- 
-msgid "Not available in this menu."
-msgstr "Não disponível neste menu."
- 
-msgid "PrevPg"
-msgstr "PagAnt"
- 
-msgid "Mail sent."
-msgstr "Mensagem enviada."
- 
-msgid "Sending in background."
-msgstr "Enviando em segundo plano."
-
-msgid "No boundary parameter found! [report this error]"
-msgstr "Nenhum parâmetro limitando encontrado! [relate este erro]"
- 
-msgid "Could not open %s"
-msgstr "Não foi possível abrir %s"
- 
-msgid "Error sending message, child exited %d (%s)."
-msgstr "Erro ao enviar a mensagem, processo filho saiu com %d (%s)."
- 
-msgid "Output of the delivery process"
-msgstr "Saída do processo de entrega"
- 
-msgid "%s...  Exiting.\n"
-msgstr "%s... Saindo.\n"
- 
-msgid "Caught %s...  Exiting.\n"
-msgstr "%s recebido... Saindo.\n"
-
-##############################
-# FIM DAS ALTERACOES MANUAIS #
-##############################
-
-#: addrbook.c:31 browser.c:53 pager.c:1368 postpone.c:32 query.c:43
-#: recvattach.c:47
+#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: recvattach.c:57
 msgid "Exit"
 msgstr "Sair"
 
@@ -115,50 +19,50 @@ msgstr "Sair"
 msgid "Select"
 msgstr "Escolher"
 
-#: addrbook.c:33 browser.c:56 compose.c:83 curs_main.c:259 pager.c:1465
-#: pgpkey.c:180 postpone.c:35 query.c:48 recvattach.c:51
+#: addrbook.c:33 browser.c:44 compose.c:92 curs_main.c:269 imap/imap_ssl.c:256
+#: pager.c:1480 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Ajuda"
 
-#: addrbook.c:131
+#: addrbook.c:120
 msgid "You have no aliases!"
 msgstr "Você não tem apelidos!"
 
-#: addrbook.c:143
+#: addrbook.c:131
 msgid "Aliases"
 msgstr "Apelidos"
 
 #. add a new alias
-#: alias.c:192
+#: alias.c:235
 msgid "Alias as: "
 msgstr "Apelidar como: "
 
-#: alias.c:198
+#: alias.c:241
 msgid "You already have an alias defined with that name!"
 msgstr "Você já tem um apelido definido com aquele nome!"
 
-#: alias.c:212
+#: alias.c:255
 msgid "Address: "
 msgstr "Endereço: "
 
-#: alias.c:228
+#: alias.c:271
 msgid "Personal name: "
 msgstr "Nome pessoal:"
 
-#: alias.c:237
+#: alias.c:280
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s =%s] Aceita?"
 
-#: alias.c:254 recvattach.c:346 recvattach.c:403
+#: alias.c:297 recvattach.c:396 recvattach.c:453
 msgid "Save to file: "
 msgstr "Salvar em arquivo:"
 
-#: alias.c:265
+#: alias.c:308
 msgid "Alias added."
 msgstr "Apelido adicionado."
 
-#: attach.c:111 attach.c:234 attach.c:425 attach.c:869
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "Não pude casar o nome, continuo?"
 
@@ -167,659 +71,781 @@ msgstr "N
 msgid "Mailcap compose entry requires %%s"
 msgstr "Entrada de composição no mailcap requer %%s"
 
-#: attach.c:137
+#: attach.c:131 attach.c:256 commands.c:169 compose.c:1126 curs_lib.c:135
+#: curs_lib.c:331
+#, fuzzy, c-format
+msgid "Error running \"%s\"!"
+msgstr "Erro ao executar \"%s\"!"
+
+#: attach.c:141
+#, fuzzy
 msgid "Failure to open file to parse headers."
-msgstr "Erro ao abrir o arquivo para interpretar cabeçalhos."
+msgstr "Erro ao abrir o arquivo para interpretar os cabeçalhos."
 
-#: attach.c:168
+#: attach.c:172
 msgid "Failure to open file to strip headers."
 msgstr "Erro ao abrir o arquivo para retirar cabeçalhos."
 
-#: attach.c:186
+#: attach.c:190
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr "Nenhuma entrada de composição no mailcap para %s, criando entrada vazia."
-
+msgstr ""
+"Nenhuma entrada de composição no mailcap para %s, criando entrada vazia."
 
 #. For now, editing requires a file, no piping
-#: attach.c:246
+#: attach.c:250
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Entrada de edição no mailcap requer %%s"
 
-#: attach.c:264
+#: attach.c:269
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Nenhuma entrada de edição no mailcap para %s"
 
-#: attach.c:391
+#: attach.c:397
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Nenhuma entrada no mailcap de acordo encontrada. Exibindo como texto."
 
-#: attach.c:404
+#: attach.c:410
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Tipo MIME não definido. Não é possível visualizar o anexo."
 
-#: attach.c:494
+#: attach.c:500
 msgid "Cannot create filter"
 msgstr "Não é possível criar o filtro."
 
-#: attach.c:696 recvattach.c:377
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "Anexo salvo."
 
-#: attach.c:751
+#: attach.c:764
 msgid "Write fault!"
 msgstr "Erro de gravação!"
 
-#: attach.c:953
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "Eu não sei como imprimir isto!"
 
-#: browser.c:54
+#: browser.c:42
 msgid "Chdir"
 msgstr "Diretório"
 
-#: browser.c:55
+#: browser.c:43
 msgid "Mask"
 msgstr "Máscara"
 
-#: browser.c:344 browser.c:671
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s não é um diretório."
 
-#: browser.c:449
+#: browser.c:480
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Caixas [%d]"
 
-#: browser.c:454
+#: browser.c:487
+#, fuzzy, c-format
+msgid "Subscribed [%s], File mask: %s"
+msgstr "Diretório [%s], Máscara de arquivos: %s"
+
+#: browser.c:491
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Diretório [%s], Máscara de arquivos: %s"
 
-#: browser.c:538 browser.c:728 browser.c:811
+#: browser.c:502
+#, fuzzy
+msgid "Can't attach a directory!"
+msgstr "Não é possível visualizar um diretório"
+
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "Nenhum arquivo casa com a máscara"
 
-#: browser.c:645
+#: browser.c:820
+#, fuzzy
+msgid "Creating mailboxes is not yet supported."
+msgstr "Não é possível marcar."
+
+#: browser.c:825
+#, fuzzy
+msgid "Delete is only supported for IMAP mailboxes"
+msgstr "Esta operação não é atualmente suportada para mensagens PGP."
+
+#: browser.c:833
+#, c-format
+msgid "Really delete mailbox \"%s\"?"
+msgstr ""
+
+#: browser.c:847
+#, fuzzy
+msgid "Mailbox deleted."
+msgstr "Laço de macro detectado."
+
+#: browser.c:853
+#, fuzzy
+msgid "Mailbox not deleted."
+msgstr "Mensagem não enviada."
+
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "Mudar para: "
 
-#: browser.c:664 browser.c:721
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "Erro ao examinar diretório."
 
-#: browser.c:682
+#: browser.c:923
 msgid "File Mask: "
 msgstr "Máscara de arquivos: "
 
-#: browser.c:744
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Ordenar inversamente por (d)ata, (a)lfa, (t)amanho ou (n)ão ordenar? "
 
-#: browser.c:745
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Ordenar por (d)ata, (a)lfa, (t)amanho ou (n)ão ordenar? "
 
-#: browser.c:746
+#: browser.c:997
 msgid "dazn"
 msgstr "datn"
 
-#: browser.c:798
+#: browser.c:1059
 msgid "New file name: "
 msgstr "Nome do novo arquivo: "
 
-#: browser.c:819
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "Não é possível visualizar um diretório"
 
-#: browser.c:837
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "Erro ao tentar exibir arquivo"
 
-#: buffy.c:363
+#: buffy.c:407
 #, c-format
 msgid "New mail in %s."
 msgstr "Novas mensagens em %s"
 
-#: color.c:306
+#: charset.c:1065
+msgid "We can't currently handle utf-8 at this point."
+msgstr ""
+
+#: charset.c:1071 charset.c:1078
+#, fuzzy, c-format
+msgid "Can't open %s: %s."
+msgstr "Não é possível mostrar estatísticas: %s"
+
+#: charset.c:1131
+#, c-format
+msgid "Error while recoding %s. See %s for recovering your data."
+msgstr ""
+
+#: color.c:322
 #, c-format
 msgid "%s: color not supported by term"
 msgstr "%s: cor não é suportada pelo terminal"
 
-#: color.c:312
+#: color.c:328
 #, c-format
 msgid "%s: no such color"
 msgstr "%s: não existe tal cor"
 
-#: color.c:358 color.c:549 color.c:560
+#: color.c:374 color.c:565 color.c:576
 #, c-format
 msgid "%s: no such object"
 msgstr "%s: não existe tal objeto"
 
-#: color.c:365
+#: color.c:381
 #, c-format
 msgid "%s: command valid only for index object"
 msgstr "%s: comando válido apenas para o objeto índice"
 
-#: color.c:373
+#: color.c:389
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s: poucos argumentos"
 
-#: color.c:537
+#: color.c:553
 msgid "Missing arguments."
 msgstr "Faltam argumentos."
 
-#: color.c:576 color.c:587
+#: color.c:592 color.c:603
 msgid "color: too few arguments"
 msgstr "color: poucos argumentos"
 
-#: color.c:610
+#: color.c:626
 msgid "mono: too few arguments"
 msgstr "mono: poucos argumentos"
 
-#: color.c:630
+#: color.c:646
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s: não existe tal atributo"
 
-#: color.c:670 hook.c:61 hook.c:69 keymap.c:687
+#: color.c:686 hook.c:61 hook.c:69 keymap.c:697
 msgid "too few arguments"
 msgstr "poucos argumentos"
 
-#: color.c:679 hook.c:75
+#: color.c:695 hook.c:75
 msgid "too many arguments"
 msgstr "muitos argumentos"
 
-#: color.c:693
+#: color.c:711
 msgid "default colors not supported"
 msgstr "cores padões não suportadas"
 
-#: commands.c:87 commands.c:95 pgp.c:1373 pgpkey.c:220
-msgid "Invoking PGP..."
-msgstr "Executando PGP..."
-
 #. find out whether or not the verify signature
-#: commands.c:92
+#: commands.c:94
 msgid "Verify PGP signature?"
 msgstr "Verificar assinatura de PGP?"
 
-#: commands.c:110 mbox.c:722
+#: commands.c:106 pgp.c:1542 pgpkey.c:491 postpone.c:549
+msgid "Invoking PGP..."
+msgstr "Executando PGP..."
+
+#: commands.c:114 mbox.c:729
 msgid "Could not create temporary file!"
 msgstr "Não foi possível criar um arquivo temporário!"
 
-#: commands.c:158
+#: commands.c:153
+msgid "PGP signature successfully verified."
+msgstr ""
+
+#: commands.c:176
 msgid "Command: "
 msgstr "Comando: "
 
-#: commands.c:176 recvattach.c:682
+#: commands.c:194 recvcmd.c:140
 msgid "Bounce message to: "
 msgstr "Repetir mensagem para: "
 
-#: commands.c:178 recvattach.c:684
+#: commands.c:196 recvcmd.c:142
 msgid "Bounce tagged messages to: "
 msgstr "Repetir mensagens marcadas para: "
 
-#: commands.c:193
+#: commands.c:211
 msgid "Error parsing address!"
 msgstr "Erro ao interpretar endereço!"
 
-#: commands.c:203
+#: commands.c:221
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Repetir mensagem para %s"
 
-#: commands.c:203
+#: commands.c:221
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Repetir mensagens para %s"
 
-#: commands.c:214
+#: commands.c:232
 msgid "Message bounced."
 msgstr "Mensagem repetida."
 
-#: commands.c:214
+#: commands.c:232
 msgid "Messages bounced."
 msgstr "Mensagens repetidas."
 
-#: commands.c:234
+#: commands.c:267
 msgid "Pipe to command: "
 msgstr "Passar por cano ao comando: "
 
-#: commands.c:334
+#: commands.c:367
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 msgstr ""
 "Ordem-Rev (d)ata/(f)rm/(r)eceb/(a)sst/(p)ara/dis(c)/de(s)ord/(t)am/r(e)fs?: "
 
-#: commands.c:335
+#: commands.c:368
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 msgstr ""
 "Ordem (d)ata/(f)rm/(r)eceb/(a)sst/(p)ara/dis(c)/de(s)ord/(t)am/r(e)fs?: "
 
-#: commands.c:336
+#: commands.c:369
 msgid "dfrsotuzc"
 msgstr "dfrapcste"
 
-#: commands.c:389
+#: commands.c:422
 msgid "Shell command: "
 msgstr "Comando do shell: "
 
-#: commands.c:505
+#: commands.c:555
 #, c-format
 msgid "%s%s to mailbox"
 msgstr "%s%s para caixa de mensagens"
 
-#: commands.c:506
+#: commands.c:556
 msgid "Decode-save"
 msgstr "Decodificar-salvar"
 
-#: commands.c:506
+#: commands.c:556
 msgid "Decode-copy"
 msgstr "Decodificar-copiar"
 
-#: commands.c:507
+#: commands.c:557
 msgid "Decrypt-save"
 msgstr "Desencriptar-salvar"
 
-#: commands.c:507
+#: commands.c:557
 msgid "Decrypt-copy"
 msgstr "Desencriptar-copiar"
 
-#: commands.c:508 curs_main.c:255 recvattach.c:48
+#: commands.c:558 curs_main.c:265 recvattach.c:58
 msgid "Save"
 msgstr "Salvar"
 
-#: commands.c:508
+#: commands.c:558
 msgid "Copy"
 msgstr "Copiar"
 
-#: commands.c:508
+#: commands.c:558
 msgid " tagged"
 msgstr " marcada"
 
-#: commands.c:577
+#: commands.c:627
 #, c-format
 msgid "Copying to %s..."
 msgstr "Copiando para %s..."
 
-#: commands.c:649
+#: commands.c:720
 msgid "Print message?"
 msgstr "Imprimir mensagem?"
 
-#: commands.c:649
+#: commands.c:720
 msgid "Print tagged messages?"
 msgstr "Imprimir mensagens marcadas?"
 
-#: commands.c:676
+#: commands.c:747
 msgid "Message printed"
 msgstr "Mensagem impressa"
 
-#: commands.c:676
+#: commands.c:747
 msgid "Messages printed"
 msgstr "Mensagens impressas"
 
-#: compose.c:76
+#: compose.c:40
+#, fuzzy
+msgid "There are no attachments."
+msgstr "Não há mensagens."
+
+#: compose.c:85
 msgid "Send"
 msgstr "Enviar"
 
-#: compose.c:77
+#: compose.c:86 remailer.c:483
 msgid "Abort"
 msgstr "Cancelar"
 
-#: compose.c:81 compose.c:538
+#: compose.c:90 compose.c:594
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
-#: compose.c:82
+#: compose.c:91
 msgid "Descrip"
 msgstr "Descrição"
 
-#: compose.c:103
+#: compose.c:112
 msgid "Sign, Encrypt"
 msgstr "Assinar, Encriptar"
 
-#: compose.c:105
+#: compose.c:114
 msgid "Encrypt"
 msgstr "Encriptar"
 
-#: compose.c:107
+#: compose.c:116
 msgid "Sign"
 msgstr "Assinar"
 
-#: compose.c:109
+#: compose.c:118
 msgid "Clear"
 msgstr "Nada"
 
-#: compose.c:116
+#: compose.c:125
 msgid " sign as: "
 msgstr " assinar como: "
 
-#: compose.c:116
+#: compose.c:125
 msgid "<default>"
 msgstr "<padrão>"
 
-#: compose.c:117 compose.c:191
+#: compose.c:126 compose.c:183
 msgid "MIC algorithm: "
 msgstr "Algoritmo MIC: "
 
-#: compose.c:132
+#: compose.c:137
 msgid ""
 "(e)ncrypt, (s)ign, sign (a)s, (b)oth, select (m)ic algorithm, or (f)orget "
 "it? "
 msgstr ""
 "(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, escolhe (m)ic, ou es(q)uece? "
 
-#: compose.c:133
+#: compose.c:138
 msgid "esabmf"
 msgstr "escamq"
 
-#: compose.c:150
-msgid "Can't open your secret key ring!"
-msgstr "Não foi possível abrir seu chaveiro secreto!"
-
-#: compose.c:155
+#: compose.c:152
 msgid "Sign as: "
 msgstr "Assinar como: "
 
-#: compose.c:175
-msgid "An unkown PGP version was defined for signing."
-msgstr "Uma versão desconhecida do PGP foi definida para assinatura."
-
-#: compose.c:185
+#: compose.c:177
 msgid "This doesn't make sense if you don't want to sign the message."
 msgstr "Isto não faz sentido se você não quer assinar a mensagem."
 
-#: compose.c:196
+#: compose.c:188
 msgid "Unknown MIC algorithm, valid ones are: pgp-md5, pgp-sha1, pgp-rmd160"
 msgstr "Algoritmo MIC desconhecido, use pgp-md5, pgp-sha1 ou pgp-rmd160"
 
-#: compose.c:232
+#: compose.c:253
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] não existe mais!"
 
-#: compose.c:240
+#: compose.c:261
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "%s [#%d] modificado. Atualizar codificação?"
 
-#: compose.c:281
-msgid "===== Attachments ====="
-msgstr "===== Anexos ====="
+#: compose.c:305
+#, fuzzy
+msgid "-- Attachments"
+msgstr "Anexos"
 
-#: compose.c:319
+#: compose.c:348
 msgid "You may not delete the only attachment."
 msgstr "Você não pode apagar o único anexo."
 
-#: compose.c:393
+#: compose.c:391
+msgid "Can't change character set for non-text attachments!"
+msgstr ""
+
+#: compose.c:397
+msgid "Enter character set: "
+msgstr ""
+
+#: compose.c:404
+msgid "UTF-8 encoding attachments has not yet been implemented."
+msgstr ""
+
+#: compose.c:410
+#, c-format
+msgid "Character set %s is unknown."
+msgstr ""
+
+#: compose.c:454
 msgid "Compose"
 msgstr "Compor"
 
-#: compose.c:543
+#: compose.c:610
+msgid "Attaching selected files..."
+msgstr ""
+
+#: compose.c:621
+#, fuzzy, c-format
+msgid "Unable to attach %s!"
+msgstr "Não foi possível anexar!"
+
+#: compose.c:639
 msgid "Open mailbox to attach message from"
 msgstr "Abrir caixa para anexar mensagem de"
 
-#: compose.c:582
+#: compose.c:674
 msgid "No messages in that folder."
 msgstr "Nenhuma mensagem naquela pasta."
 
-#: compose.c:589
+#: compose.c:683
 msgid "Tag the messages you want to attach!"
 msgstr "Marque as mensagens que você quer anexar!"
 
-#: compose.c:624 compose.c:644
+#: compose.c:715
 msgid "Unable to attach!"
 msgstr "Não foi possível anexar!"
 
-#: compose.c:780
+#: compose.c:765 compose.c:790
+msgid "Recoding only affects text attachments."
+msgstr ""
+
+#: compose.c:770
+msgid "We currently can't encode to utf-8."
+msgstr ""
+
+#: compose.c:775
+msgid "The current attachment won't be converted."
+msgstr ""
+
+#: compose.c:777
+msgid "The current attachment will be converted."
+msgstr ""
+
+#: compose.c:806
+msgid "Recoding successful."
+msgstr ""
+
+#: compose.c:880
 msgid "Invalid encoding."
 msgstr "Codificação inválida"
 
-#: compose.c:795
+#: compose.c:901
 msgid "Save a copy of this message?"
 msgstr "Salvar uma cópia desta mensagem?"
 
-#: compose.c:842
+#: compose.c:955
 msgid "Rename to: "
 msgstr "Renomear para: "
 
-#: compose.c:847
+#: compose.c:960 editmsg.c:95
 #, c-format
 msgid "Can't stat: %s"
 msgstr "Não é possível mostrar estatísticas: %s"
 
-#: compose.c:874
+#: compose.c:986
 msgid "New file: "
 msgstr "Novo arquivo: "
 
-#: compose.c:887
+#: compose.c:999
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type é da forma base/sub"
 
-#: compose.c:893
+#: compose.c:1005
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Content-Type %s desconhecido"
 
-#: compose.c:906
+#: compose.c:1018
 #, c-format
 msgid "Can't create file %s"
 msgstr "Não é possívle criar o arquivo %s"
 
-#: compose.c:914
+#: compose.c:1026
 msgid "What we have here is a failure to make an attachment"
 msgstr "O que temos aqui é uma falha ao criar um anexo"
 
-#: compose.c:977
+#: compose.c:1087
 msgid "Postpone this message?"
 msgstr "Adiar esta mensagem?"
 
-#: compose.c:1029
+#: compose.c:1141
 msgid "Write message to mailbox"
 msgstr "Gravar mensagem na caixa"
 
-#: compose.c:1033
+#: compose.c:1144
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Gravando mensagem em %s..."
 
-#: compose.c:1044
+#: compose.c:1153
 msgid "Message written."
 msgstr "Mensgem gravada."
 
-#: curs_lib.c:135
+#: curs_lib.c:143
 msgid "yes"
 msgstr "sim"
 
-#: curs_lib.c:136
+#: curs_lib.c:144
 msgid "no"
 msgstr "não"
 
 #. restore blocking operation
-#: curs_lib.c:175
+#: curs_lib.c:183
 msgid "Exit Mutt?"
 msgstr "Sair do Mutt?"
 
-#: curs_lib.c:275
+#: curs_lib.c:283
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: curs_lib.c:295
+#: curs_lib.c:303
 msgid "Press any key to continue..."
 msgstr "Pressione qualquer tecla para continuar..."
 
-#: curs_lib.c:333
+#: curs_lib.c:347
 msgid " ('?' for list): "
 msgstr " ('?' para uma lista): "
 
-#: curs_main.c:215
+#: curs_main.c:55 curs_main.c:546
+#, fuzzy
+msgid "No mailbox is open."
+msgstr "Nenhuma caixa aberta."
+
+#: curs_main.c:56
+msgid "There are no messages."
+msgstr "Não há mensagens."
+
+#: curs_main.c:57 mx.c:1053 pager.c:58 recvattach.c:47
+#, fuzzy
+msgid "Mailbox is read-only."
+msgstr "Esta caixa é somente para leitura."
+
+#: curs_main.c:58 pager.c:59 recvattach.c:764
+msgid "Function not permitted in attach-message mode."
+msgstr "Função não permitida no modo anexar-mensagem."
+
+#: curs_main.c:225
+#, fuzzy
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "Não é possível ativar escrita em uma caixa só de leitura!"
+msgstr "Não é possvel ativar escrita em uma caixa somente para leitura!"
 
-#: curs_main.c:222
+#: curs_main.c:232
 msgid "Changes to folder will be written on folder exit."
 msgstr "Mudanças na pasta serão escritas na saída"
 
-#: curs_main.c:227
+#: curs_main.c:237
 msgid "Changes to folder will not be written."
 msgstr "Mudanças na pasta não serão escritas"
 
-#: curs_main.c:252
+#: curs_main.c:262
 msgid "Quit"
 msgstr "Sair"
 
-#: curs_main.c:253 pager.c:1375 postpone.c:33
+#: curs_main.c:263 pager.c:1389 postpone.c:38
 msgid "Del"
 msgstr "Apagar"
 
-#: curs_main.c:254 postpone.c:34
+#: curs_main.c:264 postpone.c:39
 msgid "Undel"
 msgstr "Restaurar"
 
-#: curs_main.c:256 query.c:44
+#: curs_main.c:266 query.c:44
 msgid "Mail"
 msgstr "Msg"
 
-#: curs_main.c:257 pager.c:1376
+#: curs_main.c:267 pager.c:1390
 msgid "Reply"
 msgstr "Responder"
 
-#: curs_main.c:258
+#: curs_main.c:268
 msgid "Group"
 msgstr "Grupo"
 
-#: curs_main.c:429
+#: curs_main.c:441
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "A caixa foi modificada externamente. As marcas podem estar erradas."
 
-#: curs_main.c:432
+#: curs_main.c:444 pager.c:1498
 msgid "New mail in this mailbox."
 msgstr "Novas mensagens nesta caixa."
 
-#: curs_main.c:532
-msgid "No mailbox is open."
-msgstr "Nenuma caixa está aberta."
-
-#: curs_main.c:538
+#: curs_main.c:552
 msgid "No tagged messages."
 msgstr "Nenhuma mensagem marcada."
 
-#: curs_main.c:618
+#: curs_main.c:632
 msgid "Jump to message: "
 msgstr "Pular para mensagem: "
 
-#: curs_main.c:624
+#: curs_main.c:638
 msgid "Argument must be a message number."
 msgstr "O argumento deve ser um número de mensagem."
 
-#: curs_main.c:657
+#: curs_main.c:671
 msgid "That message is not visible."
 msgstr "Aquela mensagem não está visível."
 
-#: curs_main.c:660
+#: curs_main.c:674
 msgid "Invalid message number."
 msgstr "Número de mensagem inválido."
 
-#: curs_main.c:673
+#: curs_main.c:687
 msgid "Delete messages matching: "
 msgstr "Apagar mensagens casando com: "
 
-#: curs_main.c:695
+#: curs_main.c:709
 msgid "No limit pattern is in effect."
 msgstr "Nenhum padrão limitante está em efeito."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:700
+#: curs_main.c:714
 #, c-format
 msgid "Limit: %s"
 msgstr "Limitar: %s"
 
-#: curs_main.c:709
+#: curs_main.c:723
 msgid "Limit to messages matching: "
 msgstr "Limitar a mensagens casando com: "
 
-#: curs_main.c:739
+#: curs_main.c:753
 msgid "Quit Mutt?"
 msgstr "Sair do Mutt?"
 
-#: curs_main.c:841
+#: curs_main.c:864
 msgid "Tag messages matching: "
 msgstr "Marcar mensagens casando com: "
 
-#: curs_main.c:849
+#: curs_main.c:872
 msgid "Undelete messages matching: "
 msgstr "Restaurar mensagens casando com: "
 
-#: curs_main.c:856
+#: curs_main.c:879
+#, fuzzy
 msgid "Untag messages matching: "
-msgstr "Desmarcar mensagens casando com: "
-
-#: curs_main.c:874
-msgid "Open mailbox"
-msgstr "Abrir caixa"
+msgstr "Desmarcar mensagens que casem com: "
 
-#: curs_main.c:876
+#: curs_main.c:897
+#, fuzzy
 msgid "Open mailbox in read-only mode"
-msgstr "Abrir caixa em modo de somente leitura"
+msgstr "Abrir caixa somente para leitura"
 
-#: curs_main.c:892 mx.c:429 mx.c:570
-#, c-format
+#: curs_main.c:899
+#, fuzzy
+msgid "Open mailbox"
+msgstr "Abrir caixa de correio"
+
+#: curs_main.c:915 mx.c:471 mx.c:617
+#, fuzzy, c-format
 msgid "%s is not a mailbox."
-msgstr "%s não é uma caixa de mensagens."
+msgstr "%s não é uma caixa de correio."
 
-#: curs_main.c:974
+#: curs_main.c:993
 msgid "Exit Mutt without saving?"
 msgstr "Sair do Mutt sem salvar alterações?"
 
-#: curs_main.c:991 curs_main.c:1015
+#: curs_main.c:1029 curs_main.c:1053
 msgid "You are on the last message."
 msgstr "Você está na última mensagem."
 
-#: curs_main.c:998 curs_main.c:1040
+#: curs_main.c:1036 curs_main.c:1078
 msgid "No undeleted messages."
 msgstr "Nenhuma mensagem restaurada."
 
-#: curs_main.c:1033 curs_main.c:1056
+#: curs_main.c:1071 curs_main.c:1094
 msgid "You are on the first message."
 msgstr "Você está na primeira mensagem."
 
-#: curs_main.c:1128 pattern.c:1108
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "A pesquisa voltou ao início."
 
-#: curs_main.c:1137 pattern.c:1119
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "A pesquisa passou para o final."
 
-#: curs_main.c:1170
+#: curs_main.c:1208
 msgid "No new messages"
 msgstr "Nenhuma mensagem nova"
 
-#: curs_main.c:1170
+#: curs_main.c:1208
 msgid "No unread messages"
 msgstr "Nenhuma mensagem não lida"
 
-#: curs_main.c:1171
+#: curs_main.c:1209
 msgid " in this limited view"
 msgstr " nesta visão limitada"
 
-#: curs_main.c:1281
+#: curs_main.c:1333
 msgid "No more threads."
 msgstr "Nenhuma discussão restante."
 
-#: curs_main.c:1283
+#: curs_main.c:1335
 msgid "You are on the first thread."
 msgstr "Você está na primeira discussão."
 
-#: curs_main.c:1336
+#: curs_main.c:1405
 msgid "Thread contains unread messages."
 msgstr "A discussão contém mensagens não lidas."
 
-#: curs_main.c:1349 flags.c:219 thread.c:661
+#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "Separar discussões não está ativado."
 
@@ -871,101 +897,139 @@ msgstr ""
 msgid "%d: invalid message number.\n"
 msgstr "%d: número de mensagem iválido.\n"
 
-#: edit.c:312
+#: edit.c:309
 msgid "(End message with a . on a line by itself)\n"
 msgstr "(Termine a mensagem com um . sozinho em uma linha)\n"
 
-#: edit.c:370
+#: edit.c:367
 msgid "No mailbox.\n"
 msgstr "Nenhuma caixa de mensagens.\n"
 
-#: edit.c:374
+#: edit.c:371
 msgid "Message contains:\n"
 msgstr "Mensagem contém:\n"
 
-#: edit.c:378 edit.c:430
+#: edit.c:375 edit.c:426
 msgid "(continue)\n"
 msgstr "(continuar)\n"
 
-#: edit.c:391
+#: edit.c:388
 msgid "missing filename.\n"
 msgstr "falta o nome do arquivo.\n"
 
-#: edit.c:412
+#: edit.c:408
 msgid "No lines in message.\n"
 msgstr "Nenhuma linha na mensagem.\n"
 
-#: edit.c:441
+#: edit.c:437
 #, c-format
 msgid "%s: unknown editor command (~? for help)\n"
 msgstr "%s: comando de editor desconhecido (~? para ajuda)\n"
 
-#: flags.c:257
+#: editmsg.c:74
+#, fuzzy, c-format
+msgid "could not create temporary folder: %s"
+msgstr "Não foi possível criar um arquivo temporário!"
+
+#: editmsg.c:84
+#, fuzzy, c-format
+msgid "could not write temporary mail folder: %s"
+msgstr "Não foi possível criar um arquivo temporário!"
+
+#: editmsg.c:101
+#, fuzzy
+msgid "Message file is empty!"
+msgstr "A caixa de mensagens está vaxia."
+
+#: editmsg.c:108
+#, fuzzy
+msgid "Message not modified!"
+msgstr "Mensagem impressa"
+
+#: editmsg.c:116
+#, fuzzy, c-format
+msgid "Can't open message file: %s"
+msgstr "Não é possívle criar o arquivo %s"
+
+#: editmsg.c:123 editmsg.c:151
+#, fuzzy, c-format
+msgid "Can't append to folder: %s"
+msgstr "Não é possívle criar o arquivo %s"
+
+#: editmsg.c:182
+#, fuzzy, c-format
+msgid "Error. Preserving temporary file: %s"
+msgstr "Não foi possível criar um arquivo temporário"
+
+#: flags.c:266
 msgid "Set flag"
 msgstr "Atribui marca"
 
-#: flags.c:257
+#: flags.c:266
 msgid "Clear flag"
 msgstr "Limpa marca"
 
-#: handler.c:127
+#: handler.c:114
 msgid "[-- Error: unexpected end of file! --]\n"
 msgstr "[-- Erro: fim de arquivo inesperado! --]\n"
 
 #. didn't find anything that we could display!
-#: handler.c:953
+#: handler.c:956
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
-msgstr "[-- Erro: Não foi possível exibir nenhuma parte de Multipart/Aternative! --]\n"
+msgstr ""
+"[-- Erro: Não foi possível exibir nenhuma parte de Multipart/Aternative! "
+"--]\n"
 
-#: handler.c:1070
+#: handler.c:1073
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Anexo No.%d"
 
-#: handler.c:1081
+#: handler.c:1084
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Tipo: %s%s, Código: %s, Tamanho: %s --]\n"
 
-#: handler.c:1140
+#: handler.c:1143
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Autovisualizar usando %s --]\n"
 
-#: handler.c:1141
+#: handler.c:1144
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Executando comando de autovisualização: %s"
 
-#: handler.c:1178 handler.c:1196
+#: handler.c:1181 handler.c:1199
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Saída de erro da autovisualização de %s --]\n"
 
-#: handler.c:1228
+#: handler.c:1231
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
-msgstr "[-- Erro: message/external-body não tem nenhum parâmetro access-type --]\n"
+msgstr ""
+"[-- Erro: message/external-body não tem nenhum parâmetro access-type --]\n"
 
-#: handler.c:1245
+#: handler.c:1248
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Este anexo %s/%s "
 
-#: handler.c:1252
+#: handler.c:1255
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(tamanho %s bytes) "
 
-#: handler.c:1254
+#: handler.c:1257
 msgid "has been deleted --]\n"
 msgstr "foi apagado --]\n"
 
-#: handler.c:1257
+#: handler.c:1260
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- em %s --]\n"
 
-#: handler.c:1267
+#: handler.c:1270
 #, c-format
 msgid ""
 "[-- This %s/%s attachment is not included, --]\n"
@@ -975,42 +1039,42 @@ msgstr ""
 "[-- Este anexo %s/%s não está includído, e --]\n"
 "[-- a fonte externa indicada já expirou.   --]\n"
 
-#: handler.c:1281
-#, c-format
+#: handler.c:1284
+#, fuzzy, c-format
 msgid ""
 "[-- This %s/%s attachment is not included, --]\n"
 "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 "[-- Este anexo %s/%s não está incluído, e     --]\n"
-"[-- o tipo de acesso indicado não é suportado --]\n"
+"[-- o tipo de acesso indicado %s não é suportado --]\n"
 
-#: handler.c:1378
+#: handler.c:1392
 msgid "Error: multipart/signed has no protocol."
 msgstr "Erro: multipart/signed não tem protocolo."
 
-#: handler.c:1390
+#: handler.c:1405
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Erro: multipart/encrypted não tem nenhum parâmetro de protocolo!"
 
-#: handler.c:1432
+#: handler.c:1447
 msgid "Unable to open temporary file!"
 msgstr "Não foi possível abrir o arquivo temporário!"
 
-#: handler.c:1491
+#: handler.c:1506
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s não é suportado "
 
-#: handler.c:1496
+#: handler.c:1511
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(use '%s' para ver esta parte)"
 
-#: handler.c:1498
+#: handler.c:1513
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "('view-attachments' precisa estar associado a uma tecla!)"
 
-#: headers.c:202
+#: headers.c:164
 #, c-format
 msgid "%s: unable to attach file"
 msgstr "%s: não foi possível anexar o arquivo"
@@ -1048,56 +1112,84 @@ msgstr ""
 msgid "Help for %s"
 msgstr "Ajuda para %s"
 
-#: imap.c:206
-#, c-format
-msgid "imap_error(): unexpected response in %s: %s\n"
-msgstr "imap_error(): resposta inesperada em %s: %s\n"
+#: hook.c:243
+#, fuzzy, c-format
+msgid "unhook: unknown hook type: %s"
+msgstr "%s: tipo inválido"
 
-#. something is wrong because the server reported fewer messages
-#. * than we previously saw
-#.
-#: imap.c:529
-msgid "Fatal error.  Message count is out of sync!"
-msgstr "Erro fatal. O número de mensagens está fora de sincronia!"
+#: imap/auth.c:104
+msgid "Authenticating (CRAM-MD5)..."
+msgstr ""
 
-#: imap.c:662
-#, c-format
-msgid "Fetching message headers... [%d/%d]"
-msgstr "Obtendo cabeçalhos das mensagens... [%d de %d]"
+#: imap/auth.c:191
+msgid "Authenticating (anonymous)..."
+msgstr ""
 
-#. Unable to fetch headers for lower versions
-#: imap.c:689
-msgid "Unable to fetch headers from this IMAP server version."
-msgstr "Não foi possível obter cabeçalhos da versão deste servidor IMAP."
+#: imap/auth.c:266
+msgid "IMAP Username: "
+msgstr "Nome do usuário IMAP: "
 
-#: imap.c:881
-#, c-format
-msgid "Reopening mailbox... %s"
-msgstr "Reabrindo caixa... %s"
+#: imap/auth.c:282
+msgid "Anonymous authentication not supported."
+msgstr ""
 
-#: imap.c:1233
-msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Este servidor IMAP é pré-histórico. Mutt não funciona com ele."
+#: imap/auth.c:295
+msgid "GSSAPI authentication failed."
+msgstr ""
 
-#: imap.c:1254
-msgid "IMAP Username: "
-msgstr "Nome do usuário IMAP: "
+#: imap/auth.c:313
+#, fuzzy, c-format
+msgid "CRAM key for %s@%s: "
+msgstr "Entre a keyID para %s: "
+
+#: imap/auth.c:328
+msgid "CRAM-MD5 authentication failed."
+msgstr ""
 
-#: imap.c:1267
+#: imap/auth.c:343
+msgid "Skipping CRAM-MD5 authentication."
+msgstr ""
+
+#: imap/auth.c:355
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Senha para %s@%s: "
 
-#: imap.c:1280
+#: imap/auth.c:371
 msgid "Logging in..."
 msgstr "Efetuando login..."
 
 #. Login failed, try again
-#: imap.c:1293
+#: imap/auth.c:383
 msgid "Login failed."
 msgstr "Erro no login"
 
-#: imap.c:1413
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "Obtendo mensagem..."
+
+#: imap/browse.c:120
+msgid "Getting folder list..."
+msgstr ""
+
+#. something is wrong because the server reported fewer messages
+#. * than we previously saw
+#.
+#: imap/command.c:165
+msgid "Fatal error.  Message count is out of sync!"
+msgstr "Erro fatal. O número de mensagens está fora de sincronia!"
+
+#: imap/imap.c:213
+#, c-format
+msgid "Reopening mailbox... %s"
+msgstr "Reabrindo caixa... %s"
+
+#: imap/imap.c:423
+msgid "This IMAP server is ancient. Mutt does not work with it."
+msgstr "Este servidor IMAP é pré-histórico. Mutt não funciona com ele."
+
+#: imap/imap.c:589
 #, c-format
 msgid "Selecting %s..."
 msgstr "Selecionando %s..."
@@ -1106,877 +1198,1052 @@ msgstr "Selecionando %s..."
 #. * The thing to do seems to be:
 #. *  - Open a *new* IMAP session, select, and then close it. Report the
 #. * error if the mailbox did not exist.
-#: imap.c:1562
+#: imap/imap.c:805
 msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "Não é possível anexar a caixas IMAP neste servidor"
 
-#: imap.c:1572 lib.c:1206
+#. command failed cause folder doesn't exist
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "Criar %s?"
 
-#: imap.c:1624
+#: imap/imap.c:837
+msgid "Closing connection to IMAP server..."
+msgstr "Fechando a conexão com o servidor IMAP..."
+
+#: imap/imap.c:981
+#, fuzzy, c-format
+msgid "Marking %d messages deleted..."
+msgstr "Lendo %d mensagens novas (%d bytes)..."
+
+#: imap/imap.c:1001
+#, c-format
+msgid "Saving message status flags... [%d/%d]"
+msgstr "Salvando marcas de estado das mensagens... [%d de %d]"
+
+#: imap/imap.c:1060
+msgid "Closing mailbox..."
+msgstr "Fechando caixa de mensagens..."
+
+#: imap/imap.c:1070
+msgid "Expunging messages from server..."
+msgstr "Apagando mensagend do servidor..."
+
+#: imap/imap.c:1387
+#, fuzzy, c-format
+msgid "Subscribing to %s..."
+msgstr "Copiando para %s..."
+
+#: imap/imap.c:1389
+#, fuzzy, c-format
+msgid "Unsubscribing to %s..."
+msgstr "Conectando a %s..."
+
+#: imap/imap_ssl.c:107
+#, fuzzy
+msgid "Unable to get certificate from peer"
+msgstr "não foi possível determinar o diretório do usuário"
+
+#: imap/imap_ssl.c:118
+#, fuzzy, c-format
+msgid "SSL connection using %s"
+msgstr "Conectando a %s"
+
+#: imap/imap_ssl.c:143
+#, fuzzy
+msgid "Unknown"
+msgstr "erro desconhecido"
+
+#: imap/imap_ssl.c:168
+#, fuzzy
+msgid "[unable to calculate]"
+msgstr "%s: não foi possível anexar o arquivo"
+
+#: imap/imap_ssl.c:219
+msgid "This certificate belongs to:"
+msgstr ""
+
+#: imap/imap_ssl.c:228
+msgid "This certificate was issued by:"
+msgstr ""
+
+#: imap/imap_ssl.c:239
+#, c-format
+msgid "Fingerprint: %s"
+msgstr ""
+
+#: imap/imap_ssl.c:241
+msgid "SSL Certificate check"
+msgstr ""
+
+#: imap/imap_ssl.c:244
+msgid "(r)eject, accept (o)nce, (a)ccept always"
+msgstr ""
+
+#: imap/imap_ssl.c:245
+#, fuzzy
+msgid "roa"
+msgstr "sac"
+
+#: imap/imap_ssl.c:249
+msgid "(r)eject, accept (o)nce"
+msgstr ""
+
+#: imap/imap_ssl.c:250
+msgid "ro"
+msgstr ""
+
+#: imap/imap_ssl.c:254 pgpkey.c:442
+msgid "Exit  "
+msgstr "Sair "
+
+#: imap/imap_ssl.c:280
+msgid "Warning: Couldn't save certificate"
+msgstr ""
+
+#: imap/imap_ssl.c:282
+msgid "Certificate saved"
+msgstr ""
+
+#. Unable to fetch headers for lower versions
+#: imap/message.c:75
+msgid "Unable to fetch headers from this IMAP server version."
+msgstr "Não foi possível obter cabeçalhos da versão deste servidor IMAP."
+
+#: imap/message.c:92
+#, c-format
+msgid "Fetching message headers... [%d/%d]"
+msgstr "Obtendo cabeçalhos das mensagens... [%d de %d]"
+
+#: imap/message.c:260
 msgid "Fetching message..."
 msgstr "Obtendo mensagem..."
 
-#: imap.c:1762
+#: imap/message.c:431
+#, fuzzy
 msgid "Sending APPEND command ..."
-msgstr "Enviando comando APPEND ..."
+msgstr "Enviando o comando APPEND..."
 
-#: imap.c:1801
+#: imap/message.c:470
 msgid "Uploading message ..."
 msgstr "Enviando mensagem ..."
 
-#: imap.c:1856
-msgid "Closing connection to IMAP server..."
-msgstr "Fechando a conexão com o servidor IMAP..."
+#: imap/message.c:556
+#, fuzzy, c-format
+msgid "Copying %d messages to %s..."
+msgstr "Movendo mensagens lidas para %s..."
+
+#: imap/message.c:560
+#, fuzzy, c-format
+msgid "Copying message %d to %s..."
+msgstr "Gravando mensagem em %s..."
 
-#: imap.c:1900
+#: imap/socket.c:218
 #, c-format
-msgid "Saving message status flags... [%d/%d]"
-msgstr "Salvando marcas de estado das mensagens... [%d de %d]"
+msgid "Connecting to %s..."
+msgstr "Conectando a %s..."
 
-#: imap.c:1943
-msgid "Expunging messages from server..."
-msgstr "Apagando mensagend do servidor..."
+#: imap/socket.c:238
+msgid "preconnect command failed"
+msgstr ""
 
-#. tell the server to commit changes
-#: imap.c:1974
-msgid "Closing mailbox..."
-msgstr "Fechando caixa de mensagens..."
+#: imap/util.c:40
+#, fuzzy
+msgid "Continue?"
+msgstr "(continuar)\n"
+
+#: imap/util.c:46
+#, c-format
+msgid "%s [%s]\n"
+msgstr ""
 
-#: init.c:432
+#: init.c:487
 msgid "alias: no address"
 msgstr "apelido: sem endereço"
 
-#: init.c:526
+#: init.c:581
 msgid "invalid header field"
 msgstr "campo de cabeçalho inválido"
 
-#: init.c:534
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "ignorando campo de cabeçalho vazio: %s"
-
-#: init.c:586
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: método de ordenação desconhecido"
 
-#: init.c:659
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr "mutt_restore_default: erro na expressão regular: %s\n"
 
-#: init.c:719
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: variável desconhecida"
 
-#: init.c:728
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "prefixo é ilegal com reset"
 
-#: init.c:734
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "valor é ilegal com reset"
 
-#: init.c:773
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "%s está atribuída"
 
-#: init.c:773
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "%s não está atribuída"
 
-#: init.c:947
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: tipo de caixa inválido"
 
-#: init.c:1006
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: valor inválido"
 
-#: init.c:1056
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: tipo inválido"
 
-#: init.c:1105
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Erro em %s, linha %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1116
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "fonte: erros em %s"
 
-#: init.c:1126
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "fonte: erro em %s"
 
-#: init.c:1131
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "fonte: muitos argumentos"
 
-#: init.c:1182
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: comando desconhecido"
 
-#: init.c:1514
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Erro na linha de comando: %s\n"
 
-#: init.c:1557
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "não foi possível determinar o diretório do usuário"
 
-#: init.c:1565
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "não foi possível determinar o nome do usuário"
 
-#: keymap.c:440
+#: keymap.c:433
 msgid "Macro loop detected."
 msgstr "Laço de macro detectado."
 
-#: keymap.c:626 keymap.c:634
+#: keymap.c:636 keymap.c:644
 msgid "Key is not bound."
 msgstr "Tecla não associada."
 
-#: keymap.c:638
+#: keymap.c:648
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Tecla não associada. Pressione '%s' para ajuda."
 
-#: keymap.c:649
+#: keymap.c:659
 msgid "push: too many arguments"
 msgstr "push: muitos argumentos"
 
-#: keymap.c:670
+#: keymap.c:680
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s: não existe tal menu"
 
-#: keymap.c:679
+#: keymap.c:689
 msgid "null key sequence"
 msgstr "seqüência de teclas nula"
 
-#: keymap.c:757
+#: keymap.c:771
 msgid "bind: too many arguments"
 msgstr "bind: muitos argumentos"
 
-#: keymap.c:772
+#: keymap.c:786
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s: não existe tal função mapeada"
 
-#: keymap.c:795
+#: keymap.c:809
 msgid "macro: empty key sequence"
 msgstr "macro: seqüência de teclas vazia"
 
-#: keymap.c:806
+#: keymap.c:820
 msgid "macro: too many arguments"
 msgstr "macro: muitos argumentos"
 
-#: keymap.c:836
+#: keymap.c:850
 msgid "exec: too few arguments"
 msgstr "exec: poucos argumentos"
 
-#: keymap.c:856
+#: keymap.c:870
 #, c-format
 msgid "%s: no such command"
 msgstr "%s: não existe tal comando"
 
-#: keymap_defs.h:5
+#: keymap_alldefs.h:5
 msgid "null operation"
 msgstr "operação nula"
 
-#: keymap_defs.h:6
+#: keymap_alldefs.h:6
 msgid "force viewing of attachment using mailcap"
 msgstr "forçar a visualizaçãdo do anexo usando o mailcap"
 
-#: keymap_defs.h:7
+#: keymap_alldefs.h:7
 msgid "view attachment as text"
 msgstr "ver anexo como texto"
 
-#: keymap_defs.h:8
+#: keymap_alldefs.h:8
 msgid "move to the bottom of the page"
 msgstr "mover para o fundo da página"
 
-#: keymap_defs.h:9
+#: keymap_alldefs.h:9
 msgid "remail a message to another user"
 msgstr "re-enviar uma mensagem para outro usuário"
 
-#: keymap_defs.h:10
+#: keymap_alldefs.h:10
 msgid "select a new file in this directory"
 msgstr "escolha um novo arquivo neste diretório"
 
-#: keymap_defs.h:11
+#: keymap_alldefs.h:11
 msgid "view file"
 msgstr "ver arquivo"
 
-#: keymap_defs.h:12
+#: keymap_alldefs.h:12
 msgid "display the currently selected file's name"
 msgstr "mostra o nome do arquivo atualmente selecionado"
 
-#: keymap_defs.h:13
+#: keymap_alldefs.h:13
+msgid "subscribe to current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_alldefs.h:14
+msgid "unsubscribe to current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_alldefs.h:15
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_alldefs.h:16
 msgid "change directories"
 msgstr "muda de diretório"
 
-#: keymap_defs.h:14
+#: keymap_alldefs.h:17
 msgid "check mailboxes for new mail"
 msgstr "verifica se há novas mensagens na caixa"
 
-#: keymap_defs.h:15
+#: keymap_alldefs.h:18
 msgid "attach a file(s) to this message"
 msgstr "anexa um(ns) arquivo(s) à esta mensagem"
 
-#: keymap_defs.h:16
+#: keymap_alldefs.h:19
 msgid "attach message(s) to this message"
 msgstr "anexa uma(s) mensagem(ns) à esta mensagem"
 
-#: keymap_defs.h:17
+#: keymap_alldefs.h:20
+msgid "change an attachment's character set"
+msgstr ""
+
+#: keymap_alldefs.h:21
 msgid "edit the BCC list"
 msgstr "edita a lista de Cópias Escondidas (BCC)"
 
-#: keymap_defs.h:18
+#: keymap_alldefs.h:22
 msgid "edit the CC list"
 msgstr "edita a lista de Cópias (CC)"
 
-#: keymap_defs.h:19
+#: keymap_alldefs.h:23
 msgid "edit attachment description"
 msgstr "edita a descrição do anexo"
 
-#: keymap_defs.h:20
+#: keymap_alldefs.h:24
 msgid "edit attachment transfer-encoding"
 msgstr "edita o código de transferência do anexo"
 
-#: keymap_defs.h:21
+#: keymap_alldefs.h:25
 msgid "enter a file to save a copy of this message in"
 msgstr "informe um arquivo no qual salvar uma cópia desta mensagem"
 
-#: keymap_defs.h:22
+#: keymap_alldefs.h:26
 msgid "edit the file to be attached"
 msgstr "edita o arquivo a ser anexado"
 
-#: keymap_defs.h:23
+#: keymap_alldefs.h:27
 msgid "edit the from field"
 msgstr "edita o campo From"
 
-#: keymap_defs.h:24
+#: keymap_alldefs.h:28
 msgid "edit the message with headers"
 msgstr "edita a mensagem e seus cabeçalhos"
 
-#: keymap_defs.h:25
+#: keymap_alldefs.h:29
 msgid "edit the message"
 msgstr "edita a mensagem"
 
-#: keymap_defs.h:26
+#: keymap_alldefs.h:30
 msgid "edit attachment using mailcap entry"
 msgstr "edita o anexo usando sua entrada no mailcap"
 
-#: keymap_defs.h:27
+#: keymap_alldefs.h:31
 msgid "edit the Reply-To field"
 msgstr "edita o campo Reply-To"
 
-#: keymap_defs.h:28
+#: keymap_alldefs.h:32
 msgid "edit the subject of this message"
 msgstr "edita o assunto desta mensagem"
 
-#: keymap_defs.h:29
+#: keymap_alldefs.h:33
 msgid "edit the TO list"
 msgstr "edita a lista de Destinatários (TO)"
 
-#: keymap_defs.h:30
-msgid "edit attachment type"
+#: keymap_alldefs.h:34
+#, fuzzy
+msgid "edit attachment content type"
 msgstr "edita o tipo de anexo"
 
-#: keymap_defs.h:31
+#: keymap_alldefs.h:35
 msgid "get a temporary copy of an attachment"
 msgstr "obtém uma cópia temporária do anexo"
 
-#: keymap_defs.h:32
+#: keymap_alldefs.h:36
 msgid "run ispell on the message"
 msgstr "executa o ispell na mensagem"
 
-#: keymap_defs.h:33
+#: keymap_alldefs.h:37
 msgid "compose new attachment using mailcap entry"
 msgstr "compõe um novo anexo usando a entrada no mailcap"
 
-#: keymap_defs.h:34
+#: keymap_alldefs.h:38
+msgid "toggle recoding of this attachment"
+msgstr ""
+
+#: keymap_alldefs.h:39
+msgid "recode this attachment to/from the local charset"
+msgstr ""
+
+#: keymap_alldefs.h:40
 msgid "save this message to send later"
 msgstr "salva esta mensagem para ser enviada depois"
 
-#: keymap_defs.h:35
+#: keymap_alldefs.h:41
 msgid "rename/move an attached file"
 msgstr "renomeia/move um arquivo anexado"
 
-#: keymap_defs.h:36
+#: keymap_alldefs.h:42
 msgid "send the message"
 msgstr "envia a mensagem"
 
-#: keymap_defs.h:37
+#: keymap_alldefs.h:43
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_alldefs.h:44
 msgid "toggle whether to delete file after sending it"
 msgstr "troca entre apagar o arquivo após enviá-lo ou não"
 
-#: keymap_defs.h:38
+#: keymap_alldefs.h:45
 msgid "update an attachment's encoding info"
 msgstr "atualiza a informação de código de um anexo"
 
-#: keymap_defs.h:39
+#: keymap_alldefs.h:46
 msgid "write the message to a folder"
 msgstr "grava a mensagem em uma pasta"
 
-#: keymap_defs.h:40
+#: keymap_alldefs.h:47
 msgid "copy a message to a file/mailbox"
 msgstr "copia uma mensagem para um arquivo/caixa"
 
-#: keymap_defs.h:41
+#: keymap_alldefs.h:48
 msgid "create an alias from a message sender"
 msgstr "cria um apelido a partir do remetente de uma mensagem"
 
-#: keymap_defs.h:42
+#: keymap_alldefs.h:49
 msgid "move entry to bottom of screen"
 msgstr "move a entrada para o fundo da tela"
 
-#: keymap_defs.h:43
+#: keymap_alldefs.h:50
 msgid "move entry to middle of screen"
 msgstr "move a entrada para o meio da tela"
 
-#: keymap_defs.h:44
+#: keymap_alldefs.h:51
 msgid "move entry to top of screen"
 msgstr "move a entrada para o topo da tela"
 
-#: keymap_defs.h:45
+#: keymap_alldefs.h:52
 msgid "make decoded (text/plain) copy"
 msgstr "cria uma cópia decodificada (text/plain)"
 
-#: keymap_defs.h:46
+#: keymap_alldefs.h:53
 msgid "make decoded copy (text/plain) and delete"
 msgstr "cria uma cópia decodificada (text/plain) e apaga"
 
-#: keymap_defs.h:47
+#: keymap_alldefs.h:54
 msgid "delete the current entry"
 msgstr "apaga a entrada atual"
 
-#: keymap_defs.h:48
+#: keymap_alldefs.h:55
+#, fuzzy
+msgid "delete the current mailbox (IMAP only)"
+msgstr "apaga a entrada atual"
+
+#: keymap_alldefs.h:56
 msgid "delete all messages in subthread"
 msgstr "apaga todas as mensagens na sub-discussão"
 
-#: keymap_defs.h:49
+#: keymap_alldefs.h:57
 msgid "delete all messages in thread"
 msgstr "apaga todas as mensagens na discussão"
 
-#: keymap_defs.h:50
+#: keymap_alldefs.h:58
 msgid "display full address of sender"
 msgstr "mostra o endereço completo do remetente"
 
-#: keymap_defs.h:51
-msgid "display message with full headers"
+#: keymap_alldefs.h:59
+#, fuzzy
+msgid "display message and toggle header weeding"
 msgstr "mostra a mensagem e todos os seus cabeçalhos"
 
-#: keymap_defs.h:52
+#: keymap_alldefs.h:60
 msgid "display a message"
 msgstr "mostra uma mensagem"
 
-#: keymap_defs.h:53
-msgid "edit the current message for resending"
-msgstr "edita a mensagem atual para ser reenviada"
+#: keymap_alldefs.h:61
+#, fuzzy
+msgid "edit the raw message"
+msgstr "edita a mensagem"
 
-#: keymap_defs.h:54
+#: keymap_alldefs.h:62
 msgid "delete the char in front of the cursor"
 msgstr "apaga o caractere na frente do cursor"
 
-#: keymap_defs.h:55
+#: keymap_alldefs.h:63
 msgid "move the cursor one character to the left"
 msgstr "move o cursos um caractere para a esquerda"
 
-#: keymap_defs.h:56
+#: keymap_alldefs.h:64
 msgid "jump to the beginning of the line"
 msgstr "pula para o início da linha"
 
-#: keymap_defs.h:57
+#: keymap_alldefs.h:65
 msgid "cycle among incoming mailboxes"
 msgstr "circula entre as caixas de mensagem"
 
-#: keymap_defs.h:58
+#: keymap_alldefs.h:66
 msgid "complete filename or alias"
 msgstr "completa um nome de arquivo ou apelido"
 
-#: keymap_defs.h:59
+#: keymap_alldefs.h:67
 msgid "complete address with query"
 msgstr "completa um endereço com uma busca"
 
-#: keymap_defs.h:60
+#: keymap_alldefs.h:68
 msgid "delete the char under the cursor"
 msgstr "apaga o caractere sob o cursor"
 
-#: keymap_defs.h:61
+#: keymap_alldefs.h:69
 msgid "jump to the end of the line"
 msgstr "pula para o final da linha"
 
-#: keymap_defs.h:62
+#: keymap_alldefs.h:70
 msgid "move the cursor one character to the right"
 msgstr "move o cursor um caractere para a direita"
 
-#: keymap_defs.h:63 keymap_defs.h:64
+#: keymap_alldefs.h:71 keymap_alldefs.h:72
 msgid "scroll up through the history list"
 msgstr "volta uma página no histórico"
 
-#: keymap_defs.h:65
+#: keymap_alldefs.h:73
 msgid "delete chars from cursor to end of line"
 msgstr "apaga os caracteres a partir do cursor até o final da linha"
 
-#: keymap_defs.h:66
+#: keymap_alldefs.h:74
 msgid "delete all chars on the line"
 msgstr "apaga todos os caracteres na linha"
 
-#: keymap_defs.h:67
+#: keymap_alldefs.h:75
 msgid "delete the word in front of the cursor"
 msgstr "apaga a palavra em frente ao cursor"
 
-#: keymap_defs.h:68
+#: keymap_alldefs.h:76
 msgid "quote the next typed key"
 msgstr "põe a próxima tecla digitada entre aspas"
 
-#: keymap_defs.h:69
+#: keymap_alldefs.h:77
 msgid "enter a muttrc command"
 msgstr "entra um comando do muttrc"
 
-#: keymap_defs.h:70
+#: keymap_alldefs.h:78
 msgid "enter a file mask"
 msgstr "entra uma máscara de arquivos"
 
-#: keymap_defs.h:71
+#: keymap_alldefs.h:79
 msgid "exit this menu"
 msgstr "sai deste menu"
 
-#: keymap_defs.h:72
+#: keymap_alldefs.h:80
 msgid "filter attachment through a shell command"
 msgstr "filtra o anexo através de um comando do shell"
 
-#: keymap_defs.h:73
+#: keymap_alldefs.h:81
 msgid "move to the first entry"
 msgstr "move para a primeira entrada"
 
-#: keymap_defs.h:74
+#: keymap_alldefs.h:82
 msgid "toggle a message's 'important' flag"
 msgstr "troca a marca 'importante' da mensagem"
 
-#: keymap_defs.h:75
+#: keymap_alldefs.h:83
 msgid "forward a message with comments"
 msgstr "encaminha uma mensagem com comentários"
 
-#: keymap_defs.h:76
+#: keymap_alldefs.h:84
 msgid "select the current entry"
 msgstr "seleciona a entrada atual"
 
-#: keymap_defs.h:77
+#: keymap_alldefs.h:85
 msgid "reply to all recipients"
 msgstr "responde a todos os destinatários"
 
-#: keymap_defs.h:78
+#: keymap_alldefs.h:86
 msgid "scroll down 1/2 page"
 msgstr "passa meia página"
 
-#: keymap_defs.h:79
+#: keymap_alldefs.h:87
 msgid "scroll up 1/2 page"
 msgstr "volta meia página"
 
-#: keymap_defs.h:80
+#: keymap_alldefs.h:88
 msgid "this screen"
 msgstr "esta tela"
 
-#: keymap_defs.h:81
+#: keymap_alldefs.h:89
 msgid "jump to an index number"
 msgstr "pula para um número de índice"
 
-#: keymap_defs.h:82
+#: keymap_alldefs.h:90
 msgid "move to the last entry"
 msgstr "move para a última entrada"
 
-#: keymap_defs.h:83
+#: keymap_alldefs.h:91
 msgid "reply to specified mailing list"
 msgstr "responde à lista de email especificada"
 
-#: keymap_defs.h:84
+#: keymap_alldefs.h:92
 msgid "execute a macro"
 msgstr "executa um macro"
 
-#: keymap_defs.h:85
+#: keymap_alldefs.h:93
 msgid "compose a new mail message"
 msgstr "compõe uma nova mensagem eletrônica"
 
-#: keymap_defs.h:86
+#: keymap_alldefs.h:94
 msgid "open a different folder"
 msgstr "abre uma pasta diferente"
 
-#: keymap_defs.h:87
+#: keymap_alldefs.h:95
 msgid "open a different folder in read only mode"
 msgstr "abre uma pasta diferente em mode de somente leitura"
 
-#: keymap_defs.h:88
+#: keymap_alldefs.h:96
 msgid "clear a status flag from a message"
 msgstr "retira uma marca de estado de uma mensagem"
 
-#: keymap_defs.h:89
+#: keymap_alldefs.h:97
 msgid "delete messages matching a pattern"
 msgstr "apaga mensagens que casem com um padrão"
 
-#: keymap_defs.h:90
+#: keymap_alldefs.h:98
 msgid "retrieve mail from POP server"
 msgstr "obtém mensagens do servidor POP"
 
-#: keymap_defs.h:91
+#: keymap_alldefs.h:99
 msgid "move to the first message"
 msgstr "move para a primeira mensagem"
 
-#: keymap_defs.h:92
+#: keymap_alldefs.h:100
 msgid "move to the last message"
 msgstr "move para a última mensagem"
 
-#: keymap_defs.h:93
+#: keymap_alldefs.h:101
 msgid "show only messages matching a pattern"
 msgstr "mostra somente mensagens que casem com um padrão"
 
-#: keymap_defs.h:94
+#: keymap_alldefs.h:102
 msgid "jump to the next new message"
 msgstr "pula para a próxima mensagem nova"
 
-#: keymap_defs.h:95
+#: keymap_alldefs.h:103
 msgid "jump to the next subthread"
 msgstr "pula para a próxima sub-discussão"
 
-#: keymap_defs.h:96
+#: keymap_alldefs.h:104
 msgid "jump to the next thread"
 msgstr "pula para a próxima discussão"
 
-#: keymap_defs.h:97
+#: keymap_alldefs.h:105
 msgid "move to the next undeleted message"
 msgstr "move para a próxima mensagem não apagada"
 
-#: keymap_defs.h:98
+#: keymap_alldefs.h:106
 msgid "jump to the next unread message"
 msgstr "pula para a próxima mensagem não lida"
 
-#: keymap_defs.h:99
+#: keymap_alldefs.h:107
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "restaura todas as mensagens na discussão"
+
+#: keymap_alldefs.h:108
 msgid "jump to previous thread"
 msgstr "pula para a discussão anterior"
 
-#: keymap_defs.h:100
+#: keymap_alldefs.h:109
 msgid "jump to previous subthread"
 msgstr "pula para a sub-discussão anterior"
 
-#: keymap_defs.h:101
+#: keymap_alldefs.h:110
 msgid "move to the last undelete message"
 msgstr "move para a última mensagem não apagada"
 
-#: keymap_defs.h:102
+#: keymap_alldefs.h:111
 msgid "jump to the previous new message"
 msgstr "pula para a mensagem nova anterior"
 
-#: keymap_defs.h:103
+#: keymap_alldefs.h:112
 msgid "jump to the previous unread message"
 msgstr "pula para a mensagem não lida anterior"
 
-#: keymap_defs.h:104
+#: keymap_alldefs.h:113
 msgid "mark the current thread as read"
 msgstr "marca a discussão atual como lida"
 
-#: keymap_defs.h:105
+#: keymap_alldefs.h:114
 msgid "mark the current subthread as read"
 msgstr "marca a sub-discussão atual como lida"
 
-#: keymap_defs.h:106
+#: keymap_alldefs.h:115
 msgid "set a status flag on a message"
 msgstr "atribui uma marca de estado em uma mensagem"
 
-#: keymap_defs.h:107
+#: keymap_alldefs.h:116
 msgid "save changes to mailbox"
 msgstr "salva as mudanças à caixa"
 
-#: keymap_defs.h:108
+#: keymap_alldefs.h:117
 msgid "tag messages matching a pattern"
 msgstr "marca mensagens que casem com um padrão"
 
-#: keymap_defs.h:109
+#: keymap_alldefs.h:118
 msgid "undelete messages matching a pattern"
 msgstr "restaura mensagens que casem com um padrão"
 
-#: keymap_defs.h:110
+#: keymap_alldefs.h:119
 msgid "untag messages matching a pattern"
 msgstr "desmarca mensagens que casem com um padrão"
 
-#: keymap_defs.h:111
+#: keymap_alldefs.h:120
 msgid "move to the middle of the page"
 msgstr "move para o meio da página"
 
-#: keymap_defs.h:112
+#: keymap_alldefs.h:121
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_alldefs.h:122
 msgid "move to the next entry"
 msgstr "move para a próxima entrada"
 
-#: keymap_defs.h:113
+#: keymap_alldefs.h:123
 msgid "scroll down one line"
 msgstr "desce uma linha"
 
-#: keymap_defs.h:114
+#: keymap_alldefs.h:124
 msgid "move to the next page"
 msgstr "move para a próxima página"
 
-#: keymap_defs.h:115
+#: keymap_alldefs.h:125
 msgid "jump to the bottom of the message"
 msgstr "pula para o fundo da mensagem"
 
-#: keymap_defs.h:116
+#: keymap_alldefs.h:126
 msgid "return to the main-menu"
 msgstr "retorna ao menu principal"
 
-#: keymap_defs.h:117
+#: keymap_alldefs.h:127
 msgid "toggle display of quoted text"
 msgstr "troca entre mostrar texto citado ou não"
 
-#: keymap_defs.h:118
+#: keymap_alldefs.h:128
 msgid "skip beyond quoted text"
 msgstr "pula para depois do texto citado"
 
-#: keymap_defs.h:119
+#: keymap_alldefs.h:129
 msgid "jump to the top of the message"
 msgstr "volta para o topo da mensagem"
 
-#: keymap_defs.h:120
+#: keymap_alldefs.h:130
 msgid "pipe message/attachment to a shell command"
 msgstr "passa a mensagem/anexo para um comando do shell através de um cano"
 
-#: keymap_defs.h:121
+#: keymap_alldefs.h:131
 msgid "move to the previous entry"
 msgstr "move para a entrada anterior"
 
-#: keymap_defs.h:122
+#: keymap_alldefs.h:132
 msgid "scroll up one line"
 msgstr "sobe uma linha"
 
-#: keymap_defs.h:123
+#: keymap_alldefs.h:133
 msgid "move to the previous page"
 msgstr "move para a página anterior"
 
-#: keymap_defs.h:124
+#: keymap_alldefs.h:134
 msgid "print the current entry"
 msgstr "imprime a entrada atual"
 
-#: keymap_defs.h:125
+#: keymap_alldefs.h:135
 msgid "query external program for addresses"
 msgstr "executa uma busca por um endereço através de um programa externo"
 
-#: keymap_defs.h:126
+#: keymap_alldefs.h:136
 msgid "append new query results to current results"
 msgstr "anexa os resultados da nova busca aos resultados atuais"
 
-#: keymap_defs.h:127
+#: keymap_alldefs.h:137
 msgid "save changes to mailbox and quit"
 msgstr "salva mudanças à caixa e sai"
 
-#: keymap_defs.h:128
+#: keymap_alldefs.h:138
 msgid "recall a postponed message"
 msgstr "edita uma mensagem adiada"
 
-#: keymap_defs.h:129
+#: keymap_alldefs.h:139
 msgid "clear and redraw the screen"
 msgstr "limpa e redesenha a tela"
 
-#: keymap_defs.h:130
+#: keymap_alldefs.h:140
 msgid "{internal}"
 msgstr "{interno}"
 
-#: keymap_defs.h:131
+#: keymap_alldefs.h:141
 msgid "reply to a message"
 msgstr "responde a uma mensagem"
 
-#: keymap_defs.h:132
+#: keymap_alldefs.h:142
+#, fuzzy
+msgid "use the current message as a template for a new one"
+msgstr "edita a mensagem atual para ser reenviada"
+
+#: keymap_alldefs.h:143
 msgid "save message/attachment to a file"
 msgstr "salva mensagem/anexo em um arquivo"
 
-#: keymap_defs.h:133
+#: keymap_alldefs.h:144
 msgid "search for a regular expression"
 msgstr "procura por uma expressão regular"
 
-#: keymap_defs.h:134
+#: keymap_alldefs.h:145
 msgid "search backwards for a regular expression"
 msgstr "procura de trás para a frente por uma expressão regular"
 
-#: keymap_defs.h:135
+#: keymap_alldefs.h:146
 msgid "search for next match"
 msgstr "procura pelo próximo resultado"
 
-#: keymap_defs.h:136
+#: keymap_alldefs.h:147
 msgid "search for next match in opposite direction"
 msgstr "procura pelo próximo resultado na direção oposta"
 
-#: keymap_defs.h:137
+#: keymap_alldefs.h:148
 msgid "toggle search pattern coloring"
 msgstr "troca entre mostrar cores nos padrões de busca ou não"
 
-#: keymap_defs.h:138
+#: keymap_alldefs.h:149
 msgid "invoke a command in a subshell"
 msgstr "executa um comando em um subshell"
 
-#: keymap_defs.h:139
+#: keymap_alldefs.h:150
 msgid "sort messages"
 msgstr "ordena mensagens"
 
-#: keymap_defs.h:140
+#: keymap_alldefs.h:151
 msgid "sort messages in reverse order"
 msgstr "ordena mensagens em ordem reversa"
 
-#: keymap_defs.h:141
+#: keymap_alldefs.h:152
 msgid "tag the current entry"
 msgstr "marca a entrada atual"
 
-#: keymap_defs.h:142
+#: keymap_alldefs.h:153
 msgid "apply next function to tagged messages"
 msgstr "aplica a próxima função às mensagens marcadas"
 
-#: keymap_defs.h:143
+#: keymap_alldefs.h:154
 msgid "tag the current subthread"
 msgstr "marca a sub-discussão atual"
 
-#: keymap_defs.h:144
+#: keymap_alldefs.h:155
 msgid "tag the current thread"
 msgstr "marca a discussão atual"
 
-#: keymap_defs.h:145
+#: keymap_alldefs.h:156
 msgid "toggle a message's 'new' flag"
 msgstr "troca a marca 'nova' de uma mensagem"
 
-#: keymap_defs.h:146
+#: keymap_alldefs.h:157
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "troca entre reescrever a caixa ou não"
 
-#: keymap_defs.h:147
+#: keymap_alldefs.h:158
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "troca entre pesquisar em caixas ou em todos os arquivos"
 
-#: keymap_defs.h:148
+#: keymap_alldefs.h:159
 msgid "move to the top of the page"
 msgstr "move pra o topo da página"
 
-#: keymap_defs.h:149
+#: keymap_alldefs.h:160
 msgid "undelete the current entry"
 msgstr "restaura a entrada atual"
 
-#: keymap_defs.h:150
+#: keymap_alldefs.h:161
 msgid "undelete all messages in thread"
 msgstr "restaura todas as mensagens na discussão"
 
-#: keymap_defs.h:151
+#: keymap_alldefs.h:162
 msgid "undelete all messages in subthread"
 msgstr "restaura todas as mensagens na sub-discussão"
 
-#: keymap_defs.h:152
+#: keymap_alldefs.h:163
 msgid "show the Mutt version number and date"
 msgstr "mostra o número e a data da versão do Mutt"
 
-#: keymap_defs.h:153
+#: keymap_alldefs.h:164
 msgid "view attachment using mailcap entry if necessary"
 msgstr "vê anexo usando sua entrada no mailcap se necessário"
 
-#: keymap_defs.h:154
+#: keymap_alldefs.h:165
 msgid "show MIME attachments"
 msgstr "mostra anexos MIME"
 
-#: keymap_defs.h:155
+#: keymap_alldefs.h:166
 msgid "show currently active limit pattern"
 msgstr "mostra o padrão limitante atualmente ativado"
 
-#: keymap_defs.h:156
+#: keymap_alldefs.h:167
 msgid "collapse/uncollapse current thread"
 msgstr "abre/fecha a discussão atual"
 
-#: keymap_defs.h:157
+#: keymap_alldefs.h:168
 msgid "collapse/uncollapse all threads"
 msgstr "abre/fecha todas as discussões"
 
-#: keymap_defs.h:158
+#: keymap_alldefs.h:169
 msgid "attach a PGP public key"
 msgstr "anexa uma chave pública do PGP"
 
-#: keymap_defs.h:159
+#: keymap_alldefs.h:170
 msgid "show PGP options"
 msgstr "mostra as opções do PGP"
 
-#: keymap_defs.h:160
+#: keymap_alldefs.h:171
 msgid "extract PGP public keys"
 msgstr "extrai chaves públicas do PGP"
 
-#: keymap_defs.h:161
+#: keymap_alldefs.h:172
 msgid "wipe PGP passphrase from memory"
 msgstr "retira a senha do PGP da memória"
 
-#: keymap_defs.h:162
+#: keymap_alldefs.h:173
 msgid "mail a PGP public key"
 msgstr "envia uma chave pública do PGP"
 
-#: keymap_defs.h:163
+#: keymap_alldefs.h:174
 msgid "verify a PGP public key"
 msgstr "verifica uma chave pública do PGP"
 
-#: keymap_defs.h:164
+#: keymap_alldefs.h:175
 msgid "view the key's user id"
 msgstr "vê a identificação de usuário da chave"
 
-#: keymap_defs.h:165
+#: keymap_alldefs.h:176
 msgid "make decrypted copy and delete"
 msgstr "cria cópia desencriptada e apaga"
 
-#: keymap_defs.h:166
+#: keymap_alldefs.h:177
 msgid "make decrypted copy"
 msgstr "cria cópia desencriptada"
 
-#: lib.c:276 lib.c:291 lib.c:322
-msgid "Out of memory!"
-msgstr "Acabou a memória!"
+#: keymap_alldefs.h:178
+msgid "Accept the chain constructed"
+msgstr ""
 
-#: lib.c:781
-msgid "File is a directory, save under it?"
-msgstr "O arquivo é um diretório, salvar lá?"
+#: keymap_alldefs.h:179
+msgid "Append a remailer to the chain"
+msgstr ""
 
-#: lib.c:786
-msgid "File under directory: "
-msgstr "Arquivo no diretório: "
+#: keymap_alldefs.h:180
+msgid "Insert a remailer into the chain"
+msgstr ""
 
-#: lib.c:798
-msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Arquivo existe, (s)obrescreve, (a)nexa ou (c)ancela?"
+#: keymap_alldefs.h:181
+#, fuzzy
+msgid "Delete a remailer from the chain"
+msgstr "apaga todos os caracteres na linha"
 
-#: lib.c:798
-msgid "oac"
-msgstr "sac"
+#: keymap_alldefs.h:182
+msgid "Select the previous element of the chain"
+msgstr ""
 
-#: lib.c:1182
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s não é uma caixa de mensagens!"
+#: keymap_alldefs.h:183
+msgid "Select the next element of the chain"
+msgstr ""
 
-#: lib.c:1188
-#, c-format
-msgid "Append messages to %s?"
-msgstr "Anexa mensagens a %s?"
+#: keymap_alldefs.h:184
+msgid "send the message through a mixmaster remailer chain"
+msgstr ""
+
+#: lib.c:59 lib.c:74 lib.c:105
+msgid "Out of memory!"
+msgstr "Acabou a memória!"
 
-#: main.c:39
-msgid "To contact the developers, please mail to <mutt-dev@mutt.org>.\n"
-msgstr "Para contactar os programadores, envie uma mensagem para <mutt-dev@mutt.org>.\n"
+#: main.c:40
+#, fuzzy
+msgid ""
+"To contact the developers, please mail to <mutt-dev@mutt.org>.\n"
+"To report a bug, please use the muttbug utility.\n"
+msgstr ""
+"Para contactar os programadores, envie uma mensagem para "
+"<mutt-dev@mutt.org>.\n"
 
-#: main.c:42
+#: main.c:44
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-8 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2000 Michael R. Elkins and others.\n"
 "Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n"
 "Mutt is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type `mutt -vv' for details.\n"
@@ -1989,12 +2256,15 @@ msgstr ""
 "Tradução para a língua portuguesa:\n"
 "Marcus Brito <pazu@linuxbr.com.br>\n"
 
-#: main.c:48
+#: main.c:50
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>\n"
-"Copyright (C) 1997-8 Thomas Roessler <roessler@guug.de>\n"
-"Copyright (C) 1998   Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1998   Ruslan Ermilov <ru@ucb.crimea.ua>\n"
+"Copyright (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>\n"
+"Copyright (C) 1996-2000 Brandon Long <blong@fiction.net>\n"
+"Copyright (C) 1997-2000 Thomas Roessler <roessler@guug.de>\n"
+"Copyright (C) 1998-2000 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2000 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1999-2000 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "\n"
 "Lots of others not mentioned here contributed lots of code,\n"
 "fixes, and suggestions.\n"
@@ -2026,7 +2296,8 @@ msgstr ""
 "    escolha) qualquer outra versão posterior.\n"
 "\n"
 "    Este programa é distribuído na esperança de que ele seja útil, mas\n"
-"    SEM NENHUMA GARANTIA, nem mesmo a garantia implícita de COMERCIABILIDADE\n"
+"    SEM NENHUMA GARANTIA, nem mesmo a garantia implícita de "
+"COMERCIABILIDADE\n"
 "    ou FUNCIONALIDADE PARA UM DETERMINADO PROPÓSITO. Veja a Licença Pública\n"
 "    Geral da GNU para mais detalhes.\n"
 "\n"
@@ -2034,10 +2305,12 @@ msgstr ""
 "    com este programa; caso contrário, escreva para Free Software\n"
 "    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02138, USA.\n"
 
-#: main.c:73
+#: main.c:77
+#, fuzzy
 msgid ""
 "\n"
-"SHA1 implementation Copyright (C) 1995-7 Eric A. Young <eay@cryptsoft.com>\n"
+"SHA1 implementation Copyright (C) 1995-1997 Eric A. Young "
+"<eay@cryptsoft.com>\n"
 "\n"
 "    Redistribution and use in source and binary forms, with or without\n"
 "    modification, are permitted under certain conditions.\n"
@@ -2050,21 +2323,25 @@ msgid ""
 "    along with this program; if not, write to the program's developers.\n"
 msgstr ""
 "\n"
-"Implementação de SHA1 Copyright (C) 1995-7 Eric A. Young <eay@cryptsoft.com>\n"
+"Implementação de SHA1 Copyright (C) 1995-7 Eric A. Young "
+"<eay@cryptsoft.com>\n"
 "\n"
 "    Redistribuição e uso em forma binária ou código fonte, com ou sem\n"
 "    modificações, são permitidas sob certas condições.\n"
 "\n"
 "    A implementação de SHA1 vem COMO ESTÁ, e QUALQUER GARANTIA, EXPRESSA\n"
-"    OU IMPLÍCITA, incluindo, mas não se limitando a, as garantias implícitas\n"
-"    de comerciabilidade e funcionalidade para um determinado propósito, ESTÃO\n"
+"    OU IMPLÍCITA, incluindo, mas não se limitando a, as garantias "
+"implícitas\n"
+"    de comerciabilidade e funcionalidade para um determinado propósito, "
+"ESTÃO\n"
 "    REVOGADAS.\n"
 "\n"
 "    Você deve ter recebido uma cópia dos termos de distribuição completos\n"
-"    junto com este programa; caso contrário, escreva para os desenvolvedores\n"
+"    junto com este programa; caso contrário, escreva para os "
+"desenvolvedores\n"
 "    do programa.\n"
 
-#: main.c:99
+#: main.c:103
 msgid ""
 "usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> "
 "]\n"
@@ -2094,10 +2371,9 @@ msgid ""
 "  -Z\t\topen the first folder with new message, exit immediately if none\n"
 "  -h\t\tthis help message"
 msgstr ""
-"uso: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <arq> ] [ -m <tipo> ] [ -f <arq> "
-"]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <arq> ] [ -F <arq> ] [ -H <arq> ] [ "
-"-i <arq> ] [ -s <asst> ] [ -b <end> ] [ -c <end> ] <end> [ ... ]\n"
+"uso: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <arq> ] [ -m <tipo> ] [ -f <arq> ]\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <arq> ] [ -F <arq> ] [ -H <arq> ] [ -i "
+"<arq> ] [ -s <asst> ] [ -b <end> ] [ -c <end> ] <end> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <arq> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
@@ -2105,7 +2381,8 @@ msgstr ""
 "  -a <arquivo>\tanexa um arquivo à mensagem\n"
 "  -b <endereço>\tespecifica um endereço de cópia escondica (BCC)\n"
 "  -c <endereço>\tespecifica um endereço de cópia (CC)\n"
-"  -e <comando>\tespecifica um comando a ser executado depois a inicialização\n"
+"  -e <comando>\tespecifica um comando a ser executado depois a "
+"inicialização\n"
 "  -f <arquivo>\tespecifica qual caixa de mensagens abrir\n"
 "  -F <arquivo>\tespecifica um arquivo muttrc alternativo\n"
 "  -H <arquivo>\tespecifica um rascunho de onde ler cabeçalhos\n"
@@ -2122,7 +2399,7 @@ msgstr ""
 "  -Z\t\tabre a primeira pasta com novas mensagens, sai se não houver\n"
 "  -h\t\testa mensagem de ajuda"
 
-#: main.c:151
+#: main.c:155
 msgid ""
 "\n"
 "Compile options:"
@@ -2130,53 +2407,63 @@ msgstr ""
 "\n"
 "Opções de compilação:"
 
-#: main.c:305
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "Erro ao inicializar terminal."
 
-#: main.c:403
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Depurando no nível %d.\n"
 
-#: main.c:405
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG não foi definido durante a compilação. Ignorado.\n"
 
-#: main.c:543
+#: main.c:515
+#, c-format
+msgid "%s does not exist. Create it?"
+msgstr ""
+
+#: main.c:519
+#, fuzzy, c-format
+msgid "Can't create %s: %s."
+msgstr "Não é possívle criar o arquivo %s"
+
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "Nenhum destinatário foi especificado.\n"
 
-#: main.c:616
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: não foi possível anexar o arquivo.\n"
 
-#: main.c:636
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "Nenhuma caixa com novas mensagens."
 
-#: main.c:670
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "A caixa de mensagens está vaxia."
 
-#: mbox.c:143 mbox.c:202
-msgid "Mailbox is corrupt!"
-msgstr "A caixa de mensagens está corrompida!"
-
-#: mbox.c:277
+#: mbox.c:126 mbox.c:284
 msgid "Reading %s... %d (%d%%)"
 msgstr "Lendo %s... %d (%d%%)"
 
-#: mbox.c:650
+#: mbox.c:150 mbox.c:209
+msgid "Mailbox is corrupt!"
+msgstr "A caixa de mensagens está corrompida!"
+
+#: mbox.c:657
 msgid "Mailbox was corrupted!"
 msgstr "A caixa de mensagens foi corrompida!"
 
-#: mbox.c:685 mbox.c:928
+#: mbox.c:692 mbox.c:935
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Erro fatal! Não foi posssível reabrir a caixa de mensagens!"
 
-#: mbox.c:694
+#: mbox.c:701
 msgid "Unable to lock mailbox!"
 msgstr "Não foi possível travar a caixa de mensagens!"
 
@@ -2184,106 +2471,139 @@ msgstr "N
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:738
+#: mbox.c:745
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
-msgstr "sync: mbox modificada, mas nenhuma mensagem modificada! (relate este problema)"
+msgstr ""
+"sync: mbox modificada, mas nenhuma mensagem modificada! (relate este "
+"problema)"
 
-#: mbox.c:767
+#: mbox.c:774
 msgid "Writing messages... %d (%d%%)"
 msgstr "Gravando mensagens... %d(%d%%)"
 
-#: mbox.c:913
+#: mbox.c:920
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Erro de gravação! Caixa parcial salva em %s"
 
-#: mbox.c:965
+#: mbox.c:972
 msgid "Could not reopen mailbox!"
 msgstr "Não foi possívle reabrir a caixa de mensagens!"
 
-#: mbox.c:1003
+#: mbox.c:1010
 msgid "Reopening mailbox..."
 msgstr "Reabrindo caixa de mensagens..."
 
-#: menu.c:314
+#: menu.c:350
 msgid "Jump to: "
 msgstr "Pular para: "
 
-#: menu.c:323
+#: menu.c:359
 msgid "Invalid index number."
 msgstr "Número de índice inválido."
 
-#: menu.c:327 menu.c:345 menu.c:381 menu.c:422 menu.c:438 menu.c:449
-#: menu.c:460 menu.c:502 menu.c:513 menu.c:526 menu.c:539 menu.c:818
+#: menu.c:363 menu.c:381 menu.c:417 menu.c:458 menu.c:474 menu.c:485
+#: menu.c:496 menu.c:538 menu.c:549 menu.c:562 menu.c:575 menu.c:933
 msgid "No entries."
 msgstr "Nenhuma entrada."
 
-#: menu.c:342
+#: menu.c:378
 msgid "You cannot scroll down farther."
 msgstr "Você não pode mais descer."
 
-#: menu.c:358
+#: menu.c:394
 msgid "You cannot scroll up farther."
 msgstr "Você não pode mais subir"
 
-#: menu.c:378
+#: menu.c:414
 msgid "You are on the last page."
 msgstr "Você está na última página."
 
-#: menu.c:400
+#: menu.c:436
 msgid "You are on the first page."
 msgstr "Você está na primeira página"
 
-#: menu.c:479
+#: menu.c:515
 msgid "First entry is shown."
 msgstr "A primeira entrada está sendo mostrada."
 
-#: menu.c:499
+#: menu.c:535
 msgid "Last entry is shown."
 msgstr "A última entrada está sendo mostrada."
 
-#: menu.c:550
+#: menu.c:586
 msgid "You are on the last entry."
 msgstr "Você está na última entrada."
 
-#: menu.c:561
+#: menu.c:597
 msgid "You are on the first entry."
 msgstr "Você está na primeira entrada."
 
-#: menu.c:601 pattern.c:1054
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "Procurar por: "
 
-#: menu.c:602
+#: menu.c:658
 msgid "Reverse search for: "
 msgstr "Procurar de trás para frente por: "
 
-#: menu.c:613 pattern.c:1087
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "Nenhum padrão de procura."
 
-#: menu.c:643 pager.c:1828 pager.c:1844 pager.c:1931 pattern.c:1152
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "Não encontrado."
 
-#: menu.c:694
+#: menu.c:803
 msgid "No tagged entries."
 msgstr "Nenhuma entrada marcada."
 
-#: menu.c:782
+#: menu.c:896
 msgid "Search is not implemented for this menu."
 msgstr "Busca não está implementada para este menu."
 
-#: menu.c:821
+#: menu.c:901
+#, fuzzy
+msgid "Jumping is not implemented for dialogs."
+msgstr "Busca não está implementada para este menu."
+
+#: menu.c:936
 msgid "Tagging is not supported."
 msgstr "Não é possível marcar."
 
-#: mh.c:182
+#: mh.c:189
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Lendo %s... %d"
 
-#: mx.c:115
+#: muttlib.c:653
+msgid "File is a directory, save under it?"
+msgstr "O arquivo é um diretório, salvar lá?"
+
+#: muttlib.c:658
+msgid "File under directory: "
+msgstr "Arquivo no diretório: "
+
+#: muttlib.c:670
+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+msgstr "Arquivo existe, (s)obrescreve, (a)nexa ou (c)ancela?"
+
+#: muttlib.c:670
+msgid "oac"
+msgstr "sac"
+
+#: muttlib.c:956
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s não é uma caixa de mensagens!"
+
+#: muttlib.c:962
+#, c-format
+msgid "Append messages to %s?"
+msgstr "Anexa mensagens a %s?"
+
+#: mx.c:114
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
 msgstr "Limite de travas excedido, remover a trava para %s?"
@@ -2311,220 +2631,230 @@ msgstr "Limite de tempo excedido durante uma tentativa trava com flock!"
 msgid "Waiting for flock attempt... %d"
 msgstr "Esperando pela tentativa de flock... %d"
 
-#: mx.c:595
+#: mx.c:554
+#, fuzzy, c-format
+msgid "Couldn't lock %s\n"
+msgstr "Não é possível travar %s.\n"
+
+#: mx.c:642
 #, c-format
 msgid "Reading %s..."
 msgstr "Lendo %s..."
 
-#: mx.c:685
+#: mx.c:732
 #, c-format
 msgid "Writing %s..."
 msgstr "Gravando %s..."
 
-#: mx.c:711
+#: mx.c:759
 #, c-format
 msgid "Could not synchronize mailbox %s!"
 msgstr "Não foi possível sincronizar a caixa %s!"
 
-#: mx.c:775
+#: mx.c:823
 #, c-format
 msgid "Move read messages to %s?"
 msgstr "Mover mensagens lidas para %s?"
 
-#: mx.c:784 mx.c:979
+#: mx.c:832 mx.c:1068
 #, c-format
 msgid "Purge %d deleted message?"
 msgstr "Remover %d mensagem apagada?"
 
-#: mx.c:784 mx.c:979
+#: mx.c:832 mx.c:1068
 #, c-format
 msgid "Purge %d deleted messages?"
 msgstr "Remover %d mensagens apagadas?"
 
-#: mx.c:804
+#: mx.c:853
 #, c-format
 msgid "Moving read messages to %s..."
 msgstr "Movendo mensagens lidas para %s..."
 
-#: mx.c:827 mx.c:970
+#: mx.c:904 mx.c:1059
 msgid "Mailbox is unchanged."
 msgstr "A caixa de mensagens não sofreu mudanças"
 
-#: mx.c:846
+#: mx.c:934
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d mantidas, %d movidas, %d apagadas."
 
-#: mx.c:849 mx.c:995
+#: mx.c:937 mx.c:1101
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d movidas, %d movidas."
 
-#: mx.c:955
+#: mx.c:1044
 #, c-format
 msgid " Press '%s' to toggle write"
 msgstr " Pressione '%s' para trocar entre gravar ou não"
 
-#: mx.c:957
+#: mx.c:1046
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "Use 'toggle-write' para reabilitar a gravação!"
 
-#: mx.c:959
-#, c-format
+#: mx.c:1048
+#, fuzzy, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "A caixa está marcada como somente leitura. %s"
+msgstr "A caixa está marcada como não gravável. %s"
 
-#: mx.c:964
-msgid "Mailbox is read-only."
-msgstr "A caixa é somente para leitura."
+#: mx.c:1098
+#, c-format
+msgid "%d kept."
+msgstr ""
+
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "edita a mensagem"
+
+#: pager.c:57
+msgid "Not available in this menu."
+msgstr "Não disponível neste menu."
 
-#: pager.c:1369
+#: pager.c:1383
 msgid "PrevPg"
 msgstr "PagAnt"
 
-#: pager.c:1370
+#: pager.c:1384
 msgid "NextPg"
 msgstr "ProxPag"
 
-#: pager.c:1374
+#: pager.c:1388
 msgid "View Attachm."
 msgstr "Ver Anexo"
 
-#: pager.c:1377
+#: pager.c:1391
 msgid "Next"
 msgstr "Próxima"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1740 pager.c:1771 pager.c:1800 pager.c:2019
+#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
 msgid "Bottom of message is shown."
 msgstr "O fundo da mensagem está sendo mostrado."
 
-#: pager.c:1756 pager.c:1778 pager.c:1789
+#: pager.c:1796 pager.c:1818 pager.c:1829
 msgid "Top of message is shown."
 msgstr "O topo da mensagem está sendo mostrado."
 
-#: pager.c:1862
+#: pager.c:1902
 msgid "Reverse search: "
 msgstr "Busca reversa: "
 
-#: pager.c:1863
+#: pager.c:1903
 msgid "Search: "
 msgstr "Busca: "
 
-#: pager.c:1957
+#: pager.c:1998
 msgid "Help is currently being shown."
 msgstr "A ajuda está sendo mostrada."
 
-#: pager.c:1986
+#: pager.c:2027
 msgid "No more quoted text."
 msgstr "Não há mais texto citado."
 
-#: pager.c:1999
+#: pager.c:2040
 msgid "No more unquoted text after quoted text."
 msgstr "Não há mais texto não-citado após o texto citado."
 
-#: parse.c:501
+#: parse.c:517
 msgid "multipart message has no boundary parameter!"
 msgstr "mensagem multiparte não tem um parâmetro de fronteiras!"
 
-#: pattern.c:235
+#: pattern.c:239
 #, c-format
 msgid "Error in expression: %s"
 msgstr "Erro na expressão: %s"
 
-#: pattern.c:332
+#: pattern.c:336
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "Dia do mês inválido: %s"
 
-#: pattern.c:346
+#: pattern.c:350
 #, c-format
 msgid "Invalid month: %s"
 msgstr "Mês inválido: %s"
 
-#: pattern.c:400
+#: pattern.c:404
 msgid "error in expression"
 msgstr "erro na expressão"
 
-#: pattern.c:585 pattern.c:693
+#: pattern.c:589 pattern.c:697
 #, c-format
 msgid "error in pattern at: %s"
 msgstr "erro no padrão em: %s"
 
-#: pattern.c:633
+#: pattern.c:637
 #, c-format
 msgid "%c: invalid command"
 msgstr "%c: comando inválido"
 
-#: pattern.c:639
+#: pattern.c:643
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr "%c: não é possível neste modo"
 
-#: pattern.c:652
+#: pattern.c:656
 msgid "missing parameter"
 msgstr "faltam parâmetros"
 
-#: pattern.c:668
+#: pattern.c:672
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "parêntese sem um corresponente: %s"
 
-#: pattern.c:700
+#: pattern.c:704
 msgid "empty pattern"
 msgstr "padrão vazio"
 
-#: pattern.c:879
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "erro: operação desconhecida %d (relate este problema)."
 
-#: pattern.c:944 pattern.c:1073
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "Compilando padrão de busca..."
 
-#: pattern.c:958
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "Executando comando nas mensagens que casam..."
 
-#: pattern.c:1021
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "Nenhuma mensagem casa com o critério"
 
-#: pattern.c:1111
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "A busca alcançou o fundo sem encontrar um resultado"
 
-#: pattern.c:1122
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "A busca alcançou o topo sem encontrar um resultado"
 
-#: pattern.c:1144
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "Busca interrompida."
 
-#: pgp.c:130
+#: pgp.c:89
 msgid "Enter PGP passphrase:"
 msgstr "Entre a senha do PGP:"
 
-#: pgp.c:146
+#: pgp.c:105
 msgid "PGP passphrase forgotten."
 msgstr "Senha do PGP esquecida."
 
-#: pgp.c:174
-#, c-format
-msgid "Unknown PGP version \"%s\"."
-msgstr "Versão \"%s\" do PGP desconhecida."
-
-#: pgp.c:207
+#: pgp.c:135
 msgid "[-- PGP output follows (current time: "
 msgstr "[-- Saída do PGP a seguir (hora atual: "
 
-#: pgp.c:320
+#: pgp.c:243
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Erro: não foi possível criar o subprocesso do PGP! --]\n"
 
-#: pgp.c:347
+#: pgp.c:270
 msgid ""
 "\n"
 "[-- End of PGP output --]\n"
@@ -2534,18 +2864,19 @@ msgstr ""
 "[-- Fim da saída do PGP --]\n"
 "\n"
 
-#: pgp.c:353
+#: pgp.c:276
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
-msgstr "[-- INÍCIO DE MENSAGEM DO PGP --]\n"
+msgstr ""
+"[-- INÍCIO DE MENSAGEM DO PGP --]\n"
 "\n"
 
-#: pgp.c:355
+#: pgp.c:278
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- INÍCIO DE BLOCO DE CHAVE PÚBLICA DO PGP --]\n"
 
-#: pgp.c:357
+#: pgp.c:280
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -2553,7 +2884,7 @@ msgstr ""
 "[-- INÍCIO DE MENSAGEM ASSINADA DO PGP --]\n"
 "\n"
 
-#: pgp.c:459
+#: pgp.c:382
 msgid ""
 "\n"
 "[-- END PGP MESSAGE --]\n"
@@ -2561,11 +2892,11 @@ msgstr ""
 "\n"
 "[-- FIM DE MENSAGEM DO PGP --]\n"
 
-#: pgp.c:461
+#: pgp.c:384
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- FIM DE BLOCO DE CHAVE PÚBLICA DO PGP --]\n"
 
-#: pgp.c:463
+#: pgp.c:386
 msgid ""
 "\n"
 "[-- END PGP SIGNED MESSAGE --]\n"
@@ -2573,14 +2904,14 @@ msgstr ""
 "\n"
 "[-- FIM DE MENSAGEM ASSINADA DO PGP --]\n"
 
-#: pgp.c:476
+#: pgp.c:399
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
 "[-- Erro: não foi possível encontrar o início da mensagem do PGP! --]\n"
 
-#: pgp.c:669 pgp.c:894
+#: pgp.c:592 pgp.c:884
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -2588,38 +2919,56 @@ msgstr ""
 "[-- Fim da saída do PGP --]\n"
 "\n"
 
-#. Now display the signed body
-#: pgp.c:676
+#: pgp.c:640
 msgid ""
-"[-- The following data is PGP/MIME signed --]\n"
+"[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- Os dados a seguir estão assinados com PGP/MIME --]\n"
+
+#: pgp.c:648
+#, fuzzy, c-format
+msgid ""
+"[-- Error: Unknown multipart/signed protocol %s! --]\n"
+"\n"
+msgstr "Erro: multipart/signed não tem protocolo."
+
+#: pgp.c:672
+#, c-format
+msgid ""
+"[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
+msgstr ""
 
+#. Now display the signed body
 #: pgp.c:682
+#, fuzzy
 msgid ""
+"[-- The following data is signed --]\n"
 "\n"
-"[-- End of PGP/MIME signed data --]\n"
 msgstr ""
+"[-- Os dados a seguir estão assinados com PGP/MIME --]\n"
 "\n"
-"[-- Fim dos dados assinados com PGP/MIME --]\n"
 
-#: pgp.c:687
+#: pgp.c:688
 msgid ""
-"[-- Error: this message does not comply with the PGP/MIME specification! "
-"--]\n"
+"[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Erro: esta mensagem não está de acordo com a especificação PGP/MIME! "
-"--]\n"
+
+#: pgp.c:694
+#, fuzzy
+msgid ""
+"\n"
+"[-- End of signed data --]\n"
+msgstr ""
 "\n"
+"[-- Fim dos dados assinados com PGP/MIME --]\n"
 
-#: pgp.c:801
+#: pgp.c:795
 msgid "Internal error. Inform <roessler@guug.de>."
 msgstr "Erro interno. Informe <roessler@guug.de>."
 
-#: pgp.c:865
+#: pgp.c:855
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -2627,7 +2976,7 @@ msgstr ""
 "[-- Erro: não foi possível criar um subprocesso para o PGP! --]\n"
 "\n"
 
-#: pgp.c:958
+#: pgp.c:948
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -2635,11 +2984,11 @@ msgstr ""
 "[-- Erro: mensagem PGP/MIME mal formada! --]\n"
 "\n"
 
-#: pgp.c:971
+#: pgp.c:961
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- Erro: não foi possível criar um arquivo temporário! --]\n"
 
-#: pgp.c:980
+#: pgp.c:970
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
@@ -2655,146 +3004,108 @@ msgstr ""
 "\n"
 "[-- Fim dos dados encriptados com PGP/MIME --]\n"
 
-#: pgp.c:1070
+#: pgp.c:1068
 msgid "Can't open PGP subprocess!"
 msgstr "Não foi possível abrir o subprocesso do PGP!"
 
-#: pgp.c:1194
+#: pgp.c:1195
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "Usar keyID = \"%s\" para %s?"
 
-#: pgp.c:1200
+#: pgp.c:1222
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "Entre a keyID para %s: "
 
-#: pgpkey.c:173
-msgid "Exit  "
-msgstr "Sair "
+#: pgp.c:1432
+msgid "Can't invoke PGP"
+msgstr ""
 
-#: pgpkey.c:175
+#: pgp.c:1536
+#, fuzzy
+msgid "Create an application/pgp message?"
+msgstr "cria um apelido a partir do remetente de uma mensagem"
+
+#: pgpinvoke.c:298
+#, fuzzy
+msgid "Fetching PGP key..."
+msgstr "Obtendo mensagem..."
+
+#: pgpkey.c:444
 msgid "Select  "
 msgstr "Escolher "
 
-#: pgpkey.c:178
+#: pgpkey.c:447
 msgid "Check key  "
 msgstr "Verificar chave "
 
-#: pgpkey.c:191
-msgid "PGP keys matching "
+#: pgpkey.c:460
+#, fuzzy, c-format
+msgid "PGP keys matching <%s>."
+msgstr "Chaves do PGP "
+
+#: pgpkey.c:462
+#, fuzzy, c-format
+msgid "PGP keys matching \"%s\"."
 msgstr "Chaves do PGP "
 
-#: pgpkey.c:210 pgpkey.c:387
+#: pgpkey.c:481 pgpkey.c:675
 msgid "Can't open /dev/null"
 msgstr "Não foi possível abrir /dev/null"
 
-#: pgpkey.c:216 pgpkey.c:381
+#: pgpkey.c:487 pgpkey.c:669
 msgid "Can't create temporary file"
 msgstr "Não foi possível criar um arquivo temporário"
 
-#: pgpkey.c:226 pgpkey.c:398
+#: pgpkey.c:498 pgpkey.c:689
 msgid "Can't create filter"
 msgstr "Não foi possível criar um filtro"
 
-#: pgpkey.c:236
+#: pgpkey.c:508
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "Key ID: 0x%s"
 
-#: pgpkey.c:257
+#: pgpkey.c:534
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr ""
+
+#: pgpkey.c:548
 msgid "This ID's trust level is undefined."
 msgstr "O nívle de confiança deste ID é indeterminado"
 
-#: pgpkey.c:258
+#: pgpkey.c:551
 msgid "This ID is not trusted."
 msgstr "Este ID não é de confiança"
 
-#: pgpkey.c:259
+#: pgpkey.c:554
 msgid "This ID is only marginally trusted."
 msgstr "Este ID é de baixa confiança"
 
-#: pgpkey.c:262
+#: pgpkey.c:558
 #, c-format
 msgid "%s Do you really want to use it?"
 msgstr "%s Você realmente quer usá-lo?"
 
-#: pgpkey.c:369
+#: pgpkey.c:654
 msgid "Please enter the key ID: "
 msgstr "Por favor entre o key ID: "
 
-#: pgpkey.c:416
-#, c-format
-msgid "PGP Key 0x%s."
-msgstr "Chave do PGP 0x%s."
-
-#: pgppubring.c:58
-msgid "reserved"
-msgstr "reservado"
-
-#: pgppubring.c:59
-msgid "Encrypted Session Key"
-msgstr "Chave de Sessão Encriptada"
-
-#: pgppubring.c:60
-msgid "Signature Packet"
-msgstr "Pacote de Assinatura"
-
-#: pgppubring.c:61
-msgid "Conventionally Encrypted Session Key Packet"
-msgstr "Pacote de Chaves de Sessão Convencionalmente Ecriptado"
-
-#: pgppubring.c:62
-msgid "One-Pass Signature Packet"
-msgstr "Pacote de Assinatura de Um Passo"
-
-#: pgppubring.c:63
-msgid "Secret Key Packet"
-msgstr "Pacote de Chave Secreta"
-
-#: pgppubring.c:64
-msgid "Public Key Packet"
-msgstr "Pacote de Chave Pública"
-
-#: pgppubring.c:65
-msgid "Secret Subkey Packet"
-msgstr "Pacote de Subchave Secreta"
-
-#: pgppubring.c:66
-msgid "Compressed Data Packet"
-msgstr "Pacotes de Dados Compactado"
-
-#: pgppubring.c:67
-msgid "Symmetrically Encrypted Data Packet"
-msgstr "Pacote de Dados Simetricamente Encriptado"
-
-#: pgppubring.c:68
-msgid "Marker Packet"
-msgstr "Pacote de Marcação"
-
-#: pgppubring.c:69
-msgid "Literal Data Packet"
-msgstr "Pacotes de Dados Literais"
-
-#: pgppubring.c:70
-msgid "Trust Packet"
-msgstr "Pacote de Confiança"
-
-#: pgppubring.c:71
-msgid "Name Packet"
-msgstr "Pacote de Nome"
-
-#: pgppubring.c:72
-msgid "Subkey Packet"
-msgstr "Pacote de Subchave"
+#: pgpkey.c:682
+#, fuzzy
+msgid "Invoking pgp..."
+msgstr "Executando PGP..."
 
-#: pgppubring.c:73
-msgid "Reserved"
-msgstr "Reservado"
+#: pgpkey.c:707
+#, fuzzy, c-format
+msgid "PGP Key %s."
+msgstr "Chave do PGP 0x%s."
 
-#: pgppubring.c:74
-msgid "Comment Packet"
-msgstr "Pacote de Comentário"
+#: pgpkey.c:754 pgpkey.c:870
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr ""
 
 #: pop.c:66
 msgid "POP Password: "
@@ -2818,7 +3129,7 @@ msgstr "N
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: pop.c:166 pop.c:331
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "O servidor fechou a conexão!"
 
@@ -2827,14 +3138,14 @@ msgid "No new mail in POP mailbox."
 msgstr "Nenhuma mensagem nova no servidor POP."
 
 #: pop.c:209
-#, c-format
-msgid "Reading %d new message (%d bytes)..."
-msgstr "Lendo %d mensagem nova (%d bytes)..."
+#, fuzzy, c-format
+msgid "Reading new messages (%d bytes)..."
+msgstr "Lendo %d mensagens novas (%d bytes)..."
 
 #: pop.c:210
-#, c-format
-msgid "Reading %d new messages (%d bytes)..."
-msgstr "Lendo %d mensagens novas (%d bytes)..."
+#, fuzzy, c-format
+msgid "Reading new message (%d bytes)..."
+msgstr "Lendo %d mensagem nova (%d bytes)..."
 
 #: pop.c:245
 msgid "Error reading message!"
@@ -2844,20 +3155,25 @@ msgstr "Erro ao ler mensagem!"
 msgid "Error while writing mailbox!"
 msgstr "Erro ao gravar a caixa!"
 
-#: pop.c:305
-#, c-format
-msgid "%s [%d messages read]"
-msgstr "%d [%d mensagens lidas]"
+#: pop.c:308
+#, fuzzy, c-format
+msgid "%s [%d of %d messages read]"
+msgstr "%s [%d mensagens lidas]"
+
+#: pop.c:310
+#, fuzzy, c-format
+msgid "%s [%d message read]"
+msgstr "%s [%d mensagens lidas]"
 
-#: postpone.c:111
+#: postpone.c:159
 msgid "Postponed Messages"
 msgstr "Mensagens Adiadas"
 
-#: postpone.c:184 postpone.c:193
+#: postpone.c:250 postpone.c:264
 msgid "No postponed messages."
 msgstr "Nenhuma mensagem adiada."
 
-#: postpone.c:338 postpone.c:358 postpone.c:367
+#: postpone.c:449 postpone.c:469 postpone.c:478
 msgid "Illegal PGP header"
 msgstr "Cabeçalho de PGP ilegal"
 
@@ -2895,118 +3211,217 @@ msgstr "Consulta: "
 msgid "Query '%s'"
 msgstr "Consulta '%s'"
 
-#: recvattach.c:49
+#: recvattach.c:59
 msgid "Pipe"
 msgstr "Cano"
 
-#: recvattach.c:50
+#: recvattach.c:60
 msgid "Print"
 msgstr "Imprimir"
 
-#: recvattach.c:374
+#: recvattach.c:424
 msgid "Saving..."
 msgstr "Salvando..."
 
-#: recvattach.c:437
+#: recvattach.c:487
 msgid "Attachment saved"
 msgstr "Anexo salvo"
 
-#: recvattach.c:449
+#: recvattach.c:499
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "AVISO! Você está prestes a sobrescrever %s, continuar?"
 
-#: recvattach.c:467
+#: recvattach.c:517
 msgid "Attachment filtered."
 msgstr "Anexo filtrado."
 
-#: recvattach.c:533
+#: recvattach.c:584
 msgid "Filter through: "
 msgstr "Filtrar através de: "
 
-#: recvattach.c:533
+#: recvattach.c:584
 msgid "Pipe to: "
 msgstr "Passar por cano a: "
 
-#: recvattach.c:568
+#: recvattach.c:619
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "Eu não sei como imprimir anexos %s!"
 
-#: recvattach.c:631
+#: recvattach.c:684
 msgid "Print tagged attachment(s)?"
 msgstr "Imprimir anexo(s) marcado(s)?"
 
-#: recvattach.c:631
+#: recvattach.c:684
 msgid "Print attachment?"
 msgstr "Imprimir anexo?"
 
-#: recvattach.c:659
+#: recvattach.c:833
+msgid "Attachments"
+msgstr "Anexos"
+
+#: recvattach.c:900
+msgid "Deletion of attachments from PGP messages is unsupported."
+msgstr "Deleção de anexos de mensagens PGP não é suportada"
+
+#: recvattach.c:920 recvattach.c:937
+msgid "Only deletion of multipart attachments is supported."
+msgstr "Somente a deleção de anexos multiparte é suportada."
+
+#: recvcmd.c:43
 msgid "You may only bounce message/rfc822 parts."
 msgstr "Você só pode repetir partes message/rfc822"
 
-#: recvattach.c:695
+#: recvcmd.c:155
+#, c-format
+msgid "Bounce message to %s...?"
+msgstr "Repetir mensagem para %s...?"
+
+#: recvcmd.c:155
 #, c-format
 msgid "Bounce messages to %s...?"
 msgstr "Repetir mensagens para %s...?"
 
-#: recvattach.c:696
+#: recvcmd.c:372
+#, fuzzy, c-format
+msgid "Can't open temporary file %s."
+msgstr "Não foi possível criar um arquivo temporário"
+
+#: recvcmd.c:398 recvcmd.c:537 send.c:722
+msgid "Forward MIME encapsulated?"
+msgstr "Encaminhar encapsulado em MIME?"
+
+#: recvcmd.c:412
+msgid "Can't decode all tagged attachments.  MIME-forward the others?"
+msgstr ""
+
+#: recvcmd.c:545 recvcmd.c:797
+#, fuzzy, c-format
+msgid "Can't create %s."
+msgstr "Não é possívle criar o arquivo %s"
+
+#: recvcmd.c:676
+#, fuzzy
+msgid "Can't find any tagged messages."
+msgstr "aplica a próxima função às mensagens marcadas"
+
+#: recvcmd.c:697 send.c:647
+msgid "No mailing lists found!"
+msgstr "Nenhuma lista de email encontrada!"
+
+#: recvcmd.c:776
+msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
+msgstr ""
+
+#: remailer.c:480
+#, fuzzy
+msgid "Append"
+msgstr "Enviar"
+
+#: remailer.c:481
+msgid "Insert"
+msgstr ""
+
+#: remailer.c:482
+#, fuzzy
+msgid "Delete"
+msgstr "Escolher"
+
+#: remailer.c:484
+msgid "OK"
+msgstr ""
+
+#: remailer.c:512
+msgid "Can't get mixmaster's type2.list!"
+msgstr ""
+
+#: remailer.c:538
+msgid "Select a remailer chain."
+msgstr ""
+
+#: remailer.c:592
 #, c-format
-msgid "Bounce message to %s...?"
-msgstr "Repetir mensagem para %s...?"
+msgid "Error: %s can't be used as the final remailer of a chain."
+msgstr ""
 
-#: recvattach.c:921
-msgid "Attachments"
-msgstr "Anexos"
+#: remailer.c:625
+#, c-format
+msgid "Mixmaster chains are limited to %d elements."
+msgstr ""
 
-#: recvattach.c:978
-msgid "Deletion of attachments from PGP messages is unsupported."
-msgstr "Deleção de anexos de mensagens PGP não é suportada"
+#: remailer.c:650
+msgid "The remailer chain is already empty."
+msgstr ""
 
-#: recvattach.c:998 recvattach.c:1015
-msgid "Only deletion of multipart attachments is supported."
-msgstr "Somente a deleção de anexos multiparte é suportada."
+#: remailer.c:660
+#, fuzzy
+msgid "You already have the first chain element selected."
+msgstr "Você está na primeira mensagem."
 
-#: recvattach.c:1065
-msgid "This operation is not currently supported for PGP messages."
-msgstr "Esta operação não é atualmente suportada para mensagens PGP."
+#: remailer.c:670
+msgid "You already have the last chain element selected."
+msgstr ""
+
+#: remailer.c:709
+msgid "Mixmaster doesn't accept Cc or Bcc headers."
+msgstr ""
+
+#: remailer.c:733
+msgid ""
+"Please set the hostname variable to a proper value when using mixmaster!"
+msgstr ""
+
+#: remailer.c:762
+#, fuzzy, c-format
+msgid "Error sending message, child exited %d.\n"
+msgstr "Erro ao enviar mensagem, processo filho terminou com %d (%s).\n"
+
+#: remailer.c:766
+msgid "Error sending message."
+msgstr "Erro ao enviar mensagem."
 
-#: rfc1524.c:176
+#: rfc1524.c:159
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr "Entrada mal formatada para o tipo %s em \"%s\" linha %d"
 
-#: rfc1524.c:408
+#: rfc1524.c:391
 msgid "No mailcap path specified"
 msgstr "Nenhum caminho de mailcap especificado"
 
-#: rfc1524.c:434
+#: rfc1524.c:417
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "entrada no mailcap para o tipo %s não foi encontrada."
 
-#: score.c:73
+#: score.c:71
 msgid "score: too few arguments"
 msgstr "score: poucos argumentos"
 
-#: score.c:82
+#: score.c:80
 msgid "score: too many arguments"
 msgstr "score: muitos argumentos"
 
-#: send.c:229
+#: send.c:232
 msgid "No subject, abort?"
 msgstr "Sem assunto, cancelar?"
 
-#: send.c:231
+#: send.c:234
 msgid "No subject, aborting."
 msgstr "Sem assunto, cancelado."
 
+#: send.c:428
+#, fuzzy, c-format
+msgid "Follow-up to %s%s?"
+msgstr "Responder para %s%s?"
+
 #. 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:434
+#: send.c:477
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "Responder para %s%s?"
@@ -3014,133 +3429,229 @@ msgstr "Responder para %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:518
+#: send.c:622
 msgid "No tagged messages are visible!"
 msgstr "Nenhuma mensagem marcada está visível!"
 
-#: send.c:543
-msgid "No mailing lists found!"
-msgstr "Nenhuma lista de email encontrada!"
-
-#: send.c:630
+#: send.c:693
 msgid "Include message in reply?"
 msgstr "Incluir mensagem na resposta?"
 
-#: send.c:644
+#: send.c:698
+#, fuzzy
+msgid "Including quoted message..."
+msgstr "Enviando mensagem..."
+
+#: send.c:708
 msgid "Could not include all requested messages!"
 msgstr "Não foi possível incluir todas as mensagens solicitadas!"
 
-#: send.c:657
-msgid "Forward MIME encapsulated?"
-msgstr "Encaminhar encapsulado em MIME?"
+#: send.c:726
+#, fuzzy
+msgid "Preparing forwarded message..."
+msgstr "Enviando mensagem ..."
 
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:868
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "Editar mensagem adiada?"
 
-#: send.c:1100
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "Cancelar mensagem não modificada?"
 
-#: send.c:1102
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "Mensagem não modificada cancelada."
 
 #. abort
-#: send.c:1141
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "Mensagem não enviada."
 
-#: send.c:1154
+#: send.c:1333
 msgid "Message postponed."
 msgstr "Mensagem adiada."
 
-#: send.c:1163
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "Nenhum destinatário está especificado!"
 
-#: send.c:1168
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "Nenhum destinatário foi especificado."
 
-#: send.c:1174
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "Sem assunto, cancelar envio?"
 
-#: send.c:1178
+#: send.c:1357
 msgid "No subject specified."
 msgstr "Nenhum assunto especificado."
 
-#: send.c:1215
-msgid "Message edited. Really send?"
-msgstr "Mensagem editada. Realmente enviar?"
-
-#: send.c:1221
+#: send.c:1404
 msgid "Sending message..."
 msgstr "Enviando mensagem..."
 
-#: send.c:1323
+#: send.c:1529
 msgid "Could not send the message."
 msgstr "Não foi possível enviar a mensagem."
 
-#: send.c:1329
+#: send.c:1534
 msgid "Mail sent."
 msgstr "Mensagem enviada."
 
-#: sendlib.c:476
+#: send.c:1534
+msgid "Sending in background."
+msgstr "Enviando em segundo plano."
+
+#: sendlib.c:455
+#, fuzzy
 msgid "No boundary parameter found! [report this error]"
-msgstr "Nenhum parâmetro de fronteira encontrado! [relate este erro]"
+msgstr "Nenhum parâmetro limitando encontrado! [relate este erro]"
 
-#: sendlib.c:510
+#: sendlib.c:489
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s não mais existe!"
 
-#: sendlib.c:778
+#: sendlib.c:729
 #, c-format
 msgid "Could not open %s"
 msgstr "Não foi possível abrir %s"
 
-#: sendlib.c:1686
+#: sendlib.c:1709
 #, c-format
-msgid "Error sending message, child exited %d (%s).\n"
-msgstr "Erro ao enviar mensagem, processo filho terminou com %s (%s).\n"
+msgid "Error sending message, child exited %d (%s)."
+msgstr "Erro ao enviar a mensagem, processo filho saiu com %d (%s)."
 
-#: sendlib.c:1688
-#, c-format
-msgid "Saved output of child process to %s.\n"
-msgstr "Saída do processo filho salva em %s.\n"
+#: sendlib.c:1715
+msgid "Output of the delivery process"
+msgstr "Saída do processo de entrega"
 
-#: sendlib.c:1692
-msgid "Error sending message."
-msgstr "Erro ao enviar mensagem."
+#: signal.c:39
+#, c-format
+msgid "%s...  Exiting.\n"
+msgstr "%s... Saindo.\n"
 
-#: signal.c:38 signal.c:41
+#: signal.c:42
 #, c-format
 msgid "Caught %s...  Exiting.\n"
 msgstr "%s recebido... Saindo.\n"
 
-#: signal.c:43
-#, c-format
+#: signal.c:44
+#, fuzzy, c-format
 msgid "Caught signal %d...  Exiting.\n"
-msgstr "Sinal %s recebido... Saindo.\n"
-
-#: socket.c:130
-#, c-format
-msgid "Connecting to %s..."
-msgstr "Conectando a %s..."
+msgstr "Sinal %d recebido... Saindo.\n"
 
-#: sort.c:198
+#: sort.c:200
 msgid "Sorting mailbox..."
 msgstr "Ordenando caixa..."
 
-#: sort.c:226
+#: sort.c:229
 msgid "Could not find sorting function! [report this bug]"
-msgstr "Não foi possível encontrar a função de ordenação! [relate este problema]"
+msgstr ""
+"Não foi possível encontrar a função de ordenação! [relate este problema]"
 
-#: status.c:101
+#: status.c:102
 msgid "(no mailbox)"
 msgstr "(nenhuma caixa de mensagens)"
+
+#: thread.c:722
+#, fuzzy
+msgid "Parent message is not visible in limited view"
+msgstr "Aquela mensagem não está visível."
+
+#: thread.c:727
+#, fuzzy
+msgid "Parent message is not available."
+msgstr "Aquela mensagem não está visível."
+
+#~ msgid "Sending CREATE command ..."
+#~ msgstr "Enviando o comando CREATE..."
+
+#~ msgid "Can't open your secret key ring!"
+#~ msgstr "Não foi possível abrir seu chaveiro secreto!"
+
+#~ msgid "An unkown PGP version was defined for signing."
+#~ msgstr "Uma versão desconhecida do PGP foi definida para assinatura."
+
+#~ msgid "===== Attachments ====="
+#~ msgstr "===== Anexos ====="
+
+#~ msgid "imap_error(): unexpected response in %s: %s\n"
+#~ msgstr "imap_error(): resposta inesperada em %s: %s\n"
+
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "ignorando campo de cabeçalho vazio: %s"
+
+#~ msgid "Unknown PGP version \"%s\"."
+#~ msgstr "Versão \"%s\" do PGP desconhecida."
+
+#~ msgid ""
+#~ "[-- Error: this message does not comply with the PGP/MIME specification! "
+#~ "--]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "[-- Erro: esta mensagem não está de acordo com a especificação PGP/MIME! "
+#~ "--]\n"
+#~ "\n"
+
+#~ msgid "reserved"
+#~ msgstr "reservado"
+
+#~ msgid "Encrypted Session Key"
+#~ msgstr "Chave de Sessão Encriptada"
+
+#~ msgid "Signature Packet"
+#~ msgstr "Pacote de Assinatura"
+
+#~ msgid "Conventionally Encrypted Session Key Packet"
+#~ msgstr "Pacote de Chaves de Sessão Convencionalmente Ecriptado"
+
+#~ msgid "One-Pass Signature Packet"
+#~ msgstr "Pacote de Assinatura de Um Passo"
+
+#~ msgid "Secret Key Packet"
+#~ msgstr "Pacote de Chave Secreta"
+
+#~ msgid "Public Key Packet"
+#~ msgstr "Pacote de Chave Pública"
+
+#~ msgid "Secret Subkey Packet"
+#~ msgstr "Pacote de Subchave Secreta"
+
+#~ msgid "Compressed Data Packet"
+#~ msgstr "Pacotes de Dados Compactado"
+
+#~ msgid "Symmetrically Encrypted Data Packet"
+#~ msgstr "Pacote de Dados Simetricamente Encriptado"
+
+#~ msgid "Marker Packet"
+#~ msgstr "Pacote de Marcação"
+
+#~ msgid "Literal Data Packet"
+#~ msgstr "Pacotes de Dados Literais"
+
+#~ msgid "Trust Packet"
+#~ msgstr "Pacote de Confiança"
+
+#~ msgid "Name Packet"
+#~ msgstr "Pacote de Nome"
+
+#~ msgid "Subkey Packet"
+#~ msgstr "Pacote de Subchave"
+
+#~ msgid "Reserved"
+#~ msgstr "Reservado"
+
+#~ msgid "Comment Packet"
+#~ msgstr "Pacote de Comentário"
+
+#~ msgid "Message edited. Really send?"
+#~ msgstr "Mensagem editada. Realmente enviar?"
+
+#~ msgid "Saved output of child process to %s.\n"
+#~ msgstr "Saída do processo filho salva em %s.\n"
diff --git a/po/ru.po b/po/ru.po
index 53909b75..cf27bf2f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.1.2i\n"
-"POT-Creation-Date: 2000-02-15 09:44+0100\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: 2000-01-14 21:11 +0200\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
@@ -66,7 +66,7 @@ msgstr "
 msgid "Alias added."
 msgstr "ðÓÅ×ÄÏÎÉÍ ÓÏÚÄÁÎ."
 
-#: attach.c:111 attach.c:238 attach.c:431 attach.c:887
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "îÅ ÕÄÁÌÏÓØ ÒÁÚÏÂÒÁÔØ ÉÍÑ. ðÒÏÄÏÌÖÉÔØ?"
 
@@ -116,15 +116,15 @@ msgstr "MIME-
 msgid "Cannot create filter"
 msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÆÉÌØÔÒ"
 
-#: attach.c:706 recvattach.c:427
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "÷ÌÏÖÅÎÉÅ ÓÏÈÒÁÎÅÎÏ."
 
-#: attach.c:762
+#: attach.c:764
 msgid "Write fault!"
 msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ!"
 
-#: attach.c:971
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "îÅÉÚ×ÅÓÔÎÏ, ËÁË ÜÔÏ ÐÅÞÁÔÁÔØ!"
 
@@ -136,7 +136,7 @@ msgstr "
 msgid "Mask"
 msgstr "íÁÓËÁ"
 
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ."
@@ -160,68 +160,68 @@ msgstr "
 msgid "Can't attach a directory!"
 msgstr "ëÁÔÁÌÏÇ ÐÒÉÓÏÅÄÉÎÉÔØ ÎÅ×ÏÚÍÏÖÎÏ!"
 
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "îÅÔ ÆÁÊÌÏ×, ÕÄÏ×ÌÅÔ×ÏÒÑÀÝÉÈ ÄÁÎÎÏÊ ÍÁÓËÅ"
 
-#: browser.c:816
+#: browser.c:820
 msgid "Creating mailboxes is not yet supported."
 msgstr "óÏÚÄÁÎÉÅ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× ÅÝÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ."
 
-#: browser.c:821
+#: browser.c:825
 #, fuzzy
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "õÄÁÌÅÎÉÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ ÄÌÑ IMAP-ÑÝÉËÏ×"
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "÷Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË \"%s\"?"
 
-#: browser.c:843
+#: browser.c:847
 msgid "Mailbox deleted."
 msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÕÄÁÌÅÎ."
 
-#: browser.c:849
+#: browser.c:853
 msgid "Mailbox not deleted."
 msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÎÅ ÕÄÁÌÅÎ."
 
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "ðÅÒÅÊÔÉ ×: "
 
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "ïÛÉÂËÁ ÐÒÏÓÍÏÔÒÁ ËÁÔÁÌÏÇÁ."
 
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "íÁÓËÁ ÆÁÊÌÁ: "
 
 # original translate: msgstr "ïÂÒÁÔÎÙÊ ÐÏÒÑÄÏË ÐÏ (Ä)ÁÔÅ, (É)ÍÅÎÉ, (Ò)ÁÚÍÅÒÕ ÉÌÉ (Î)Å cÏÒÔÉÒÏ×ÁÔØ?"
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 
 # original translate: msgstr "õÐÏÒÑÄÏÞÉÔØ ÐÏ (Ä)ÁÔÅ, (É)ÍÅÎÉ, (Ò)ÁÚÍÅÒÕ ÉÌÉ (Î)Å ÓÏÒÔÉÒÏ×ÁÔØ?"
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 
 # original translate: msgstr "ÄÉÒÎ"
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr ""
 
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "îÏ×ÏÅ ÉÍÑ ÆÁÊÌÁ: "
 
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "îÅ ÕÄÁÌÏÓØ ÐÒÏÓÍÏÔÒÅÔØ ËÁÔÁÌÏÇ"
 
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "ïÛÉÂËÁ ÐÒÉ ÐÏÐÙÔËÅ ÐÒÏÓÍÏÔÒÁ ÆÁÊÌÁ"
 
@@ -817,11 +817,11 @@ msgstr "
 msgid "You are on the first message."
 msgstr "üÔÏ ÐÅÒ×ÏÅ ÓÏÏÂÝÅÎÉÅ."
 
-#: curs_main.c:1166 pattern.c:1112
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "äÏÓÔÉÇÎÕÔ ËÏÎÅÃ; ÐÒÏÄÏÌÖÁÅÍ ÐÏÉÓË Ó ÎÁÞÁÌÁ."
 
-#: curs_main.c:1175 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "äÏÓÔÉÇÎÕÔÏ ÎÁÞÁÌÏ; ÐÒÏÄÏÌÖÁÅÍ ÐÏÉÓË Ó ËÏÎÃÁ."
 
@@ -1170,8 +1170,14 @@ msgstr "
 msgid "Login failed."
 msgstr "òÅÇÉÓÔÒÁÃÉÑ ÎÅ ÕÄÁÌÁÓØ."
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "óÏÏÂÝÅÎÉÅ ÐÏÓÙÌÁÅÔÓÑ..."
+
+#: imap/browse.c:120
+#, fuzzy
+msgid "Getting folder list..."
 msgstr ""
 "óÏÅÄÉÎÅÎÉÅ Ó ÓÅÒ×ÅÒÏÍ ÕÓÔÁÎÏ×ÌÅÎÏ, ÉÚ×ÌÅËÁÅÔÓÑ ÓÐÉÓÏË ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ×..."
 
@@ -1205,7 +1211,7 @@ msgid "Unable to append to IMAP mailboxes at this server"
 msgstr ""
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "óÏÚÄÁÔØ %s?"
@@ -1368,94 +1374,89 @@ msgstr "
 msgid "invalid header field"
 msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÐÏÌÅ × ÚÁÇÏÌÏ×ËÅ"
 
-#: init.c:589
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "ÐÕÓÔÏÅ ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ (%s) ÐÒÏÐÕÝÅÎÏ"
-
-#: init.c:641
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ÍÅÔÏÄ ÓÏÒÔÉÒÏ×ËÉ"
 
-#: init.c:717
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr "mutt_restore_default: ÏÛÉÂËÁ × ÒÅÇÕÌÑÒÎÏÍ ×ÙÒÁÖÅÎÉÉ: %s\n"
 
-#: init.c:777
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÁÑ ÐÅÒÅÍÅÎÎÁÑ"
 
-#: init.c:786
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "ÐÒÅÆÉËÓ ÎÅÄÏÐÕÓÔÉÍ ÐÒÉ ÓÂÒÏÓÅ ÚÎÁÞÅÎÉÊ"
 
-#: init.c:792
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "ÚÎÁÞÅÎÉÅ ÎÅÄÏÐÕÓÔÉÍÏ ÐÒÉ ÓÂÒÏÓÅ ÚÎÁÞÅÎÉÊ"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "%s: ÚÎÁÞÅÎÉÅ ÕÓÔÁÎÏ×ÌÅÎÏ"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "%s: ÚÎÁÞÅÎÉÅ ÎÅ ÏÐÒÅÄÅÌÅÎÏ"
 
-#: init.c:1035
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ÔÉÐ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ"
 
-#: init.c:1060 init.c:1105
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ"
 
-#: init.c:1160
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ"
 
-#: init.c:1199
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "ïÛÉÂËÁ × %s: ÓÔÒÏËÁ %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1210
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: ÏÛÉÂËÉ × %s"
 
-#: init.c:1220
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "source: ÏÛÉÂËÁ × %s"
 
-#: init.c:1225
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "source: ÓÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×"
 
-#: init.c:1276
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ"
 
-#: init.c:1633
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "ïÛÉÂËÁ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ: %s\n"
 
-#: init.c:1676
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "ÎÅ ÕÄÁÌÏÓØ ÏÐÒÅÄÅÌÉÔØ ÄÏÍÁÛÎÉÊ ËÁÔÁÌÏÇ"
 
-#: init.c:1684
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "ÎÅ ÕÄÁÌÏÓØ ÏÐÒÅÄÅÌÉÔØ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
@@ -2419,43 +2420,43 @@ msgstr ""
 "\n"
 "ðÁÒÁÍÅÔÒÙ ËÏÍÐÉÌÑÃÉÉ:"
 
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÔÅÒÍÉÎÁÌÁ."
 
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "ïÔÌÁÄËÁ ÎÁ ÕÒÏ×ÎÅ %d.\n"
 
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "óÉÍ×ÏÌ DEBUG ÎÅ ÂÙÌ ÏÐÒÅÄÅÌÅÎ ÐÒÉ ËÏÍÐÉÌÑÃÉÉ.  éÇÎÏÒÕÅÔÓÑ.\n"
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ. óÏÚÄÁÔØ ÅÇÏ?"
 
-#: main.c:521
+#: main.c:519
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ %s: %s"
 
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "áÄÒÅÓÁÔÙ ÎÅ ÕËÁÚÁÎÙ.\n"
 
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: ÎÅ ÕÄÁÌÏÓØ ×ÌÏÖÉÔØ ÆÁÊÌ.\n"
 
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "îÅÔ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× Ó ÎÏ×ÏÊ ÐÏÞÔÏÊ."
 
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÐÕÓÔ."
 
@@ -2551,7 +2552,7 @@ msgstr "
 msgid "You are on the first entry."
 msgstr "÷Ù ÕÖÅ ÎÁ ÐÅÒ×ÏÊ ÚÁÐÉÓÉ."
 
-#: menu.c:657 pattern.c:1058
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "ðÏÉÓË: "
 
@@ -2559,11 +2560,11 @@ msgstr "
 msgid "Reverse search for: "
 msgstr "ïÂÒÁÔÎÙÊ ÐÏÉÓË: "
 
-#: menu.c:668 pattern.c:1091
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "îÅÔ ÏÂÒÁÚÃÁ ÐÏÉÓËÁ."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1156
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "îÅ ÎÁÊÄÅÎÏ."
 
@@ -2588,28 +2589,28 @@ msgstr "
 msgid "Reading %s... %d"
 msgstr "þÉÔÁÅÔÓÑ %s... %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr ""
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr ""
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr ""
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr ""
 
-#: muttlib.c:961
+#: muttlib.c:956
 #, fuzzy, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÞÔÏ×ÙÍ ÑÝÉËÏÍ."
 
-#: muttlib.c:967
+#: muttlib.c:962
 #, fuzzy, c-format
 msgid "Append messages to %s?"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ ÐÒÏÞÉÔÁÎÎÙÅ ÓÏÏÂÝÅÎÉÑ × %s?"
@@ -2717,6 +2718,11 @@ msgstr "
 msgid "%d kept."
 msgstr "%d ÏÓÔÁ×ÌÅÎÏ."
 
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "ÒÅÄÁËÔÉÒÏ×ÁÔØ ÓÏÏÂÝÅÎÉÅ"
+
 #: pager.c:57
 msgid "Not available in this menu."
 msgstr "îÅ ÄÏÓÔÕÐÎÏ × ÜÔÏÍ ÍÅÎÀ."
@@ -2817,32 +2823,32 @@ msgstr "
 msgid "empty pattern"
 msgstr "ÐÕÓÔÏÊ ÏÂÒÁÚÅÃ"
 
-#: pattern.c:883
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "ÏÛÉÂËÁ: ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÅÒÁÃÉÑ %d (ÓÏÏÂÝÉÔÅ Ï ÜÔÏÊ ÏÛÉÂËÅ)."
 
-#: pattern.c:948 pattern.c:1077
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "ïÂÒÁÚÅà ÐÏÉÓËÁ ËÏÍÐÉÌÉÒÕÅÔÓÑ..."
 
-#: pattern.c:962
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "éÓÐÏÌÎÑÅÔÓÑ ËÏÍÁÎÄÁ ÄÌÑ ÐÏÄÈÏÄÑÝÉÈ ÓÏÏÂÝÅÎÉÊ..."
 
-#: pattern.c:1025
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "îÉ ÏÄÎÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÐÏÄÈÏÄÉÔ ÐÏÄ ËÒÉÔÅÒÉÊ."
 
-#: pattern.c:1115
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "ðÏÉÓË ÄÏÛÅÌ ÄÏ ËÏÎÃÁ, ÎÅ ÎÁÊÄÑ ÎÉÞÅÇÏ ÐÏÄÈÏÄÑÝÅÇÏ"
 
-#: pattern.c:1126
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "ðÏÉÓË ÄÏÛÅÌ ÄÏ ÎÁÞÁÌÁ, ÎÅ ÎÁÊÄÑ ÎÉÞÅÇÏ ÐÏÄÈÏÄÑÝÅÇÏ"
 
-#: pattern.c:1148
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "ðÏÉÓË ÐÒÅÒ×ÁÎ."
 
@@ -3142,7 +3148,7 @@ msgstr "
 msgid "Connecting to %s"
 msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÓÏÅÄÉÎÅÎÉÅ Ó %s"
 
-#: pop.c:166 pop.c:340
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "óÅÒ×ÅÒ ÚÁËÒÙÌ ÓÏÅÄÉÎÅÎÉÅ!"
 
@@ -3467,56 +3473,56 @@ msgstr "
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:973
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "ðÒÏÄÏÌÖÉÔØ ÏÔÌÏÖÅÎÎÏÅ ÓÏÏÂÝÅÎÉÅ?"
 
-#: send.c:1217
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "ïÔËÁÚÁÔØÓÑ ÏÔ ÎÅÉÚÍÅÎÅÎÎÏÇÏ ÓÏÏÂÝÅÎÉÑ?"
 
-#: send.c:1219
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "óÏÏÂÝÅÎÉÅ ÎÅ ÉÚÍÅÎÉÌÏÓØ, ÏÔËÁÚ."
 
 #. abort
-#: send.c:1260
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "ðÉÓØÍÏ ÎÅ ÏÔÐÒÁ×ÌÅÎÏ."
 
-#: send.c:1281
+#: send.c:1333
 msgid "Message postponed."
 msgstr "óÏÏÂÝÅÎÉÅ ÏÔÌÏÖÅÎÏ."
 
-#: send.c:1290
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "îÅ ÕËÁÚÁÎÏ ÎÉ ÏÄÎÏÇÏ ÁÄÒÅÓÁÔÁ!"
 
-#: send.c:1295
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "îÅ ÂÙÌÏ ÕËÁÚÁÎÏ ÎÉ ÏÄÎÏÇÏ ÁÄÒÅÓÁÔÁ."
 
-#: send.c:1301
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "îÅÔ ÔÅÍÙ ÓÏÏÂÝÅÎÉÑ, ÐÒÅÒ×ÁÔØ ÐÏÓÙÌËÕ?"
 
-#: send.c:1305
+#: send.c:1357
 msgid "No subject specified."
 msgstr "ôÅÍÁ ÓÏÏÂÝÅÎÉÑ ÎÅ ÕËÁÚÁÎÁ."
 
-#: send.c:1347
+#: send.c:1404
 msgid "Sending message..."
 msgstr "óÏÏÂÝÅÎÉÅ ÐÏÓÙÌÁÅÔÓÑ..."
 
-#: send.c:1473
+#: send.c:1529
 msgid "Could not send the message."
 msgstr "îÅ ÕÄÁÌÏÓØ ÏÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ"
 
-#: send.c:1478
+#: send.c:1534
 msgid "Mail sent."
 msgstr "óÏÏÂÝÅÎÉÅ ÐÏÓÌÁÎÏ."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Sending in background."
 msgstr "óÏÏÂÝÅÎÉÅ ÐÏÓÙÌÁÅÔÓÑ × ÆÏÎÏ×ÏÍ ÒÅÖÉÍÅ."
 
@@ -3534,12 +3540,12 @@ msgstr "%s 
 msgid "Could not open %s"
 msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ %s"
 
-#: sendlib.c:1702
+#: sendlib.c:1709
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÓÌÁÔØ ÓÏÏÂÝÅÎÉÅ, ÐÒÏÃÅÓÓ-ÐÏÔÏÍÏË ×ÅÒÎÕÌ %d (%s)."
 
-#: sendlib.c:1708
+#: sendlib.c:1715
 msgid "Output of the delivery process"
 msgstr ""
 
@@ -3579,6 +3585,9 @@ msgstr ""
 msgid "Parent message is not available."
 msgstr "òÏÄÉÔÅÌØÓËÏÅ ÓÏÏÂÝÅÎÉÅ ÎÅÄÏÓÔÕÐÎÏ."
 
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "ÐÕÓÔÏÅ ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ (%s) ÐÒÏÐÕÝÅÎÏ"
+
 #~ msgid "Recoding only affetcs text attachments."
 #~ msgstr "ðÅÒÅËÏÄÉÒÏ×ËÁ ÉÍÅÅÔ ÓÍÙÓÌ ÔÏÌØËÏ ÄÌÑ ÔÅËÓÔÏ×ÙÈ ×ÌÏÖÅÎÉÊ."
 
diff --git a/po/sk.po b/po/sk.po
index a873a5a9..9ac5b65c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.95.6i\n"
-"POT-Creation-Date: 2000-02-15 09:44+0100\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: 1999-07-29 00:00+0100\n"
 "Last-Translator: Miroslav Vasko <vasko@ies.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -65,7 +65,7 @@ msgstr "Ulo
 msgid "Alias added."
 msgstr "Pridal som zástupcu."
 
-#: attach.c:111 attach.c:238 attach.c:431 attach.c:887
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "Nena¹iel som ¹ablónu názvu, pokraèova»?"
 
@@ -115,15 +115,15 @@ msgstr "MIME typ nie je definovan
 msgid "Cannot create filter"
 msgstr "Nemo¾no vytvori» filter."
 
-#: attach.c:706 recvattach.c:427
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "Pripojené dáta boli ulo¾ené."
 
-#: attach.c:762
+#: attach.c:764
 msgid "Write fault!"
 msgstr "Chyba zápisu!"
 
-#: attach.c:971
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "Neviem, ako vytlaèi» dáta!"
 
@@ -135,7 +135,7 @@ msgstr "Zmena adres
 msgid "Mask"
 msgstr "Maska"
 
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s nie je adresár."
@@ -160,68 +160,68 @@ msgstr "Adres
 msgid "Can't attach a directory!"
 msgstr "Nemo¾no prezera» adresár"
 
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "Maske nevyhovujú ¾iadne súbory"
 
-#: browser.c:816
+#: browser.c:820
 #, fuzzy
 msgid "Creating mailboxes is not yet supported."
 msgstr "Oznaèovanie nie je podporované."
 
-#: browser.c:821
+#: browser.c:825
 #, fuzzy
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Táto operácia nie je podporovaná pre PGP správy."
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr ""
 
-#: browser.c:843
+#: browser.c:847
 #, fuzzy
 msgid "Mailbox deleted."
 msgstr "Bola zistená sluèka v makre."
 
-#: browser.c:849
+#: browser.c:853
 #, fuzzy
 msgid "Mailbox not deleted."
 msgstr "Po¹ta nebola odoslaná."
 
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "Zmeò adresár na: "
 
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "Chyba pri èítaní adresára."
 
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "Maska súborov: "
 
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Spätné triedenie podµa (d)átumu, zn(a)kov, (z)-veµkosti, (n)etriedi»? "
 
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Triedenie podµa (d)átumu, zn(a)kov, (z)-veµkosti, alebo (n)etriedi»? "
 
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr "dazn"
 
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "Nové meno súboru: "
 
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "Nemo¾no prezera» adresár"
 
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "Chyba pri prezeraní súboru"
 
@@ -812,11 +812,11 @@ msgstr "
 msgid "You are on the first message."
 msgstr "Ste na prvej správe."
 
-#: curs_main.c:1166 pattern.c:1112
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "Vyhµadávanie pokraèuje z vrchu."
 
-#: curs_main.c:1175 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "Vyhµadávanie pokraèuje zo spodu."
 
@@ -1163,8 +1163,13 @@ msgstr "Prihlasujem sa..."
 msgid "Login failed."
 msgstr "Prihlasovanie zlyhalo."
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "Vyvolávam správu..."
+
+#: imap/browse.c:120
+msgid "Getting folder list..."
 msgstr ""
 
 #. something is wrong because the server reported fewer messages
@@ -1197,7 +1202,7 @@ msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "Nemo¾no pridáva» k IMAP schránkam na tomto serveri"
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "Vytvori» %s?"
@@ -1359,94 +1364,89 @@ msgstr "z
 msgid "invalid header field"
 msgstr "neplatná polo¾ka hlavièky"
 
-#: init.c:589
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "ignorujem prázdnu polo¾ku hlavièky: %s"
-
-#: init.c:641
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: neznáma metóda triedenia"
 
-#: init.c:717
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr "mutt_restore_default: chyba v regvýr: %s\n"
 
-#: init.c:777
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: neznáma premenná"
 
-#: init.c:786
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "prefix je neplatný s vynulovaním"
 
-#: init.c:792
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "hodnota je neplatná s vynulovaním"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "%s je nastavené"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "%s je nenastavené"
 
-#: init.c:1035
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: neplatný typ schránky"
 
-#: init.c:1060 init.c:1105
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: neplatná hodnota"
 
-#: init.c:1160
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: neznáma hodnota"
 
-#: init.c:1199
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Chyba v %s, riadok %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1210
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "zdroj: chyby v %s"
 
-#: init.c:1220
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "zdroj: chyba na %s"
 
-#: init.c:1225
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "zdroj: príli¹ veµa argumentov"
 
-#: init.c:1276
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: neznámy príkaz"
 
-#: init.c:1633
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Chyba v príkazovom riadku: %s\n"
 
-#: init.c:1676
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "nemo¾no urèi» domáci adresár"
 
-#: init.c:1684
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "nemo¾no urèi» meno pou¾ívateµa"
 
@@ -2400,43 +2400,43 @@ msgstr ""
 "\n"
 "Nastavenia kompilácie:"
 
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "Chyba pri inicializácii terminálu."
 
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Ladenie na úrovni %d.\n"
 
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG nebol definovaný pri kompilácii. Ignorované.\n"
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr ""
 
-#: main.c:521
+#: main.c:519
 #, fuzzy, c-format
 msgid "Can't create %s: %s."
 msgstr "Nemo¾no vytvori» súbor %s"
 
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "Neboli uvedení ¾iadni príjemcovia.\n"
 
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: neschopný pripoji» súbor.\n"
 
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "®iadna schránka s novými správami."
 
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "Schránka je prázdna."
 
@@ -2531,7 +2531,7 @@ msgstr "Ste na poslednej polo
 msgid "You are on the first entry."
 msgstr "Ste na prvej polo¾ke."
 
-#: menu.c:657 pattern.c:1058
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "Hµada»: "
 
@@ -2539,11 +2539,11 @@ msgstr "H
 msgid "Reverse search for: "
 msgstr "Hµada» spätne: "
 
-#: menu.c:668 pattern.c:1091
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "®iadny vzor pre hµadanie."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1156
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "Nenájdené."
 
@@ -2569,28 +2569,28 @@ msgstr "Ozna
 msgid "Reading %s... %d"
 msgstr "Èítam %s... %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr "Súbor je adresár, ulo¾i» v òom?"
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr "Súbor v adresári: "
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "Súbor existuje, (o)-prepísa», prid(a)» alebo (c)-zru¹i»?"
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr "oac"
 
-#: muttlib.c:961
+#: muttlib.c:956
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s nie je schránka!"
 
-#: muttlib.c:967
+#: muttlib.c:962
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Prida» správy do %s?"
@@ -2696,6 +2696,11 @@ msgstr "Schr
 msgid "%d kept."
 msgstr ""
 
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "upravi» správu"
+
 #: pager.c:57
 #, fuzzy
 msgid "Not available in this menu."
@@ -2797,32 +2802,32 @@ msgstr "nesp
 msgid "empty pattern"
 msgstr "prázdny vzor"
 
-#: pattern.c:883
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "chyba: neznámy operand %d (oznámte túto chybu)."
 
-#: pattern.c:948 pattern.c:1077
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "Kompilujem vyhµadávací vzor..."
 
-#: pattern.c:962
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "Vykonávam príkaz na nájdených správach..."
 
-#: pattern.c:1025
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "®iadne správy nesplnili kritérium."
 
-#: pattern.c:1115
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "Hµadanie narazilo na spodok bez nájdenia zhody"
 
-#: pattern.c:1126
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "Hµadanie narazilo na vrchol bez nájdenia zhody"
 
-#: pattern.c:1148
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "Hµadanie bolo preru¹ené."
 
@@ -3119,7 +3124,7 @@ msgstr "Nemo
 msgid "Connecting to %s"
 msgstr "Pripájam sa na %s"
 
-#: pop.c:166 pop.c:340
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "Server uzavrel spojenie!"
 
@@ -3445,56 +3450,56 @@ msgstr "Ods
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:973
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "Vyvola» odlo¾enú správu?"
 
-#: send.c:1217
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "Zru¹i» nezmenenú správu?"
 
-#: send.c:1219
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "Nezmenená správa bola zru¹ená."
 
 #. abort
-#: send.c:1260
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "Po¹ta nebola odoslaná."
 
-#: send.c:1281
+#: send.c:1333
 msgid "Message postponed."
 msgstr "Správa bola odlo¾ená."
 
-#: send.c:1290
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "Nie sú uvedení ¾iadni príjemcovia!"
 
-#: send.c:1295
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "Neboli uvedení ¾iadni príjemcovia!"
 
-#: send.c:1301
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "®iadny predmet, zru¹i» posielanie?"
 
-#: send.c:1305
+#: send.c:1357
 msgid "No subject specified."
 msgstr "Nebol uvedený predmet."
 
-#: send.c:1347
+#: send.c:1404
 msgid "Sending message..."
 msgstr "Posielam správu..."
 
-#: send.c:1473
+#: send.c:1529
 msgid "Could not send the message."
 msgstr "Nemo¾no posla» správu."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Mail sent."
 msgstr "Správa bola odoslaná."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Sending in background."
 msgstr ""
 
@@ -3512,12 +3517,12 @@ msgstr "%s u
 msgid "Could not open %s"
 msgstr "Nemo¾no otvori» %s"
 
-#: sendlib.c:1702
+#: sendlib.c:1709
 #, fuzzy, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Chyba pri posielaní správy, dcérsky proces vrátil %d (%s).\n"
 
-#: sendlib.c:1708
+#: sendlib.c:1715
 msgid "Output of the delivery process"
 msgstr ""
 
@@ -3558,6 +3563,9 @@ msgstr "T
 msgid "Parent message is not available."
 msgstr "Táto správa nie je viditeµná."
 
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "ignorujem prázdnu polo¾ku hlavièky: %s"
+
 #~ msgid "imap_error(): unexpected response in %s: %s\n"
 #~ msgstr "Imap_error(): neoèakávaná odpoveï v %s: %s\n"
 
diff --git a/po/sv.po b/po/sv.po
index 3af35a19..3200dbcf 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.1.2\n"
-"POT-Creation-Date: 2000-02-15 09:44+0100\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: 2000-01-30 14:47+0100\n"
 "Last-Translator: Jörgen Tegnér <teg@post.netlink.se>\n"
 "Language-Team: \n"
@@ -62,7 +62,7 @@ msgstr "Spar i fil: "
 msgid "Alias added."
 msgstr "Lade till alias."
 
-#: attach.c:111 attach.c:238 attach.c:431 attach.c:887
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "Kan inte para ihop namnmall, fortsätt?"
 
@@ -112,15 +112,15 @@ msgstr "MIME-typ 
 msgid "Cannot create filter"
 msgstr "Kan inte skapa filter."
 
-#: attach.c:706 recvattach.c:427
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "Bifogad fil sparad."
 
-#: attach.c:762
+#: attach.c:764
 msgid "Write fault!"
 msgstr "Ett fel uppstod vid skrivning!"
 
-#: attach.c:971
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "Jag vet inte hur det här ska skrivas ut!"
 
@@ -132,7 +132,7 @@ msgstr "
 msgid "Mask"
 msgstr "Mask"
 
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s är inte ett bibiliotek."
@@ -156,65 +156,65 @@ msgstr "Bibliotek [%s], filmask: %s"
 msgid "Can't attach a directory!"
 msgstr "Kan inte bifoga ett bibliotek!"
 
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "Ingen fil passar med filmasken."
 
-#: browser.c:816
+#: browser.c:820
 msgid "Creating mailboxes is not yet supported."
 msgstr "Skapande av brevlådor stöds inte än."
 
-#: browser.c:821
+#: browser.c:825
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Endast brevlådor av IMAP-typ kan tas bort."
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Ta bort brevlådan '%s'?"
 
-#: browser.c:843
+#: browser.c:847
 msgid "Mailbox deleted."
 msgstr "Brevlådan har tagits bort."
 
-#: browser.c:849
+#: browser.c:853
 msgid "Mailbox not deleted."
 msgstr "Brevlådan togs inte bort."
 
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "Ändra bibliotek till: "
 
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "Ett fel uppstod när biblioteket skulle läsas."
 
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "Filmask: "
 
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Omvänd sortering efter (d)atum, (a)lpha), (s)torlek eller i(n)te alls? "
 
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Sortering efter (d)atum, (a)lpha), (s)torlek eller i(n)te alls? "
 
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr "dasn"
 
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "Nytt filnamn: "
 
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "Kan inte läsa bibliotek"
 
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "Ett fel uppstod när filen skulle visas"
 
@@ -804,11 +804,11 @@ msgstr "Inga 
 msgid "You are on the first message."
 msgstr "Det här är första brevet i listan."
 
-#: curs_main.c:1166 pattern.c:1112
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "Sökning fortsatte i början."
 
-#: curs_main.c:1175 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "Sökning fortsatte i slutet."
 
@@ -1154,8 +1154,14 @@ msgstr "Ansluter..."
 msgid "Login failed."
 msgstr "Anslutning misslyckades..."
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "Skickar brevet..."
+
+#: imap/browse.c:120
+#, fuzzy
+msgid "Getting folder list..."
 msgstr "Kontaktar server, läser lista med brevlådor..."
 
 #. something is wrong because the server reported fewer messages
@@ -1190,7 +1196,7 @@ msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "Kunde inte skriva till brevlådor i den här IMAP-servern"
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "Skapa %s?"
@@ -1353,94 +1359,89 @@ msgstr "alias: ingen adress"
 msgid "invalid header field"
 msgstr "ogiltigt rubrik för variabel"
 
-#: init.c:589
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "ignorerar tomt rubrikfält: %s."
-
-#: init.c:641
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: okänd metod för sortering"
 
-#: init.c:717
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr "mutt_restore_default: fel i mönster: %s\n"
 
-#: init.c:777
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: okänd variabel"
 
-#: init.c:786
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "prefix är inte tillåten med 'reset'"
 
-#: init.c:792
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "värde är inte tillåten med 'reset'"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "%s är satt"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "%s är inte satt"
 
-#: init.c:1035
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: ogiltig typ av brevlåda"
 
-#: init.c:1060 init.c:1105
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: ogiltigt värde"
 
-#: init.c:1160
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: okänd typ"
 
-#: init.c:1199
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Fel i %s, rad %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1210
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: fel i %s"
 
-#: init.c:1220
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "source: fel vid %s"
 
-#: init.c:1225
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "source: för många parametrar"
 
-#: init.c:1276
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: okänt kommando"
 
-#: init.c:1633
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Fel i kommandorad: %s\n"
 
-#: init.c:1676
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "kan inte avgöra var hembibilioteket är"
 
-#: init.c:1684
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "kan inte avgöra användarnamn"
 
@@ -2321,43 +2322,43 @@ msgstr ""
 "\n"
 "Inkompilerade val:"
 
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "Fel vid initiering av terminalen."
 
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Avlusningsnivån är %d.\n"
 
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG var inte valt vid kompilering.  Ignoreras.\n"
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s finns inte. Vill du skapa den?"
 
-#: main.c:521
+#: main.c:519
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Kan inte skapa %s: %s."
 
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "Inga mottagare angivna.\n"
 
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: kan inte bifoga fil.\n"
 
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "Ingen brevlåda har nya brev."
 
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "Brevlådan är tom."
 
@@ -2453,7 +2454,7 @@ msgstr "Du 
 msgid "You are on the first entry."
 msgstr "Du är på första elementet."
 
-#: menu.c:657 pattern.c:1058
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "Leta efter: "
 
@@ -2461,11 +2462,11 @@ msgstr "Leta efter: "
 msgid "Reverse search for: "
 msgstr "Leta efter i omvänd ordning: "
 
-#: menu.c:668 pattern.c:1091
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "Inget mönster för sökning."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1156
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "Hittades inte."
 
@@ -2490,28 +2491,28 @@ msgstr "Markering st
 msgid "Reading %s... %d"
 msgstr "Läser %s... %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr ""
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr ""
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr ""
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr ""
 
-#: muttlib.c:961
+#: muttlib.c:956
 #, fuzzy, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s är inte en brevlåda."
 
-#: muttlib.c:967
+#: muttlib.c:962
 #, fuzzy, c-format
 msgid "Append messages to %s?"
 msgstr "Flytta lästa brev till %s?"
@@ -2617,6 +2618,11 @@ msgstr "Brevl
 msgid "%d kept."
 msgstr "%d sparade"
 
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "ändra brevet"
+
 #: pager.c:57
 msgid "Not available in this menu."
 msgstr "Finns inte i den här menyn."
@@ -2717,32 +2723,32 @@ msgstr "parentes kan inte paras ihop: %s"
 msgid "empty pattern"
 msgstr "tomt mönster"
 
-#: pattern.c:883
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "fel: okänd operation %d (var vänlig rappportera felet)"
 
-#: pattern.c:948 pattern.c:1077
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "Kompilerar sökmönster..."
 
-#: pattern.c:962
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "Kör kommando på passande brev..."
 
-#: pattern.c:1025
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "Inga brev passade kriteriet."
 
-#: pattern.c:1115
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "Sökningen nådded slutet utan att hitta något"
 
-#: pattern.c:1126
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "Sökningen nådded början utan att hitta något"
 
-#: pattern.c:1148
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "Sökningen avbröts."
 
@@ -3042,7 +3048,7 @@ msgstr "Kunde inte hitta adress till servern %s."
 msgid "Connecting to %s"
 msgstr "Ansluter till %s."
 
-#: pop.c:166 pop.c:340
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "Servern stängde förbindelsen!"
 
@@ -3366,56 +3372,56 @@ msgstr "F
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:973
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "Återkalla uppskjutet brev?"
 
-#: send.c:1217
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "Brevet har inte ändrats. Avbryt?"
 
-#: send.c:1219
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "Brevet har inte ändrats. Avbröt"
 
 #. abort
-#: send.c:1260
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "Brevet skickades inte."
 
-#: send.c:1281
+#: send.c:1333
 msgid "Message postponed."
 msgstr "Brev uppskjutet."
 
-#: send.c:1290
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "Inga mottagare angivna!"
 
-#: send.c:1295
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "Inga mottagare angavs."
 
-#: send.c:1301
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "Ärende saknas, avbryt sändning?"
 
-#: send.c:1305
+#: send.c:1357
 msgid "No subject specified."
 msgstr "Ärende saknas."
 
-#: send.c:1347
+#: send.c:1404
 msgid "Sending message..."
 msgstr "Skickar brevet..."
 
-#: send.c:1473
+#: send.c:1529
 msgid "Could not send the message."
 msgstr "Kunde inte skicka brevet."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Mail sent."
 msgstr "Brevet har skickats."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Sending in background."
 msgstr "Skickar i bakgrunden."
 
@@ -3433,12 +3439,12 @@ msgstr "%s finns inte l
 msgid "Could not open %s"
 msgstr "Kunde inte öppna %s"
 
-#: sendlib.c:1702
+#: sendlib.c:1709
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Fel vid sändning av brev, delprocess returnerade : %d (%s)."
 
-#: sendlib.c:1708
+#: sendlib.c:1715
 msgid "Output of the delivery process"
 msgstr "Utdata från sändprogrammet"
 
@@ -3477,3 +3483,6 @@ msgstr "F
 #: thread.c:727
 msgid "Parent message is not available."
 msgstr "Första brevet är inte tillgängligt."
+
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "ignorerar tomt rubrikfält: %s."
diff --git a/po/uk.po b/po/uk.po
index fadc22ef..6700c7e4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2000-02-15 09:44+0100\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: 1998-10-25 15:44+0200\n"
 "Last-Translator: Andrej N. Gritsenko <andrej@lucky.net>\n"
 "Language-Team: Ukrainian <uk@ua.net>\n"
@@ -66,7 +66,7 @@ msgstr "
 msgid "Alias added."
 msgstr "á̦ÁÓ ÄÏÄÁÎÏ."
 
-#: attach.c:111 attach.c:238 attach.c:431 attach.c:887
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "îÅÍÁ¤ צÄÐÏצÄÎÏÇÏ ¦Í'Ñ, ÄÁ̦?"
 
@@ -116,15 +116,15 @@ msgstr "
 msgid "Cannot create filter"
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Æ¦ÌØÔÒ"
 
-#: attach.c:706 recvattach.c:427
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "äÏÄÁÔÏË ÚÁÐÉÓÁÎÏ."
 
-#: attach.c:762
+#: attach.c:764
 msgid "Write fault!"
 msgstr "úÂ¦Ê ÚÁÐÉÓÕ!"
 
-#: attach.c:971
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "îÅ ÚÎÁÀ, ÑË ÃÅ ÄÒÕËÕ×ÁÔÉ!"
 
@@ -136,7 +136,7 @@ msgstr "
 msgid "Mask"
 msgstr "íÁÓËÁ"
 
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ÎÅ ¤ ËÁÔÁÌÏÇÏÍ."
@@ -161,68 +161,68 @@ msgstr "
 msgid "Can't attach a directory!"
 msgstr "îÅÍÏÖÌÉ×Ï ÐÏÂÁÞÉÔÉ ËÁÔÁÌÏÇ"
 
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "îÅÍÁ¤ צÄÐÏצÄÎÉÈ ÄÏ ÍÁÓËÉ ÆÁÊ̦×"
 
-#: browser.c:816
+#: browser.c:820
 #, fuzzy
 msgid "Creating mailboxes is not yet supported."
 msgstr "÷ÉĦÌÅÎÎÑ ÎŠЦÄÔÒÉÍÕ¤ÔØÓÑ."
 
-#: browser.c:821
+#: browser.c:825
 #, fuzzy
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "ãÑ ÏÐÅÒÁÃ¦Ñ ÎŠЦÄÔÒÉÍÕ¤ÔØÓÑ ÄÌÑ ÌÉÓÔ¦× Ú PGP."
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr ""
 
-#: browser.c:843
+#: browser.c:847
 #, fuzzy
 msgid "Mailbox deleted."
 msgstr "úÎÁÊÄÅÎÏ ÚÁÃÉËÌÅÎÎÑ ÍÁËÒÏÓÕ."
 
-#: browser.c:849
+#: browser.c:853
 #, fuzzy
 msgid "Mailbox not deleted."
 msgstr "ìÉÓÔ ÎŠצÄÐÒÁ×ÌÅÎÏ."
 
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "ðÅÒÅÊÔÉ ÄÏ: "
 
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "ëÁÔÁÌÏÇ ÎÅ ÓËÁÎÕ¤ÔØÓÑ."
 
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "íÁÓËÁ: "
 
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "ú×ÏÒÏÔÎØÏ ÓÏÒÔÕ×ÁÔÉ ÚÁ ÄÁÔÏÀ(d), ̦ÔÅÒÏÀ(a), ÒÏÚͦÒÏÍ(s), ÞÉ Î¦(n)?"
 
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "óÏÒÔÕ×ÁÔÉ ÚÁ ÄÁÔÏÀ(d), ̦ÔÅÒÏÀ(a), ÒÏÚͦÒÏÍ(s), ÞÉ Î¦(n)?"
 
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr ""
 
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "¶Í'Ñ ÎÏ×ÏÇÏ ÆÁÊÌÕ: "
 
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "îÅÍÏÖÌÉ×Ï ÐÏÂÁÞÉÔÉ ËÁÔÁÌÏÇ"
 
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "îÅÍÏÖÌÉ×Ï ÒÏÚÇÌÑÎÕÔÉ ÆÁÊÌ"
 
@@ -810,11 +810,11 @@ msgstr "
 msgid "You are on the first message."
 msgstr "ãÅ ÐÅÒÛÉÊ ÌÉÓÔ."
 
-#: curs_main.c:1166 pattern.c:1112
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "ðÏÛÕË Ú ÐÏÞÁÔËÕ."
 
-#: curs_main.c:1175 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "ðÏÛÕË ×¦Ä Ë¦ÎÃÑ."
 
@@ -1154,8 +1154,13 @@ msgstr "
 msgid "Login failed."
 msgstr "òŤÓÔÒÁæÑ..."
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "ïÔÒÉÍÁÎÎÑ ÌÉÓÔÁ..."
+
+#: imap/browse.c:120
+msgid "Getting folder list..."
 msgstr ""
 
 #. something is wrong because the server reported fewer messages
@@ -1188,7 +1193,7 @@ msgid "Unable to append to IMAP mailboxes at this server"
 msgstr ""
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "óÔ×ÏÒÉÔÉ %s?"
@@ -1349,94 +1354,89 @@ msgstr "alias: 
 msgid "invalid header field"
 msgstr "ÎÅצÒÎÅ ÐÏÌÅ ÚÁÇÏÌÏ×ËÕ"
 
-#: init.c:589
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "ÐÏÒÏÖΤ ÐÏÌÅ ÚÁÇÏÌÏ×ËÕ '%s' ¦ÇÎÏÒÏ×ÁÎÏ"
-
-#: init.c:641
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: ÎÅצÄÏÍÉÊ ÍÅÔÏÄ ÓÏÒÔÕ×ÁÎÎÑ"
 
-#: init.c:717
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr ""
 
-#: init.c:777
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: ÎÅצÄÏÍÁ ÚͦÎÎÁ"
 
-#: init.c:786
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "ÐÒÅƦËÓ ÎÅÐÒÉÐÕÓÔÉÍÉÊ ÄÌÑ ÓËÉÄÁÎÎÑ"
 
-#: init.c:792
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "ÚÎÁÞÅÎÎÑ ÎÅÐÒÉÐÕÓÔÉÍÅ ÄÌÑ ÓËÉÄÁÎÎÑ"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "%s ×ÓÔÁÎÏ×ÌÅÎÏ"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "%s ÎÅ ×ÓÔÁÎÏ×ÌÅÎÏ"
 
-#: init.c:1035
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: ÎÅצÒÎÉÊ ÔÉÐ ÓËÒÉÎØËÉ"
 
-#: init.c:1060 init.c:1105
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: ÎÅצÒÎÅ ÚÎÁÞÅÎÎÑ"
 
-#: init.c:1160
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: ÎÅצÄÏÍÉÊ ÔÉÐ"
 
-#: init.c:1199
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "ðÏÍÉÌËÁ × %s, ÒÑÄÏË %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1210
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: ÐÏÍÉÌËÉ × %s"
 
-#: init.c:1220
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "source: ÐÏÍÉÌËÁ × %s"
 
-#: init.c:1225
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "source: ÄÕÖÅ ÂÁÇÁÔÏ ÁÒÇÕÍÅÎÔ¦×"
 
-#: init.c:1276
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: ÎÅצÄÏÍÁ ËÏÍÁÎÄÁ"
 
-#: init.c:1633
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "ðÏÍÉÌËÁ ËÏÍÁÎÄÎÏÇÏ ÒÑÄËÕ: %s\n"
 
-#: init.c:1676
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "ÎÅÍÏÖÌÉ×Ï Ú'ÑÓÕ×ÁÔÉ ÄÏÍÁÛÎ¦Ê ËÁÔÁÌÏÇ"
 
-#: init.c:1684
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "ÎÅÍÏÖÌÉ×Ï Ú'ÑÓÕ×ÁÔÉ ¦Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ"
 
@@ -2347,43 +2347,43 @@ msgid ""
 "Compile options:"
 msgstr ""
 
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "ðÏÍÉÌËÁ ¦Î¦Ã¦Á̦ÚÁç§ ÔÅÒͦÎÁÌÕ."
 
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr ""
 
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG ÎÅ ×ËÁÚÁÎÏ Ð¦Ä ÞÁÓ ËÏÍЦÌÑç§. ¶ÇÎÏÒÕ¤ÔØÓÑ.\n"
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr ""
 
-#: main.c:521
+#: main.c:519
 #, fuzzy, c-format
 msgid "Can't create %s: %s."
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÆÁÊÌ %s"
 
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "ïÔÒÉÍÕ×ÁÞ¦× ÎÅ ×ËÁÚÁÎÏ.\n"
 
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: ÎÅÍÏÖÌÉ×Ï ÐÒɤÄÎÁÔÉ ÆÁÊÌ.\n"
 
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "îÅÍÁ¤ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ Ú ÎÏ×ÏÀ ÐÏÛÔÏÀ."
 
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "ðÏÛÔÏ×Á ÓËÒÉÎØËÁ ÐÏÒÏÖÎÑ."
 
@@ -2477,7 +2477,7 @@ msgstr "
 msgid "You are on the first entry."
 msgstr "ãÅ ÐÅÒÛÁ ÐÏÚÉæÑ."
 
-#: menu.c:657 pattern.c:1058
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "ûÕËÁÔÉ ×ÉÒÁÚ:"
 
@@ -2485,11 +2485,11 @@ msgstr "
 msgid "Reverse search for: "
 msgstr "ú×ÏÒÏÔÎ¦Ê ÐÏÛÕË ×ÉÒÁÚÕ: "
 
-#: menu.c:668 pattern.c:1091
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "îÅÍÁ¤ ×ÉÒÁÚÕ ÐÏÛÕËÕ."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1156
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "îÅ ÚÎÁÊÄÅÎÏ."
 
@@ -2516,29 +2516,29 @@ msgstr "
 msgid "Reading %s... %d"
 msgstr "þÉÔÁÎÎÑ %s... %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr "æÁÊÌ ¤ ËÁÔÁÌÏÇÏÍ, ÚÂÅÒÅÇÔÉ Õ ÎØÏÍÕ?"
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr "æÁÊÌ Õ ËÁÔÁÌÏÚ¦: "
 
-#: muttlib.c:675
+#: muttlib.c:670
 #, fuzzy
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "æÁÊÌ ¦ÓÎÕ¤, ÚÎÉÝÉÔÉ Ê ÚÁÐÉÓÁÔÉ ÃÅÊ?"
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr ""
 
-#: muttlib.c:961
+#: muttlib.c:956
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s ÎÅ ¤ ÐÏÛÔÏ×ÏÀ ÓËÒÉÎØËÏÀ!"
 
-#: muttlib.c:967
+#: muttlib.c:962
 #, c-format
 msgid "Append messages to %s?"
 msgstr "äÏÄÁÔÉ ÌÉÓÔÉ ÄÏ %s?"
@@ -2644,6 +2644,11 @@ msgstr "
 msgid "%d kept."
 msgstr ""
 
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "ÒÅÄÁÇÕ×ÁÔÉ ÌÉÓÔ"
+
 #: pager.c:57
 #, fuzzy
 msgid "Not available in this menu."
@@ -2745,32 +2750,32 @@ msgstr "צ
 msgid "empty pattern"
 msgstr "ÐÏÒÏÖÎ¦Ê ×ÉÒÁÚ"
 
-#: pattern.c:883
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr ""
 
-#: pattern.c:948 pattern.c:1077
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "ëÏÍЦÌÑÃ¦Ñ ×ÉÒÁÚÕ ÐÏÛÕËÕ..."
 
-#: pattern.c:962
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "÷ÉËÏÎÁÎÎÑ ËÏÍÁÎÄÉ ÄÏ ×¦ÄÐÏצÄÎÉÈ ÌÉÓÔ¦×..."
 
-#: pattern.c:1025
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "ìÉÓÔ¦×, ÝÏ ×¦ÄÐÏצÄÁÀÔØ ËÒÉÔÅÒ¦À, ÎÅ ÚÎÁÊÄÅÎÏ."
 
-#: pattern.c:1115
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "ðÏÛÕË Ä¦ÊÛÏ× ÄÏ Ë¦ÎÃÑ, ÁÌÅ ÎÅ ÚÎÁÊÄÅÎÏ Î¦ÞÏÇÏ"
 
-#: pattern.c:1126
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "ðÏÛÕË Ä¦ÊÛÏ× ÄÏ ÐÏÞÁÔËÕ, ÁÌÅ ÎÅ ÚÎÁÊÄÅÎÏ Î¦ÞÏÇÏ"
 
-#: pattern.c:1148
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "ðÏÛÕË ÐÅÒÅÒ×ÁÎÏ."
 
@@ -3067,7 +3072,7 @@ msgstr "
 msgid "Connecting to %s"
 msgstr "ú'¤ÄÎÁÎÎÑ Ú %s"
 
-#: pop.c:166 pop.c:340
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "óÅÒ×ÅÒ ÚÁËÒÉ× Ú'¤ÄÎÁÎÎÑ!"
 
@@ -3393,57 +3398,57 @@ msgstr "
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:973
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "÷ÉËÌÉËÁÔÉ ÚÁÌÉÛÅÎÉÊ ÌÉÓÔ?"
 
-#: send.c:1217
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "÷¦ÄͦÎÉÔÉ ×¦ÄÐÒÁ×ËÕ ÎÅ ÚͦÎÅÎÏÇÏ ÌÉÓÔÁ?"
 
-#: send.c:1219
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "ìÉÓÔ ÎÅ ÚͦÎÅÎÏ, ÔÏÍÕ ×¦ÄÐÒÁ×ËÕ ×¦ÄͦÎÅÎÏ."
 
 #. abort
-#: send.c:1260
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "ìÉÓÔ ÎŠצÄÐÒÁ×ÌÅÎÏ."
 
-#: send.c:1281
+#: send.c:1333
 msgid "Message postponed."
 msgstr "ìÉÓÔ ÚÁÌÉÛÅÎÏ ÄÌÑ ÐÏÄÁÌØÛϧ צÄÐÒÁ×ËÉ.."
 
-#: send.c:1290
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "ïÔÒÉÍÕ×ÁÞ¦× ÎÅ ×ËÁÚÁÎÏ!"
 
-#: send.c:1295
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "ïÔÒÉÍÕ×ÁÞ¦× ÎÅ ÂÕÌÏ ×ËÁÚÁÎÏ."
 
-#: send.c:1301
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "ôÅÍÉ ÎÅÍÁ¤, צÄͦÎÉÔÉ ×¦ÄÐÒÁ×ËÕ?"
 
-#: send.c:1305
+#: send.c:1357
 msgid "No subject specified."
 msgstr "ôÅÍÉ ÎÅ ×ËÁÚÁÎÏ."
 
-#: send.c:1347
+#: send.c:1404
 msgid "Sending message..."
 msgstr "ìÉÓÔ ×¦ÄÐÒÁ×ÌѤÔØÓÑ..."
 
-#: send.c:1473
+#: send.c:1529
 #, fuzzy
 msgid "Could not send the message."
 msgstr "צĦÓÌÁÔÉ ÌÉÓÔ"
 
-#: send.c:1478
+#: send.c:1534
 msgid "Mail sent."
 msgstr "ìÉÓÔ ÐÏÓÌÁÎÏ."
 
-#: send.c:1478
+#: send.c:1534
 msgid "Sending in background."
 msgstr ""
 
@@ -3461,12 +3466,12 @@ msgstr "%s ¦
 msgid "Could not open %s"
 msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ %s"
 
-#: sendlib.c:1702
+#: sendlib.c:1709
 #, fuzzy, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "ðÏÍÉÌËÁ צÄÐÒÁ×ËÉ, ËÏÄ ÐÏ×ÅÒÎÅÎÎÑ %d (%s).\n"
 
-#: sendlib.c:1708
+#: sendlib.c:1715
 msgid "Output of the delivery process"
 msgstr ""
 
@@ -3507,6 +3512,9 @@ msgstr "
 msgid "Parent message is not available."
 msgstr "ãÅÊ ÌÉÓÔ ÎÅ ÍÏÖÎÁ ÐÏÂÁÞÉÔÉ."
 
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "ÐÏÒÏÖΤ ÐÏÌÅ ÚÁÇÏÌÏ×ËÕ '%s' ¦ÇÎÏÒÏ×ÁÎÏ"
+
 #~ msgid "imap_error(): unexpected response in %s: %s\n"
 #~ msgstr "imap_error(): ÎÅÖÄÁÎÁ צÄÐÏצÄØ × %s: %s\n"
 
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index 44b71a9e..2f515a87 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.1.2\n"
-"POT-Creation-Date: 2000-02-15 09:44+0100\n"
+"POT-Creation-Date: 2000-02-22 18:03+0100\n"
 "PO-Revision-Date: 1999-12-20 20:41+0800\n"
 "Last-Translator: Anthony Wong <ypwong@debian.org>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -65,7 +65,7 @@ msgstr "
 msgid "Alias added."
 msgstr "§O¦W¤w¸g¼W¥[¡C"
 
-#: attach.c:111 attach.c:238 attach.c:431 attach.c:887
+#: attach.c:111 attach.c:238 attach.c:431 attach.c:889
 msgid "Can't match nametemplate, continue?"
 msgstr "µLªk°t¦X¤G­Ó¦P¼Ë¦WºÙ¡AÄ~Äò¡H"
 
@@ -115,15 +115,15 @@ msgstr "MIME 
 msgid "Cannot create filter"
 msgstr "µLªk«Ø¥ß¹LÂo¾¹"
 
-#: attach.c:706 recvattach.c:427
+#: attach.c:707 recvattach.c:427
 msgid "Attachment saved."
 msgstr "ªþ¥ó¤w³QÀx¦s¡C"
 
-#: attach.c:762
+#: attach.c:764
 msgid "Write fault!"
 msgstr "¼g¤J¥¢±Ñ¡I"
 
-#: attach.c:971
+#: attach.c:973
 msgid "I don't know how to print that!"
 msgstr "§Ú¤£ª¾¹D­n¦p¦ó¦C¦L¥¦¡I"
 
@@ -135,7 +135,7 @@ msgstr "
 msgid "Mask"
 msgstr "¾B¸n"
 
-#: browser.c:369 browser.c:908
+#: browser.c:369 browser.c:912
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ¤£¬O¤@­Ó¥Ø¿ý"
@@ -159,64 +159,64 @@ msgstr "
 msgid "Can't attach a directory!"
 msgstr "µLªkªþ±a¥Ø¿ý¡I"
 
-#: browser.c:620 browser.c:975 browser.c:1068
+#: browser.c:620 browser.c:979 browser.c:1072
 msgid "No files match the file mask"
 msgstr "¨S¦³ÀÉ®×»PÀÉ®×¾B¸n¬Û²Å"
 
-#: browser.c:816
+#: browser.c:820
 msgid "Creating mailboxes is not yet supported."
 msgstr "¥¼¤ä´©»s³y¶l½c¡C"
 
-#: browser.c:821
+#: browser.c:825
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "¥u¦³ IMAP ¶l½c¤~¤ä´©§R°£"
 
-#: browser.c:829
+#: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "¯uªº­n§R°£ \"%s\" ¶l½c¡H"
 
-#: browser.c:843
+#: browser.c:847
 msgid "Mailbox deleted."
 msgstr "¶l½c¤w§R°£¡C"
 
-#: browser.c:849
+#: browser.c:853
 msgid "Mailbox not deleted."
 msgstr "¶l½c¥¼³Q§R°£¡C"
 
-#: browser.c:867
+#: browser.c:871
 msgid "Chdir to: "
 msgstr "§ïÅܥؿý¨ì¡G"
 
-#: browser.c:901 browser.c:968
+#: browser.c:905 browser.c:972
 msgid "Error scanning directory."
 msgstr "µLªk±½´y¥Ø¿ý¡C"
 
-#: browser.c:919
+#: browser.c:923
 msgid "File Mask: "
 msgstr "ÀÉ®×¾B¸n¡G"
 
-#: browser.c:991
+#: browser.c:995
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "¤Ï¦V±Æ§Ç (d)¤é´Á, (a)¦r¤¸, (z)¤j¤p ©Î (n)¤£±Æ§Ç ? "
 
-#: browser.c:992
+#: browser.c:996
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "¨Ì·Ó (d)¤é´Á (a)¦r¤¸ (z)¤j¤p ¨Ó±Æ§Ç¡A©Î(n)¤£±Æ§Ç ? "
 
-#: browser.c:993
+#: browser.c:997
 msgid "dazn"
 msgstr ""
 
-#: browser.c:1055
+#: browser.c:1059
 msgid "New file name: "
 msgstr "·sÀɦW¡G"
 
-#: browser.c:1086
+#: browser.c:1090
 msgid "Can't view a directory"
 msgstr "µLªkÅã¥Ü¥Ø¿ý"
 
-#: browser.c:1104
+#: browser.c:1108
 msgid "Error trying to view file"
 msgstr "µLªk¸ÕµÛÅã¥ÜÀÉ®×"
 
@@ -806,11 +806,11 @@ msgstr "
 msgid "You are on the first message."
 msgstr "±z¤w¸g¦b²Ä¤@«Ê«H¤F¡C"
 
-#: curs_main.c:1166 pattern.c:1112
+#: curs_main.c:1166 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "·j´M¦Ü¶}ÀY¡C"
 
-#: curs_main.c:1175 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "·j´M¦Üµ²§À¡C"
 
@@ -1156,8 +1156,14 @@ msgstr "
 msgid "Login failed."
 msgstr "µn¤J¥¢±Ñ¡C"
 
-#: imap/browse.c:112
-msgid "Contacted server, getting folder list..."
+#: imap/browse.c:93
+#, fuzzy
+msgid "Getting namespaces..."
+msgstr "±H¥X«H¥ó¤¤¡K"
+
+#: imap/browse.c:120
+#, fuzzy
+msgid "Getting folder list..."
 msgstr "¤w±µÄ²¦øªA¾¹¡A¥¿®³¨ú¥Ø¿ýªí¡K"
 
 #. something is wrong because the server reported fewer messages
@@ -1190,7 +1196,7 @@ msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "µLªkªþ¥[¦b³o­Ó¦øªA¾¹¤Wªº IMAP «H½c"
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:813 imap/message.c:577 muttlib.c:985
+#: imap/imap.c:813 imap/message.c:577 muttlib.c:980
 #, c-format
 msgid "Create %s?"
 msgstr "«Ø¥ß %s¡H"
@@ -1353,94 +1359,89 @@ msgstr "
 msgid "invalid header field"
 msgstr "µL®Äªº¼ÐÀYÄæ¦ì"
 
-#: init.c:589
-#, c-format
-msgid "ignoring empty header field: %s"
-msgstr "¤£²z·|ªÅªº¼ÐÀYÄæ¦ì¡G%s"
-
-#: init.c:641
+#: init.c:634
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s¡G¤£©úªº±Æ§Ç¤è¦¡"
 
-#: init.c:717
+#: init.c:710
 #, c-format
 msgid "mutt_restore_default: error in regexp: %s\n"
 msgstr "mutt_restore_defualt¡G¿ù»~ªº¥¿³Wªí¥Ü¦¡¡G%s\n"
 
-#: init.c:777
+#: init.c:770
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s¡G¤£©úªºÅܼÆ"
 
-#: init.c:786
+#: init.c:779
 msgid "prefix is illegal with reset"
 msgstr "­«·s³]¸m«á¦r­º¤´¤£¦X³W©w"
 
-#: init.c:792
+#: init.c:785
 msgid "value is illegal with reset"
 msgstr "­«·s³]¸m«á­È¤´¤£¦X³W©w"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is set"
 msgstr "%s ¤w³Q³]©w"
 
-#: init.c:831
+#: init.c:824
 #, c-format
 msgid "%s is unset"
 msgstr "%s ¨S¦³³Q³]©w"
 
-#: init.c:1035
+#: init.c:1028
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s¡GµL®Äªº«H½cºØÃþ"
 
-#: init.c:1060 init.c:1105
+#: init.c:1053 init.c:1098
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s¡GµL®Äªº­È"
 
-#: init.c:1160
+#: init.c:1153
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s¡G¤£©úªººØÃþ"
 
-#: init.c:1199
+#: init.c:1192
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "%s µo¥Í¿ù»~¡A¦æ¸¹ %d¡G%s"
 
 #. the muttrc source keyword
-#: init.c:1210
+#: init.c:1203
 #, c-format
 msgid "source: errors in %s"
 msgstr "source¡G¿ù»~µo¥Í¦b %s"
 
-#: init.c:1220
+#: init.c:1213
 #, c-format
 msgid "source: error at %s"
 msgstr "source¡G¿ù»~µo¥Í¦b %s"
 
-#: init.c:1225
+#: init.c:1218
 msgid "source: too many arguments"
 msgstr "source¡G¤Ó¦h¤Þ¼Æ"
 
-#: init.c:1276
+#: init.c:1269
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s¡G¤£©úªº«ü¥O"
 
-#: init.c:1633
+#: init.c:1626
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "«ü¥O¦æ¦³¿ù¡G%s\n"
 
-#: init.c:1676
+#: init.c:1669
 msgid "unable to determine home directory"
 msgstr "µLªk¨M©w home ¥Ø¿ý"
 
-#: init.c:1684
+#: init.c:1677
 msgid "unable to determine username"
 msgstr "µLªk¨M©w¨Ï¥ÎªÌ¦WºÙ"
 
@@ -2385,43 +2386,43 @@ msgstr ""
 "\n"
 "½sĶ¿ï¶µ¡G"
 
-#: main.c:297
+#: main.c:295
 msgid "Error initializing terminal."
 msgstr "µLªkªì©l¤Æ²×ºÝ¾÷¡C"
 
-#: main.c:396
+#: main.c:394
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "°£¿ù¼Ò¦¡¦b²Ä %d ¼h¡C\n"
 
-#: main.c:398
+#: main.c:396
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "¦b½sĶ®É­Ô¨S¦³©w¸q DEBUG¡C©ñ±ó°õ¦æ¡C\n"
 
-#: main.c:517
+#: main.c:515
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s ¤£¦s¦b¡C»s³y¶Ü¡H"
 
-#: main.c:521
+#: main.c:519
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "µLªk«Ø¥ß %s: %s."
 
-#: main.c:560
+#: main.c:558
 msgid "No recipients specified.\n"
 msgstr "¨S¦³«ü©w±µ¨üªÌ¡C\n"
 
-#: main.c:633
+#: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s¡GµLªkªþ±aÀɮסC\n"
 
-#: main.c:653
+#: main.c:651
 msgid "No mailbox with new mail."
 msgstr "¨S¦³«H½c¦³·s«H¥ó¡C"
 
-#: main.c:687
+#: main.c:685
 msgid "Mailbox is empty."
 msgstr "«H½c¤ºªÅµL¤@ª«¡C"
 
@@ -2515,7 +2516,7 @@ msgstr "
 msgid "You are on the first entry."
 msgstr "±z²{¦b¦b²Ä¤@¶µ¡C"
 
-#: menu.c:657 pattern.c:1058
+#: menu.c:657 pattern.c:1069
 msgid "Search for: "
 msgstr "·j´M¡G"
 
@@ -2523,11 +2524,11 @@ msgstr "
 msgid "Reverse search for: "
 msgstr "ªð¦V·j´M¡G"
 
-#: menu.c:668 pattern.c:1091
+#: menu.c:668 pattern.c:1102
 msgid "No search pattern."
 msgstr "¨S¦³·j´M®æ¦¡¡C"
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1156
+#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
 msgid "Not found."
 msgstr "¨S¦³§ä¨ì¡C"
 
@@ -2552,28 +2553,28 @@ msgstr "
 msgid "Reading %s... %d"
 msgstr "Ū¨ú %s¡K %d"
 
-#: muttlib.c:658
+#: muttlib.c:653
 msgid "File is a directory, save under it?"
 msgstr "Àɮ׬O¤@­Ó¥Ø¿ý, Àx¦s¦b¥¦¤U­± ?"
 
-#: muttlib.c:663
+#: muttlib.c:658
 msgid "File under directory: "
 msgstr "¦b¥Ø¿ý©³¤UªºÀɮסG"
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "Àɮפw¸g¦s¦b, (o)Âл\\, (a)ªþ¥[, ©Î¬O (c)¨ú®ø ?"
 
-#: muttlib.c:675
+#: muttlib.c:670
 msgid "oac"
 msgstr ""
 
-#: muttlib.c:961
+#: muttlib.c:956
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s ¤£¬O«H½c¡I"
 
-#: muttlib.c:967
+#: muttlib.c:962
 #, c-format
 msgid "Append messages to %s?"
 msgstr "ªþ¥[«H¥ó¨ì %s ?"
@@ -2679,6 +2680,11 @@ msgstr "
 msgid "%d kept."
 msgstr "%d «O¯d¤F¡C"
 
+#: mx.c:1380
+#, fuzzy
+msgid "Can't write message"
+msgstr "½s¿è«H¥ó¤º®e"
+
 #: pager.c:57
 msgid "Not available in this menu."
 msgstr "¦b³o­Óµæ³æ¤¤¨S¦³³o­Ó¥\\¯à¡C"
@@ -2779,32 +2785,32 @@ msgstr "
 msgid "empty pattern"
 msgstr "ªÅªº®æ¦¡"
 
-#: pattern.c:883
+#: pattern.c:894
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "¿ù»~¡G¤£©úªº op %d (½Ð¦^³ø³o­Ó¿ù»~)¡C"
 
-#: pattern.c:948 pattern.c:1077
+#: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
 msgstr "½sĶ·j´M¼Ë¦¡¤¤¡K"
 
-#: pattern.c:962
+#: pattern.c:973
 msgid "Executing command on matching messages..."
 msgstr "¥¿¦b¹ï²Å¦Xªº¶l¥ó°õ¦æ©R¥O¡K"
 
-#: pattern.c:1025
+#: pattern.c:1036
 msgid "No messages matched criteria."
 msgstr "¨S¦³¶l¥ó²Å¦X­n¨D¡C"
 
-#: pattern.c:1115
+#: pattern.c:1126
 msgid "Search hit bottom without finding match"
 msgstr "¤w·j´M¦Üµ²§À¡A¨Ã¨S¦³µo²{¥ô¦ó²Å¦X"
 
-#: pattern.c:1126
+#: pattern.c:1137
 msgid "Search hit top without finding match"
 msgstr "¤w·j´M¦Ü¶}ÀY¡A¨Ã¨S¦³µo²{¥ô¦ó²Å¦X"
 
-#: pattern.c:1148
+#: pattern.c:1159
 msgid "Search interrupted."
 msgstr "·j´M¤w³Q¤¤Â_¡C"
 
@@ -3104,7 +3110,7 @@ msgstr "
 msgid "Connecting to %s"
 msgstr "¥¿³s½u¨ì %s"
 
-#: pop.c:166 pop.c:340
+#: pop.c:166 pop.c:341
 msgid "Server closed connection!"
 msgstr "»P¦øªA¾¹ªºÁpµ²¤¤Â_¤F!"
 
@@ -3428,56 +3434,56 @@ msgstr "
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:973
+#: send.c:1025
 msgid "Recall postponed message?"
 msgstr "­n¥s¥X³Q©µ¿ðªº«H¥ó?"
 
-#: send.c:1217
+#: send.c:1269
 msgid "Abort unmodified message?"
 msgstr "¬O§_­n¤¤Â_¥¼­×§ï¹Lªº«H¥ó?"
 
-#: send.c:1219
+#: send.c:1271
 msgid "Aborted unmodified message."
 msgstr "¤¤Â_¨S¦³­×§ï¹Lªº«H¥ó"
 
 #. abort
-#: send.c:1260
+#: send.c:1312
 msgid "Mail not sent."
 msgstr "«H¥ó¨S¦³±H¥X¡C"
 
-#: send.c:1281
+#: send.c:1333
 msgid "Message postponed."
 msgstr "«H¥ó³Q©µ¿ð±H¥X¡C"
 
-#: send.c:1290
+#: send.c:1342
 msgid "No recipients are specified!"
 msgstr "¨S¦³«ü©w±µ¨üªÌ¡I"
 
-#: send.c:1295
+#: send.c:1347
 msgid "No recipients were specified."
 msgstr "¨S¦³«ü©w±µ¨üªÌ¡C"
 
-#: send.c:1301
+#: send.c:1353
 msgid "No subject, abort sending?"
 msgstr "¨S¦³«H¥ó¼ÐÃD¡A­n¤¤Â_±H«Hªº¤u§@?"
 
-#: send.c:1305
+#: send.c:1357
 msgid "No subject specified."
 msgstr "¨S¦³«ü©w¼ÐÃD¡C"
 
-#: send.c:1347
+#: send.c:1404
 msgid "Sending message..."
 msgstr "±H¥X«H¥ó¤¤¡K"
 
-#: send.c:1473
+#: send.c:1529
 msgid "Could not send the message."
 msgstr "µLªk±H¥X«H¥ó¡C"
 
-#: send.c:1478
+#: send.c:1534
 msgid "Mail sent."
 msgstr "«H¥ó¤w¸g±H¥X¡C"
 
-#: send.c:1478
+#: send.c:1534
 msgid "Sending in background."
 msgstr "¥¿¦b­I´º§@·~¤¤¶Ç°e¡C"
 
@@ -3495,12 +3501,12 @@ msgstr "%s 
 msgid "Could not open %s"
 msgstr "µLªk¶}±Ò %s"
 
-#: sendlib.c:1702
+#: sendlib.c:1709
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "±H°e°T®§¥X²{¿ù»~¡A¤lµ{§Ç¤wµ²§ô %d (%s)¡C"
 
-#: sendlib.c:1708
+#: sendlib.c:1715
 msgid "Output of the delivery process"
 msgstr "Delivery process ªº¿é¥X"
 
@@ -3540,6 +3546,9 @@ msgstr "
 msgid "Parent message is not available."
 msgstr "¥D«H¥ó¤£¦s¦b¡C"
 
+#~ msgid "ignoring empty header field: %s"
+#~ msgstr "¤£²z·|ªÅªº¼ÐÀYÄæ¦ì¡G%s"
+
 #~ msgid "Authenticating (GSSAPI)..."
 #~ msgstr "ÅçÃÒ¤¤ (GSSAPI)¡K"