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

Some updates; make update-po.
---

diff --git a/po/cs.po b/po/cs.po
index 39dc9bf6..9576ecf2 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-24 22:31+0100\n"
+"POT-Creation-Date: 2000-02-29 23:32+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"
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "Konec"
@@ -22,7 +22,7 @@ msgstr "Volba"
 
 #
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Nápovìda"
 
@@ -269,17 +269,22 @@ msgstr "Chyba p
 msgid "New mail in %s."
 msgstr "V %s je nová po¹ta."
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr "V tomto okam¾iku není mo¾né utf-8 korektnì zpracovat."
 
 #
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, c-format
 msgid "Can't open %s: %s."
 msgstr "%s nelze otevøít: %s"
 
-#: charset.c:1131
+#: charset.c:1148
+#, fuzzy, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr "Chyba pøi automatickém ukládání %s. Va¹e data mù¾ete obnovit z %s."
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr "Chyba pøi automatickém ukládání %s. Va¹e data mù¾ete obnovit z %s."
@@ -794,7 +799,7 @@ msgid " ('?' for list): "
 msgstr " ('?' pro seznam): "
 
 #
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "®ádná schránka není otevøena."
 
@@ -804,12 +809,12 @@ msgid "There are no messages."
 msgstr "Nejsou ¾ádné zprávy."
 
 #
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "Ze schránky je mo¾né pouze èíst."
 
 #
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 msgid "Function not permitted in attach-message mode."
 msgstr "V re¾imu pøikládání zpráv není tato funkce povolena."
 
@@ -834,7 +839,7 @@ msgid "Quit"
 msgstr "Konec"
 
 #
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "Smazat"
 
@@ -849,7 +854,7 @@ msgid "Mail"
 msgstr "Psát"
 
 #
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "Odepsat"
 
@@ -859,160 +864,160 @@ msgid "Group"
 msgstr "Skupinì"
 
 #
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Obsah schránky byl zmìnìn zvenèí. Atributy mohou být nesprávné."
 
 #
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "V této schránce je nová po¹ta."
 
 #
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "®ádné zprávy nejsou oznaèeny."
 
 #
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "Pøejít na zprávu: "
 
 #
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "Argumentem musí být èíslo zprávy."
 
 #
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "Tato zpráva není viditelná."
 
 #
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "Èíslo zprávy není správné."
 
 #
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "Smazat zprávy shodující se s: "
 
 #
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr "®ádné omezení není zavedeno."
 
 #
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr "Omezení: %s"
 
 #
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "Omezit na zprávy shodující se s: "
 
 #
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "Ukonèit Mutt?"
 
 #
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "Oznaèit zprávy shodující se s: "
 
 #
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "Obnovit zprávy shodující se s: "
 
 #
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "Odznaèit zprávy shodující se s: "
 
 #
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "Otevøít schránku pouze pro ètení"
 
 #
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "Otevøít schránku"
 
 #
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s není schránkou."
 
 #
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "Ukonèit Mutt bez ulo¾ení zmìn?"
 
 #
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "Jste na poslední zprávì."
 
 #
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "Nejsou ¾ádné obnovené zprávy."
 
 #
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "Jste na první zprávì."
 
 #
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "Hledání pokraèuje od zaèátku."
 
 #
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "Hledání pokraèuje od konce."
 
 #
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "Nejsou ¾ádné nové zprávy"
 
 #
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "Nejsou ¾ádné nepøeètené zprávy"
 
 #
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr " v tomto omezeném zobrazení"
 
 #
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "Nejsou dal¹í vlákna."
 
 #
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "Jste na prvním vláknu."
 
 #
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "Vlákno obsahuje nepøeètené zprávy."
 
 #
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "Vlákna nejsou podporována."
 
@@ -1379,6 +1384,11 @@ msgstr "Prob
 msgid "Login failed."
 msgstr "Pøihlá¹ení se nezdaøilo."
 
+#. now begin login
+#: imap/auth_gss.c:74
+msgid "Authenticating (GSSAPI)..."
+msgstr "Ovìøuji (GSSAPI)..."
+
 #
 #: imap/browse.c:93
 #, fuzzy
@@ -1393,7 +1403,7 @@ msgstr "Spojen
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Osudová chyba. Aktuální poèet zpráv nesouhlasí s pøedchozím údajem!"
 
@@ -1436,35 +1446,35 @@ msgid "Closing connection to IMAP server..."
 msgstr "Konèím spojení s IMAP serverem..."
 
 #
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Ma¾u zprávy (poèet: %d)..."
 
 #
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Ukládám pøíznaky stavu zprávy... [%d/%d]"
 
 #
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "Uzavírám schránku..."
 
 #
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "Odstraòuji zprávy ze serveru..."
 
 #
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Pøihla¹uji %s..."
 
 #
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Odhla¹uji %s..."
@@ -1584,11 +1594,11 @@ msgid "preconnect command failed"
 msgstr "pøíkaz pøed spojením selhal"
 
 #
-#: imap/util.c:40
+#: imap/util.c:41
 msgid "Continue?"
 msgstr "Pokraèovat?"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr "%s [%s]\n"
@@ -2947,98 +2957,98 @@ msgid "Reopening mailbox..."
 msgstr "Otevírám schránku znovu..."
 
 #
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "Pøeskoèit na: "
 
 #
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "Nesprávné indexové èíslo."
 
 #
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "®ádné polo¾ky."
 
 #
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "Dolù ji¾ rolovat nemù¾ete."
 
 #
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "Nahoru ji¾ rolovat nemù¾ete."
 
 #
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "Jste na poslední stránce."
 
 #
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "Jste na první stránce."
 
 #
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "První polo¾ka je zobrazena."
 
 #
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "Poslední polo¾ka je zobrazena."
 
 #
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "Jste na poslední polo¾ce."
 
 #
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "Jste na první polo¾ce."
 
 #
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "Vyhledat: "
 
 #
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "Vyhledat obráceným smìrem: "
 
 #
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 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:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "Nenalezeno."
 
 #
-#: menu.c:803
+#: menu.c:811
 msgid "No tagged entries."
 msgstr "®ádné polo¾ky nejsou oznaèeny."
 
 #
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "V tomto menu není hledání pøístupné."
 
 #
-#: menu.c:901
+#: menu.c:909
 msgid "Jumping is not implemented for dialogs."
 msgstr "V dialozích není pøeskakování implementováno."
 
 #
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "Oznaèování není podporováno."
 
@@ -3204,63 +3214,63 @@ msgid "Can't write message"
 msgstr "editovat zprávu"
 
 #
-#: pager.c:57
+#: pager.c:60
 msgid "Not available in this menu."
 msgstr "V tomto menu není tato funkce dostupná."
 
 #
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "Pøstr"
 
 #
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "Dlstr"
 
 #
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "Pøílohy"
 
 #
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "Dal¹í"
 
 #
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "Konec zprávy je zobrazen."
 
 #
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "Zaèátek zprávy je zobrazen."
 
 #
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "Hledat opaèným smìrem: "
 
 #
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "Hledat: "
 
 #
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "Nápovìda je právì zobrazena."
 
 #
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "®ádný dal¹í citovaný text."
 
 #
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "Za citovaným textem ji¾ nenásleduje ¾ádný bì¾ný text."
 
@@ -4230,6 +4240,3 @@ msgstr "Rodi
 #
 #~ msgid "ignoring empty header field: %s"
 #~ msgstr "ignoruji prázdnou hlavièku: %s"
-
-#~ msgid "Authenticating (GSSAPI)..."
-#~ msgstr "Ovìøuji (GSSAPI)..."
diff --git a/po/de.po b/po/de.po
index 84ea8314..9af3bf90 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.4 (CVS 2000-02-22)\n"
-"POT-Creation-Date: 2000-02-24 22:31+0100\n"
+"POT-Creation-Date: 2000-02-29 23:32+0100\n"
 "PO-Revision-Date: 2000-02-22 20:54+01:00\n"
 "Last-Translator: Roland Rosenfeld <roland@spinnaker.de>\n"
 "Language-Team: German <mutt-po@mutt.org>\n"
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "Verlassen"
@@ -20,7 +20,7 @@ msgid "Select"
 msgstr "Auswählen"
 
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Hilfe"
 
@@ -225,16 +225,21 @@ msgstr "Fehler bei der Anzeige einer Datei"
 msgid "New mail in %s."
 msgstr "Neue Nachrichten in %s."
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr "UTF-8 wird an dieser Stelle noch nicht unterstützt."
 
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, c-format
 msgid "Can't open %s: %s."
 msgstr "Kann %s nicht öffnen: %s."
 
-#: charset.c:1131
+#: charset.c:1148
+#, fuzzy, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr "Fehler beim Umschlüsseln von %s. Siehe %s um die Daten zu retten."
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr "Fehler beim Umschlüsseln von %s. Siehe %s um die Daten zu retten."
@@ -661,7 +666,7 @@ msgstr "Bitte dr
 msgid " ('?' for list): "
 msgstr " (für eine Liste '?' eingeben): "
 
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "Keine Mailbox ist geöffnet."
 
@@ -669,11 +674,11 @@ msgstr "Keine Mailbox ist ge
 msgid "There are no messages."
 msgstr "Es sind keine Nachrichten vorhanden."
 
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "Mailbox kann nur gelesen, nicht geschrieben werden."
 
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 msgid "Function not permitted in attach-message mode."
 msgstr "Funktion steht beim Anhängen von Nachrichten nicht zur Verfügung."
 
@@ -693,7 +698,7 @@ msgstr "
 msgid "Quit"
 msgstr "Ende"
 
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "Lösch."
 
@@ -705,7 +710,7 @@ msgstr "Behalten"
 msgid "Mail"
 msgstr "Senden"
 
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "Antw."
 
@@ -713,130 +718,130 @@ msgstr "Antw."
 msgid "Group"
 msgstr "Antw.alle"
 
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Mailbox wurde verändert. Markierungen können veraltet sein."
 
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "Neue Nachrichten in dieser Mailbox."
 
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "Keine markierten Nachrichten."
 
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "Springe zu Nachricht: "
 
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "Argument muß eine Nachrichtennummer sein."
 
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "Diese Nachricht ist nicht sichtbar."
 
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "Ungültige Nachrichtennummer."
 
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "Lösche Nachrichten nach Muster: "
 
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr "Zur Zeit ist kein Muster aktiv."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr "Begrenze: %s"
 
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "Begrenze auf Nachrichten nach Muster: "
 
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "Mutt beenden?"
 
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "Markiere Nachrichten nach Muster: "
 
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "Entferne Löschmarkierung nach Muster: "
 
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "Entferne Markierung nach Muster: "
 
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "Öffne Mailbox im nur-Lesen-Modus"
 
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "Öffne Mailbox"
 
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s ist keine Mailbox."
 
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "Mutt verlassen, ohne Änderungen zu speichern?"
 
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "Sie sind bereits auf der letzten Nachricht."
 
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "Alle Nachrichten gelöscht."
 
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "Sie sind bereits auf der ersten Nachricht."
 
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "Suche von vorne begonnen."
 
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "Suche von hinten begonnen."
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "Keine neuen Nachrichten"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "Keine ungelesenen Nachrichten"
 
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr " in dieser begrenzten Ansicht."
 
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "Keine weiteren Diskussionsfäden."
 
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "Sie haben bereits den ersten Diskussionsfaden ausgewählt."
 
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "Diskussionsfaden enthält ungelesene Nachrichten."
 
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "Darstellung von Diskussionsfäden ist nicht eingeschaltet."
 
@@ -1155,6 +1160,11 @@ msgstr "Anmeldung..."
 msgid "Login failed."
 msgstr "Anmeldung gescheitert..."
 
+#. now begin login
+#: imap/auth_gss.c:74
+msgid "Authenticating (GSSAPI)..."
+msgstr "Authentifiziere (GSSAPI)..."
+
 #: imap/browse.c:93
 msgid "Getting namespaces..."
 msgstr "Hole Namensräume..."
@@ -1166,7 +1176,7 @@ msgstr "Hole Liste der Ordner..."
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Kritischer Fehler.  Nachrichtenzähler weicht ab!"
 
@@ -1202,30 +1212,30 @@ msgstr "%s erstellen?"
 msgid "Closing connection to IMAP server..."
 msgstr "Beende Verbindung zum IMAP-Server..."
 
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Markiere %d Nachrichten zum Löschen..."
 
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Speichere Nachrichten-Status-Indikatoren... [%d/%d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "Schließe Mailbox..."
 
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "Lösche Nachrichten auf dem Server..."
 
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Abonniere %s..."
 
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Beende Abonement von %s..."
@@ -1334,11 +1344,11 @@ msgstr "Verbinde zu %s..."
 msgid "preconnect command failed"
 msgstr "\"preconnect\" Kommando fehlgeschlagen"
 
-#: imap/util.c:40
+#: imap/util.c:41
 msgid "Continue?"
 msgstr "Weiter?"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr "%s [%s]\n"
@@ -2468,80 +2478,80 @@ msgstr "Konnte Mailbox nicht erneut 
 msgid "Reopening mailbox..."
 msgstr "Öffne Mailbox erneut..."
 
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "Springe zu: "
 
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "Ungültige Indexnummer."
 
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "Keine Einträge"
 
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "Sie können nicht weiter nach unten gehen."
 
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "Sie können nicht weiter nach oben gehen."
 
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "Sie sind auf der letzten Seite."
 
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "Sie sind auf der ersten Seite."
 
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "Der erste Eintrag wird angezeigt."
 
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "Der letzte Eintrag wird angezeigt."
 
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "Sie sind auf dem letzten Eintrag."
 
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "Sie sind auf dem ersten Eintrag"
 
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "Suche nach: "
 
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "Suche rückwärts nach: "
 
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 pattern.c:1102
 msgid "No search pattern."
 msgstr "Kein Suchmuster."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "Nicht gefunden."
 
-#: menu.c:803
+#: menu.c:811
 msgid "No tagged entries."
 msgstr "Keine markierten Einträge."
 
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "In diesem Menü kann nicht gesucht werden."
 
-#: menu.c:901
+#: menu.c:909
 msgid "Jumping is not implemented for dialogs."
 msgstr "Springen in Dialogen ist nicht möglich."
 
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "Markieren wird nicht unterstützt."
 
@@ -2681,52 +2691,52 @@ msgstr "%d behalten."
 msgid "Can't write message"
 msgstr "Kann Nachricht nicht schreiben"
 
-#: pager.c:57
+#: pager.c:60
 msgid "Not available in this menu."
 msgstr "Funktion ist in diesem Menü nicht verfügbar."
 
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "S.zurück"
 
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "S.vor"
 
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "Anhänge betr."
 
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "Nächste Nachr."
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "Das Ende der Nachricht wird angezeigt."
 
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "Der Beginn der Nachricht wird angezeigt."
 
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "Suche rückwärts: "
 
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "Suche: "
 
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "Hilfe wird bereits angezeigt."
 
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "Kein weiterer zitierter Text."
 
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "Kein weiterer eigener Text nach zitiertem Text."
 
@@ -3547,9 +3557,6 @@ msgstr "Bezugsnachricht ist nicht verf
 #~ msgid "return to the main-menu"
 #~ msgstr "Kehre zum Hauptmenü zurück"
 
-#~ msgid "Authenticating (GSSAPI)..."
-#~ msgstr "Authentifiziere (GSSAPI)..."
-
 #~ msgid "Recoding only affetcs text attachments."
 #~ msgstr "Die Änderung der Kodierung betrifft nur Text Anhänge."
 
diff --git a/po/el.po b/po/el.po
index 4501c5d4..c1e21852 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Mutt-1.1.2i\n"
-"POT-Creation-Date: 2000-02-24 22:31+0100\n"
-"PO-Revision-Date: 2000-01-19 12:00+0200\n"
+"Project-Id-Version: Mutt-1.1.5i\n"
+"POT-Creation-Date: 2000-02-29 23:32+0100\n"
+"PO-Revision-Date: 2000-02-27 12:00+0200\n"
 "Last-Translator: ÖÜíçò ÄïêéáíÜêçò <madf@hellug.gr>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "¸îïäïò"
@@ -28,7 +28,7 @@ msgstr "
 
 #
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "ÂïÞèåéá"
 
@@ -201,33 +201,29 @@ msgstr "
 
 #
 #: browser.c:820
-#, fuzzy
 msgid "Creating mailboxes is not yet supported."
-msgstr "Óçìåéþóåéò äåí õðïóôçñßæïíôáé."
+msgstr "Ç äçìéïõñãßá ãñáììáôïêéâùôßùí äåí õðïóôçñßæåôáé áêüìá."
 
 #
 # recvattach.c:1065
 #: browser.c:825
-#, fuzzy
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "ÁõôÞ ç ëåéôïõñãßá äåí õðïóôçñßæåôáé ðñïò ôï ðáñüí ãéá ìçíýìáôá PGP."
+msgstr "Ç äéáãñáöÞ õðïóôçñßæåôáé ìüíï ãéá ôá ãñáììáôïêéâþôéá IMAP"
 
 #: browser.c:833
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr ""
+msgstr "ÄéáãñáöÞ ôïõ ãñáììáôïêéâùôßïõ \"%s\";"
 
 #
 #: browser.c:847
-#, fuzzy
 msgid "Mailbox deleted."
-msgstr "Åíôïðßóôçêå âñüã÷ïò ìáêñïåíôïëÞò."
+msgstr "Ôï ãñáììáôïêéâþôéïõ äéáãñÜöôçêå."
 
 #
 #: browser.c:853
-#, fuzzy
 msgid "Mailbox not deleted."
-msgstr "Ôï ãñÜììá äåí åóôÜëç."
+msgstr "Ôï ãñáììáôïêéâþôéïõ äåí äéáãñÜöôçêå."
 
 #
 #: browser.c:871
@@ -282,17 +278,22 @@ msgstr "
 msgid "New mail in %s."
 msgstr "ÍÝá áëëçëïãñáößá óôï %s."
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr "Áäõíáìßá ÷åéñéóìïý ôïõ utf-8 áõôÞ ôç óôéãìÞ."
 
 #
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, c-format
 msgid "Can't open %s: %s."
 msgstr "Áäõíáìßá ðñïóâáóç ôïõ %s: %s"
 
-#: charset.c:1131
+#: charset.c:1148
+#, fuzzy, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr "ÓöÜëìá êáôÜ ôçí åðáíáêùäéêïðïéÞóç ôïõ %s. Äåßôå ôï %s ãéá åðáíáöïñÜ."
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr "ÓöÜëìá êáôÜ ôçí åðáíáêùäéêïðïéÞóç ôïõ %s. Äåßôå ôï %s ãéá åðáíáöïñÜ."
@@ -525,9 +526,8 @@ msgstr "
 
 #
 #: compose.c:40
-#, fuzzy
 msgid "There are no attachments."
-msgstr "Äåí õðÜñ÷ïõí ìçíýìáôá."
+msgstr "Äåí õðÜñ÷ïõí ðñïóáñôÞóåéò."
 
 #
 #: compose.c:85
@@ -816,7 +816,7 @@ msgid " ('?' for list): "
 msgstr "('?' ãéá ëßóôá): "
 
 #
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "Äåí õðÜñ÷ïõí áíïé÷ôÜ ãñáììáôïêéâþôéá."
 
@@ -826,12 +826,12 @@ msgid "There are no messages."
 msgstr "Äåí õðÜñ÷ïõí ìçíýìáôá."
 
 #
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "Ôï ãñáììáôïêéâþôéï åßíáé ãéá ìüíï-áíÜãíùóç."
 
 #
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 msgid "Function not permitted in attach-message mode."
 msgstr "ÁõôÞ ç ëåéôïõñãßÜ áðáãïñåýåôå óôçí êáôÜóôáóç ðñïóÜñôçóç-ìçíýìáôïò."
 
@@ -857,7 +857,7 @@ msgid "Quit"
 msgstr "¸îïäïò"
 
 #
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "ÄéáãñáöÞ"
 
@@ -872,7 +872,7 @@ msgid "Mail"
 msgstr "Ôá÷õäñ"
 
 #
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "ÁðÜíô"
 
@@ -882,161 +882,161 @@ msgid "Group"
 msgstr "ÏìÜäá"
 
 #
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
 "Ôï ãñáììáôïêéâþôéï ôñïðïðïéÞèçêå åîùôåñéêÜ. Ç óçìáßåò ìðïñåß íá åßíáé ëÜèïò"
 
 #
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "ÍÝá áëëçëïãñáößá óå áõôü ôï ãñáììáôïêéâþôéï."
 
 #
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "Äåí õðÜñ÷ïõí óçìåéùìÝíá ìçíýìáôá."
 
 #
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "ÌåôÜâáóç óôï ìÞíõìá: "
 
 #
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "Ç ðáñÜìåôñïò ðñÝðåé íá åßíáé áñéèìüò ìçíýìáôïò."
 
 #
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "Áõôü ôï ìÞíõìá äåí åßíáé ïñáôü."
 
 #
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "Ìç Ýãêõñïò áñéèìüò ìçíýìáôïò."
 
 #
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "ÄéáãñáöÞ ðáñüìïéùí ìçíõìÜôùí: "
 
 #
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr "ÊáíÝíá õðüäåéãìá ïñßùí óå ëåéôïõñãßá."
 
 #
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr "¼ñéï: %s"
 
 #
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "Ðåñéïñéóìüò óôá ðáñüìïéá ìçíýìáôá: "
 
 #
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "¸îïäïò áðü ôï Mutt;"
 
 #
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "Óçìåßùóôå ôá ðáñüìïéá ìçíýìáôá ìå: "
 
 #
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "ÅðáíÝöåñåôå ôá ðáñüìïéá ìçíýìáôá ìå: "
 
 #
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "Îåóçìåéþóôåôå ôá ðáñüìïéá ìçíýìáôá ìå: "
 
 #
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "Áíïßîôå ôï ãñáììáôïêéâþôéï óå êáôÜóôáóç ìüíï ãéá åããñáöÞ"
 
 #
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "Áíïßîôå ôï ãñáììáôïêéâþôéï"
 
 #
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "Ôï %s äåí åßíáé ãñáììáôïêéâþôéï."
 
 #
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "¸îïäïò áðü ôï Mutt ÷ùñßò áðïèÞêåõóç;"
 
 #
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "Åßóôå óôï ôåëåõôáßï ìÞíõìá."
 
 #
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "Äåí õðÜñ÷ïõí áðåêáôáóôçìÝíá ìçíýìáôá."
 
 #
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "Åßóôå óôï ðñþôï ìÞíõìá."
 
 #
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "ÁíáæÞôçóç óõíå÷ßóôçêå áðü ôçí êïñõöÞ."
 
 #
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "ÁíáæÞôçóç óõíå÷ßóôçêå óôç âÜóç."
 
 #
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "Äåí õðÜñ÷ïõí íÝá ìçíýìáôá"
 
 #
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "Äåí õðÜñ÷ïõí ìç áíáãíùóìÝíá ìçíýìáôá"
 
 #
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr "óå áõôÞ ôçí ðåñéïñéóìÝíç üøç"
 
 #
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "Äåí õðÜñ÷ïõí Üëëåò óõæçôÞóåéò."
 
 #
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "Åßóôå óôç ðñþôç óõæÞôçóç."
 
 #
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "Ç óõæÞôçóç ðåñéÝ÷åé ìç áíáãíùóìÝíá ìçíýìáôá."
 
 #
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "Ç ÷ñÞóç óõæçôÞóåùí äåí Ý÷åé åíåñãïðïéçèåß."
 
@@ -1129,45 +1129,43 @@ msgstr "%s: 
 
 #
 #: editmsg.c:74
-#, fuzzy, c-format
+#, c-format
 msgid "could not create temporary folder: %s"
-msgstr "Áäõíáìßá êáôÜ ôç äçìéïõñãßá ðñïóùñéíïý áñ÷åßïõ!"
+msgstr "áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý öáêÝëïõ: %s"
 
 #
 #: editmsg.c:84
-#, fuzzy, c-format
+#, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "Áäõíáìßá êáôÜ ôç äçìéïõñãßá ðñïóùñéíïý áñ÷åßïõ!"
+msgstr "áäõíáìßá åããñáöÞò ðñïóùñéíïý öáêÝëïõ áëëçëïãñáößáò: %s"
 
 #
 #: editmsg.c:101
-#, fuzzy
 msgid "Message file is empty!"
-msgstr "Ôï ãñáììáôïêéâþôéï åßíáé Üäåéï."
+msgstr "Ôï áñ÷åßï ìçíõìÜôùí åßíáé Üäåéï!"
 
 #
 #: editmsg.c:108
-#, fuzzy
 msgid "Message not modified!"
-msgstr "Ôï ìÞíõìá åêôõðþèçêå"
+msgstr "Ôï ìÞíõìá äåí ôñïðïðïéÞèçêå!"
 
 #
 #: editmsg.c:116
-#, fuzzy, c-format
+#, c-format
 msgid "Can't open message file: %s"
-msgstr "Áäõíáìßá äçìéïõñãßáò áñ÷åßïõ %s"
+msgstr "Áäõíáìßá ðñüóâáóçò óôï áñ÷åßï ìçíõìÜôùí: %s"
 
 #
 #: editmsg.c:123 editmsg.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "Can't append to folder: %s"
-msgstr "Áäõíáìßá äçìéïõñãßáò áñ÷åßïõ %s"
+msgstr "Áäõíáìßá ðñüóèåóçò óôï öÜêåëï: %s"
 
 #
 #: editmsg.c:182
-#, fuzzy, c-format
+#, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "Äåí ìðïñþ íá äçìéïõñãÞóù ðñïóùñéíü áñ÷åßï"
+msgstr "ÓöÜëìá. ÄéáôÞñçóç ðñïóùñéíïý áñ÷åßïõ"
 
 #
 #: flags.c:266
@@ -1351,18 +1349,17 @@ msgstr "
 
 #
 #: hook.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "%s: Üãíùóôïò ôýðïò"
+msgstr "unhook: Üãíùóôïò ôýðïò hook: %s"
 
 #: imap/auth.c:104
 msgid "Authenticating (CRAM-MD5)..."
 msgstr "Áõèåíôéêïðïßçóç (CRAM-MD5)..."
 
 #: imap/auth.c:191
-#, fuzzy
 msgid "Authenticating (anonymous)..."
-msgstr "Áõèåíôéêïðïßçóç (GSSAPI)..."
+msgstr "Áõèåíôéêïðïßçóç (áíþíõìç)..."
 
 #
 #: imap/auth.c:266
@@ -1371,7 +1368,7 @@ msgstr "
 
 #: imap/auth.c:282
 msgid "Anonymous authentication not supported."
-msgstr ""
+msgstr "Ç áíþíõìç áõèåíôéêïðïßçóç äåí õðïóôçñßæåôáé."
 
 #: imap/auth.c:295
 msgid "GSSAPI authentication failed."
@@ -1389,9 +1386,8 @@ msgid "CRAM-MD5 authentication failed."
 msgstr "Áõèåíôéêïðïßçóç CRAM-MD5 áðÝôõ÷å."
 
 #: imap/auth.c:343
-#, fuzzy
 msgid "Skipping CRAM-MD5 authentication."
-msgstr "Áõèåíôéêïðïßçóç CRAM-MD5 áðÝôõ÷å."
+msgstr "ÐáñÜëåéøç áõèåíôéêïðïßçóçò CRAM-MD5."
 
 #
 #: imap/auth.c:355
@@ -1410,22 +1406,26 @@ msgstr "
 msgid "Login failed."
 msgstr "ÁðÝôõ÷å ç åßóïäïò óôï óýóôçìá."
 
+#. now begin login
+#: imap/auth_gss.c:74
+#, fuzzy
+msgid "Authenticating (GSSAPI)..."
+msgstr "Áõèåíôéêïðïßçóç (CRAM-MD5)..."
+
 #
 #: imap/browse.c:93
-#, fuzzy
 msgid "Getting namespaces..."
-msgstr "ËÞøç ìçíýìáôïò..."
+msgstr "ËÞøç namespaces..."
 
 #: imap/browse.c:120
-#, fuzzy
 msgid "Getting folder list..."
-msgstr "Óýíäåóç óôï äéá÷åéñéóôÞ, ëÞøç ëßóôáò öáêÝëùí..."
+msgstr "ËÞøç ëßóôáò öáêÝëùí..."
 
 #
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Ìïéñáßï óöÜëìá. Ï áñéèìüò ôùí ìçíõìÜôùí äåí åßíáé óå óõìöùíßá!"
 
@@ -1469,95 +1469,92 @@ msgid "Closing connection to IMAP server..."
 msgstr "Êëåßóéìï óýíäåóçò óôïí åîõðçñåôçôÞ IMAP..."
 
 #
-#: imap/imap.c:981
-#, fuzzy, c-format
+#: imap/imap.c:991
+#, c-format
 msgid "Marking %d messages deleted..."
-msgstr "ÁíÜãíùóç %d íÝùí ìçíõìÜôùí (%d bytes)..."
+msgstr "Óçìåßùóç %d äéáãñáöèÝíôùí ìçíõìÜôùí..."
 
 #
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "ÁðïèÞêåõóç óçìáéþí êáôÜóôáóçò ìçíýìáôïò... [%d/%d]"
 
 #
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "Êëåßóéìï ãñáììáôïêéâùôßïõ..."
 
 #
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "ÄéáãñáöÞ ìçíõìÜôùí áðü ôïí åîõðçñåôçôÞ..."
 
 #
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "ÅããñáöÞ óôï %s..."
 
 #
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "ÄéáãñáöÞ óôï %s..."
 
 #
 #: imap/imap_ssl.c:107
-#, fuzzy
 msgid "Unable to get certificate from peer"
-msgstr "áäõíáìßá óôïí åíôïðéóìü ôïõ êáôáëüãïõ ÷ñÞóôç (home directory)"
+msgstr "Áäõíáìéá óôç ëÞøç ðéóôïðïéçôéêïý áðü ôï ôáßñé"
 
 #
 #: imap/imap_ssl.c:118
-#, fuzzy, c-format
+#, c-format
 msgid "SSL connection using %s"
-msgstr "Óýíäåóç óôï %s"
+msgstr "Óýíäåóç SSL ÷ñçóéìïðïéüíôáò ôï %s"
 
 #
 #: imap/imap_ssl.c:143
-#, fuzzy
 msgid "Unknown"
-msgstr "Üãíùóôï óöÜëìá"
+msgstr "¶ãíùóôï"
 
 #
 #: imap/imap_ssl.c:168
-#, fuzzy
 msgid "[unable to calculate]"
-msgstr "%s: áäõíáìßá óôç ðñïóÜñôçóç ôïõ áñ÷åßïõ"
+msgstr "[áäõíáìßá õðïëïãéóìïý]"
 
 #: imap/imap_ssl.c:219
 msgid "This certificate belongs to:"
-msgstr ""
+msgstr "Áõôü ôï ðéóôïðïéçôéêü áíÞêåé óôï:"
 
 #: imap/imap_ssl.c:228
 msgid "This certificate was issued by:"
-msgstr ""
+msgstr "Áõôü ôï ðéóôïðïéçôéêü åêäüèçêå áðü ôï:"
 
 #: imap/imap_ssl.c:239
 #, c-format
 msgid "Fingerprint: %s"
-msgstr ""
+msgstr "Áðïôýðùìá: %s"
 
 #: imap/imap_ssl.c:241
 msgid "SSL Certificate check"
-msgstr ""
+msgstr "¸ëåã÷ïò Ðéóôïðïéçôéêïý SSL"
 
 #: imap/imap_ssl.c:244
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr ""
+msgstr "(r)áðüññéøç, (o)áðïäï÷Þ ìéá öïñÜ, (a)áðïäï÷Þ ðÜíôá"
 
 #: imap/imap_ssl.c:245
 msgid "roa"
-msgstr ""
+msgstr "roa"
 
 #: imap/imap_ssl.c:249
 msgid "(r)eject, accept (o)nce"
-msgstr ""
+msgstr "(r)áðüññéøç, (o)áðïäï÷Þ ìéá öïñÜ"
 
 #: imap/imap_ssl.c:250
 msgid "ro"
-msgstr ""
+msgstr "ro"
 
 #
 #: imap/imap_ssl.c:254 pgpkey.c:442
@@ -1566,24 +1563,23 @@ msgstr "
 
 #: imap/imap_ssl.c:280
 msgid "Warning: Couldn't save certificate"
-msgstr ""
+msgstr "Ðñïåéäïðïßçóç: Áäõíáìßá áðïèÞêåõóçò ðéóôïðïéçôéêïý"
 
 #: imap/imap_ssl.c:282
 msgid "Certificate saved"
-msgstr ""
+msgstr "Ôï ðéóôïðïéçôéêü áðïèçêåýôçêå"
 
 #
 #. Unable to fetch headers for lower versions
 #: imap/message.c:75
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr ""
-"Äåí êáôÜöåñá íá ëÜâù åðéêåöáëßäåßôå áðü áõôÞ ôçí Ýêäïóç ôïõ åîõðçñåôçôÞ IMAP."
+msgstr "Áäõíáìßá ëÞøçò åðéêåöáëßäùí áðü áõôÞ ôçí Ýêäïóç ôïõ åîõðçñåôçôÞ IMAP."
 
 #
 #: imap/message.c:92
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "ËÞøç åðéêåöáëßäùí áðü ìçíýìáôá... [%d/%d]"
+msgstr "ËÞøç åðéêåöáëßäùí áðü ôá ìçíýìáôá... [%d/%d]"
 
 #
 #: imap/message.c:260
@@ -1602,15 +1598,15 @@ msgstr "
 
 #
 #: imap/message.c:556
-#, fuzzy, c-format
+#, c-format
 msgid "Copying %d messages to %s..."
-msgstr "Ìåôáêßíçóç áíáãíùóìÝíùí ìçíõìÜôùí óôï %s..."
+msgstr "ÁíôéãñáöÞ %d ìçíõìÜôùí óôï %s..."
 
 #
 #: imap/message.c:560
-#, fuzzy, c-format
+#, c-format
 msgid "Copying message %d to %s..."
-msgstr "ÅããñáöÞ ìçíýìáôïò óôï %s ..."
+msgstr "ÁíôéãñáöÞ ìçíýìáôïò %d óôï %s ..."
 
 #
 #: imap/socket.c:218
@@ -1620,18 +1616,17 @@ msgstr "
 
 #: imap/socket.c:238
 msgid "preconnect command failed"
-msgstr ""
+msgstr "áðïôõ÷ßá åíôïëÞò ðñïóýíäåóçò"
 
 #
-#: imap/util.c:40
-#, fuzzy
+#: imap/util.c:41
 msgid "Continue?"
-msgstr "(óõíå÷ßóôå)\n"
+msgstr "ÓõíÝ÷åéá;"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
-msgstr ""
+msgstr "%s [%s]\n"
 
 #
 #: init.c:487
@@ -1669,13 +1664,13 @@ msgstr "
 #
 #: init.c:785
 msgid "value is illegal with reset"
-msgstr "ç ôéìÞ åßíáé Üêõñç ìå ôçí áíáíÝùóç"
+msgstr "ç ôéìÞ åßíáé Üêõñç ìå ôçí åðáíáöïñÜ"
 
 #
 #: init.c:824
 #, c-format
 msgid "%s is set"
-msgstr "Ôï %s ôåèåß"
+msgstr "Ôï %s Ý÷åé ôåèåß"
 
 #
 #: init.c:824
@@ -1844,47 +1839,44 @@ msgstr "
 #
 #: keymap_alldefs.h:11
 msgid "view file"
-msgstr "áíáãéãíþóêåé ôï áñ÷åßï"
+msgstr "áíÜãíùóç ôï áñ÷åßï"
 
 #
 #: keymap_alldefs.h:12
 msgid "display the currently selected file's name"
-msgstr "áðåéêïíßæåé ôï üíïìá ôïõ ôñÝ÷ïíôïò åðéëåãìÝíïõ áñ÷åßïõ"
+msgstr "áðåéêüíéóç ôïõ ïíüìáôïò ôïõ ôñÝ÷ïíôïò åðéëåãìÝíïõ áñ÷åßïõ"
 
 #: keymap_alldefs.h:13
-#, fuzzy
 msgid "subscribe to current mailbox (IMAP only)"
-msgstr "åããñáöÞ óôï ôñÝ÷ùí ãñáììáôïêéâþôéï (IMAP Ìüíï)"
+msgstr "åããñáöÞ óôï ôñÝ÷ùí ãñáììáôïêéâþôéï (IMAP ìüíï)"
 
 #: keymap_alldefs.h:14
-#, fuzzy
 msgid "unsubscribe to current mailbox (IMAP only)"
-msgstr "äéáãñáöÞ áðü ôï ôñÝ÷ùí ãñáììáôïêéâþôéï (IMAP Ìüíï)"
+msgstr "äéáãñáöÞ áðü ôï ôñÝ÷ùí ãñáììáôïêéâþôéï (IMAP ìüíï)"
 
 #: keymap_alldefs.h:15
-#, fuzzy
 msgid "toggle view all/subscribed mailboxes (IMAP only)"
-msgstr "áëëÜãÞ üøçò üëá/åããåãñáììÝíá ãñáììáôïêéâþôéá  (IMAP Ìüíï)"
+msgstr "áëëÜãÞ üøçò üëá/åããåãñáììÝíá ãñáììáôïêéâþôéá  (IMAP ìüíï)"
 
 #
 #: keymap_alldefs.h:16
 msgid "change directories"
-msgstr "áëëÜæåé êáôáëüãïõò"
+msgstr "áëëáãÞ êáôáëüãùí"
 
 #
 #: keymap_alldefs.h:17
 msgid "check mailboxes for new mail"
-msgstr "åîåôÜæåé ôá ãñáììá/ôéá ãéá íÝá áëëçëïãñáößá"
+msgstr "åîÝôáóç ãñáììá/ôßùí ãéá íÝá áëëçëïãñáößá"
 
 #
 #: keymap_alldefs.h:18
 msgid "attach a file(s) to this message"
-msgstr "ðñïóáñôÜ áñ÷åßï/á óå áõôü ôï ìÞíõìá"
+msgstr "ðñïóÜñôçóç áñ÷åßïõ/ùí óå áõôü ôï ìÞíõìá"
 
 #
 #: keymap_alldefs.h:19
 msgid "attach message(s) to this message"
-msgstr "ðñïóáñôÜ ìÞíõìá/ôá óå áõôü ôï ìÞíõìá"
+msgstr "ðñïóÜñôçóç ìçíýìáôïò/ôùí óå áõôü ôï ìÞíõìá"
 
 #: keymap_alldefs.h:20
 msgid "change an attachment's character set"
@@ -1893,89 +1885,87 @@ msgstr "
 #
 #: keymap_alldefs.h:21
 msgid "edit the BCC list"
-msgstr "åðåîåñãÜæôå ôç ëßóôá BCC"
+msgstr "åðåîåñãáóßá ôçò ëßóôáò BCC"
 
 #
 #: keymap_alldefs.h:22
 msgid "edit the CC list"
-msgstr "åðåîåñãÜæåôå ôç ëßóôá CC"
+msgstr "åðåîåñãáóßá ôçò ëßóôáò CC"
 
 #
 #: keymap_alldefs.h:23
 msgid "edit attachment description"
-msgstr "åðåîåñãÜæåôå ôçí ðåñéãñáöÞ ôçò ðñïóÜñôçóçò"
+msgstr "åðåîåñãáóßá ôçò ðåñéãñáöÞò ôçò ðñïóÜñôçóçò"
 
 #
 #: keymap_alldefs.h:24
 msgid "edit attachment transfer-encoding"
-msgstr "åðåîåñãÜæåôå ôçí ìåôáöïñÜ-êùäéêïðïßçóç ôçò ðñïóÜñôçóçò"
+msgstr "åðåîåñãáóßá ôçò êùäéêïðïßçóçò-ìåôáöïñÜò ôçò ðñïóÜñôçóçò"
 
 #
 #: keymap_alldefs.h:25
 msgid "enter a file to save a copy of this message in"
-msgstr ""
-"ïñßóôå Ýíá áñ÷åßï ãéá íá áðïèçêåýóåôå ìÝóá Ýíá áíôßãñáöï áõôïý ôïõ ìçíýìáôïò "
+msgstr "ïñéóìüò áñ÷åßïõ ãéá áðïèÞêåõóç áíôéãñÜöïõ áõôïý ôïõ ìçíýìáôïò "
 
 #
 #: keymap_alldefs.h:26
 msgid "edit the file to be attached"
-msgstr "åðåîåñãÜæåôå ôï öÜêåëï ðïõ èá ðñïóáñôçèåß"
+msgstr "åðåîåñãáóßá ôïõ öáêÝëïõ ðïõ èá ðñïóáñôçèåß"
 
 #
 #: keymap_alldefs.h:27
 msgid "edit the from field"
-msgstr "åðåîåñãÜæåôå ôï ðåäßï from"
+msgstr "åðåîåñãáóßá ôïõ ðåäßïõ from"
 
 #
 #: keymap_alldefs.h:28
 msgid "edit the message with headers"
-msgstr "åðåîåñãÜæåôå ôï ìÞíõìá ìå åðéêåöáëßäåßôå"
+msgstr "åðåîåñãáóßá ôïõ ìçíýìáôïò ìå åðéêåöáëßäåò"
 
 #
 #: keymap_alldefs.h:29
 msgid "edit the message"
-msgstr "åðåîåñãÜæåôå ôï ìÞíõìá"
+msgstr "åðåîåñãáóßá ôïõ ìçíýìáôïò"
 
 #
 #: keymap_alldefs.h:30
 msgid "edit attachment using mailcap entry"
-msgstr "åðåîåñãÜæåôå ôçí ðñïóÜñôçóç ÷ñçóéìïðïéüíôáò êáôá÷þñçóç mailcap"
+msgstr "åðåîåñãáóßá ôçò ðñïóÜñôçóçò ÷ñçóéìïðïéüíôáò êáôá÷þñçóç mailcap"
 
 #
 #: keymap_alldefs.h:31
 msgid "edit the Reply-To field"
-msgstr "åðåîåñãÜæåôå ôï ðåäßï Reply-To"
+msgstr "åðåîåñãáóßá ôïõ ðåäßïõ Reply-To"
 
 #
 #: keymap_alldefs.h:32
 msgid "edit the subject of this message"
-msgstr "åðåîåñãÜæåôå ôï èÝìá áõôïý ôïõ ìçíýìáôïò"
+msgstr "åðåîåñãáóßá ôïõ èÝìáôïò áõôïý ôïõ ìçíýìáôïò"
 
 #
 #: keymap_alldefs.h:33
 msgid "edit the TO list"
-msgstr "åðåîåñãÜæåôå ôçí ëßóôá TO"
+msgstr "åðåîåñãáóßáôçò ëßóôáò TO"
 
 #
 #: keymap_alldefs.h:34
-#, fuzzy
 msgid "edit attachment content type"
-msgstr "åðåîåñãÜæåôå ôï ôýðï ôçò ðñïóÜñôçóçò"
+msgstr "åðåîåñãáóßá ôïõ ôýðïõ ôïõ ðåñéå÷ïìÝíïõ ôçò ðñïóÜñôçóçò"
 
 #
 #: keymap_alldefs.h:35
 msgid "get a temporary copy of an attachment"
-msgstr "äßíåé Ýíá ðñïóùñéíü áíôßãñáöï ôçò ðñïóÜñôçóçò"
+msgstr "áðüäïóç Ýíüò ðñïóùñéíïý áíôéãñÜöïõ ôçò ðñïóÜñôçóçò"
 
 #
 #: keymap_alldefs.h:36
 msgid "run ispell on the message"
-msgstr "ôñÝ÷åé ôï ispell óôï ìÞíõìá"
+msgstr "åëåã÷ïò ôïõ ìçíýìáôïò ìå ôï  ispell"
 
 #
 #: keymap_alldefs.h:37
 msgid "compose new attachment using mailcap entry"
-msgstr "óõíèÝôåé ìéá íÝá ðñïóÜñôçóç ÷ñçóéìïðïéþíôáò êáôá÷þñçóç mailcap"
+msgstr "óýíèåóç íÝáò ðñïóÜñôçóçò ÷ñçóéìïðïéþíôáò êáôá÷þñçóç mailcap"
 
 #: keymap_alldefs.h:38
 msgid "toggle recoding of this attachment"
@@ -1989,7 +1979,7 @@ msgstr ""
 #
 #: keymap_alldefs.h:40
 msgid "save this message to send later"
-msgstr "áðïèçêåýåé áõôü ôï ìÞíõìá ãéá íá óôáëèåß áñãüôåñá"
+msgstr "áðïèÞêåõóç áõôïý ôïõ ìçíýìáôïò ãéá ìåôÝðåéôá áðïóôïëÞ"
 
 #
 #: keymap_alldefs.h:41
@@ -1999,36 +1989,36 @@ msgstr "
 #
 #: keymap_alldefs.h:42
 msgid "send the message"
-msgstr "óôÝëíåé ôï ìÞíõìá"
+msgstr "áðïóôïëÞ ôïõ ìçíýìáôïò"
 
 #: keymap_alldefs.h:43
 msgid "toggle disposition between inline/attachment"
-msgstr ""
+msgstr "åðéëïãÞ ÷áñáêôÞñá áíÜìåóá áðü åóùôåñéêü êåßìåíï/ðñïóÜñôçóç"
 
 #
 #: keymap_alldefs.h:44
 msgid "toggle whether to delete file after sending it"
-msgstr "èÝôåé ôçí äéáãñáöÞ ôïõ áñ÷åßïõ ìåôÜ ôçí áðïóôïëÞ, Þ ü÷é"
+msgstr "åðéëïãÞ ôçò äéáãñáöÞò ôïõ áñ÷åßïõ ìåôÜ ôçí áðïóôïëÞ, Þ ü÷é"
 
 #
 #: keymap_alldefs.h:45
 msgid "update an attachment's encoding info"
-msgstr "áíáíåþíåé ôéò ðëçñïöïñßåò êùäéêïðïßçóçò ôçò ðñïóÜñôçóçò"
+msgstr "áíáíÝùóç ôùí ðëçñïöïñéþí êùäéêïðïßçóçò ôçò ðñïóÜñôçóçò"
 
 #
 #: keymap_alldefs.h:46
 msgid "write the message to a folder"
-msgstr "åããñÜöåé ôï ìÞíõìá óå Ýíá öÜêåëï"
+msgstr "åããñáöÞ ôïõ ìçíýìáôïò óå Ýíá öÜêåëï"
 
 #
 #: keymap_alldefs.h:47
 msgid "copy a message to a file/mailbox"
-msgstr "áíôéãñÜöåé Ýíá ìÞíõìá óå Ýíá áñ÷åßï/ãñáììá/ôéï"
+msgstr "áíôéãñáöÞ åíïò ìçíýìáôïò óå Ýíá áñ÷åßï/ãñáììá/ôéï"
 
 #
 #: keymap_alldefs.h:48
 msgid "create an alias from a message sender"
-msgstr "äçìéïõñãåß Ýíá øåõäþíõìï áðü Ýíá áðïóôïëÝá ìçíýìáôïò"
+msgstr "äçìéïõñãßá åíüò øåõäùíýìïõ áðü Ýíá áðïóôïëÝá ìçíýìáôïò"
 
 #
 #: keymap_alldefs.h:49
@@ -2048,32 +2038,31 @@ msgstr "
 #
 #: keymap_alldefs.h:52
 msgid "make decoded (text/plain) copy"
-msgstr "êÜíåé áðïêùäéêïðïéçìÝíï (text/plain) áíôßãñáöï"
+msgstr "äçìéïõñãßá áðïêùäéêïðïéçìÝíïõ (text/plain) áíôéãñÜöïõ"
 
 #
 #: keymap_alldefs.h:53
 msgid "make decoded copy (text/plain) and delete"
-msgstr "êÜíåé áðïêùäéêïðïéçìÝíï (text/plain) áíôßãñáöï êáé äéåãñÜöåé"
+msgstr "äçìéïõñãßá áðïêùäéêïðïéçìÝíïõ (text/plain) áíôéãñÜöï êáé äéåãñáöÞ"
 
 #
 #: keymap_alldefs.h:54
 msgid "delete the current entry"
-msgstr "äéåãñÜöåé ôçí ôñÝ÷ïõóá êáôá÷þñçóç"
+msgstr "äéáãñáöÞ ôçòôñÝ÷ïõóáò êáôá÷þñçóçò"
 
 #: keymap_alldefs.h:55
-#, fuzzy
 msgid "delete the current mailbox (IMAP only)"
-msgstr "åããñáöÞ óôï ôñÝ÷ùí ãñáììáôïêéâþôéï (IMAP Ìüíï)"
+msgstr "åããñáöÞ óôï ôñÝ÷ùí ãñáììáôïêéâþôéï (IMAP ìüíï)"
 
 #
 #: keymap_alldefs.h:56
 msgid "delete all messages in subthread"
-msgstr "äéåãñÜöåé üëá ôá ìçíýìáôá óôç äåõôåñåýïõóá óõæÞôçóç"
+msgstr "äéáãñáöÞ üëùí ôùí ìçíõìÜôùí óôç äåõôåñåýïõóá óõæÞôçóç"
 
 #
 #: keymap_alldefs.h:57
 msgid "delete all messages in thread"
-msgstr "äéåãñÜöåé üëá ôá ìçíýìáôá óôç óõæÞôçóç"
+msgstr "äéáãñáöÞ üëùí ôùí ìçíõìÜôùí óôç óõæÞôçóç"
 
 #
 #: keymap_alldefs.h:58
@@ -2082,24 +2071,23 @@ msgstr "
 
 #
 #: keymap_alldefs.h:59
-#, fuzzy
 msgid "display message and toggle header weeding"
-msgstr "áðåéêüíéóç ôïõ ìçíýìáôïò ìå ðëÞñç åðéêåöáëßäá"
+msgstr "áðåéêüíéóç ôïõ ìçíýìáôïò êáé åðéëïãÞ êáèáñéóìïý åðéêåöáëßäáò"
 
 #
 #: keymap_alldefs.h:60
 msgid "display a message"
-msgstr "áðåéêïíßæåé ôï ìÞíõìá"
+msgstr "áðåéêüíéóç ôïõ ìçíýìáôïò"
 
 #
 #: keymap_alldefs.h:61
 msgid "edit the raw message"
-msgstr "åðåîåñãÜæåôå ôï <<ùìü>> ìÞíõìá"
+msgstr "åðåîåñãáóßá ôïõ <<ùìïý>> ìçíýìáôïò"
 
 #
 #: keymap_alldefs.h:62
 msgid "delete the char in front of the cursor"
-msgstr "äéåãñÜöåé ôï ÷áñáêôÞñá ìðñïóôÜ áðü ôï êÝñóïñá"
+msgstr "äéáãñáöÞ ôïõ ÷áñáêôÞñá ìðñïóôÜ áðü ôï êÝñóïñá"
 
 #
 #: keymap_alldefs.h:63
@@ -2129,7 +2117,7 @@ msgstr "
 #
 #: keymap_alldefs.h:68
 msgid "delete the char under the cursor"
-msgstr "äéåãñÜöåé ôï ÷áñáêôÞñá êÜôù áðü ôï äñïìÝá"
+msgstr "äéáãñáöÞ ôïõ ÷áñáêôÞñá êÜôù áðü ôï äñïìÝá"
 
 #
 #: keymap_alldefs.h:69
@@ -2149,32 +2137,32 @@ msgstr "
 #
 #: keymap_alldefs.h:73
 msgid "delete chars from cursor to end of line"
-msgstr "äéåãñÜöåé ôïõò ÷áñáêôÞñåò áðü ôï êÝñóïñá åþò ôï ôÝëïò ôçò ãñáììÞò"
+msgstr "äéáãñÜöç ôïõò ÷áñáêôÞñåò áðü ôï êÝñóïñá åþò ôï ôÝëïò ôçò ãñáììÞò"
 
 #
 #: keymap_alldefs.h:74
 msgid "delete all chars on the line"
-msgstr "äéåãñÜöåé üëïõò ôïõò ÷áñáêôÞñåò óôç ãñáììÞ"
+msgstr "äéáãñÜöç üëïõò ôïõò ÷áñáêôÞñåò óôç ãñáììÞ"
 
 #
 #: keymap_alldefs.h:75
 msgid "delete the word in front of the cursor"
-msgstr "äéåãñÜöåé ôçí ëÝîç ìðñïóôÜ óôïí êÝñóïñá"
+msgstr "äéáãñÜöç ôçí ëÝîç ìðñïóôÜ óôïí êÝñóïñá"
 
 #
 #: keymap_alldefs.h:76
 msgid "quote the next typed key"
-msgstr "ðáñáèÝôåé ôï åðüìåíï ðëÞêôñï"
+msgstr "ðáñÜèåóç ôïõ åðüìåíïõ ðëÞêôñïõ"
 
 #
 #: keymap_alldefs.h:77
 msgid "enter a muttrc command"
-msgstr "êáôá÷ùñåß ìéá åíôïëÞ muttrc"
+msgstr "êáôá÷þñçóç ìéáò åíôïëÞò muttrc"
 
 #
 #: keymap_alldefs.h:78
 msgid "enter a file mask"
-msgstr "êáôá÷ùñåß ìéá ìÜóêá áñ÷åßùí"
+msgstr "êáôá÷þñçóç ìéáò ìÜóêáò áñ÷åßùí"
 
 #
 #: keymap_alldefs.h:79
@@ -2184,7 +2172,7 @@ msgstr "
 #
 #: keymap_alldefs.h:80
 msgid "filter attachment through a shell command"
-msgstr "öéëôñÜñåé ôçí ðñïóÜñôçóç ìÝóù ìéáò åíôïëÞò öëïéïý"
+msgstr "öéëôñÜñéóìá ôçò ðñïóÜñôçóçò ìÝóù ìéáò åíôïëÞò öëïéïý"
 
 #
 #: keymap_alldefs.h:81
@@ -2199,12 +2187,12 @@ msgstr "
 #
 #: keymap_alldefs.h:83
 msgid "forward a message with comments"
-msgstr "ðñïùèåß Ýíá ìÞíõìá ìå ó÷üëéá"
+msgstr "ðñïþèçóç åíüò ìçíýìáôïò ìå ó÷üëéá"
 
 #
 #: keymap_alldefs.h:84
 msgid "select the current entry"
-msgstr "åðéëÝãåé ôçí ôñÝ÷ïõóá êáôá÷þñçóç"
+msgstr "åðéëïãÞ ôçò ôñÝ÷ïõóáò êáôá÷þñçóçò"
 
 #
 #: keymap_alldefs.h:85
@@ -2244,32 +2232,32 @@ msgstr "
 #
 #: keymap_alldefs.h:92
 msgid "execute a macro"
-msgstr "åêôåëåß ìéá ìáêñïåíôïëÞ"
+msgstr "åêôÝëåóç ìéáò ìáêñïåíôïëÞò"
 
 #
 #: keymap_alldefs.h:93
 msgid "compose a new mail message"
-msgstr "óõíèÝôåé Ýíá íÝï ìÞíõìá"
+msgstr "óýíèåóç åíüò íÝïõ ìçíýìáôïò"
 
 #
 #: keymap_alldefs.h:94
 msgid "open a different folder"
-msgstr "áíïßîôå Ýíá äéáöïñåôéêü öÜêåëï"
+msgstr "Üíïéãìá åíüò äéáöïñåôéêïý öáêÝëïõ"
 
 #
 #: keymap_alldefs.h:95
 msgid "open a different folder in read only mode"
-msgstr "áíïßîôå Ýíá äéáöïñåôéêü öÜêåëï óå êáôÜóôáóç ìüíï-áíÜãíùóçò"
+msgstr "Üíïéãìá åíüò äéáöïñåôéêïý öáêÝëïõ óå êáôÜóôáóç ìüíï-áíÜãíùóçò"
 
 #
 #: keymap_alldefs.h:96
 msgid "clear a status flag from a message"
-msgstr "êáèáñßóôå ôçí óçìáßá êáôÜóôáóçò áðü ôï ìÞíõìá"
+msgstr "êáèáñéóìïò ôçò óçìáßáò êáôÜóôáóçò áðü ôï ìÞíõìá"
 
 #
 #: keymap_alldefs.h:97
 msgid "delete messages matching a pattern"
-msgstr "äéåãñÜøôå ôá ìçíýìáôá ðïõ ôáéñéÜæïõí óå Ýíá ìïíôÝëï/ìïñöÞ"
+msgstr "äéáãñáöÞ ôùí ìçíõìáôùí ðïõ ôáéñéÜæïõí óå Ýíá ìïíôÝëï/ìïñöÞ"
 
 #
 #: keymap_alldefs.h:98
@@ -2333,9 +2321,8 @@ msgstr "
 
 #
 #: keymap_alldefs.h:110
-#, fuzzy
 msgid "move to the previous undeleted message"
-msgstr "ìåôáêßíçóç óôï åðüìåíï áðïêáôáóôçìÝíï ìÞíõìá"
+msgstr "ìåôáêßíçóç óôï ðñïçãïýìåíï áðïêáôáóôçìÝíï ìÞíõìá"
 
 #
 #: keymap_alldefs.h:111
@@ -2350,38 +2337,39 @@ msgstr "
 #
 #: keymap_alldefs.h:113
 msgid "mark the current thread as read"
-msgstr "óçìåéþíåé ôçí ôñÝ÷ïõóá ñïÞ óõæÞôçóçò ùò áíáãíùóìÝíç"
+msgstr "óçìåßùóç ôçò ôñÝ÷ïõóáò óõæÞôçóçò ùò áíáãíùóìÝíç"
 
 #
 #: keymap_alldefs.h:114
 msgid "mark the current subthread as read"
-msgstr "óçìåéþíåé ôçí ôñÝ÷ïõóá ñïÞ õðïóõæÞôçóçò ùò áíáãíùóìÝíç"
+msgstr "óçìåßùóç ôçòôñÝ÷ïõóáò õðïóõæÞôçóçò ùò áíáãíùóìÝíç"
 
 #
 #: keymap_alldefs.h:115
 msgid "set a status flag on a message"
-msgstr "ïñßæåé ôçí óçìáßá êáôÜóôáóçò óå Ýíá ìÞíõìá"
+msgstr "ïñéóìüò ôçò óçìáßáò êáôÜóôáóçò óå Ýíá ìÞíõìá"
 
 #
 #: keymap_alldefs.h:116
 msgid "save changes to mailbox"
-msgstr "áðïèçêåýåé ôéò áëëáãÝò óôï ãñáììáôïêéâþôéï"
+msgstr "áðïèÞêåõóç ôùí áëëáãþí óôï ãñáììáôïêéâþôéï"
 
 #
 #: keymap_alldefs.h:117
 msgid "tag messages matching a pattern"
-msgstr "óçìåéþíåé ôá ìçíýìáôá ðïõ ôáéñéÜæïõí ìå ìéá ìïñöÞ/ìïíôÝëï"
+msgstr "óçìåßùóç ôùí ìçíõìÜôùí ðïõ ôáéñéÜæïõí ìå ìéá ìïñöÞ/ìïíôÝëï"
 
 #
 #: keymap_alldefs.h:118
 msgid "undelete messages matching a pattern"
-msgstr "áðïêáèçóôÜ (undelete) ôá ìçíýìáôá ðïõ ôáéñéÜæïõí ìå ìßá ìïñöÞ/ìïíôÝëï"
+msgstr ""
+"áðïêáôÜóôáóç (undelete) ôùí ìçíõìÜôùí ðïõ ôáéñéÜæïõí ìå ìßá ìïñöÞ/ìïíôÝëï"
 
 #
 #: keymap_alldefs.h:119
 msgid "untag messages matching a pattern"
 msgstr ""
-"áöáéñåß ôç óçìåßùóç áðü ôá ìçíýìáôá ðïõ ôáéñéÜæïõí ìå ìßá ìïñöÞ/ìïíôÝëï"
+"áöáßñåóç ôçò óçìåßùóçò áðü ôá ìçíýìáôá ðïõ ôáéñéÜæïõí ìå ìßá ìïñöÞ/ìïíôÝëï"
 
 #
 #: keymap_alldefs.h:120
@@ -2389,9 +2377,8 @@ msgid "move to the middle of the page"
 msgstr "ìåôáêßíçóç óôï ìÝóï ôçò óåëßäáò"
 
 #: keymap_alldefs.h:121
-#, fuzzy
 msgid "create a new mailbox (IMAP only)"
-msgstr "åããñáöÞ óôï ôñÝ÷ùí ãñáììáôïêéâþôéï (IMAP Ìüíï)"
+msgstr "äçìéïõñãßá åíüò íÝïõ ãñáììáôïêéâùôßïõ (IMAP ìüíï)"
 
 #
 #: keymap_alldefs.h:122
@@ -2401,12 +2388,12 @@ msgstr "
 #
 #: keymap_alldefs.h:123
 msgid "scroll down one line"
-msgstr "ìåôáêéíåß ìéá ãñáììÞ ðñïò ôá êÜôù"
+msgstr "ìåôáêßíçóç ìéá ãñáììÞ ðñïò ôá êÜôù"
 
 #
 #: keymap_alldefs.h:124
 msgid "move to the next page"
-msgstr "ìåôáêéíåß óôçí åðüìåíç óåëßäá"
+msgstr "ìåôáêßíçóç óôçí åðüìåíç óåëßäá"
 
 #
 #: keymap_alldefs.h:125
@@ -2416,12 +2403,12 @@ msgstr "
 #
 #: keymap_alldefs.h:126
 msgid "toggle display of quoted text"
-msgstr "åðéëÝîôå ôçí åìöÜíéóç ôïõ quoted êåéìÝíïõ"
+msgstr "åðéëïãÞ ôçò åìöÜíéóçò ôïõ quoted êåéìÝíïõ"
 
 #
 #: keymap_alldefs.h:127
 msgid "skip beyond quoted text"
-msgstr "ðñïóðåñíÜ ðÝñá áðü ôï quoted êåßìåíï"
+msgstr "ðñïóðÝñáóç ðÝñá áðü ôï quoted êåßìåíï"
 
 #
 #: keymap_alldefs.h:128
@@ -2431,7 +2418,7 @@ msgstr "
 #
 #: keymap_alldefs.h:129
 msgid "pipe message/attachment to a shell command"
-msgstr "äéï÷åôåýåé ôï ìÞíõìá/ðñïóÜñôçóç óå ìéá åíôïëÞ öëïéïý"
+msgstr "äéï÷Ýôåõóç ôïõ ìçíýìáôïò/ðñïóÜñôçóçò óå ìéá åíôïëÞ öëïéïý"
 
 #
 #: keymap_alldefs.h:130
@@ -2451,32 +2438,32 @@ msgstr "
 #
 #: keymap_alldefs.h:133
 msgid "print the current entry"
-msgstr "åêôõðþíåé ôçí ôñÝ÷ïõóá êáôá÷þñçóç"
+msgstr "åêôýðùóç ôçò ôñÝ÷ïõóáò êáôá÷þñçóçò"
 
 #
 #: keymap_alldefs.h:134
 msgid "query external program for addresses"
-msgstr "åñùôÜ Ýíá åîùôåñéêü ðñüãñáììá ãéá äéåõèýíóåéò"
+msgstr "åñþôçóç åíüò åîùôåñéêïý ðñïãñÜììáôïò ãéá äéåõèýíóåéò"
 
 #
 #: keymap_alldefs.h:135
 msgid "append new query results to current results"
-msgstr "ðñïóèÝôåé ôá íÝá áðïôåëÝóìáôá ôçò åñþôçóçò óôá ôñÝ÷ïõóá"
+msgstr "ðñüóèåóç ôùí íÝùí áðïôåëåóìÜôùí ôçò åñþôçóçò óôá ôñÝ÷ùíôá"
 
 #
 #: keymap_alldefs.h:136
 msgid "save changes to mailbox and quit"
-msgstr "áðïèçêåýåé ôéò áëëáãÝò óôï ãñáììáôïêéâþôéï êáé åãêáôáëåßøáôå"
+msgstr "áðïèÞêåõóç ôùí áëëáãþí óôï ãñáììáôïêéâþôéï êáé åãêáôÜëåéøç"
 
 #
 #: keymap_alldefs.h:137
 msgid "recall a postponed message"
-msgstr "åðáíáêáëåß Ýíá áíáâåâëçìÝíï ìÞíõìá"
+msgstr "åðáíÜêëçóç åíüò áíáâåâëçìÝíïõ ìçíýìáôïò"
 
 #
 #: keymap_alldefs.h:138
 msgid "clear and redraw the screen"
-msgstr "êáèáñßæåé êáé áíáíåþíåé ôçí ïèüíç"
+msgstr "êáèáñéóìüò êáé áíáíÝùóç ôçò ïèüíçò"
 
 #
 #: keymap_alldefs.h:139
@@ -2486,26 +2473,26 @@ msgstr "{
 #
 #: keymap_alldefs.h:140
 msgid "reply to a message"
-msgstr "áðáíôÞóôå óå Ýíá ìÞíõìá"
+msgstr "áðÜíôçóç óå Ýíá ìÞíõìá"
 
 #: keymap_alldefs.h:141
 msgid "use the current message as a template for a new one"
-msgstr ""
+msgstr "÷ñçóéìïðïßçóç ôïõ ôñÝ÷ïíôïò ìçíýìáôïò ùò ó÷åäßïõ ãéá Ýíá íÝï"
 
 #
 #: keymap_alldefs.h:142
 msgid "save message/attachment to a file"
-msgstr "áðïèçêåýóôå ìÞíõìá/ðñïóÜñôçóç óå Ýíá áñ÷åßï"
+msgstr "áðïèÞêåõóç ìçíýìáôïò/ðñïóÜñôçóçò óå Ýíá áñ÷åßï"
 
 #
 #: keymap_alldefs.h:143
 msgid "search for a regular expression"
-msgstr "áíáæçôÞóôå ìéá êáíïíéêÞ Ýêöñáóç"
+msgstr "áíáæÞôçóç ìéáò êáíïíéêÞò Ýêöñáóçò"
 
 #
 #: keymap_alldefs.h:144
 msgid "search backwards for a regular expression"
-msgstr "áíáæçôÞóôå ìéá êáíïíéêÞ Ýêöñáóç ðñïò ôá ðßóù"
+msgstr "áíáæÞôçóç ìéáò êáíïíéêÞò Ýêöñáóçò ðñïò ôá ðßóù"
 
 #
 #: keymap_alldefs.h:145
@@ -2515,137 +2502,137 @@ msgstr "
 #
 #: keymap_alldefs.h:146
 msgid "search for next match in opposite direction"
-msgstr "áíáæçôÞóôå ôï åðüìåíï ôáßñéáóìá ðñïò ôçí áíôßèåôç êáôåýèõíóç"
+msgstr "áíáæÞôçóç ôïõ åðüìåíïõ ôáéñéÜóìáôïò ðñïò ôçí áíôßèåôç êáôåýèõíóç"
 
 #
 #: keymap_alldefs.h:147
 msgid "toggle search pattern coloring"
-msgstr "äéáëÝîôå ôï ÷ñùìáôéóìü ôùí áðïôåëåóìÜôùí áíáæÞôçóçò"
+msgstr "åðéëïãÞ ôïõ ÷ñùìáôéóìïý ôùí áðïôåëåóìÜôùí áíáæÞôçóçò"
 
 #
 #: keymap_alldefs.h:148
 msgid "invoke a command in a subshell"
-msgstr "åðéêáëåóèåßôå ìéá åíôïëÞ óå Ýíá äåõôåñåýùí öëïéü"
+msgstr "êëÞóç ìéáò åíôïëÞò óå Ýíá äåõôåñåýùí öëïéü"
 
 #
 #: keymap_alldefs.h:149
 msgid "sort messages"
-msgstr "ôáîéíïìÞóôå ôá ìçíýìáôá"
+msgstr "ôáîéíüìçóç ôùí ìçíõìÜôùí"
 
 #
 #: keymap_alldefs.h:150
 msgid "sort messages in reverse order"
-msgstr "ôáîéíïìÞóôå ôá ìçíýìáôá óå áíÜóôñïöç óåßñá"
+msgstr "ôáîéíüìçóç ôùí ìçíõìÜôùí óå áíÜóôñïöç óåßñá"
 
 #
 #: keymap_alldefs.h:151
 msgid "tag the current entry"
-msgstr "óçìåéþóôå ôçí ôñÝ÷ïõóá êáôá÷þñçóç"
+msgstr "óçìåßùóç ôçò ôñÝ÷ïõóáò êáôá÷þñçóçò"
 
 #
 #: keymap_alldefs.h:152
 msgid "apply next function to tagged messages"
-msgstr "åöáñìüóôå ôçí åðüìåíç ëåéôïõñãßá óôá óçìåéùìÝíá ìçíýìáôá"
+msgstr "åöáñìïãÞ ôçò åðüìåíçò ëåéôïõñãßáò óôá óçìåéùìÝíá ìçíýìáôá"
 
 #
 #: keymap_alldefs.h:153
 msgid "tag the current subthread"
-msgstr "óçìåéþóôå ôçí ôñÝ÷ïõóá äåõôåñåýïõóá ñïÞ óõæÞôçóçò"
+msgstr "óçìåßùóç ôçò ôñÝ÷ïõóáò äåõôåñåýïõóáò óõæÞôçóçò"
 
 #
 #: keymap_alldefs.h:154
 msgid "tag the current thread"
-msgstr "óçìåéþóôå ôçí ôñÝ÷ïõóá ñïÞ óõæÞôçóçò"
+msgstr "óçìåßùóç ôçò ôñÝ÷ïõóáò óõæÞôçóçò"
 
 #
 #: keymap_alldefs.h:155
 msgid "toggle a message's 'new' flag"
-msgstr "äéáëÝîôå ôçí 'íÝá' óçìáßá ìçíýìáôïò"
+msgstr "åðéëïãÞ ôçò 'íÝáò' óçìáßáò ìçíýìáôïò"
 
 #
 #: keymap_alldefs.h:156
 msgid "toggle whether the mailbox will be rewritten"
-msgstr "äéáëÝîôå åÜí ôï ãñáììáôïêéâþôéï èá îáíáãñáöôåß"
+msgstr "åðéëïãÞ åÜí ôï ãñáììáôïêéâþôéï èá îáíáãñáöôåß"
 
 #
 #: keymap_alldefs.h:157
 msgid "toggle whether to browse mailboxes or all files"
-msgstr "äéáëÝîôå åÜí èá îåöõëßóåéò ôá ãñáììáôïêéâþôéá Þ üëá ôá áñ÷åßá"
+msgstr "åðéëïãÞ ãéá ðåñéÞãçóç óôá ãñáììáôïêéâþôéá Þ óå üëá ôá áñ÷åßá"
 
 #
 #: keymap_alldefs.h:158
 msgid "move to the top of the page"
-msgstr "ìåôáêéíçèåßôå óôçí áñ÷Þ ôçò óåëßäáò"
+msgstr "ìåôáêßíçóç óôçí áñ÷Þ ôçò óåëßäáò"
 
 #
 #: keymap_alldefs.h:159
 msgid "undelete the current entry"
-msgstr "áðïêáôáóôçóÝôå ôçí ôñÝ÷ïõóá êáôá÷þñçóç"
+msgstr "áðïêáôÜóôáóç ôçò ôñÝ÷ïõóáò êáôá÷þñçóçò"
 
 #
 #: keymap_alldefs.h:160
 msgid "undelete all messages in thread"
-msgstr "áðïêáôáóôçóÝôå üëá ôá ìçíýìáôá óôç ñïÞ óõæÞôçóçò"
+msgstr "áðïêáôÜóôáóç üëùí ôùí ìçíõìÜôùí óôç óõæÞôçóç"
 
 #
 #: keymap_alldefs.h:161
 msgid "undelete all messages in subthread"
-msgstr "áðïêáôáóôçóÝôå üëá ôá ìçíýìáôá óôç äåõôåñåýóïõóá ñïÞ óõæÞôçóçò"
+msgstr "áðïêáôÜóôáóç üëùí ôùí ìçíõìÜôùí óôç äåõôåñÝõïõóá óõæÞôçóç"
 
 #
 #: keymap_alldefs.h:162
 msgid "show the Mutt version number and date"
-msgstr "äåßîôå ôïí áñéèìü Ýêäïóçò êáé ôçí çìåñïìçíßá ôïõ Mutt"
+msgstr "åìöÜíéóç ôïõ áñéèìïý Ýêäïóçò ôïõ Mutt êáé ôçí çìåñïìçíßá"
 
 #
 #: keymap_alldefs.h:163
 msgid "view attachment using mailcap entry if necessary"
 msgstr ""
-"äåßôå ôçí ðñïóÜñôçóç ÷ñçóéìïðïéþíôáò åÜí ÷ñåéÜæåôáé ôçí êáôá÷þñçóç mailcap"
+"åìöÜíéóç ðñïóÜñôçóçò ÷ñçóéìïðïéþíôáò åÜí ÷ñåéÜæåôáé ôçí êáôá÷þñçóç mailcap"
 
 #
 #: keymap_alldefs.h:164
 msgid "show MIME attachments"
-msgstr "äåßîôå ôéò ðñïóáñôÞóåéò MIME"
+msgstr "åìöÜíéóç ôùí ðñïóáñôÞóåùí MIME"
 
 #
 #: keymap_alldefs.h:165
 msgid "show currently active limit pattern"
-msgstr "äåßîôå ôï åíåñãü ìïíôÝëï ïñßùí"
+msgstr "åìöÜíéóç ôçò åíåñãÞò ìïñöÞò ôùí ïñßùí"
 
 #
 #: keymap_alldefs.h:166
 msgid "collapse/uncollapse current thread"
-msgstr "ìáæÝøôå/áðëþóôå ôçí ôñÝ÷ïõóá ñïÞ óõæÞôçóçò"
+msgstr "ìÜæåìá/Üðëùìá ôçò ôñÝ÷ïõóáò óõæÞôçóçò"
 
 #
 #: keymap_alldefs.h:167
 msgid "collapse/uncollapse all threads"
-msgstr "ìáæÝøôå/áðëþóôå üëåò ôéò ñïÝò óõæÞôçóåùí"
+msgstr "ìÜæåìá/Üðëùìá üëùí ôùí óõæçôÞóåùí"
 
 #
 # keymap_defs.h:158
 #: keymap_alldefs.h:168
 msgid "attach a PGP public key"
-msgstr "ðñïóáñôÞóôå ôï äçìüóéï êëåéäß PGP"
+msgstr "ðñïóÜñôçóç ôïõ äçìüóéïõ êëåéäéïý PGP"
 
 #
 # keymap_defs.h:159
 #: keymap_alldefs.h:169
 msgid "show PGP options"
-msgstr "åìöáíßóôå ôéò åðéëïãÝò PGP"
+msgstr "åìöÜíéóç ôùí åðéëïãþí PGP"
 
 #
 # keymap_defs.h:160
 #: keymap_alldefs.h:170
 msgid "extract PGP public keys"
-msgstr "åîáãÜãåôå ôá äçìüóéá êëåéäéÜ PGP"
+msgstr "åîáãùãÞ ôùí äçìüóéùí êëåéäéþí PGP"
 
 #
 # keymap_defs.h:161
 #: keymap_alldefs.h:171
 msgid "wipe PGP passphrase from memory"
-msgstr "åîáöáíßæåé ôçí öñÜóç êëåéäß PGP áðü ôç ìíÞìç"
+msgstr "åîáöÜíéóç ôçò öñÜóçò êëåéäß PGP áðü ôç ìíÞìç"
 
 #
 # keymap_defs.h:162
@@ -2657,7 +2644,7 @@ msgstr "
 # keymap_defs.h:163
 #: keymap_alldefs.h:173
 msgid "verify a PGP public key"
-msgstr "åðéâåâáéþóôå Ýíá äçìüóéï êëåéäß PGP"
+msgstr "åðéâåâáßùóç åíüò äçìüóéïõ êëåéäéïý PGP"
 
 #
 # keymap_defs.h:164
@@ -2690,7 +2677,7 @@ msgstr "
 #
 #: keymap_alldefs.h:180
 msgid "Delete a remailer from the chain"
-msgstr "ÄéåãñÜöåé Ýíá åðáíáðïóôïëÝá áðü ôçí áëõóßäá"
+msgstr "ÄéáãñáöÞ åíüò åðáíáðïóôïëÝá áðü ôçí áëõóßäá"
 
 #: keymap_alldefs.h:181
 msgid "Select the previous element of the chain"
@@ -2711,33 +2698,31 @@ msgstr "
 
 #
 #: 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 ""
 "Ãéá íá åðéêïéíùíÞóåôå ìå ôïõò developers, óôåßëôå mail óôï "
 "<mutt-dev@mutt.org>.\n"
+"Ãéá íá áíáöÝñåôå Ýíá ðñüâëçìá ÷ñçóéìïðïéÞóåôå ôï åñãáëåßï muttbug.\n"
 
 #
 #: main.c:44
-#, fuzzy
 msgid ""
 "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"
 msgstr ""
-"Copyright (C) 1996-9 Michael R. Elkins êáé Üëëïé.\n"
+"Copyright (C) 1996-2000 Michael R. Elkins êáé Üëëïé.\n"
 "Ôï Mutt Ýñ÷åôáé ÁÐÏÊËÅÉÓÔÉÊÁ ×ÙÑÉÓ ÅÃÃÕÇÓÇ; ãéá ëåðôïìÝñåéåò ðáôÞóôå `mutt "
 "-vv'.\n"
 "Ôï Mutt Ýéíáé åëåýèåñï ëïãéóìéêü, êáé åõ÷áñßóôùò ìðïñåßôå íá ôï "
-"åðáíáäéáíÝìåôáé\n"
+"åðáíáäéáíÝìåôå\n"
 "õðï ïñéóìÝíïõò üñïõò; ãñÜøôå `mutt -vv' ãéá ëåðôïìÝñåéåò.\n"
 
 #
 #: main.c:50
-#, fuzzy
 msgid ""
 "Copyright (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2000 Brandon Long <blong@fiction.net>\n"
@@ -2763,11 +2748,12 @@ msgid ""
 "    along with this program; if not, write to the Free Software\n"
 "    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n"
 msgstr ""
-"Copyright (C) 1996-9 Michael R. Elkins <me@cs.hmc.edu>\n"
-"Copyright (C) 1996-9 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-9 Thomas Roessler <roessler@guug.de>\n"
-"Copyright (C) 1998-9 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999   Brendan Cully <brendan@kublai.com>\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"
 "Ðïëëïß Üëëïé ðïõ äåí áíáöÝñïíôáé åäþ Ý÷ïõí óõíåéóöÝñåé êþäéêá,\n"
 "äéïñèþóåéò, êáé ðñïôÜóåéò.\n"
@@ -2792,7 +2778,6 @@ msgstr ""
 #
 # main.c:73
 #: main.c:77
-#, fuzzy
 msgid ""
 "\n"
 "SHA1 implementation Copyright (C) 1995-1997 Eric A. Young "
@@ -2809,7 +2794,7 @@ msgid ""
 "    along with this program; if not, write to the program's developers.\n"
 msgstr ""
 "\n"
-"ÅêðëÞñùóç SHA1 Copyright (C) 1995-7 Eric A. Young <eay@cryptsoft.com>\n"
+"ÅêðëÞñùóç SHA1 Copyright (C) 1995-1997 Eric A. Young\n"
 "\n"
 "    Åðáíáäéáíüìç êáé ÷ñÞóç óå ðçãáßá êáé äõáäéêÞ, ìå Þ ÷ùñßò\n"
 "    ôñïðïðïéÞóåéò, åðéôñÝðïíôáé õðü óõãêåêñéìÝíïõò üñïõò.\n"
@@ -2818,6 +2803,7 @@ msgstr ""
 "    ÅÃÃÕÇÓÅÉÓ, óõìðåñéëáìâáíïìÝíåò, áëëÜ ü÷é ðåñéïñéóìÝíåò óå áõôÝò, ôéò\n"
 "    õðïíïïýìåíåò åããõÞóåéò åìðïñåõóéìüôçôáò êáé áñìïäéüôçôïò ãéá Ýíá åéäéêü\n"
 "    ëüãï ÁÐÏÑÑÉÐÔÏÍÔÁÉ.\n"
+"\n"
 "    Èá ðñÝðåé íá Ý÷åôå ëÜâåé Ýíá áíôßãñáöï ìå ôïõò üñïõò ôçò ðëÞñçò "
 "äéáíïìÞò\n"
 "    ìå ôï ðñüãñáììá áõôü, åÜí ü÷é, ãñÜøôå óôïõò developers ôïõ "
@@ -2872,6 +2858,7 @@ msgstr ""
 "  -H <áñ÷åßï>\têáèïñßóôå Ýíá ðñïó÷Ýäéï áðü ôï ïðïßï èá äéáâáóôåß ç "
 "åðéêåöáëßäá\n"
 "  -i <áñ÷åßï>\têáèïñßóôå Ýíá áñ÷åßï ðïõ ôï Mutt èá óõìðåñéëáìâÜíåé êáôÜ ôçí "
+"\n"
 "áðÜíôçóç\n"
 "  -m <ôýðïò>\têáèïñßóôå Ýíá ôýðï ðñïêáèïñéóìÝíïõ ãñáììáôïêéâùôßïõ\n"
 "  -n\t\têÜíåôå ôï Mutt íá ìçí äéáâÜóåé ôï Muttrc ôïõ óõóôÞìáôïò\n"
@@ -2881,7 +2868,7 @@ msgstr ""
 "  -v\t\täåßîôå ôçí Ýêäïóç êáé ôïõò ïñéóìïýò êáôÜ ôç ìåôáãëþôôéóç\n"
 "  -x\t\tåîïìïéþóôå ôçí êáôÜóôáóç áðïóôïëÞò mailx\n"
 "  -y\t\täéáëÝîôå Ýíá ãñáììáôïêéâþôéï áðü ôçí ëßóôá `ãñáììáôïêéâùôßùí'\n"
-"  -z\t\tåãêáôáëåßøáôå áìÝóùò åÜí äåí õðÜñ÷ïõí ìçíýìáôá óôï ãñáììáôïêéâþôéï\n"
+"  -z\t\tåãêáôÜëåéøç áìÝóùò åÜí äåí õðÜñ÷ïõí ìçíýìáôá óôï ãñáììáôïêéâþôéï\n"
 "  -Z\t\táíïßîôå ôïí ðñþôï öÜêåëï ìå íÝï ìÞíõìá, âãåßôå åÜí äåí õðÜñ÷ïõí\n"
 "  -h\t\táõôü ôï ìÞíõìá âïÞèåéáò"
 
@@ -2930,7 +2917,7 @@ msgstr "
 #: main.c:631
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "%s: äå ìðïñþ íá ðñïóáñôÞóù ôï áñ÷åßï.\n"
+msgstr "%s: áäõíáìßá ðñïóÜñôçóçò ôïõ áñ÷åßïõ.\n"
 
 #
 #: main.c:651
@@ -2939,9 +2926,8 @@ msgstr "
 
 #
 #: main.c:660
-#, fuzzy
 msgid "No incoming mailboxes defined."
-msgstr "ìåôáêßíçóç ìåôáîý ôùí ãñáììáôïêéâùôßùí"
+msgstr "Äåí Ý÷åé ïñéóôåß ãñáììáôïêéâþôéï åéóåñ÷ïìÝíùí."
 
 #
 #: main.c:689
@@ -2966,12 +2952,12 @@ msgstr "
 #
 #: mbox.c:692 mbox.c:935
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "Ìïéñáßï ëÜèïò! Äåí ìðüñåóá íá áíïßîù îáíÜ ôï ãñáììáôïêéâþôéï!"
+msgstr "Ìïéñáßï ëÜèïò! Áäõíáìßá åðáíáðñüóâáóçò ôïõ ãñáììáôïêéâùôßïõ!"
 
 #
 #: mbox.c:701
 msgid "Unable to lock mailbox!"
-msgstr "Äåí êáôÜöåñá íá êëåéäþóù ôï ãñáììáôïêéâþôéï!"
+msgstr "Áäõíáìßá êëåéäþìáôïò ôïõ ãñáììáôïêéâùôßïõ!"
 
 #
 #. this means ctx->changed or ctx->deleted was set, but no
@@ -2981,8 +2967,8 @@ msgstr "
 #: mbox.c:745
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
-"sync: ôï ãñáìì/ôéï mbox Ý÷åé ôñïðïðïéçèåß, äåí õðÜñ÷ïõí üìùò ôñïðïðïéçìÝíá\n"
-"      ìçíýìáôá! (áíÝöåñå áõôü ôï óöÜëìá)"
+"sync: ôï mbox Ý÷åé ôñïðïðïéçèåß, äåí õðÜñ÷ïõí ôñïðïðïéçìÝíá ìçíýìáôá!\n"
+"(áíáöÝñáôå áõôü ôï óöÜëìá)"
 
 #
 #: mbox.c:774
@@ -2998,107 +2984,106 @@ msgstr "
 #
 #: mbox.c:972
 msgid "Could not reopen mailbox!"
-msgstr "Äåí ìðüñåóá íá îáíáíïßîù ôï ãñáììáôïêéâþôéï!"
+msgstr "Áäõíáìßá åðáíáðñüóâáóçò ôïõ ãñáììáôïêéâùôßïõ!"
 
 #
 #: mbox.c:1010
 msgid "Reopening mailbox..."
-msgstr "¶íïéãìá îáíÜ ôïõ ãñáììáôïêéâùôßïõ..."
+msgstr "Åðáíáðñüóâáóç óôï ãñáììáôïêéâþôéï..."
 
 #
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
-msgstr "ÐÞäçóå óôï: "
+msgstr "Ìåôáêßíçóç óôï: "
 
 #
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "Ìç Ýãêõñïò áñéèìüò äåßêôç"
 
 #
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "Êáììßá êáôá÷þñçóç"
 
 #
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "Äåí ìðïñåßôå íá ìåôáêéíçèåßôå ðáñáêÜôù."
 
 #
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "Äåí ìðïñåßôå íá ìåôáêéíçèåßôå ðáñáðÜíù."
 
 #
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "Åßóôå óôçí ôåëåõôáßá óåëßäá."
 
 #
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "Åßóôå óôçí ðñþôç óåëßäá."
 
 #
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "Ç ðñþôç êáôá÷þñçóç åìöáíßæåôáé."
 
 #
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "Ç ôåëåõôáßá êáôá÷þñçóç åìöáíßæåôáé."
 
 #
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "Åßóôå óôçí ôåëåõôáßá êáôá÷þñçóç."
 
 #
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "Åßóôå óôçí ðñþôç êáôá÷þñçóç."
 
 #
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "ÁíáæÞôçóç ãéá: "
 
 #
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "ÁíÜóôñïöç áíáæÞôçóç ãéá: "
 
 #
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 pattern.c:1102
 msgid "No search pattern."
-msgstr "ÊáíÝíá ìïíôÝëï áíáæÞôçóçò."
+msgstr "ÊáíÝíá ó÷Ýäéï áíáæÞôçóçò."
 
 #
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "Äå âñÝèçêå."
 
 #
-#: menu.c:803
+#: menu.c:811
 msgid "No tagged entries."
 msgstr "Êáììßá óçìåéùìÝíç åßóïäïò."
 
 #
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "Äåí Ý÷åé åöáñìïóôåß áíáæÞôçóç ãéá áõôü ôï ìåíïý."
 
 #
-#: menu.c:901
-#, fuzzy
+#: menu.c:909
 msgid "Jumping is not implemented for dialogs."
-msgstr "Äåí Ý÷åé åöáñìïóôåß áíáæÞôçóç ãéá áõôü ôï ìåíïý."
+msgstr "Äåí Ý÷åé åöáñìïóôåß ìåôáêßíçóç ãéá ôïõò äéáëüãïõò."
 
 #
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "Óçìåéþóåéò äåí õðïóôçñßæïíôáé."
 
@@ -3110,43 +3095,43 @@ msgstr "
 
 #: muttlib.c:653
 msgid "File is a directory, save under it?"
-msgstr ""
+msgstr "Ôï áñ÷åßï åßíáé öÜêåëïò, áðïèÞêåõóç õðü áõôïý;"
 
 #: muttlib.c:658
 msgid "File under directory: "
-msgstr ""
+msgstr "Áñ÷åßï õðü öÜêåëï:"
 
 #: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr ""
+msgstr "Ôï áñ÷åßï õðÜñ÷åé, (o)äéáãñáöÞ ôïõ õðÜñ÷ïíôïò, (a)ðñüóèåóç, (c)Üêõñï;"
 
 #: muttlib.c:670
 msgid "oac"
-msgstr ""
+msgstr "oac"
 
 #
 #: muttlib.c:956
-#, fuzzy, c-format
+#, c-format
 msgid "%s is not a mailbox!"
-msgstr "Ôï %s äåí åßíáé ãñáììáôïêéâþôéï."
+msgstr "Ôï %s äåí åßíáé ãñáììáôïêéâþôéï!"
 
 #
 #: muttlib.c:962
-#, fuzzy, c-format
+#, c-format
 msgid "Append messages to %s?"
-msgstr "Ìåôáêßíçóç áíáãíùóìÝíùí ìçíõìÜôùí óôï %s;"
+msgstr "Ðñüóèåóç ìçíõìÜôùí óôï %s;"
 
 #
 #: mx.c:114
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Ï áñéèìüò êëåéäùìÜôùí îåðåñÜóôçêå, íá âãÜëù ôï êëåßäùìá ãéá ôï %s?"
+msgstr "Ï áñéèìüò êëåéäùìÜôùí îåðåñÜóôçêå, îåêëåßäùìá ôïõ %s;"
 
 #
 #: mx.c:126
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "Äåí ìðïñþ íá êÜíù dotlock ôï %s.\n"
+msgstr "Áäõíáìßá dotlock ôïõ %s.\n"
 
 #
 #: mx.c:184
@@ -3172,9 +3157,9 @@ msgstr "
 
 #
 #: mx.c:537
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't lock %s\n"
-msgstr "Äåí ìðïñþ íá êÜíù dotlock ôï %s.\n"
+msgstr "Áäõíáìßá êëåéäþìáôïò ôïõ %s\n"
 
 #
 #: mx.c:625
@@ -3192,7 +3177,7 @@ msgstr "
 #: mx.c:741
 #, c-format
 msgid "Could not synchronize mailbox %s!"
-msgstr "Äåí ìðïñþ íá óõã÷ñïíßóù ôï ãñáììáôïêéâþôéï %s!"
+msgstr "Áäõíáìßá óõã÷ñïíéóìïý ôïõ ãñáììáôïêéâùôßïõ %s!"
 
 #
 #: mx.c:805
@@ -3255,72 +3240,71 @@ msgstr "
 #: mx.c:1080
 #, c-format
 msgid "%d kept."
-msgstr ""
+msgstr "%d êñáôÞèçêáí."
 
 #
 #: mx.c:1362
-#, fuzzy
 msgid "Can't write message"
-msgstr "åðåîåñãÜæåôå ôï ìÞíõìá"
+msgstr "Áäõíáìßá åããñáöÞò ôïõ ìçíýìáôïò"
 
 #
-#: pager.c:57
+#: pager.c:60
 msgid "Not available in this menu."
-msgstr "Äåí åßíáéäéáèÝóéìï óå áõôü ôï ìåíïý."
+msgstr "Äåí åßíáé äéáèÝóéìï óå áõôü ôï ìåíïý."
 
 #
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "ÐñïçãÓåë"
 
 #
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "ÅðüìÓåë"
 
 #
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "¼øçÐñïóÜñô"
 
 #
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "Åðüìåíï"
 
 #
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "Åìöáíßæåôáé ç âÜóç ôïõ ìçíýìáôïò."
 
 #
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "Åìöáíßæåôáé ç áñ÷Þ ôïõ ìçíýìáôïò."
 
 #
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "ÁíÜóôñïöç áíáæÞôçóç: "
 
 #
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "ÁíáæÞôçóç:"
 
 #
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "Ç âïÞèåéá Þäç åìöáíßæåôáé."
 
 #
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "¼÷é Üëëï êáèïñéóìÝíï êåßìåíï."
 
 #
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "¼÷é Üëëï ìç êáèïñéóìÝíï êåßìåíï ìåôÜ áðü êáèïñéóìÝíï."
 
@@ -3529,7 +3513,6 @@ msgstr ""
 "\n"
 
 #: pgp.c:640
-#, fuzzy
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -3684,15 +3667,15 @@ msgstr "
 
 #
 #: pgpkey.c:460
-#, fuzzy, c-format
+#, c-format
 msgid "PGP keys matching <%s>."
-msgstr "PGP êëåéäéÜ ðïõ ôáéñéÜæïõí "
+msgstr "¼ìïéá PGP êëåéäéÜ <%s>."
 
 #
 #: pgpkey.c:462
-#, fuzzy, c-format
+#, c-format
 msgid "PGP keys matching \"%s\"."
-msgstr "PGP êëåéäéÜ ðïõ ôáéñéÜæïõí "
+msgstr "¼ìïéá PGP êëåéäéÜ \"%s\"."
 
 #
 # pgpkey.c:210 pgpkey.c:387
@@ -3789,7 +3772,7 @@ msgstr "
 #: pop.c:114
 #, c-format
 msgid "Could not find address for host %s."
-msgstr "Äåí ìðïñþ íá âñù ôç äéåýèõíóç ãéá ôï óýóôçìá %s."
+msgstr "Áäõíáìßá åýñåóçò ôçò äéåýèõíóçò ãéá ôï óýóôçìá %s."
 
 #
 #: pop.c:122
@@ -3809,15 +3792,15 @@ msgstr "
 
 #
 #: pop.c:209
-#, fuzzy, c-format
+#, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "ÁíÜãíùóç %d íÝùí ìçíõìÜôùí (%d bytes)..."
+msgstr "ÁíÜãíùóç íÝùí ìçíõìÜôùí (%d bytes)..."
 
 #
 #: pop.c:210
-#, fuzzy, c-format
+#, c-format
 msgid "Reading new message (%d bytes)..."
-msgstr "ÁíÜãíùóç %d êáéíïýñãéïõ ìçíýìáôïò (%d bytes)..."
+msgstr "ÁíÜãíùóç íÝïõ ìçíýìáôïò (%d bytes)..."
 
 #
 #: pop.c:245
@@ -3831,13 +3814,13 @@ msgstr "
 
 #
 #: pop.c:308
-#, fuzzy, c-format
+#, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [%d ìçíýìáôá äéáâÜóôçêáí]"
+msgstr "%s [%d áðü %d ìçíýìáôá äéáâÜóôçêáí]"
 
 #
 #: pop.c:310
-#, fuzzy, c-format
+#, c-format
 msgid "%s [%d message read]"
 msgstr "%s [%d ìçíýìáôá äéáâÜóôçêáí]"
 
@@ -3902,12 +3885,12 @@ msgstr "
 #
 #: recvattach.c:59
 msgid "Pipe"
-msgstr "Äéï÷åôåýåé"
+msgstr "Äéï÷Ýôåõóç"
 
 #
 #: recvattach.c:60
 msgid "Print"
-msgstr "Åêôýðþíåé"
+msgstr "Åêôýðùóç"
 
 #
 #: recvattach.c:424
@@ -3923,7 +3906,7 @@ msgstr "
 #: recvattach.c:499
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ! Ðñüêåéôáé íá ãñÜøåéò ðÜíù áðü ôï %s, íá óõíå÷ßóù;"
+msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ! Ðñüêåéôáé íá ãñÜøåéò ðÜíù áðü ôï %s, óõíÝ÷åéá;"
 
 #
 #: recvattach.c:517
@@ -3974,7 +3957,7 @@ msgstr "
 #
 #: recvcmd.c:43
 msgid "You may only bounce message/rfc822 parts."
-msgstr "Ìðïñåßò íá äéáâéâÜóåéò ìüíï ìÞíõìá/ìÝñç rfc822"
+msgstr "Ìðïñåßôå íá äéáâéâÜóåôå ìüíï ìÞíõìá/ìÝñç rfc822"
 
 #
 #: recvcmd.c:155
@@ -3990,9 +3973,9 @@ msgstr "
 
 #
 #: recvcmd.c:372
-#, fuzzy, c-format
+#, c-format
 msgid "Can't open temporary file %s."
-msgstr "Äåí ìðïñþ íá äçìéïõñãÞóù ðñïóùñéíü áñ÷åßï"
+msgstr "Áäõíáìßá ðñüóâáóçò óôï ðñïóùñéíü áñ÷åßï %s."
 
 #
 #: recvcmd.c:398 recvcmd.c:537 send.c:722
@@ -4002,18 +3985,19 @@ msgstr "
 #: recvcmd.c:412
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
+"Áäõíáìßá áðïêùäéêïðïßçóçò üëùí ôùí óçìåéùìÝíùí ðñïóáñôÞóåùí. Ðñïþèçóç-MIME "
+"ôùí Üëëùí;"
 
 #
 #: recvcmd.c:545 recvcmd.c:797
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create %s."
-msgstr "Áäõíáìßá äçìéïõñãßáò ôïõ %s: %s."
+msgstr "Áäõíáìßá äçìéïõñãßáò ôïõ %s."
 
 #
 #: recvcmd.c:676
-#, fuzzy
 msgid "Can't find any tagged messages."
-msgstr "åöáñìüóôå ôçí åðüìåíç ëåéôïõñãßá óôá óçìåéùìÝíá ìçíýìáôá"
+msgstr "Áäõíáìßá åýñåóçò óçìåéùìÝíùí ìçíõìÜôùí."
 
 #
 #: recvcmd.c:697 send.c:647
@@ -4023,81 +4007,81 @@ msgstr "
 #: recvcmd.c:776
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
+"Áäõíáìßá áðïêùäéêïðïßçóçò üëùí ôùí óçìåéùìÝíùí ðñïóáñôÞóåùí. "
+"MIME-encapsulate ôéò Üëëåò;"
 
 #
 #: remailer.c:480
-#, fuzzy
 msgid "Append"
-msgstr "ÁðïóôïëÞ"
+msgstr "Ðñüóèåóç"
 
 #: remailer.c:481
 msgid "Insert"
-msgstr ""
+msgstr "Åßóïäïò"
 
 #
 #: remailer.c:482
-#, fuzzy
 msgid "Delete"
-msgstr "ÅðéëÝîôå"
+msgstr "ÄéáãñáöÞ"
 
 #: remailer.c:484
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: remailer.c:512
 msgid "Can't get mixmaster's type2.list!"
-msgstr ""
+msgstr "Áäõíáìßá ëÞøçò ôçò type2.list ôïõ mixmaster!"
 
 #
 #: remailer.c:538
-#, fuzzy
 msgid "Select a remailer chain."
-msgstr "ÄéåãñÜöåé Ýíá åðáíáðïóôïëÝá áðü ôçí áëõóßäá"
+msgstr "ÅðéëïãÞ ìéáò áëõóßäáò áðáíáðïóôïëÝá."
 
 #: remailer.c:592
 #, c-format
 msgid "Error: %s can't be used as the final remailer of a chain."
 msgstr ""
+"ÓöÜëìá: ôï %s äåí ìðïñåß íá åßíáé ï ôåëéêüò åðáíáðïóôïëÝáò ôçò áëõóßäáò."
 
 #: remailer.c:625
 #, c-format
 msgid "Mixmaster chains are limited to %d elements."
-msgstr ""
+msgstr "Ïé áëõóßäåò Mixmaster åßíáé ðåñéïñéóìÝíåò óå %d óôïé÷åßá."
 
 #: remailer.c:650
 msgid "The remailer chain is already empty."
-msgstr ""
+msgstr "Ç áëõóßäá åðáíáðïóôïëÝùí åßíáé Þäç Üäåéá."
 
 #
 #: remailer.c:660
-#, fuzzy
 msgid "You already have the first chain element selected."
-msgstr "Åßóôå óôï ðñþôï ìÞíõìá."
+msgstr "¸÷åôå Þäç åðéëÝîåé ôï ðñþôï óôïé÷åßï ôçò áëõóßäáò."
 
 #: remailer.c:670
 msgid "You already have the last chain element selected."
-msgstr ""
+msgstr "¸÷åôå Þäç åðéëÝîåé ôï ôåëåõôáßï óôïé÷åßï ôçò áëõóßäáò."
 
 #: remailer.c:709
 msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr ""
+msgstr "Ï Mixmaster äåí äÝ÷åôå Cc Þ Bcc åðéêåöáëßäåò."
 
 #: remailer.c:733
 msgid ""
 "Please set the hostname variable to a proper value when using mixmaster!"
 msgstr ""
+"Ðáñáêáëþ ïñßóôå óùóôÜ ôçí ìåôáâëçôÞ ôïõ ïíüìáôïò ôïõ óõóôÞìáôïò üôáí "
+"÷ñçóéìïðïéåßôå ôï mixmaster!"
 
 #
 #: remailer.c:762
-#, fuzzy, c-format
+#, c-format
 msgid "Error sending message, child exited %d.\n"
-msgstr "ÓöÜëìá êáôÜ ôçí áðïóôïëÞ ìçíýìáôïò, ôåñìáôéóìüò äéåñãáóßáò ìå %d (%s)."
+msgstr "ÓöÜëìá óôçí áðïóôïëÞ ìçíýìáôïò, ôåñìáôéóìüò èõãáôñéêÞò ìå %d (%s).\n"
 
 #
 #: remailer.c:766
-#, fuzzy
 msgid "Error sending message."
-msgstr "ÓöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ ìçíýìáôïò!"
+msgstr "ÓöÜëìá êáôÜ ôçí áðïóôïëÞ ôïõ ìçíýìáôïò."
 
 #
 #: rfc1524.c:159
@@ -4164,7 +4148,7 @@ msgstr "
 #
 #: send.c:693
 msgid "Include message in reply?"
-msgstr "Íá óõìðåñéëÜâù ôï ìÞíõìá óôçí áðÜíôçóç;"
+msgstr "Óõìðåñßëçøç ôïõ ìçíýìáôïò óôçí áðÜíôçóç;"
 
 #
 #: send.c:698
@@ -4174,7 +4158,7 @@ msgstr "
 #
 #: send.c:708
 msgid "Could not include all requested messages!"
-msgstr "Äåí ìðüñåóá íá óõìðåñéëÜâù üëá ôá ìçíýìáôá ðïõ æçôÞèçêáí!"
+msgstr "Áäõíáìßá óõìðåñßëçøçò üëùí ôùí ìçíõìÜôùí ðïõ æçôÞèçêáí!"
 
 #
 #: send.c:726
@@ -4238,7 +4222,7 @@ msgstr "
 #
 #: send.c:1529
 msgid "Could not send the message."
-msgstr "Äåí êáôÜöåñá íá óôåßëù ôï ìÞíõìá."
+msgstr "Áäõíáìßá áðïóôïëÞò ôïõ ìçíýìáôïò."
 
 #
 #: send.c:1534
@@ -4271,7 +4255,7 @@ msgstr "
 #: sendlib.c:1709
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "ÓöÜëìá êáôÜ ôçí áðïóôïëÞ ìçíýìáôïò, ôåñìáôéóìüò äéåñãáóßáò ìå %d (%s)."
+msgstr "ÓöÜëìá êáôÜ ôçí áðïóôïëÞ ìçíýìáôïò, ôåñìáôéóìüò èõãáôñéêÞò ìå %d (%s)."
 
 #
 #: sendlib.c:1715
@@ -4321,25 +4305,3 @@ msgstr "
 #: thread.c:727
 msgid "Parent message is not available."
 msgstr "Ôï ôñÝ÷ùí ìÞíõìá äåí åßíáé äéáèÝóéìï."
-
-#
-#~ msgid "move to the last undelete message"
-#~ msgstr "ìåôáêßíçóç óôï ôåëåõôáßï áðïêáôáóôçìÝíï ìÞíõìá"
-
-#
-#~ msgid "return to the main-menu"
-#~ msgstr "åðéóôñïöÞ óôï êõñßùò-ìåíïý"
-
-#
-#~ msgid "ignoring empty header field: %s"
-#~ msgstr "áãíüçóç Üäåéïõ ðåäßïõ åðéêåöáëßäáò: %s"
-
-#~ msgid "Authenticating (GSSAPI)..."
-#~ msgstr "Áõèåíôéêïðïßçóç (GSSAPI)..."
-
-#~ msgid "Recoding only affetcs text attachments."
-#~ msgstr "Ç åðáíáêùäéêïðïßçóç åðéññåÜæåé ìüíï ôçò ðñïóáñôÞóåéò êåéìÝíïõ."
-
-#
-#~ msgid "imap_error(): unexpected response in %s: %s\n"
-#~ msgstr "imap_error(): ìç áíáìåíüìåíç áðÜíôçóç óå %s: %s\n"
diff --git a/po/eo.po b/po/eo.po
index f30bd9db..379ab270 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-24 22:31+0100\n"
+"POT-Creation-Date: 2000-02-29 23:32+0100\n"
 "PO-Revision-Date: 2000-02-23 09:33+00:00\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: eo <eo@li.org>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "Fino"
@@ -22,7 +22,7 @@ msgid "Select"
 msgstr "Elekto"
 
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Helpo"
 
@@ -226,16 +226,21 @@ msgstr "Eraro dum vidigo de dosiero"
 msgid "New mail in %s."
 msgstr "Nova mesaøo en %s."
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr "Ni ankoraý ne povas trakti UTF-8 æi tie."
 
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, c-format
 msgid "Can't open %s: %s."
 msgstr "Ne povas malfermi %s: %s."
 
-#: charset.c:1131
+#: charset.c:1148
+#, fuzzy, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr "Eraro dum rekodado de %s. Vidu %s por savi la datenojn."
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr "Eraro dum rekodado de %s. Vidu %s por savi la datenojn."
@@ -662,7 +667,7 @@ msgstr "Premu klavon por da
 msgid " ('?' for list): "
 msgstr " ('?' por listo): "
 
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "Neniu poþtfako estas malfermita."
 
@@ -670,11 +675,11 @@ msgstr "Neniu po
 msgid "There are no messages."
 msgstr "Ne estas mesaøoj."
 
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "Poþtfako estas nurlega."
 
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 msgid "Function not permitted in attach-message mode."
 msgstr "Funkcio nepermesata dum elektado de aldonoj."
 
@@ -694,7 +699,7 @@ msgstr "
 msgid "Quit"
 msgstr "Fini"
 
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "Forviþi"
 
@@ -706,7 +711,7 @@ msgstr "Malforvi
 msgid "Mail"
 msgstr "Nova mesaøo"
 
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "Respondi"
 
@@ -714,130 +719,130 @@ msgstr "Respondi"
 msgid "Group"
 msgstr "Respondi al grupo"
 
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Poþtfako estis modifita de ekstere. Flagoj povas esti maløustaj."
 
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "Nova mesaøo en æi tiu poþtfako"
 
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "Mankas markitaj mesaøoj."
 
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "Salti al mesaøo: "
 
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "Argumento devas esti mesaønumero."
 
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "Tiu mesaøo ne estas videbla."
 
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "Nevalida mesaønumero."
 
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "Forviþi mesaøojn laý la þablono: "
 
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr "Nenia þablono estas aktiva."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr "Þablono: %s"
 
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "Limigi al mesaøoj laý la þablono: "
 
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "Æu eliri el Mutt?"
 
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "Marki mesaøojn laý la þablono: "
 
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "Malforviþi mesaøojn laý la þablono: "
 
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "Malmarki mesaøojn laý la þablono: "
 
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "Malfermi poþtfakon nurlege"
 
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "Malfermi poþtfakon"
 
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s ne estas poþtfako."
 
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "Eliri el Mutt sen skribi?"
 
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "Vi estas æe la lasta mesaøo."
 
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "Mankas neforviþitaj mesaøoj."
 
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "Vi estas æe la unua mesaøo."
 
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "Seræo rekomencis æe la komenco."
 
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "Seræo rekomencis æe la fino."
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "Mankas novaj mesaøoj"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "Mankas nelegitaj mesaøoj"
 
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr " en æi tiu limigita rigardo"
 
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "Ne restas fadenoj."
 
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "Vi estas æe la unua fadeno."
 
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "Fadeno enhavas nelegitajn mesaøojn."
 
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "Fadenoj ne estas þaltitaj."
 
@@ -1153,6 +1158,12 @@ msgstr "Salutas ..."
 msgid "Login failed."
 msgstr "Saluto malsukcesis."
 
+#. now begin login
+#: imap/auth_gss.c:74
+#, fuzzy
+msgid "Authenticating (GSSAPI)..."
+msgstr "Rajtiøas (CRAM-MD5) ..."
+
 #: imap/browse.c:93
 msgid "Getting namespaces..."
 msgstr "Prenas nomspacojn ..."
@@ -1164,7 +1175,7 @@ msgstr "Prenas liston de po
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Fatala eraro. Mesaøonombro ne kongruas!"
 
@@ -1200,30 +1211,30 @@ msgstr "
 msgid "Closing connection to IMAP server..."
 msgstr "Fermas la konekton al la IMAP-servilo ..."
 
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Markas %d mesaøojn kiel forviþitajn ..."
 
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Skribas mesaøoflagojn ... [%d/%d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "Fermas poþtfakon ..."
 
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "Forviþas mesaøojn de la servilo ..."
 
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Abonas %s ..."
 
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Malabonas %s ..."
@@ -1331,11 +1342,11 @@ msgstr "Konekti
 msgid "preconnect command failed"
 msgstr "antaýkonekta komando malsukcesis"
 
-#: imap/util.c:40
+#: imap/util.c:41
 msgid "Continue?"
 msgstr "Æu daýrigi?"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr "%s [%s]\n"
@@ -2459,80 +2470,80 @@ msgstr "Ne povis remalfermi po
 msgid "Reopening mailbox..."
 msgstr "Remalfermas poþtfakon ..."
 
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "Salti al: "
 
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "Nevalida indeksnumero."
 
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "Neniaj registroj."
 
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "Vi ne povas rulumi pli malsupren."
 
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "Vi ne povas rulumi pli supren."
 
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "Vi estas æe la lasta paøo."
 
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "Vi estas æe la unua paøo."
 
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "Unua registro estas montrita."
 
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "Lasta registro estas montrita."
 
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "Vi estas æe la lasta registro."
 
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "Vi estas æe la lasta registro."
 
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "Seræi pri: "
 
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "Inversa seræo pri: "
 
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 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:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "Ne trovita."
 
-#: menu.c:803
+#: menu.c:811
 msgid "No tagged entries."
 msgstr "Mankas markitaj registroj."
 
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "Seræo ne eblas por æi tiu menuo."
 
-#: menu.c:901
+#: menu.c:909
 msgid "Jumping is not implemented for dialogs."
 msgstr "Saltado ne funkcias æe dialogoj."
 
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "Markado ne funkcias."
 
@@ -2672,52 +2683,52 @@ msgstr "%d retenite."
 msgid "Can't write message"
 msgstr "Ne povas skribi mesaøon"
 
-#: pager.c:57
+#: pager.c:60
 msgid "Not available in this menu."
 msgstr "Ne disponata en æi tiu menuo."
 
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "AntPø"
 
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "SekvPø"
 
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "Vidi Partojn"
 
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "Sekva"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "Fino de mesaøo estas montrita."
 
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "Vi estas æe la komenco de la mesaøo"
 
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "Inversa seræo: "
 
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "Seræo: "
 
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "Helpo estas nun montrata."
 
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "Ne plu da citita teksto."
 
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "Ne plu da necitita teksto post citita teksto."
 
diff --git a/po/es.po b/po/es.po
index aab937fc..abab9473 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt\n"
-"POT-Creation-Date: 2000-02-24 22:31+0100\n"
-"PO-Revision-Date: 2000-01-31 17:27+01:00\n"
+"POT-Creation-Date: 2000-02-29 23:32+0100\n"
+"PO-Revision-Date: 2000-02-27 13:37+01:00\n"
 "Last-Translator: Boris Wesslowski <Boris@Wesslowski.com>\n"
 "Language-Team: -\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "Salir"
@@ -19,7 +19,7 @@ msgid "Select"
 msgstr "Seleccionar"
 
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Ayuda"
 
@@ -224,16 +224,21 @@ msgstr "Error al tratar de mostrar el archivo"
 msgid "New mail in %s."
 msgstr "Correo nuevo en %s."
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr "utf-8 no esta soportado al momento."
 
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, c-format
 msgid "Can't open %s: %s."
 msgstr "No se pudo abrir %s: %s."
 
-#: charset.c:1131
+#: charset.c:1148
+#, fuzzy, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr "Error al recodificar %s. Vea %s para recuperar sus datos."
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr "Error al recodificar %s. Vea %s para recuperar sus datos."
@@ -659,7 +664,7 @@ msgstr "Presione una tecla para continuar..."
 msgid " ('?' for list): "
 msgstr " ('?' para lista): "
 
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "Ningún buzón esta abierto."
 
@@ -667,11 +672,11 @@ msgstr "Ning
 msgid "There are no messages."
 msgstr "No hay mensajes."
 
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "El buzón es de sólo lectura."
 
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 msgid "Function not permitted in attach-message mode."
 msgstr "Función no permitida en el modo de adjuntar mensaje."
 
@@ -691,7 +696,7 @@ msgstr "Los cambios al buz
 msgid "Quit"
 msgstr "Salir"
 
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "Sup."
 
@@ -703,7 +708,7 @@ msgstr "Recuperar"
 msgid "Mail"
 msgstr "Nuevo"
 
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "Responder"
 
@@ -711,130 +716,130 @@ msgstr "Responder"
 msgid "Group"
 msgstr "Grupo"
 
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Buzón fue modificado.  Los indicadores pueden estar mal."
 
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "Correo nuevo en este buzón."
 
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "No hay mensajes marcados."
 
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "Saltar a mensaje: "
 
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "Argumento tiene que ser un número de mensaje."
 
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "Ese mensaje no es visible."
 
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "Número de mensaje erróneo."
 
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "Suprimir mensajes que coincidan con: "
 
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr "No hay patrón limitante activo."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr "Límite: %s"
 
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "Limitar a mensajes que coincidan con: "
 
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "¿Salir de Mutt?"
 
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "Marcar mensajes que coincidan con: "
 
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "No suprimir mensajes que coincidan con: "
 
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "Desmarcar mensajes que coincidan con: "
 
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "Abrir buzón en modo de sólo lectura"
 
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "Abrir buzón"
 
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s no es un buzón."
 
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "¿Salir de Mutt sin guardar?"
 
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "Está en el último mensaje."
 
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "No hay mensajes sin suprimir."
 
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "Está en el primer mensaje."
 
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "La búsqueda volvió a empezar desde arriba."
 
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "La búsqueda volvió a empezar desde abajo."
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "No hay mensajes nuevos"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "No hay mensajes sin leer"
 
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr " en esta vista limitada"
 
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "No hay mas hilos."
 
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "Ya está en el primer hilo."
 
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "El hilo contiene mensajes sin leer."
 
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "La muestra por hilos no esta activada."
 
@@ -1100,9 +1105,9 @@ msgid "Help for %s"
 msgstr "Ayuda para %s"
 
 #: hook.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "%s: tipo desconocido"
+msgstr "unhook: tipo de gancho desconocido: %s"
 
 #: imap/auth.c:104
 msgid "Authenticating (CRAM-MD5)..."
@@ -1151,20 +1156,24 @@ msgstr "Entrando..."
 msgid "Login failed."
 msgstr "El login falló."
 
-#: imap/browse.c:93
+#. now begin login
+#: imap/auth_gss.c:74
 #, fuzzy
+msgid "Authenticating (GSSAPI)..."
+msgstr "Verificando autentidad (CRAM-MD5)..."
+
+#: imap/browse.c:93
 msgid "Getting namespaces..."
-msgstr "Consiguiendo mensaje..."
+msgstr "Consiguiendo espacio de nombres..."
 
 #: imap/browse.c:120
-#, fuzzy
 msgid "Getting folder list..."
-msgstr "Contactando servidor, recogiendo lista de carpetas..."
+msgstr "Consiguiendo lista de carpetas..."
 
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "¡Error fatal!  La cuenta de mensajes no esta sincronizada."
 
@@ -1200,30 +1209,30 @@ msgstr "
 msgid "Closing connection to IMAP server..."
 msgstr "Cerrando conexión al servidor IMAP..."
 
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Marcando %d mensajes como suprimidos..."
 
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Guardando indicadores de estado de mensajes... [%d/%d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "Cerrando buzón..."
 
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "Eliminando mensajes del servidor..."
 
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Suscribiendo a %s..."
 
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Desuscribiendo de %s..."
@@ -1332,11 +1341,11 @@ msgstr "Conectando a %s..."
 msgid "preconnect command failed"
 msgstr "la órden antrerior a la conección falló"
 
-#: imap/util.c:40
+#: imap/util.c:41
 msgid "Continue?"
 msgstr "¿Continuar?"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr "%s [%s]\n"
@@ -1904,9 +1913,8 @@ msgid "jump to previous subthread"
 msgstr "saltar al subhilo anterior"
 
 #: keymap_alldefs.h:110
-#, fuzzy
 msgid "move to the previous undeleted message"
-msgstr "ir al próximo mensaje no borrado"
+msgstr "ir al mensaje no borrado anterior"
 
 #: keymap_alldefs.h:111
 msgid "jump to the previous new message"
@@ -2205,11 +2213,12 @@ msgid "Out of memory!"
 msgstr "¡Sin memoria!"
 
 #: 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 los autores mande un mensaje a <mutt-dev@mutt.org>.\n"
+msgstr ""
+"Para contactar los desarrolladores mande un mensaje a <mutt-dev@mutt.org>.\n"
+"Para reportar un fallo use la utilería muttbug por favor.\n"
 
 #: main.c:44
 msgid ""
@@ -2406,9 +2415,8 @@ msgid "No mailbox with new mail."
 msgstr "Ningún buzón con correo nuevo."
 
 #: main.c:660
-#, fuzzy
 msgid "No incoming mailboxes defined."
-msgstr "cambiar entre buzones de entrada"
+msgstr "Ningún buzón de entrada fue definido."
 
 #: main.c:689
 msgid "Mailbox is empty."
@@ -2460,80 +2468,80 @@ msgstr "
 msgid "Reopening mailbox..."
 msgstr "Reabriendo buzón..."
 
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "Saltar a: "
 
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "Número de índice inválido."
 
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "No hay entradas."
 
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "Ya no puede bajar más."
 
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "Ya no puede subir más."
 
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "Está en la última página."
 
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "Está en la primera página."
 
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "La primera entrada esta siendo mostrada."
 
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "La última entrada esta siendo mostrada."
 
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "Está en la última entrada."
 
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "Está en la primera entrada."
 
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "Buscar por: "
 
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "Buscar en sentido opuesto: "
 
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 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:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "No fue encontrado."
 
-#: menu.c:803
+#: menu.c:811
 msgid "No tagged entries."
 msgstr "No hay entradas marcadas."
 
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "No puede buscar en este menú."
 
-#: menu.c:901
+#: menu.c:909
 msgid "Jumping is not implemented for dialogs."
 msgstr "Saltar no está implementado para diálogos."
 
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "Marcar no está soportado."
 
@@ -2670,56 +2678,55 @@ msgid "%d kept."
 msgstr "Quedaron %d."
 
 #: mx.c:1362
-#, fuzzy
 msgid "Can't write message"
-msgstr "editar el mensaje"
+msgstr "No se pudo escribir el mensaje"
 
-#: pager.c:57
+#: pager.c:60
 msgid "Not available in this menu."
 msgstr "No disponible en este menú."
 
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "PágAnt"
 
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "PróxPág"
 
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "Adjuntos"
 
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "Sig."
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "El final del mensaje esta siendo mostrado."
 
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "El principio del mensaje esta siendo mostrado."
 
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "Buscar hacia atrás: "
 
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "Buscar: "
 
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "La ayuda esta siendo mostrada."
 
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "No hay mas texto citado."
 
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "No hay mas texto sin citar bajo el texto citado."
 
@@ -3535,15 +3542,3 @@ msgstr "El mensaje anterior no es visible en vista limitada"
 #: thread.c:727
 msgid "Parent message is not available."
 msgstr "El mensaje anterior no está disponible."
-
-#~ msgid "move to the last undelete message"
-#~ msgstr "ir al último mensaje no borrado"
-
-#~ msgid "return to the main-menu"
-#~ msgstr "regresar al menú principal"
-
-#~ 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 105e7048..ec97e16a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,9 +5,9 @@
 # , fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Mutt 1.1.4\n"
-"POT-Creation-Date: 2000-02-24 22:31+0100\n"
-"PO-Revision-Date: 2000-02-15 22:50+0100\n"
+"Project-Id-Version: Mutt 1.1.5\n"
+"POT-Creation-Date: 2000-02-29 23:32+0100\n"
+"PO-Revision-Date: 2000-02-27 13:32+0100\n"
 "Last-Translator: Marc Baudoin <babafou@babafou.eu.org>, Vincent Lefevre "
 "<vincent@vinc17.org>\n"
 "Language-Team: mutt-dev <mutt-dev@mutt.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "Quitter"
@@ -25,7 +25,7 @@ msgid "Select"
 msgstr "Sélectionner"
 
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Aide"
 
@@ -235,16 +235,21 @@ msgstr "Erreur en essayant de visualiser le fichier"
 msgid "New mail in %s."
 msgstr "Nouveau(x) message(s) dans %s."
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr "Nous ne supportons pas actuellement l'utf-8 à cet endroit."
 
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, c-format
 msgid "Can't open %s: %s."
 msgstr "Impossible d'ouvrir %s : %s."
 
-#: charset.c:1131
+#: charset.c:1148
+#, fuzzy, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr "Erreur en recodant %s. Voir %s pour récupérer vos données."
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr "Erreur en recodant %s. Voir %s pour récupérer vos données."
@@ -689,7 +694,7 @@ msgstr "Appuyez sur une touche pour continuer..."
 msgid " ('?' for list): "
 msgstr " ('?' pour avoir la liste) : "
 
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "Aucune boîte aux lettres n'est ouverte."
 
@@ -697,12 +702,12 @@ msgstr "Aucune bo
 msgid "There are no messages."
 msgstr "Il n'y a pas de messages."
 
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "La boîte aux lettres est en lecture seule."
 
 # , c-format
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 msgid "Function not permitted in attach-message mode."
 msgstr "Fonction non autorisée en mode attach-message."
 
@@ -723,7 +728,7 @@ msgstr "Les modifications du dossier ne seront pas enregistr
 msgid "Quit"
 msgstr "Quitter"
 
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "Effacer"
 
@@ -735,7 +740,7 @@ msgstr "R
 msgid "Mail"
 msgstr "Message"
 
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "Répondre"
 
@@ -743,133 +748,133 @@ msgstr "R
 msgid "Group"
 msgstr "Groupe"
 
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
 "Boîte aux lettres modifiée extérieurement. Les indicateurs peuvent être faux."
 
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "Nouveau(x) message(s) dans cette boîte aux lettres."
 
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "Pas de messages marqués."
 
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "Aller au message : "
 
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "L'argument doit être un numéro de message."
 
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "Ce message n'est pas visible."
 
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "Numéro de message invalide."
 
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "Effacer les messages correspondant à : "
 
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr "Aucun motif de limite n'est en vigueur."
 
 # , c-format
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr "Limite : %s"
 
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "Limiter aux messages correspondant à : "
 
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "Quitter Mutt ?"
 
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "Marquer les messages correspondant à : "
 
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "Récupérer les messages correspondant à : "
 
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "Démarquer les messages correspondant à : "
 
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "Ouvre la boîte aux lettres en lecture seule"
 
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "Ouvre la boîte aux lettres"
 
 # , c-format
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s n'est pas une boîte aux lettres."
 
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "Quitter Mutt sans sauvegarder ?"
 
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "Vous êtes sur le dernier message."
 
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "Aucun message récupéré."
 
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "Vous êtes sur le premier message."
 
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "La recherche est repartie du début."
 
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "La recherche est repartie de la fin."
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "Pas de nouveaux messages"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "Pas de messages non lus"
 
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr " dans cette vue limitée"
 
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "Pas d'autres discussions."
 
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "Vous êtes sur la première discussion."
 
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "Cette discussion contient des messages non-lus."
 
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "L'affichage des discussions n'est pas activé."
 
@@ -1211,20 +1216,23 @@ msgstr "Connexion..."
 msgid "Login failed."
 msgstr "La connexion a échoué."
 
+#. now begin login
+#: imap/auth_gss.c:74
+msgid "Authenticating (GSSAPI)..."
+msgstr "Authentification (GSSAPI)..."
+
 #: imap/browse.c:93
-#, fuzzy
 msgid "Getting namespaces..."
-msgstr "Récupération du message..."
+msgstr "Récupération des espaces de noms..."
 
 #: imap/browse.c:120
-#, fuzzy
 msgid "Getting folder list..."
-msgstr "Serveur contacté, récupération de la liste des dossiers..."
+msgstr "Récupération de la liste des dossiers..."
 
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Erreur fatale. Le nombre de messages ne correspond pas !"
 
@@ -1263,33 +1271,33 @@ msgid "Closing connection to IMAP server..."
 msgstr "Fermeture de la connexion au serveur IMAP..."
 
 # , c-format
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Marquage de %d messages à effacer..."
 
 # , c-format
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Sauvegarde des indicateurs de statut du message... [%d/%d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "Fermeture de la boîte aux lettres..."
 
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "Effacement des messages sur le serveur..."
 
 # , c-format
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Abonnement à %s..."
 
 # , c-format
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Désabonnement de %s..."
@@ -1405,11 +1413,11 @@ msgstr "Connexion 
 msgid "preconnect command failed"
 msgstr "la commande preconnect a échoué"
 
-#: imap/util.c:40
+#: imap/util.c:41
 msgid "Continue?"
 msgstr "Continuer ?"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr "%s [%s]\n"
@@ -1996,9 +2004,8 @@ msgid "jump to previous subthread"
 msgstr "aller à la sous-discussion précédente"
 
 #: keymap_alldefs.h:110
-#, fuzzy
 msgid "move to the previous undeleted message"
-msgstr "aller au message non effacé suivant"
+msgstr "aller au message non effacé précédent"
 
 #: keymap_alldefs.h:111
 msgid "jump to the previous new message"
@@ -2510,9 +2517,8 @@ msgid "No mailbox with new mail."
 msgstr "Pas de boîte aux lettres avec des nouveaux messages."
 
 #: main.c:660
-#, fuzzy
 msgid "No incoming mailboxes defined."
-msgstr "parcourir les boîtes aux lettres recevant du courrier"
+msgstr "Pas de boîtes aux lettres recevant du courrier définies."
 
 #: main.c:689
 msgid "Mailbox is empty."
@@ -2564,80 +2570,80 @@ msgstr "La bo
 msgid "Reopening mailbox..."
 msgstr "Réouverture de la boîte aux lettres..."
 
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "Aller à : "
 
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "Numéro d'index invalide."
 
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "Pas d'entrées."
 
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "Défilement vers le bas impossible."
 
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "Défilement vers le haut impossible."
 
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "Vous êtes sur la dernière page."
 
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "Vous êtes sur la première page."
 
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "La première entrée est affichée."
 
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "La dernière entrée est affichée."
 
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "Vous êtes sur la dernière entrée."
 
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "Vous êtes sur la première entrée."
 
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "Rechercher : "
 
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "Rechercher en arrière : "
 
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 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:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "Non trouvé."
 
-#: menu.c:803
+#: menu.c:811
 msgid "No tagged entries."
 msgstr "Pas d'entrées marquées."
 
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "La recherche n'est pas implémentée pour ce menu."
 
-#: menu.c:901
+#: menu.c:909
 msgid "Jumping is not implemented for dialogs."
 msgstr "Le saut n'est pas implémenté pour les dialogues."
 
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "Le marquage n'est pas supporté."
 
@@ -2792,56 +2798,55 @@ msgid "%d kept."
 msgstr "%d gardés."
 
 #: mx.c:1362
-#, fuzzy
 msgid "Can't write message"
-msgstr "éditer le message"
+msgstr "Impossible d'écrire le message"
 
-#: pager.c:57
+#: pager.c:60
 msgid "Not available in this menu."
 msgstr "Non disponible dans ce menu."
 
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "PgPréc"
 
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "PgSuiv"
 
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "Voir attach."
 
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "Suivant"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "La fin du message est affichée."
 
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "Le début du message est affiché."
 
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "Rechercher en arrière : "
 
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "Rechercher : "
 
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "L'aide est actuellement affichée."
 
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "Il n'y a plus de texte cité."
 
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "Il n'y a plus de texte non cité après le texte cité."
 
@@ -3701,9 +3706,6 @@ msgstr "Le message p
 #~ msgid "ignoring empty header field: %s"
 #~ msgstr "En-tête vide ignoré : %s"
 
-#~ msgid "Authenticating (GSSAPI)..."
-#~ msgstr "Authentification (GSSAPI)..."
-
 #~ msgid "Recoding only affetcs text attachments."
 #~ msgstr "Le recodage affecte uniquement les attachements textuels."
 
diff --git a/po/gl.po b/po/gl.po
index d653d172..73d618dd 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-24 22:31+0100\n"
+"POT-Creation-Date: 2000-02-29 23:32+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"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "Saír"
@@ -23,7 +23,7 @@ msgid "Select"
 msgstr "Seleccionar"
 
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Axuda"
 
@@ -234,16 +234,21 @@ msgstr "Erro intentando ver ficheiro"
 msgid "New mail in %s."
 msgstr "Novo correo en %s."
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr ""
 
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, fuzzy, c-format
 msgid "Can't open %s: %s."
 msgstr "Non foi atopado: %s"
 
-#: charset.c:1131
+#: charset.c:1148
+#, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr ""
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr ""
@@ -670,7 +675,7 @@ msgstr "Pulsa calquera tecla para seguir..."
 msgid " ('?' for list): "
 msgstr "('?' para lista): "
 
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "Non hai buzóns abertos."
 
@@ -679,12 +684,12 @@ msgstr "Non hai buz
 msgid "There are no messages."
 msgstr "Non hai mensaxes."
 
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "O buzón é de só lectura."
 
 #
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 msgid "Function not permitted in attach-message mode."
 msgstr "Función non permitida no modo \"adxuntar-mensaxe\"."
 
@@ -704,7 +709,7 @@ msgstr "Os cambios 
 msgid "Quit"
 msgstr "Saír"
 
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "Borrar"
 
@@ -716,7 +721,7 @@ msgstr "Recuperar"
 msgid "Mail"
 msgstr "Nova"
 
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "Responder"
 
@@ -724,130 +729,130 @@ msgstr "Responder"
 msgid "Group"
 msgstr "Grupo"
 
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "O buzón foi modificado externamente. Os indicadores poden ser erróneos"
 
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "Novo correo neste buzón."
 
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "Non hai mensaxes marcadas."
 
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "Saltar á mensaxe: "
 
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "O parámetro debe ser un número de mensaxe."
 
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "Esa mensaxe non é visible."
 
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "Número de mensaxe inválido."
 
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "Borrar as mensaxes que coincidan con: "
 
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr "Non hai patrón limitante efectivo."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr "Límite: %s"
 
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "Limitar ás mensaxes que coincidan con: "
 
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "¿Saír de Mutt?"
 
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "Marcar as mensaxes que coincidan con: "
 
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "Recuperar as mensaxes que coincidan con: "
 
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "Desmarcar as mensaxes que coincidan con: "
 
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "Abrir buzón en modo de só lectura"
 
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "Abrir buzón"
 
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s non é un buzón."
 
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "¿Saír de Mutt sen gardar?"
 
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "Está na última mensaxe."
 
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "Non hai mensaxes recuperadas."
 
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "Está na primeira mensaxe."
 
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "A búsqueda volveu ó principio."
 
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "A búsqueda volveu ó final."
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "Non hai novas mensaxes"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "Non hai mensaxes sen ler"
 
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr " nesta vista limitada"
 
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "Non hai máis fíos"
 
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "Está no primeiro fío"
 
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "O fío contén mensaxes sen ler."
 
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "Enfiamento non habilitado."
 
@@ -1166,6 +1171,11 @@ msgstr "Comezando secuencia de login ..."
 msgid "Login failed."
 msgstr "O login fallou."
 
+#. now begin login
+#: imap/auth_gss.c:74
+msgid "Authenticating (GSSAPI)..."
+msgstr ""
+
 #: imap/browse.c:93
 #, fuzzy
 msgid "Getting namespaces..."
@@ -1178,7 +1188,7 @@ msgstr ""
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Erro fatal. ¡A conta de mensaxes non está sincronizada!"
 
@@ -1214,30 +1224,30 @@ msgstr "
 msgid "Closing connection to IMAP server..."
 msgstr "Pechando conexión ó servidor IMAP..."
 
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, fuzzy, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Lendo %d novas mensaxes (%d bytes)..."
 
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Gardando indicadores de estado da mensaxe... [%d/%d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "Pechando buzón..."
 
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "Borrando mensaxes do servidor..."
 
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, fuzzy, c-format
 msgid "Subscribing to %s..."
 msgstr "Copiando a %s..."
 
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, fuzzy, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Conectando con %s..."
@@ -1349,12 +1359,12 @@ msgstr "Conectando con %s..."
 msgid "preconnect command failed"
 msgstr ""
 
-#: imap/util.c:40
+#: imap/util.c:41
 #, fuzzy
 msgid "Continue?"
 msgstr "(seguir)\n"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr ""
@@ -2484,81 +2494,81 @@ msgstr "
 msgid "Reopening mailbox..."
 msgstr "Reabrindo buzón..."
 
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "Saltar a: "
 
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "Número de índice inválido."
 
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "Non hai entradas."
 
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "Non é posible moverse máis abaixo."
 
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "Non é posible moverse máis arriba."
 
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "Está na derradeira páxina."
 
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "Está na primeira páxina."
 
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "Amosase a primeira entrada."
 
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "Amosase a derradeira entrada."
 
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "Está na derradeira entrada."
 
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "Está na primeira entrada."
 
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "Búsqueda de: "
 
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "Búsqueda inversa de: "
 
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 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:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "Non se atopou."
 
-#: menu.c:803
+#: menu.c:811
 msgid "No tagged entries."
 msgstr "Non hai entradas marcadas."
 
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "A búsqueda non está implementada neste menú."
 
-#: menu.c:901
+#: menu.c:909
 #, fuzzy
 msgid "Jumping is not implemented for dialogs."
 msgstr "A búsqueda non está implementada neste menú."
 
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "O marcado non está soportado."
 
@@ -2700,52 +2710,52 @@ msgid "Can't write message"
 msgstr "edita-la mensaxe"
 
 #
-#: pager.c:57
+#: pager.c:60
 msgid "Not available in this menu."
 msgstr "Non dispoñible neste menú."
 
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "PáxAnt"
 
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "SegPáx"
 
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "Ver adxunto"
 
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "Seguinte"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "Amosase o final da mensaxe."
 
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "Amosase o principio da mensaxe."
 
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "Búsqueda inversa: "
 
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "Búsqueda: "
 
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "Estase a amosa-la axuda"
 
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "Non hai máis texto citado."
 
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "Non hai máis texto sen citar despois do texto citado."
 
diff --git a/po/id.po b/po/id.po
index 7b8bdea5..dd0d6292 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,19 +1,19 @@
-# Ronny Haryanto <ronny-muttpo@haryan.to>, 1999.
+# Ronny Haryanto <ronny@haryan.to>, 1999.
 #
 # http://i18n.linux.or.id
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1.2i\n"
-"POT-Creation-Date: 2000-02-24 22:31+0100\n"
-"PO-Revision-Date: 2000-01-30 12:40-0600\n"
-"Last-Translator: Ronny Haryanto <ronny-muttpo@haryan.to>\n"
+"Project-Id-Version: 1.1.5i\n"
+"POT-Creation-Date: 2000-02-29 23:32+0100\n"
+"PO-Revision-Date: 2000-02-27 09:00-0600\n"
+"Last-Translator: Ronny Haryanto <ronny@haryan.to>\n"
 "Language-Team: Indonesia <i18n@linux.or.id>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 7bit\n"
 
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "Keluar"
@@ -23,7 +23,7 @@ msgid "Select"
 msgstr "Pilih"
 
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Bantuan"
 
@@ -227,16 +227,22 @@ msgstr "Gagal menampilkan file"
 msgid "New mail in %s."
 msgstr "Surat baru di %s."
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr "Kami belum bisa menangani UTF-8 pada saat ini."
 
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, c-format
 msgid "Can't open %s: %s."
 msgstr "Tidak bisa membuka: %s"
 
-#: charset.c:1131
+#: charset.c:1148
+#, fuzzy, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr ""
+"Error saat meng-coding ulang %s. Lihat %s untuk menyelamatkan data anda."
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr ""
@@ -664,7 +670,7 @@ msgstr "Tekan sembarang tombol untuk lanjut..."
 msgid " ('?' for list): "
 msgstr " ('?' utk lihat daftar): "
 
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "Tidak ada kotak surat yang terbuka."
 
@@ -672,11 +678,11 @@ msgstr "Tidak ada kotak surat yang terbuka."
 msgid "There are no messages."
 msgstr "Tidak ada surat."
 
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "Kotak surat hanya bisa dibaca."
 
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 msgid "Function not permitted in attach-message mode."
 msgstr "Fungsi ini tidak diperbolehkan pada mode pelampiran-surat"
 
@@ -696,7 +702,7 @@ msgstr "Perubahan ke folder tidak akan dilakukan."
 msgid "Quit"
 msgstr "Keluar"
 
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "Hapus"
 
@@ -708,7 +714,7 @@ msgstr "Nggak jadi hapus"
 msgid "Mail"
 msgstr "Surat"
 
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "Balas"
 
@@ -716,132 +722,132 @@ msgstr "Balas"
 msgid "Group"
 msgstr "Grup"
 
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
 "Kotak surat diobok-obok oleh program lain. Tanda-tanda surat mungkin tidak "
 "tepat."
 
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "Surat baru di kotak ini."
 
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "Tidak ada surat yang ditandai."
 
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "Ke surat no: "
 
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "Parameter harus berupa nomer surat."
 
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "Surat itu tidak bisa dilihat."
 
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "Tidak ada nomer begitu."
 
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "Hapus surat-surat yang: "
 
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr "Pola batas (limit pattern) tidak ditentukan."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr " Batas: %s"
 
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "Hanya surat-surat yang: "
 
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "Keluar dari Mutt?"
 
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "Tandai surat-surat yang: "
 
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "Tidak jadi hapus surat-surat yang: "
 
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "Tidak jadi tandai surat-surat yang: "
 
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "Buka kotak surat dengan mode read-only"
 
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "Buka kotak surat"
 
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s bukan kotak surat."
 
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "Keluar dari Mutt tanpa menyimpan?"
 
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "Anda sudah di surat yang terakhir."
 
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "Tidak ada surat yang tidak jadi dihapus."
 
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "Anda sudah di surat yang pertama."
 
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "Pencarian kembali ke atas."
 
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "Pencarian kembali ke bawah."
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "Tidak ada surat baru"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "Tidak ada surat yang belum dibaca"
 
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr " di tampilan terbatas ini"
 
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "Tidak ada thread lagi."
 
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "Anda di thread yang pertama."
 
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "Thread berisi surat yang belum dibaca."
 
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "Tidak disetting untuk melakukan threading."
 
@@ -924,39 +930,37 @@ msgid "%s: unknown editor command (~? for help)\n"
 msgstr "%s: perintah editor tidak dikenali (~? utk bantuan)\n"
 
 #: editmsg.c:74
-#, fuzzy, c-format
+#, c-format
 msgid "could not create temporary folder: %s"
-msgstr "Tidak bisa membuat file sementara!"
+msgstr "Tidak bisa membuat kotak surat sementara: %s"
 
 #: editmsg.c:84
-#, fuzzy, c-format
+#, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "Tidak bisa membuat file sementara!"
+msgstr "Tidak bisa membuat kotak surat sementara: %s"
 
 #: editmsg.c:101
-#, fuzzy
 msgid "Message file is empty!"
-msgstr "Kotak surat kosong."
+msgstr "Surat kosong!"
 
 #: editmsg.c:108
-#, fuzzy
 msgid "Message not modified!"
-msgstr "Surat telah dicetak"
+msgstr "Surat tidak diubah!"
 
 #: editmsg.c:116
-#, fuzzy, c-format
+#, c-format
 msgid "Can't open message file: %s"
-msgstr "Tidak bisa membuat file %s"
+msgstr "Tidak bisa membuka file pesan: %s"
 
 #: editmsg.c:123 editmsg.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "Can't append to folder: %s"
-msgstr "Tidak bisa membuat file %s"
+msgstr "Tidak bisa menambah ke kotak surat: %s"
 
 #: editmsg.c:182
-#, fuzzy, c-format
+#, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "Tidak bisa membuat file sementara"
+msgstr "Error. Menyimpan file sementara: %s"
 
 #: flags.c:266
 msgid "Set flag"
@@ -1110,9 +1114,9 @@ msgid "Help for %s"
 msgstr "Bantuan utk %s"
 
 #: hook.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "%s: jenis tidak dikenali"
+msgstr "unhook: jenis tidak dikenali: %s"
 
 #: imap/auth.c:104
 msgid "Authenticating (CRAM-MD5)..."
@@ -1161,22 +1165,25 @@ msgstr "Sedang login..."
 msgid "Login failed."
 msgstr "Login gagal."
 
+#. now begin login
+#: imap/auth_gss.c:74
+msgid "Authenticating (GSSAPI)..."
+msgstr "Mengauthentikasi (GSSAPI)..."
+
 #: imap/browse.c:93
-#, fuzzy
 msgid "Getting namespaces..."
-msgstr "Mengirim surat..."
+msgstr "Mencari namespaces..."
 
 #: imap/browse.c:120
-#, fuzzy
 msgid "Getting folder list..."
-msgstr "Server berhasil dihubungi, mengambil daftar kotak surat..."
+msgstr "Mengambil daftar kotak surat..."
 
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
-msgstr ""
+msgstr "Fatal error. Jumlah surat tidak konsisten dengan server!"
 
 #: imap/imap.c:213
 #, c-format
@@ -1210,86 +1217,83 @@ msgstr "Buat %s?"
 msgid "Closing connection to IMAP server..."
 msgstr "Menutup hubungan ke server IMAP..."
 
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Menandai %d surat-surat \"dihapus\"..."
 
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Menyimpan tanda-tanda status surat... [%d/%d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "Menutup kotak surat..."
 
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "Menghapus surat-surat di server..."
 
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Berlangganan ke %s..."
 
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Berhenti langganan dari %s..."
 
 #: imap/imap_ssl.c:107
-#, fuzzy
 msgid "Unable to get certificate from peer"
-msgstr "tidak bisa menentukan home direktori"
+msgstr "Tidak bisa mengambil sertifikat"
 
 #: imap/imap_ssl.c:118
-#, fuzzy, c-format
+#, c-format
 msgid "SSL connection using %s"
-msgstr "Menghubungi %s"
+msgstr "Hubungan SSL menggunakan %s"
 
 #: imap/imap_ssl.c:143
-#, fuzzy
 msgid "Unknown"
-msgstr "eh..eh.. napa nih?"
+msgstr "Tidak diketahui"
 
 #: imap/imap_ssl.c:168
-#, fuzzy
 msgid "[unable to calculate]"
 msgstr "%s: tidak bisa melampirkan file"
 
 #: imap/imap_ssl.c:219
 msgid "This certificate belongs to:"
-msgstr ""
+msgstr "Sertifikat ini dimiliki oleh:"
 
 #: imap/imap_ssl.c:228
 msgid "This certificate was issued by:"
-msgstr ""
+msgstr "Sertifikat ini dikeluarkan oleh:"
 
 #: imap/imap_ssl.c:239
 #, c-format
 msgid "Fingerprint: %s"
-msgstr ""
+msgstr "Cap jari: %s"
 
 #: imap/imap_ssl.c:241
 msgid "SSL Certificate check"
-msgstr ""
+msgstr "Cek sertifikat SSL"
 
 #: imap/imap_ssl.c:244
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr ""
+msgstr "(t)olak, terima (s)ekali, terima selal(u)"
 
 #: imap/imap_ssl.c:245
 msgid "roa"
-msgstr ""
+msgstr "tsu"
 
 #: imap/imap_ssl.c:249
 msgid "(r)eject, accept (o)nce"
-msgstr ""
+msgstr "(t)olak, terima (s)ekali"
 
 #: imap/imap_ssl.c:250
 msgid "ro"
-msgstr ""
+msgstr "ts"
 
 #: imap/imap_ssl.c:254 pgpkey.c:442
 msgid "Exit  "
@@ -1297,45 +1301,43 @@ msgstr "Keluar  "
 
 #: imap/imap_ssl.c:280
 msgid "Warning: Couldn't save certificate"
-msgstr ""
+msgstr "Warning: Tidak dapat menyimpan sertifikat"
 
 #: imap/imap_ssl.c:282
 msgid "Certificate saved"
-msgstr ""
+msgstr "Sertifikat telah disimpan"
 
 #. Unable to fetch headers for lower versions
 #: imap/message.c:75
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr ""
+msgstr "Tidak dapat mengambil header dari IMAP server versi ini."
 
 #: imap/message.c:92
-#, fuzzy, c-format
+#, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "Menyimpan tanda-tanda status surat... [%d/%d]"
+msgstr "Mengambil header surat... [%d/%d]"
 
 #: imap/message.c:260
-#, fuzzy
 msgid "Fetching message..."
-msgstr "Mengirim surat..."
+msgstr "Mengambil surat..."
 
 #: imap/message.c:431
 msgid "Sending APPEND command ..."
-msgstr ""
+msgstr "Mengirim perintah APPEND ..."
 
 #: imap/message.c:470
-#, fuzzy
 msgid "Uploading message ..."
-msgstr "Mengirim surat..."
+msgstr "Meletakkan pesan ..."
 
 #: imap/message.c:556
-#, fuzzy, c-format
+#, c-format
 msgid "Copying %d messages to %s..."
-msgstr "Pindahkan surat-surat yang sudah dibaca ke %s..."
+msgstr "Menyalin %d pesan ke %s..."
 
 #: imap/message.c:560
-#, fuzzy, c-format
+#, c-format
 msgid "Copying message %d to %s..."
-msgstr "Menyimpan surat ke %s ..."
+msgstr "Menyalin surat %d ke %s..."
 
 #: imap/socket.c:218
 #, c-format
@@ -1346,12 +1348,11 @@ msgstr "Menghubungi %s..."
 msgid "preconnect command failed"
 msgstr "perintah pra-koneksi gagal"
 
-#: imap/util.c:40
-#, fuzzy
+#: imap/util.c:41
 msgid "Continue?"
-msgstr "(lanjut)\n"
+msgstr "Lanjutkan?"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr ""
@@ -1656,7 +1657,7 @@ msgstr "kirim suratnya"
 
 #: keymap_alldefs.h:43
 msgid "toggle disposition between inline/attachment"
-msgstr ""
+msgstr "penampilan inline atau sebagai attachment"
 
 #: keymap_alldefs.h:44
 msgid "toggle whether to delete file after sending it"
@@ -1919,9 +1920,8 @@ msgid "jump to previous subthread"
 msgstr "ke subthread sebelumnya"
 
 #: keymap_alldefs.h:110
-#, fuzzy
 msgid "move to the previous undeleted message"
-msgstr "ke surat berikutnya yang tidak dihapus"
+msgstr "ke pesan sebelumnya yang tidak dihapus"
 
 #: keymap_alldefs.h:111
 msgid "jump to the previous new message"
@@ -2189,43 +2189,43 @@ msgstr "buat salinan yang sudah di-decrypt"
 
 #: keymap_alldefs.h:177
 msgid "Accept the chain constructed"
-msgstr ""
+msgstr "Terima rangkaian yang dibentuk"
 
 #: keymap_alldefs.h:178
 msgid "Append a remailer to the chain"
-msgstr ""
+msgstr "Tambahkan remailer ke rangkaian"
 
 #: keymap_alldefs.h:179
 msgid "Insert a remailer into the chain"
-msgstr ""
+msgstr "Sisipkan remailer ke rangkaian"
 
 #: keymap_alldefs.h:180
-#, fuzzy
 msgid "Delete a remailer from the chain"
-msgstr "hapus baris"
+msgstr "Hapus remailer dari rangkaian"
 
 #: keymap_alldefs.h:181
 msgid "Select the previous element of the chain"
-msgstr ""
+msgstr "Pilih elemen sebelumnya dalam rangkaian"
 
 #: keymap_alldefs.h:182
 msgid "Select the next element of the chain"
-msgstr ""
+msgstr "Pilih elemen berikutnya dalam rangkaian"
 
 #: keymap_alldefs.h:183
 msgid "send the message through a mixmaster remailer chain"
-msgstr ""
+msgstr "kirim pesan melalui sebuah rangkaian remailer mixmaster"
 
 #: lib.c:59 lib.c:74 lib.c:105
 msgid "Out of memory!"
 msgstr "Buset, memory abis!"
 
 #: 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 "Untuk menghubungi developersnya, kirim email ke <mutt-dev@mutt.org>.\n"
+msgstr ""
+"Untuk menghubungi developersnya, kirim email ke <mutt-dev@mutt.org>.\n"
+"Untuk melaporkan bug, mohon gunakan alat bantu muttbug.\n"
 
 #: main.c:44
 msgid ""
@@ -2410,9 +2410,8 @@ msgid "No mailbox with new mail."
 msgstr "Tidak ada kotak surat dengan surat baru."
 
 #: main.c:660
-#, fuzzy
 msgid "No incoming mailboxes defined."
-msgstr "cycle antara kotak surat yang menerima surat"
+msgstr "Tidak ada kotak surat incoming yang didefinisikan."
 
 #: main.c:689
 msgid "Mailbox is empty."
@@ -2464,80 +2463,80 @@ msgstr "Tidak bisa membuka kembali mailbox!"
 msgid "Reopening mailbox..."
 msgstr "Membuka kembali kotak surat..."
 
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "Ke: "
 
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "Nomer indeks tidak betul."
 
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "Tidak ada entry."
 
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "Sudah tidak bisa geser lagi. Jebol nanti."
 
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "Sudah tidak bisa geser lagi. Jebol nanti."
 
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "Anda di halaman terakhir."
 
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "Anda di halaman pertama."
 
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "Entry pertama sudah ditampilkan."
 
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "Entry terakhir sudah ditampilkan."
 
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "Anda di entry terakhir."
 
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "Anda di entry pertama."
 
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "Cari: "
 
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "Cari mundur: "
 
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 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:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "Tidak ketemu."
 
-#: menu.c:803
+#: menu.c:811
 msgid "No tagged entries."
 msgstr "Tidak ada entry yang ditandai."
 
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "Pencarian tidak bisa dilakukan untuk menu ini."
 
-#: menu.c:901
+#: menu.c:909
 msgid "Jumping is not implemented for dialogs."
 msgstr "Pelompatan tidak diimplementasikan untuk dialogs."
 
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "Penandaan tidak didukung."
 
@@ -2548,29 +2547,29 @@ msgstr "Membaca %s... %d"
 
 #: muttlib.c:653
 msgid "File is a directory, save under it?"
-msgstr ""
+msgstr "File adalah sebuah direktori, simpan di dalamnya?"
 
 #: muttlib.c:658
 msgid "File under directory: "
-msgstr ""
+msgstr "File di dalam direktori: "
 
 #: muttlib.c:670
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr ""
+msgstr "File sudah ada, (t)impa, t(a)mbahkan, atau (b)atal?"
 
 #: muttlib.c:670
 msgid "oac"
-msgstr ""
+msgstr "tab"
 
 #: muttlib.c:956
-#, fuzzy, c-format
+#, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s bukan kotak surat."
+msgstr "%s bukan kotak surat!"
 
 #: muttlib.c:962
-#, fuzzy, c-format
+#, c-format
 msgid "Append messages to %s?"
-msgstr "Pindahkan surat-surat yang sudah dibaca ke %s?"
+msgstr "Tambahkan surat-surat ke %s?"
 
 #: mx.c:114
 #, c-format
@@ -2674,56 +2673,55 @@ msgid "%d kept."
 msgstr "%d disimpan."
 
 #: mx.c:1362
-#, fuzzy
 msgid "Can't write message"
-msgstr "edit surat"
+msgstr "Tidak dapat menulis pesan"
 
-#: pager.c:57
+#: pager.c:60
 msgid "Not available in this menu."
 msgstr "Tidak ada di menu ini."
 
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "HlmnSblm"
 
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "HlmnBrkt"
 
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "Lampiran"
 
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "Brkt"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "Sudah paling bawah."
 
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "Sudah paling atas."
 
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "Cari mundur: "
 
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "Cari: "
 
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "Bantuan sudah ditampilkan."
 
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "Tidak ada lagi teks kutipan."
 
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "Tidak ada lagi teks yang tidak dikutp setelah teks kutipan."
 
@@ -3244,22 +3242,22 @@ msgstr "Hanya penghapusan lampiran dari surat multi bagian yang didukung."
 
 #: recvcmd.c:43
 msgid "You may only bounce message/rfc822 parts."
-msgstr ""
+msgstr "Anda hanya dapat menge-bounce bagian-bagian 'message/rfc822'."
 
 #: recvcmd.c:155
-#, fuzzy, c-format
+#, c-format
 msgid "Bounce message to %s...?"
-msgstr "Tembuskan surat ke %s"
+msgstr "Bounce surat ke %s...?"
 
 #: recvcmd.c:155
-#, fuzzy, c-format
+#, c-format
 msgid "Bounce messages to %s...?"
-msgstr "Tembuskan surat-surat ke %"
+msgstr "Bounce surat-surat ke %s...?"
 
 #: recvcmd.c:372
-#, fuzzy, c-format
+#, c-format
 msgid "Can't open temporary file %s."
-msgstr "Tidak bisa membuat file sementara"
+msgstr "Tidak bisa membuka file sementara %s."
 
 #: recvcmd.c:398 recvcmd.c:537 send.c:722
 msgid "Forward MIME encapsulated?"
@@ -3268,16 +3266,17 @@ msgstr "Forward dalam MIME?"
 #: recvcmd.c:412
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
+"Tidak dapat menguraikan semua lampiran yang ditandai. MIME-forward yg "
+"lainnya?"
 
 #: recvcmd.c:545 recvcmd.c:797
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create %s."
-msgstr "Tidak bisa membuat %s: %s."
+msgstr "Tidak bisa membuat %s."
 
 #: recvcmd.c:676
-#, fuzzy
 msgid "Can't find any tagged messages."
-msgstr "terapkan fungsi berikutnya ke surat-surat yang ditandai"
+msgstr "Tidak dapat menemukan surat yang ditandai."
 
 #: recvcmd.c:697 send.c:647
 msgid "No mailing lists found!"
@@ -3286,20 +3285,20 @@ msgstr "Tidak ada mailing list yang ditemukan!"
 #: recvcmd.c:776
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
+"Tidak dapat menguraikan semua lampiran yang ditandai. Ubah yg lainnya ke "
+"MIME?"
 
 #: remailer.c:480
-#, fuzzy
 msgid "Append"
-msgstr "Kirim"
+msgstr "Tambahkan"
 
 #: remailer.c:481
 msgid "Insert"
-msgstr ""
+msgstr "Masukkan"
 
 #: remailer.c:482
-#, fuzzy
 msgid "Delete"
-msgstr "Pilih"
+msgstr "Hapus"
 
 #: remailer.c:484
 msgid "OK"
@@ -3307,53 +3306,51 @@ msgstr ""
 
 #: remailer.c:512
 msgid "Can't get mixmaster's type2.list!"
-msgstr ""
+msgstr "Tidak dapat mengambil type2.list milik mixmaster!"
 
 #: remailer.c:538
 msgid "Select a remailer chain."
-msgstr ""
+msgstr "Pilih rangkaian remailer."
 
 #: remailer.c:592
 #, c-format
 msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr ""
+msgstr "Error: %s tidak dapat digunakan sebagai akhir rangkaian remailer."
 
 #: remailer.c:625
 #, c-format
 msgid "Mixmaster chains are limited to %d elements."
-msgstr ""
+msgstr "Rangkaian mixmaster dibatasi hingga %d elemen."
 
 #: remailer.c:650
 msgid "The remailer chain is already empty."
-msgstr ""
+msgstr "Rangkaian remailer sudah kosong."
 
 #: remailer.c:660
-#, fuzzy
 msgid "You already have the first chain element selected."
-msgstr "Anda sudah di surat yang pertama."
+msgstr "Anda sudah memilih awal rangkaian."
 
 #: remailer.c:670
 msgid "You already have the last chain element selected."
-msgstr ""
+msgstr "Anda sudah memilih akhir rangkaian."
 
 #: remailer.c:709
 msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr ""
+msgstr "Mixmaster tidak menerima header Cc maupun Bcc."
 
 #: remailer.c:733
 msgid ""
 "Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
+msgstr "Mohon variabel hostname diisi dengan benar jika menggunakan mixmaster!"
 
 #: remailer.c:762
-#, fuzzy, c-format
+#, c-format
 msgid "Error sending message, child exited %d.\n"
-msgstr "Error mengirimkan surat, proses keluar dengan kode %d (%s)."
+msgstr "Error mengirimkan surat, proses keluar dengan kode %d.\n"
 
 #: remailer.c:766
-#, fuzzy
 msgid "Error sending message."
-msgstr "Gagal membaca surat!"
+msgstr "Gagal mengirim surat."
 
 #: rfc1524.c:159
 #, c-format
@@ -3546,8 +3543,5 @@ msgstr "Surat induk tidak ada."
 #~ msgid "ignoring empty header field: %s"
 #~ msgstr "mengacuhkan kolom header kosong: %s"
 
-#~ msgid "Authenticating (GSSAPI)..."
-#~ msgstr "Mengauthentikasi (GSSAPI)..."
-
 #~ msgid "Recoding only affetcs text attachments."
 #~ msgstr "Peng-coding-an ulang hanya berpengaruh terhadap lampiran teks."
diff --git a/po/it.po b/po/it.po
index 92675264..3b9769cd 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-24 22:31+0100\n"
+"POT-Creation-Date: 2000-02-29 23:32+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"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "Esci"
@@ -25,7 +25,7 @@ msgid "Select"
 msgstr "Seleziona"
 
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Aiuto"
 
@@ -231,16 +231,21 @@ msgstr "C'
 msgid "New mail in %s."
 msgstr "Nuova posta in %s."
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr "Attualmente non possiamo gestire utf-8 a questo punto."
 
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, c-format
 msgid "Can't open %s: %s."
 msgstr "Impossibile aprire %s: %s."
 
-#: charset.c:1131
+#: charset.c:1148
+#, fuzzy, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr "Errore ricodificando %s. Guarda %s per recuperare i tuoi dati."
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr "Errore ricodificando %s. Guarda %s per recuperare i tuoi dati."
@@ -665,7 +670,7 @@ msgstr "Premi un tasto per continuare..."
 msgid " ('?' for list): "
 msgstr " ('?' per la lista): "
 
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "Nessuna mailbox aperta."
 
@@ -673,11 +678,11 @@ msgstr "Nessuna mailbox aperta."
 msgid "There are no messages."
 msgstr "Non ci sono messaggi."
 
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "La mailbox è di sola lettura."
 
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 msgid "Function not permitted in attach-message mode."
 msgstr "Funzione non permessa nella modalità attach-message."
 
@@ -697,7 +702,7 @@ msgstr "I cambiamenti al folder non saranno scritti."
 msgid "Quit"
 msgstr "Esci"
 
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "Canc"
 
@@ -709,7 +714,7 @@ msgstr "DeCanc"
 msgid "Mail"
 msgstr "Mail"
 
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "Rispondi"
 
@@ -717,131 +722,131 @@ msgstr "Rispondi"
 msgid "Group"
 msgstr "Gruppo"
 
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
 "La mailbox è stata modificata dall'esterno.  I flag possono essere sbagliati."
 
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "C'è nuova posta in questa mailbox."
 
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "Nessun messaggio segnato."
 
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "Salta al messaggio: "
 
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "L'argomento deve essere il numero di un messaggio."
 
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "Questo messaggio non è visibile."
 
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "Numero del messaggio non valido."
 
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "Cancella i messaggi corrispondenti a: "
 
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr "Non è attivo alcun modello limitatore."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr "Limita: %s"
 
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "Limita ai messaggi corrispondenti a: "
 
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "Esci da Mutt?"
 
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "Segna i messaggi corrispondenti a: "
 
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "De-cancella i messaggi corrispondenti a: "
 
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "Togli il segno ai messaggi corrispondenti a: "
 
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "Apri la mailbox in sola lettura"
 
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "Apri la mailbox"
 
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s non è una mailbox."
 
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "Esci da Mutt senza salvare?"
 
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "Sei all'ultimo messaggio."
 
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "Nessun messaggio da de-cancellare."
 
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "Sei al primo messaggio."
 
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "La ricerca è ritornata all'inizio."
 
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "La ricerca è ritornata al fondo."
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "Non ci sono nuovi messaggi"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "Non ci sono messaggi non letti"
 
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr " in questa visualizzazione limitata"
 
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "Non ci sono altri thread."
 
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "Sei al primo thread."
 
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "Il thread contiene messaggi non letti."
 
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "Il threading non è attivo."
 
@@ -1159,6 +1164,11 @@ msgstr "Faccio il login..."
 msgid "Login failed."
 msgstr "Login fallito."
 
+#. now begin login
+#: imap/auth_gss.c:74
+msgid "Authenticating (GSSAPI)..."
+msgstr "Autenticazione in corso (GSSAPI)..."
+
 #: imap/browse.c:93
 #, fuzzy
 msgid "Getting namespaces..."
@@ -1172,7 +1182,7 @@ msgstr "Connesso al server, scarico la lista dei folder..."
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Errore fatale. Il numero dei messaggi non è sincronizzato!"
 
@@ -1208,30 +1218,30 @@ msgstr "Creo %s?"
 msgid "Closing connection to IMAP server..."
 msgstr "Chiudo la connessione al server IMAP..."
 
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Segno cancellati %d messaggi..."
 
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Salvo i flag di stato dei messaggi... [%d/%d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "Chiudo la mailbox..."
 
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "Cancello i messaggi dal server..."
 
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Mi iscrivo a %s..."
 
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Mi deiscrivo da %s..."
@@ -1339,11 +1349,11 @@ msgstr "Mi connetto a %s..."
 msgid "preconnect command failed"
 msgstr "comando di preconnessione fallito"
 
-#: imap/util.c:40
+#: imap/util.c:41
 msgid "Continue?"
 msgstr "Continua?"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr "%s [%s]\n"
@@ -2431,80 +2441,80 @@ msgstr "Impossibile riaprire la mailbox!"
 msgid "Reopening mailbox..."
 msgstr "Riapro la mailbox..."
 
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "Salta a: "
 
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "Numero dell'indice non valido."
 
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "Nessuna voce."
 
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "Non puoi spostarti più in basso."
 
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "Non puoi spostarti più in alto."
 
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "Sei all'ultima pagina."
 
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "Sei alla prima pagina."
 
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "La prima voce è questa."
 
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "L'ultima voce è questa."
 
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "Sei all'ultima voce."
 
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "Sei alla prima voce."
 
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "Cerca: "
 
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "Cerca all'indietro: "
 
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 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:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "Non trovato."
 
-#: menu.c:803
+#: menu.c:811
 msgid "No tagged entries."
 msgstr "Nessuna voce segnata."
 
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "In questo menù la ricerca non è stata implementata."
 
-#: menu.c:901
+#: menu.c:909
 msgid "Jumping is not implemented for dialogs."
 msgstr "I salti non sono implementati per i dialog."
 
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "Non è possibile segnare un messaggio."
 
@@ -2645,52 +2655,52 @@ msgstr "%d tenuti."
 msgid "Can't write message"
 msgstr "modifica il messaggio"
 
-#: pager.c:57
+#: pager.c:60
 msgid "Not available in this menu."
 msgstr "Non disponibile in questo menù."
 
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "PgPrec"
 
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "PgSucc"
 
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "Vedi Allegato"
 
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "Succ"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "La fine del messaggio è questa."
 
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "L'inizio del messaggio è questo."
 
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "Cerca all'indietro: "
 
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "Cerca: "
 
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "L'help è questo."
 
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "Non c'è altro testo citato."
 
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "Non c'è altro testo non citato dopo quello citato."
 
@@ -3500,6 +3510,3 @@ msgstr "Il messaggio padre non 
 
 #~ 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 681af1ff..320425ad 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-24 22:31+0100\n"
+"POT-Creation-Date: 2000-02-29 23:32+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"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "Á¾·á"
@@ -23,7 +23,7 @@ msgid "Select"
 msgstr "¼±ÅÃ"
 
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "µµ¿ò¸»"
 
@@ -225,16 +225,21 @@ msgstr "
 msgid "New mail in %s."
 msgstr "%s¿¡ »õ ÆíÁö µµÂø."
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr "È÷ Ç׸ñ¿¡¼­´Â ¾ÆÁ÷ UTF-8À» Á¦¾îÇÒ ¼ö ¾øÀ½."
 
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, c-format
 msgid "Can't open %s: %s."
 msgstr "%s¸¦ ¿­ ¼ö ¾øÀ½: %s"
 
-#: charset.c:1131
+#: charset.c:1148
+#, fuzzy, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr "%s ±â·Ï Áß ¿À·ù. ÀڷḦ º¹±¸ÇÏ·Á¸é %s¸¦ º¸¼¼¿ä."
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr "%s ±â·Ï Áß ¿À·ù. ÀڷḦ º¹±¸ÇÏ·Á¸é %s¸¦ º¸¼¼¿ä."
@@ -658,7 +663,7 @@ msgstr "
 msgid " ('?' for list): "
 msgstr " (¸ñ·ÏÀ» º¸·Á¸é '?'): "
 
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "¿­¸° ÆíÁöÇÔÀÌ ¾øÀ½."
 
@@ -666,11 +671,11 @@ msgstr "
 msgid "There are no messages."
 msgstr "¸Þ¼¼Áö°¡ ¾ø½À´Ï´Ù."
 
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "Àбâ Àü¿ë ÆíÁöÇÔ."
 
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 msgid "Function not permitted in attach-message mode."
 msgstr "¸Þ¼¼Áö ÷ºÎ ¸ðµå¿¡¼­ Çã°¡µÇÁö ¾Ê´Â ±â´ÉÀÓ."
 
@@ -690,7 +695,7 @@ msgstr "
 msgid "Quit"
 msgstr "Á¾·á"
 
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "»èÁ¦"
 
@@ -704,7 +709,7 @@ msgstr "
 msgid "Mail"
 msgstr "ÆíÁö"
 
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "´äÀå"
 
@@ -712,130 +717,130 @@ msgstr "
 msgid "Group"
 msgstr "±×·ì"
 
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "¿ÜºÎ¿¡¼­ ÆíÁöÇÔÀÌ º¯°æµÊ. Ç÷¡±×°¡ Ʋ¸± ¼ö ÀÖÀ½"
 
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "ÇöÀç ÆíÁöÇÔ¿¡ »õ ÆíÁö µµÂø."
 
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "űװ¡ ºÙÀº ¸Þ¼¼Áö ¾øÀ½."
 
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "¸Þ¼¼Áö À̵¿: "
 
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "Àμö´Â ¸Þ¼¼Áö ¹øÈ£¿©¾ß ÇÔ."
 
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "ÀÌ ¸Þ¼¼Áö´Â º¼ ¼ö ¾ø´Â »óÅÂÀÓ."
 
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "À߸øµÈ ¹®¼­ ¹øÈ£"
 
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "ÀÏÄ¡ÇÏ´Â ¸Þ¼¼Áö »èÁ¦: "
 
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr "ÇöÀç ¹üÀ§ ÆÐÅÏÀÌ ¾ø½À´Ï´Ù."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr "¹üÀ§: %s"
 
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "Á¦ÇÑ°ú ÀÏÄ¡ÇÏ´Â ¸Þ½ÃÁö¸¦ º¸¿©ÁÜ:"
 
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "MuttÀ» Á¾·áÇÒ±î¿ä?"
 
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "ÀÏÄ¡ÇÏ´Â ¸Þ¼¼Áö¿¡ ÅÂ±× ºÙÀÓ: "
 
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "ÀÏÄ¡ÇÏ´Â ¸Þ¼¼Áö º¹±¸: "
 
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "ÀÏÄ¡ÇÏ´Â ¸Þ¼¼Áö¿¡ ÅÂ±× ¾ø¾Ú: "
 
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "Àбâ Àü¿ëÀ¸·Î ÆíÁöÇÔ ¿­±â"
 
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "ÆíÁöÇÔ ¿­±â"
 
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s´Â ÆíÁöÇÔÀÌ ¾Æ´Ô."
 
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "ÀúÀåÇÏÁö ¾Ê°í MuttÀ» ³¡³¾±î¿ä?"
 
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "¸¶Áö¸· ¸Þ¼¼ÁöÀÔ´Ï´Ù."
 
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "º¹±¸µÈ ¸Þ¼¼Áö ¾øÀ½."
 
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "ù¹ø° ¸Þ¼¼ÁöÀÔ´Ï´Ù."
 
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "À§·ÎºÎÅÍ ´Ù½Ã °Ë»öÇÔ."
 
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "¾Æ·¡ºÎÅÍ ´Ù½Ã °Ë»öÇÔ."
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "»õ·Î¿î ¸Þ¼¼Áö ¾øÀ½"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "ÀÐÁö ¾ÊÀº ¸Þ¼¼Áö ¾øÀ½"
 
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr ""
 
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "´õ ÀÌ»ó ±ÛŸ·¡ ¾øÀ½."
 
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "óÀ½ ±ÛŸ·¡ÀÔ´Ï´Ù.."
 
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "±ÛŸ·¡¿¡ ÀÐÁö ¾ÊÀº ¸Þ¼¼Áö ÀÖÀ½."
 
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "±ÛŸ·¡¸¦ »ç¿ëÇÏÁö ¾ÊÀ½."
 
@@ -1149,6 +1154,12 @@ msgstr "
 msgid "Login failed."
 msgstr "Á¢¼Ó ½ÇÆÐ."
 
+#. now begin login
+#: imap/auth_gss.c:74
+#, fuzzy
+msgid "Authenticating (GSSAPI)..."
+msgstr "ÀÎÁõ Áß (CRAM-MD5)..."
+
 #: imap/browse.c:93
 #, fuzzy
 msgid "Getting namespaces..."
@@ -1162,7 +1173,7 @@ msgstr "
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Ä¡¸íÀû ¿À·ù. ¸Þ½ÃÁö ¼ýÀÚ°¡ µ¿±âµÇÁö ¾ÊÀ½!"
 
@@ -1198,30 +1209,30 @@ msgstr "%s
 msgid "Closing connection to IMAP server..."
 msgstr "IMAP ¼­¹ö Á¢¼Ó ´Ý´Â Áß..."
 
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Ç¥½ÃµÈ %d°³ÀÇ ¸Þ¼¼Áö¸¦ »èÁ¦ÇÔ..."
 
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "¸Þ¼¼Áö »óÅ Ç÷¡±× ÀúÀå... [%d/%d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "ÆíÁöÇÔ ´Ý´Â Áß..."
 
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "¼­¹öÀÇ ¸Þ¼¼Áö »èÁ¦ Áß..."
 
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "%s¿¡ ±¸µ¶ Áß..."
 
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "%s¿¡ ±¸µ¶ ÇØÁ¦ Áß..."
@@ -1329,11 +1340,11 @@ msgstr "%s
 msgid "preconnect command failed"
 msgstr "preconnect ¸í·É ½ÇÆÐ"
 
-#: imap/util.c:40
+#: imap/util.c:41
 msgid "Continue?"
 msgstr "°è¼ÓÇÒ±î¿ä?"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr "%s [%s]\n"
@@ -2447,80 +2458,80 @@ msgstr "
 msgid "Reopening mailbox..."
 msgstr "ÆíÁöÇÔÀ» ´Ù½Ã ¿±´Ï´Ù..."
 
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "À̵¿ÇÒ À§Ä¡: "
 
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "À߸øµÈ »öÀÎ ¹øÈ£."
 
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "Ç׸ñÀÌ ¾øÀ½."
 
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "´õ ÀÌ»ó ³»·Á°¥ ¼ö ¾øÀ½."
 
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "´õ ÀÌ»ó ¿Ã¶ó°¥ ¼ö ¾øÀ½."
 
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "¸¶Áö¸· ÆäÀÌÁöÀÔ´Ï´Ù."
 
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "ù¹ø° ÆäÀÌÁöÀÔ´Ï´Ù."
 
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "ù¹ø° Ç׸ñ º¸ÀÓ."
 
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "¸¶Áö¸· Ç׸ñ º¸ÀÓ."
 
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "¸¶Áö¸· Ç׸ñÀÔ´Ï´Ù."
 
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "ù¹ø° Ç׸ñÀÔ´Ï´Ù."
 
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "ã¾Æº¸±â: "
 
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "°Å²Ù·Î ã¾Æº¸±â: "
 
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 pattern.c:1102
 msgid "No search pattern."
 msgstr "ÆÐÅÏÀ» ãÀ» ¼ö ¾øÀ½."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "ãÀ» ¼ö ¾øÀ½."
 
-#: menu.c:803
+#: menu.c:811
 msgid "No tagged entries."
 msgstr "űװ¡ ºÙÀº Ç׸ñ ¾øÀ½."
 
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "ÀÌ ¸Þ´º¿¡´Â °Ë»ö ±â´ÉÀÌ ¾ø½À´Ï´Ù."
 
-#: menu.c:901
+#: menu.c:909
 msgid "Jumping is not implemented for dialogs."
 msgstr "¼±ÅÃâ¿¡´Â ¹Ù·Î °¡±â ±â´ÉÀÌ ¾ø½À´Ï´Ù."
 
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "ű׸¦ ºÙÀÌ´Â °ÍÀ» Áö¿øÄ¡ ¾ÊÀ½."
 
@@ -2660,52 +2671,52 @@ msgstr "%d
 msgid "Can't write message"
 msgstr "¸Þ½ÃÁö¸¦ ¾²Áö ¸øÇÔ"
 
-#: pager.c:57
+#: pager.c:60
 msgid "Not available in this menu."
 msgstr "ÀÌ ¸Þ´º¿¡¼± À¯È¿ÇÏÁö ¾ÊÀ½ ¾ÊÀ½."
 
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "ÀÌÀüÀå"
 
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "´ÙÀ½Àå"
 
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "÷ºÎ¹°º¸±â"
 
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "´ÙÀ½"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "¸Þ¼¼ÁöÀÇ ³¡ÀÔ´Ï´Ù."
 
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "¸Þ¼¼ÁöÀÇ Ã³À½ÀÔ´Ï´Ù."
 
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "°Å²Ù·Î ã±â: "
 
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "ã±â: "
 
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "ÇöÀç µµ¿ò¸»À» º¸°í ÀÖ½À´Ï´Ù."
 
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "´õ ÀÌ»óÀÇ Àο빮 ¾øÀ½."
 
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "Àο빮 ÀÌÈÄ¿¡ ´õ ÀÌ»óÀÇ ºñ Àο빮 ¾øÀ½."
 
diff --git a/po/nl.po b/po/nl.po
index 64ac4226..d6944298 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-24 22:31+0100\n"
+"POT-Creation-Date: 2000-02-29 23:32+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"
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "Afsluiten"
@@ -20,7 +20,7 @@ msgid "Select"
 msgstr "Selecteren"
 
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Hulp"
 
@@ -229,16 +229,21 @@ msgstr "Fout opgetreden tijdens het weergeven van bestand"
 msgid "New mail in %s."
 msgstr "Nieuwe berichten in %s."
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr ""
 
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, fuzzy, c-format
 msgid "Can't open %s: %s."
 msgstr "Kan directory %s niet lezen."
 
-#: charset.c:1131
+#: charset.c:1148
+#, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr ""
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr ""
@@ -662,7 +667,7 @@ msgstr "Druk een willekeurige toets in."
 msgid " ('?' for list): "
 msgstr " ('?' voor een overzicht): "
 
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "Er is geen mailbox geopend."
 
@@ -671,11 +676,11 @@ msgstr "Er is geen mailbox geopend."
 msgid "There are no messages."
 msgstr "Thread bevat ongelezen berichten"
 
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "Mailbox is read-only."
 
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 #, fuzzy
 msgid "Function not permitted in attach-message mode."
 msgstr "%c: Niet ondersteund in deze modus"
@@ -697,7 +702,7 @@ msgstr "Wijzigingen worden niet weggeschreven."
 msgid "Quit"
 msgstr "Einde"
 
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "Wis"
 
@@ -709,7 +714,7 @@ msgstr "Herstel"
 msgid "Mail"
 msgstr "Sturen"
 
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "Antw."
 
@@ -717,130 +722,130 @@ msgstr "Antw."
 msgid "Group"
 msgstr "Groep"
 
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Mailbox werd extern veranderd. Markeringen kunnen onjuist zijn!"
 
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "Nieuwe berichten in deze mailbox."
 
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "Geen gemarkeerde berichten."
 
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "Ga naar bericht: "
 
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "Argument moet een berichtennummer zijn."
 
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "Dit bericht is niet zichtbaar."
 
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "Ongeldig berichtennummer"
 
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "Wis berichten volgens patroon: "
 
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr "Er is geen limietpatroon in werking."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr "Limiet: %s"
 
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "Limiteer berichten volgens patroon: "
 
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "Mutt afsluiten?"
 
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "Berichten markeren volgens patroon: "
 
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "Herstel berichten : "
 
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "Verwijder markering volgens patroon: "
 
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "Open mailbox in schrijfbeveiligde modus"
 
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "Open mailbox"
 
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s is geen mailbox."
 
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "Mutt verlaten zonder op te slaan?"
 
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "U bent bij het laatste bericht."
 
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "Alle berichten zijn gewist."
 
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "U bent bij het eerste bericht."
 
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "Zoekopdracht bovenaan begonnen."
 
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "Zoekopdracht onderaan begonnen."
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "Geen nieuwe berichten"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "Geen ongelezen berichten"
 
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr " in deze beperkte weergave."
 
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "Geen verdere threads."
 
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "U bent al bij de eerste thread."
 
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "Thread bevat ongelezen berichten"
 
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "Het weergeven van threads is niet ingeschakeld."
 
@@ -1160,6 +1165,11 @@ msgstr "Aanmelden..."
 msgid "Login failed."
 msgstr "Aanmelden mislukt..."
 
+#. now begin login
+#: imap/auth_gss.c:74
+msgid "Authenticating (GSSAPI)..."
+msgstr ""
+
 #: imap/browse.c:93
 #, fuzzy
 msgid "Getting namespaces..."
@@ -1172,7 +1182,7 @@ msgstr ""
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Kritieke fout. Berichtenteller wijkt af!"
 
@@ -1208,30 +1218,30 @@ msgstr "%s aanmaken?"
 msgid "Closing connection to IMAP server..."
 msgstr "Verbinding met IMAP-server wordt gesloten.."
 
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, fuzzy, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Bezig met het lezen van %d berichten (%d bytes)..."
 
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Berichten-status wordt opgeslagen... [%d/%d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "Mailbox wordt gesloten..."
 
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "Berichten op de server worden gewist..."
 
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, fuzzy, c-format
 msgid "Subscribing to %s..."
 msgstr "Kopieer naar %s..."
 
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, fuzzy, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Bezig met verbinden met %s..."
@@ -1342,12 +1352,12 @@ msgstr "Bezig met verbinden met %s..."
 msgid "preconnect command failed"
 msgstr ""
 
-#: imap/util.c:40
+#: imap/util.c:41
 #, fuzzy
 msgid "Continue?"
 msgstr "(verder)\n"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr ""
@@ -2416,82 +2426,82 @@ msgstr "Kon mailbox niet opnieuw openen!"
 msgid "Reopening mailbox..."
 msgstr "Mailbox wordt heropend.."
 
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "Ga naar: "
 
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "Ongeldig Indexnummer."
 
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "Geen items"
 
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "U kunt niet verder naar beneden gaan."
 
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "U kunt niet verder naar boven gaan."
 
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "U bent op de laatste pagina."
 
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "U bent op de eerste pagina."
 
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "Het eerste item wordt weergegeven."
 
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "Het laatste item wordt weergegeven."
 
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "U bent op het laatste item."
 
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "U bent op het eerste item."
 
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "Zoek naar: "
 
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "Zoek achteruit naar: "
 
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 pattern.c:1102
 msgid "No search pattern."
 msgstr "Geen zoekpatroon."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "Niet gevonden."
 
-#: menu.c:803
+#: menu.c:811
 #, fuzzy
 msgid "No tagged entries."
 msgstr "Geen geselecteerde items."
 
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "In dit menu kan niet worden gezocht."
 
-#: menu.c:901
+#: menu.c:909
 #, fuzzy
 msgid "Jumping is not implemented for dialogs."
 msgstr "In dit menu kan niet worden gezocht."
 
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "Markeren is niet ondersteund."
 
@@ -2633,53 +2643,53 @@ msgstr ""
 msgid "Can't write message"
 msgstr "Bewerk het bericht"
 
-#: pager.c:57
+#: pager.c:60
 #, fuzzy
 msgid "Not available in this menu."
 msgstr "Nieuwe berichten in deze mailbox."
 
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "Vorig.P"
 
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "Volg.P"
 
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "Bijlagen bek."
 
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "Volgend ber."
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "Einde van bericht is weergegeven."
 
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "Begin van bericht is weergegeven."
 
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "Achteruit zoeken: "
 
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "Zoeken: "
 
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "Hulp wordt al weergegeven."
 
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "Geen verdere geciteerde text."
 
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "Geen verdere eigen text na geciteerde text."
 
diff --git a/po/pl.po b/po/pl.po
index f96cac77..1b2b9d69 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-24 22:31+0100\n"
+"POT-Creation-Date: 2000-02-29 23:32+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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "Wyj¶cie"
@@ -27,7 +27,7 @@ msgid "Select"
 msgstr "Wybierz"
 
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Pomoc"
 
@@ -234,16 +234,21 @@ msgstr "B
 msgid "New mail in %s."
 msgstr "W skrzynce %s pojawi³a siê nowa poczta."
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr "utf-8 nie jest, jak na razie, obs³ugiwany."
 
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, c-format
 msgid "Can't open %s: %s."
 msgstr "Nie mo¿na otworzyæ %s: %s."
 
-#: charset.c:1131
+#: charset.c:1148
+#, fuzzy, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr "B³±d przekodowywania %s. Zajrzyj do %s je¶li musisz odzyskaæ dane."
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr "B³±d przekodowywania %s. Zajrzyj do %s je¶li musisz odzyskaæ dane."
@@ -670,7 +675,7 @@ msgstr "Naci
 msgid " ('?' for list): "
 msgstr " (przyci¶niêcie '?' wy¶wietla listê): "
 
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "Nie otwarto ¿adnej skrzynki."
 
@@ -678,11 +683,11 @@ msgstr "Nie otwarto 
 msgid "There are no messages."
 msgstr "Brak listów."
 
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "Skrzynka jest tylko do odczytu."
 
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 msgid "Function not permitted in attach-message mode."
 msgstr "Funkcja niedostêpna w trybie za³±czania"
 
@@ -702,7 +707,7 @@ msgstr "Zmiany w folderze nie zostan
 msgid "Quit"
 msgstr "Wyjd¼"
 
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "Usuñ"
 
@@ -714,7 +719,7 @@ msgstr "Odtw
 msgid "Mail"
 msgstr "Wy¶lij"
 
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "Odpowiedz"
 
@@ -722,130 +727,130 @@ msgstr "Odpowiedz"
 msgid "Group"
 msgstr "Grupie"
 
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Skrzynka zosta³a zmodyfikowana z zewn±trz. Flagi mog± byæ nieaktualne."
 
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "Uwaga - w bie¿±cej skrzynce pojawi³a siê nowa poczta!"
 
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "Brak zaznaczonych listów."
 
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "Skocz do listu: "
 
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "Argumentem musi byæ numer listu."
 
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "Ten list nie jest widoczny."
 
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "B³êdny numer listu."
 
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "Usuñ listy pasuj±ce do wzorca: "
 
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr "Ograniczenie nie jest okre¶lone."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr "Ograniczenie: %s"
 
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "Ogranicz do pasuj±cych listów: "
 
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "Wyj¶æ z Mutta?"
 
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "Zaznacz pasuj±ce listy: "
 
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "Odtwórz pasuj±ce listy: "
 
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "Odznacz pasuj±ce listy: "
 
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "Otwórz skrzynkê tylko do odczytu"
 
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "Otwórz skrzynkê"
 
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s nie jest skrzynk±."
 
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "Wyj¶æ z Mutta bez zapisywania zmian?"
 
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "To jest ostatni list."
 
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "Brak odtworzonych listów."
 
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "To jest pierwszy list."
 
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "Kontynuacja poszukiwania od pocz±tku."
 
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "Kontynuacja poszukiwania od koñca."
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "Brak nowych listów"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "Przeczytano ju¿ wszystkie listy"
 
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr " w trybie ograniczonego przegl±dania"
 
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "Nie ma wiêcej w±tków."
 
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "To pierwszy w±tek."
 
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "Watek zawiera nieprzeczytane listy."
 
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "W±tkowanie nie zosta³o w³±czone."
 
@@ -1167,6 +1172,11 @@ msgstr "Logowanie..."
 msgid "Login failed."
 msgstr "Zalogowanie nie powiod³o siê."
 
+#. now begin login
+#: imap/auth_gss.c:74
+msgid "Authenticating (GSSAPI)..."
+msgstr "Uwierzytelnianie (GSSAPI)..."
+
 #: imap/browse.c:93
 #, fuzzy
 msgid "Getting namespaces..."
@@ -1180,7 +1190,7 @@ msgstr "Po
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "B³±d krytyczny. Niezidentyfikowana ilo¶æ listów!"
 
@@ -1216,30 +1226,30 @@ msgstr "Utworzy
 msgid "Closing connection to IMAP server..."
 msgstr "Zamykanie po³±czenia z serwerem IMAP..."
 
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, fuzzy, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Czytanie %d nowych listów (%d bajtów)..."
 
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Zapisywanie stanu flag listów... [%d/%d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "Zamykanie skrzynki..."
 
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "Kasowanie listów na serwerze... "
 
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Subskrybowanie %s..."
 
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Odsubskrybowanie %s..."
@@ -1350,12 +1360,12 @@ msgstr "
 msgid "preconnect command failed"
 msgstr ""
 
-#: imap/util.c:40
+#: imap/util.c:41
 #, fuzzy
 msgid "Continue?"
 msgstr "(kontynuuj)\n"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr ""
@@ -2499,81 +2509,81 @@ msgstr "Nie mo
 msgid "Reopening mailbox..."
 msgstr "Ponowne otwieranie skrzynki..."
 
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "Przeskocz do: "
 
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "Niew³a¶ciwy numer indeksu."
 
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "Brak pozycji."
 
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "Nie mo¿na ni¿ej przewin±æ."
 
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "Nie mo¿na wy¿ej przewin±æ."
 
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "To jest ostatnia strona."
 
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "To jest pierwsza strona."
 
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "Pokazana jest pierwsza pozycja."
 
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "Pokazana jest ostatnia pozycja."
 
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "To jest ostatnia pozycja."
 
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "To jest pierwsza pozycja."
 
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "Szukaj frazy: "
 
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "Szukaj frazy w przeciwnym kierunku: "
 
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 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:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "Nic nie znaleziono."
 
-#: menu.c:803
+#: menu.c:811
 msgid "No tagged entries."
 msgstr "Brak zaznaczonych pozycji listy."
 
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "Poszukiwanie nie jest mo¿liwe w tym menu."
 
-#: menu.c:901
+#: menu.c:909
 #, fuzzy
 msgid "Jumping is not implemented for dialogs."
 msgstr "Poszukiwanie nie jest mo¿liwe w tym menu."
 
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "Zaznaczanie nie jest obs³ugiwane."
 
@@ -2714,52 +2724,52 @@ msgstr ""
 msgid "Can't write message"
 msgstr "edytuj tre¶æ listu"
 
-#: pager.c:57
+#: pager.c:60
 msgid "Not available in this menu."
 msgstr "Nie ma takiego polecenia w tym menu."
 
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "PoprzStr"
 
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "NastStr"
 
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "Zobacz za³."
 
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "Nastêpny"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "Pokazany jest koniec listu."
 
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "Pokazany jest pocz±tek listu."
 
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "Szukaj w przeciwnym kierunku: "
 
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "Szukaj: "
 
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "Pomoc jest w³a¶nie wy¶wietlana."
 
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "Nie ma wiêcej cytowanego tekstu."
 
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "Brak tekstu za cytowanym fragmentem."
 
@@ -3586,9 +3596,6 @@ msgstr "Pierwszy list tego w
 #~ msgid "ignoring empty header field: %s"
 #~ msgstr "ignorowanie pustego nag³ówka: %s"
 
-#~ msgid "Authenticating (GSSAPI)..."
-#~ msgstr "Uwierzytelnianie (GSSAPI)..."
-
 #~ msgid "Recoding only affetcs text attachments."
 #~ msgstr "Tylko tekstowe za³±czniki mo¿na przekodowaæ."
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 02311ed1..8a3796ad 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.95.6\n"
-"POT-Creation-Date: 2000-02-24 22:31+0100\n"
+"POT-Creation-Date: 2000-02-29 23:32+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"
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding:\n"
 
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "Sair"
@@ -20,7 +20,7 @@ msgid "Select"
 msgstr "Escolher"
 
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Ajuda"
 
@@ -229,16 +229,21 @@ msgstr "Erro ao tentar exibir arquivo"
 msgid "New mail in %s."
 msgstr "Novas mensagens em %s"
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr ""
 
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, fuzzy, c-format
 msgid "Can't open %s: %s."
 msgstr "Não é possível mostrar estatísticas: %s"
 
-#: charset.c:1131
+#: charset.c:1148
+#, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr ""
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr ""
@@ -664,7 +669,7 @@ msgstr "Pressione qualquer tecla para continuar..."
 msgid " ('?' for list): "
 msgstr " ('?' para uma lista): "
 
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 #, fuzzy
 msgid "No mailbox is open."
 msgstr "Nenhuma caixa aberta."
@@ -673,12 +678,12 @@ msgstr "Nenhuma caixa aberta."
 msgid "There are no messages."
 msgstr "Não há mensagens."
 
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 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
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 msgid "Function not permitted in attach-message mode."
 msgstr "Função não permitida no modo anexar-mensagem."
 
@@ -699,7 +704,7 @@ msgstr "Mudan
 msgid "Quit"
 msgstr "Sair"
 
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "Apagar"
 
@@ -711,7 +716,7 @@ msgstr "Restaurar"
 msgid "Mail"
 msgstr "Msg"
 
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "Responder"
 
@@ -719,133 +724,133 @@ msgstr "Responder"
 msgid "Group"
 msgstr "Grupo"
 
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "A caixa foi modificada externamente. As marcas podem estar erradas."
 
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "Novas mensagens nesta caixa."
 
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "Nenhuma mensagem marcada."
 
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "Pular para mensagem: "
 
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "O argumento deve ser um número de mensagem."
 
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "Aquela mensagem não está visível."
 
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "Número de mensagem inválido."
 
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "Apagar mensagens casando com: "
 
-#: curs_main.c:709
+#: curs_main.c:718
 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:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr "Limitar: %s"
 
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "Limitar a mensagens casando com: "
 
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "Sair do Mutt?"
 
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "Marcar mensagens casando com: "
 
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "Restaurar mensagens casando com: "
 
-#: curs_main.c:879
+#: curs_main.c:888
 #, fuzzy
 msgid "Untag messages matching: "
 msgstr "Desmarcar mensagens que casem com: "
 
-#: curs_main.c:897
+#: curs_main.c:906
 #, fuzzy
 msgid "Open mailbox in read-only mode"
 msgstr "Abrir caixa somente para leitura"
 
-#: curs_main.c:899
+#: curs_main.c:908
 #, fuzzy
 msgid "Open mailbox"
 msgstr "Abrir caixa de correio"
 
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, fuzzy, c-format
 msgid "%s is not a mailbox."
 msgstr "%s não é uma caixa de correio."
 
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "Sair do Mutt sem salvar alterações?"
 
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "Você está na última mensagem."
 
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "Nenhuma mensagem restaurada."
 
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "Você está na primeira mensagem."
 
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "A pesquisa voltou ao início."
 
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "A pesquisa passou para o final."
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "Nenhuma mensagem nova"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "Nenhuma mensagem não lida"
 
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr " nesta visão limitada"
 
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "Nenhuma discussão restante."
 
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "Você está na primeira discussão."
 
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "A discussão contém mensagens não lidas."
 
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "Separar discussões não está ativado."
 
@@ -1164,6 +1169,11 @@ msgstr "Efetuando login..."
 msgid "Login failed."
 msgstr "Erro no login"
 
+#. now begin login
+#: imap/auth_gss.c:74
+msgid "Authenticating (GSSAPI)..."
+msgstr ""
+
 #: imap/browse.c:93
 #, fuzzy
 msgid "Getting namespaces..."
@@ -1176,7 +1186,7 @@ msgstr ""
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Erro fatal. O número de mensagens está fora de sincronia!"
 
@@ -1212,30 +1222,30 @@ msgstr "Criar %s?"
 msgid "Closing connection to IMAP server..."
 msgstr "Fechando a conexão com o servidor IMAP..."
 
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, fuzzy, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Lendo %d mensagens novas (%d bytes)..."
 
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Salvando marcas de estado das mensagens... [%d de %d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "Fechando caixa de mensagens..."
 
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "Apagando mensagend do servidor..."
 
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, fuzzy, c-format
 msgid "Subscribing to %s..."
 msgstr "Copiando para %s..."
 
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, fuzzy, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Conectando a %s..."
@@ -1348,12 +1358,12 @@ msgstr "Conectando a %s..."
 msgid "preconnect command failed"
 msgstr ""
 
-#: imap/util.c:40
+#: imap/util.c:41
 #, fuzzy
 msgid "Continue?"
 msgstr "(continuar)\n"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr ""
@@ -2496,81 +2506,81 @@ msgstr "N
 msgid "Reopening mailbox..."
 msgstr "Reabrindo caixa de mensagens..."
 
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "Pular para: "
 
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "Número de índice inválido."
 
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "Nenhuma entrada."
 
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "Você não pode mais descer."
 
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "Você não pode mais subir"
 
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "Você está na última página."
 
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "Você está na primeira página"
 
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "A primeira entrada está sendo mostrada."
 
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "A última entrada está sendo mostrada."
 
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "Você está na última entrada."
 
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "Você está na primeira entrada."
 
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "Procurar por: "
 
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "Procurar de trás para frente por: "
 
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 pattern.c:1102
 msgid "No search pattern."
 msgstr "Nenhum padrão de procura."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "Não encontrado."
 
-#: menu.c:803
+#: menu.c:811
 msgid "No tagged entries."
 msgstr "Nenhuma entrada marcada."
 
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "Busca não está implementada para este menu."
 
-#: menu.c:901
+#: menu.c:909
 #, fuzzy
 msgid "Jumping is not implemented for dialogs."
 msgstr "Busca não está implementada para este menu."
 
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "Não é possível marcar."
 
@@ -2711,52 +2721,52 @@ msgstr ""
 msgid "Can't write message"
 msgstr "edita a mensagem"
 
-#: pager.c:57
+#: pager.c:60
 msgid "Not available in this menu."
 msgstr "Não disponível neste menu."
 
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "PagAnt"
 
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "ProxPag"
 
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "Ver Anexo"
 
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "Próxima"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "O fundo da mensagem está sendo mostrado."
 
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "O topo da mensagem está sendo mostrado."
 
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "Busca reversa: "
 
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "Busca: "
 
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "A ajuda está sendo mostrada."
 
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "Não há mais texto citado."
 
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "Não há mais texto não-citado após o texto citado."
 
diff --git a/po/ru.po b/po/ru.po
index 61de7cdd..2c01d61b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,13 +8,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.1.2i\n"
-"POT-Creation-Date: 2000-02-24 22:31+0100\n"
+"POT-Creation-Date: 2000-02-29 23:32+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"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "÷ÙÈÏÄ"
@@ -24,7 +24,7 @@ msgid "Select"
 msgstr "÷ÙÂÒÁÔØ"
 
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "ðÏÄÓËÁÚËÁ"
 
@@ -230,16 +230,22 @@ msgstr "
 msgid "New mail in %s."
 msgstr "îÏ×ÁÑ ÐÏÞÔÁ × ÐÏÞÔÏ×ÏÍ ÑÝÉËÅ %s."
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr "÷ ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ × ÄÁÎÎÏÊ ÔÏÞËÅ utf-8 ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ."
 
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, c-format
 msgid "Can't open %s: %s."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s"
 
-#: charset.c:1131
+#: charset.c:1148
+#, fuzzy, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr ""
+"ïÛÉÂËÁ ×Ï ×ÒÅÍÑ ÐÅÒÅËÏÄÉÒÏ×ËÉ %s. óÍ. %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÷ÁÛÉÈ ÄÁÎÎÙÈ."
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr ""
@@ -674,7 +680,7 @@ msgstr "
 msgid " ('?' for list): "
 msgstr " ('?' -- ÓÐÉÓÏË): "
 
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "îÅÔ ÏÔËÒÙÔÏÇÏ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ."
 
@@ -682,11 +688,11 @@ msgstr "
 msgid "There are no messages."
 msgstr "óÏÏÂÝÅÎÉÊ ÎÅÔ."
 
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÎÅÍÏÄÉÆÉÃÉÒÕÅÍ."
 
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 msgid "Function not permitted in attach-message mode."
 msgstr "æÕÎËÃÉÑ ÎÅÄÏÐÕÓÔÉÍÁ ÄÌÑ ÒÅÖÉÍÁ \"×ÌÏÖÉÔØ ÓÏÏÂÝÅÎÉÅ\"."
 
@@ -706,7 +712,7 @@ msgstr "
 msgid "Quit"
 msgstr "÷ÙÈÏÄ"
 
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "õÄÁÌÉÔØ"
 
@@ -718,7 +724,7 @@ msgstr "
 msgid "Mail"
 msgstr "óÏÚÄÁÔØ"
 
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "ïÔ×ÅÔÉÔØ"
 
@@ -726,130 +732,130 @@ msgstr "
 msgid "Group"
 msgstr "ïÔ×ÅÔÉÔØ ×ÓÅÍ"
 
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "ñÝÉË ÂÙÌ ÉÚÍÅÎÅÎ ÓÎÁÒÕÖÉ.  úÎÁÞÅÎÉÑ ÆÌÁÇÏ× ÍÏÇÕÔ ÂÙÔØ ÎÅËÏÒÒÅËÔÎÙ."
 
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "îÏ×ÁÑ ÐÏÞÔÁ × ÜÔÏÍ ÑÝÉËÅ."
 
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "îÅÔ ÏÔÍÅÞÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ."
 
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "ðÅÒÅÊÔÉ Ë ÓÏÏÂÝÅÎÉÀ: "
 
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "áÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÎÏÍÅÒÏÍ ÓÏÏÂÝÅÎÉÑ."
 
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "üÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ×ÉÄÉÍÏ."
 
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "îÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÓÏÏÂÝÅÎÉÑ."
 
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "õÄÁÌÉÔØ ÓÏÏÂÝÅÎÉÑ ÐÏ ÏÂÒÁÚÃÕ: "
 
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr "ûÁÂÌÏÎ ÏÇÒÁÎÉÞÅÎÉÑ ÓÐÉÓËÁ ÏÔÓÕÔÓÔ×ÕÅÔ."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr "ûÁÂÌÏÎ ÏÇÒÁÎÉÞÅÎÉÑ: %s"
 
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "ïÇÒÁÎÉÞÉÔØÓÑ ÓÏÏÂÝÅÎÉÑÍÉ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÍÉ: "
 
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "÷ÙÊÔÉ ÉÚ Mutt?"
 
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "ïÔÍÅÔÉÔØ ÓÏÏÂÝÅÎÉÑ ÐÏ ÏÂÒÁÚÃÕ: "
 
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ ÓÏÏÂÝÅÎÉÑ ÐÏ ÏÂÒÁÚÃÕ: "
 
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "óÎÑÔØ ÐÏÍÅÔËÕ Ó ÓÏÏÂÝÅÎÉÊ ÐÏ ÏÂÒÁÚÃÕ: "
 
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "ïÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ"
 
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "ïÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË"
 
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÞÔÏ×ÙÍ ÑÝÉËÏÍ."
 
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "÷ÙÊÔÉ ÉÚ Mutt ÂÅÚ ÓÏÈÒÁÎÅÎÉÑ ÉÚÍÅÎÅÎÉÊ?"
 
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "üÔÏ ÐÏÓÌÅÄÎÅÅ ÓÏÏÂÝÅÎÉÅ."
 
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "îÅÔ ×ÏÓÓÔÁÎÏ×ÌÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ."
 
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "üÔÏ ÐÅÒ×ÏÅ ÓÏÏÂÝÅÎÉÅ."
 
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "äÏÓÔÉÇÎÕÔ ËÏÎÅÃ; ÐÒÏÄÏÌÖÁÅÍ ÐÏÉÓË Ó ÎÁÞÁÌÁ."
 
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "äÏÓÔÉÇÎÕÔÏ ÎÁÞÁÌÏ; ÐÒÏÄÏÌÖÁÅÍ ÐÏÉÓË Ó ËÏÎÃÁ."
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "îÅÔ ÎÏ×ÙÈ ÓÏÏÂÝÅÎÉÊ"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "îÅÔ ÎÅÐÒÏÞÉÔÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ"
 
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr " ÐÒÉ ÐÒÏÓÍÏÔÒÅ Ó ÏÇÒÁÎÉÞÅÎÉÅÍ"
 
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "îÅÔ ÂÏÌØÛÅ ÄÉÓËÕÓÓÉÊ."
 
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "üÔÏ ÐÅÒ×ÁÑ ÄÉÓËÕÓÓÉÑ"
 
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "÷ ÄÉÓËÕÓÓÉÉ ÐÒÉÓÕÔÓÔ×ÕÀÔ ÎÅÐÒÏÞÉÔÁÎÎÙÅ ÓÏÏÂÝÅÎÉÑ."
 
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "çÒÕÐÐÉÒÏ×ËÁ ÐÏ ÄÉÓËÕÓÓÉÑÍ ÎÅ ×ËÌÀÞÅÎÁ."
 
@@ -1170,6 +1176,11 @@ msgstr "
 msgid "Login failed."
 msgstr "òÅÇÉÓÔÒÁÃÉÑ ÎÅ ÕÄÁÌÁÓØ."
 
+#. now begin login
+#: imap/auth_gss.c:74
+msgid "Authenticating (GSSAPI)..."
+msgstr ""
+
 #: imap/browse.c:93
 #, fuzzy
 msgid "Getting namespaces..."
@@ -1184,7 +1195,7 @@ msgstr ""
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr ""
 
@@ -1220,30 +1231,30 @@ msgstr "
 msgid "Closing connection to IMAP server..."
 msgstr "úÁËÒÙÔÉÅ ÓÏÅÄÉÎÅÎÉÑ Ó ÓÅÒ×ÅÒÏÍ IMAP..."
 
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "ïÔÍÅÔËÁ %d ÓÏÏÂÝÅÎÉÊ, ËÁË ÕÄÁÌÅÎÎÙÈ (%d ÂÁÊÔÏ×)..."
 
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "óÏÈÒÁÎÅÎÉÅ ÆÌÁÇÏ× ÓÏÓÔÏÑÎÉÑ ÓÏÏÂÝÅÎÉÊ... [%d ÉÚ %d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "úÁËÒÙÔÉÅ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ..."
 
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "õÄÁÌÅÎÉÅ ÓÏÏÂÝÅÎÉÊ Ó ÓÅÒ×ÅÒÁ..."
 
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "ðÏÄÐÉÓÙ×ÁÀÓØ ÎÁ %s..."
 
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "ïÔÐÉÓÙ×ÁÀÓØ ÏÔ %s..."
@@ -1356,12 +1367,12 @@ msgstr "
 msgid "preconnect command failed"
 msgstr ""
 
-#: imap/util.c:40
+#: imap/util.c:41
 #, fuzzy
 msgid "Continue?"
 msgstr "(ÐÒÏÄÏÌÖÉÔØ)\n"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr ""
@@ -2509,80 +2520,80 @@ msgstr "
 msgid "Reopening mailbox..."
 msgstr "ðÏ×ÔÏÒÎÏÅ ÏÔËÒÙÔÉÅ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ..."
 
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "ðÅÒÅÊÔÉ Ë: "
 
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "îÅ×ÅÒÎÙÊ ÉÎÄÅËÓ."
 
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "úÁÐÉÓÉ ÏÔÓÕÔÓÔ×ÕÀÔ."
 
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "ðÒÏËÒÕÔËÁ ÄÁÌØÛÅ ÎÅ×ÏÚÍÏÖÎÁ."
 
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "ðÒÏËÒÕÔËÁ ÄÁÌØÛÅ ÎÅ×ÏÚÍÏÖÎÁ."
 
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "÷Ù ÕÖÅ ÎÁ ÐÏÓÌÅÄÎÅÊ ÓÔÒÁÎÉÃÅ."
 
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "÷Ù ÕÖÅ ÎÁ ÐÅÒ×ÏÊ ÓÔÒÁÎÉÃÅ."
 
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "ðÅÒ×ÁÑ ÚÁÐÉÓØ ÕÖÅ ÎÁ ÜËÒÁÎÅ."
 
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "ðÏÓÌÅÄÎÑÑ ÚÁÐÉÓØ ÕÖÅ ÎÁ ÜËÒÁÎÅ."
 
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "÷Ù ÕÖÅ ÎÁ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ."
 
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "÷Ù ÕÖÅ ÎÁ ÐÅÒ×ÏÊ ÚÁÐÉÓÉ."
 
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "ðÏÉÓË: "
 
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "ïÂÒÁÔÎÙÊ ÐÏÉÓË: "
 
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 pattern.c:1102
 msgid "No search pattern."
 msgstr "îÅÔ ÏÂÒÁÚÃÁ ÐÏÉÓËÁ."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "îÅ ÎÁÊÄÅÎÏ."
 
-#: menu.c:803
+#: menu.c:811
 msgid "No tagged entries."
 msgstr "îÅÔ ÏÔÍÅÞÅÎÎÙÈ ÚÁÐÉÓÅÊ."
 
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "ðÏÉÓË ÎÅ ÒÅÁÌÉÚÏ×ÁÎ × ÜÔÏÍ ÍÅÎÀ."
 
-#: menu.c:901
+#: menu.c:909
 msgid "Jumping is not implemented for dialogs."
 msgstr "ðÅÒÅÈÏÄ ÐÏ ÎÏÍÅÒÕ ÓÏÏÂÝÅÎÉÑ ÎÅ ÒÅÁÌÉÚÏ×ÁÎ ÄÌÑ ÄÉÁÌÏÇÏ×."
 
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "÷ÏÚÍÏÖÎÏÓÔØ ÐÏÍÅÔËÉ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ."
 
@@ -2725,52 +2736,52 @@ msgstr "%d 
 msgid "Can't write message"
 msgstr "ÒÅÄÁËÔÉÒÏ×ÁÔØ ÓÏÏÂÝÅÎÉÅ"
 
-#: pager.c:57
+#: pager.c:60
 msgid "Not available in this menu."
 msgstr "îÅ ÄÏÓÔÕÐÎÏ × ÜÔÏÍ ÍÅÎÀ."
 
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "îÁÚÁÄóÔÒ"
 
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "÷ÐÅÒÅÄóÔÒ"
 
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "÷ÌÏÖÅÎÉÑ"
 
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "óÌÅÄÕÀÝÉÊ"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "ðÏÓÌÅÄÎÑÑ ÓÔÒÏËÁ ÓÏÏÂÝÅÎÉÑ ÕÖÅ ÎÁ ÜËÒÁÎÅ."
 
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "ðÅÒ×ÁÑ ÓÔÒÏËÁ ÓÏÏÂÝÅÎÉÑ ÕÖÅ ÎÁ ÜËÒÁÎÅ."
 
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "ïÂÒÁÔÎÙÊ ÐÏÉÓË: "
 
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "ðÏÉÓË: "
 
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "ðÏÄÓËÁÚËÁ ÕÖÅ ÐÏËÁÚÙ×ÁÅÔÓÑ."
 
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "îÅÔ ÂÏÌØÛÅ ÃÉÔÉÒÕÅÍÏÇÏ ÔÅËÓÔÁ."
 
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "úÁ ÃÉÔÉÒÕÅÍÙÍ ÔÅËÔÏÍ ÂÏÌØÛÅ ÎÅÔ ÏÓÎÏ×ÎÏÇÏ ÔÅËÓÔÁ."
 
diff --git a/po/sk.po b/po/sk.po
index d5368016..35759092 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-24 22:31+0100\n"
+"POT-Creation-Date: 2000-02-29 23:32+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"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "Koniec"
@@ -23,7 +23,7 @@ msgid "Select"
 msgstr "Oznaèi»"
 
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Pomoc"
 
@@ -230,16 +230,21 @@ msgstr "Chyba pri prezeran
 msgid "New mail in %s."
 msgstr "Nová po¹ta v %s."
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr ""
 
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, fuzzy, c-format
 msgid "Can't open %s: %s."
 msgstr "Nemo¾no zisti» stav: %s"
 
-#: charset.c:1131
+#: charset.c:1148
+#, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr ""
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr ""
@@ -667,7 +672,7 @@ msgstr "Stla
 msgid " ('?' for list): "
 msgstr " ('?' pre zoznam): "
 
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "Nie je otvorená ¾iadna schránka."
 
@@ -676,11 +681,11 @@ msgstr "Nie je otvoren
 msgid "There are no messages."
 msgstr "Vlákno obsahuje neèítané správy."
 
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "Schránka je iba na èítanie."
 
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 #, fuzzy
 msgid "Function not permitted in attach-message mode."
 msgstr "%c: nepodporovaný v tomto móde"
@@ -701,7 +706,7 @@ msgstr "Zmeny v zlo
 msgid "Quit"
 msgstr "Koniec"
 
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "Zma¾"
 
@@ -713,7 +718,7 @@ msgstr "Odma
 msgid "Mail"
 msgstr "Napí¹"
 
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "Odpovedz"
 
@@ -721,130 +726,130 @@ msgstr "Odpovedz"
 msgid "Group"
 msgstr "Skupina"
 
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Schránka bola zmenená zvonku. Príznaky mô¾u by» nesprávne."
 
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "V tejto schránke je nová po¹ta."
 
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "®iadne oznaèené správy."
 
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "Skoèi» na správu: "
 
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "Parameter musí by» èíslo správy."
 
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "Táto správa nie je viditeµná."
 
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "Neplatné èíslo správy."
 
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "Zmaza» správy zodpovedajúce: "
 
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr "®iadny limitovací vzor nie je aktívny."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr "Limit: %s"
 
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "Limituj správy zodpovedajúce: "
 
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "Ukonèi» Mutt?"
 
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "Oznaè správy zodpovedajúce: "
 
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "Odma¾ správy zodpovedajúce: "
 
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "Odznaè správy zodpovedajúce: "
 
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "Otvor schránku iba na èítanie"
 
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "Otvor schránku"
 
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s nie je schránka"
 
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "Ukonèi» Mutt bey ulo¾enia?"
 
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "Ste na poslednej správe."
 
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "®iadne odmazané správy."
 
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "Ste na prvej správe."
 
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "Vyhµadávanie pokraèuje z vrchu."
 
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "Vyhµadávanie pokraèuje zo spodu."
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "®iadne nové správy"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "®iadne neèítané správy"
 
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr " v tomto obmedzenom zobrazení"
 
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "®iadne ïaµ¹ie vlákna."
 
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "Ste na prvom vlákne."
 
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "Vlákno obsahuje neèítané správy."
 
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "Vláknenie nie je povolené."
 
@@ -1163,6 +1168,11 @@ msgstr "Prihlasujem sa..."
 msgid "Login failed."
 msgstr "Prihlasovanie zlyhalo."
 
+#. now begin login
+#: imap/auth_gss.c:74
+msgid "Authenticating (GSSAPI)..."
+msgstr ""
+
 #: imap/browse.c:93
 #, fuzzy
 msgid "Getting namespaces..."
@@ -1175,7 +1185,7 @@ msgstr ""
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Fatálna chyba. Poèet správ nie je zosynchronizovaný!"
 
@@ -1211,30 +1221,30 @@ msgstr "Vytvori
 msgid "Closing connection to IMAP server..."
 msgstr "Zatváram spojenie s IMAP serverom..."
 
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, fuzzy, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Èítam %d nových správ (%d bytov)..."
 
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Ukladám stavové príznaky správy... [%d/%d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "Zatváram schránku..."
 
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "Vymazávam správy zo serveru..."
 
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, fuzzy, c-format
 msgid "Subscribing to %s..."
 msgstr "Kopírujem do %s..."
 
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, fuzzy, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Spájam sa s %s..."
@@ -1346,12 +1356,12 @@ msgstr "Sp
 msgid "preconnect command failed"
 msgstr ""
 
-#: imap/util.c:40
+#: imap/util.c:41
 #, fuzzy
 msgid "Continue?"
 msgstr "(pokraèova»)\n"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr ""
@@ -2488,81 +2498,81 @@ msgstr "Nemo
 msgid "Reopening mailbox..."
 msgstr "Znovuotváram schránku..."
 
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "Skoè do: "
 
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "Neplatné èíslo indexu."
 
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "®iadne polo¾ky."
 
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "Nemô¾te rolova» ïalej dolu."
 
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "Nemô¾te rolova» ïalej hore."
 
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "Ste na poslednej stránke."
 
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "Ste na prvej stránke."
 
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "Je zobrazená prvá polo¾ka."
 
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "Je zobrazená posledná polo¾ka."
 
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "Ste na poslednej polo¾ke."
 
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "Ste na prvej polo¾ke."
 
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "Hµada»: "
 
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "Hµada» spätne: "
 
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 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:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "Nenájdené."
 
-#: menu.c:803
+#: menu.c:811
 msgid "No tagged entries."
 msgstr "®iadne oznaèené polo¾ky."
 
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "Hµadanie nie je implementované pre toto menu."
 
-#: menu.c:901
+#: menu.c:909
 #, fuzzy
 msgid "Jumping is not implemented for dialogs."
 msgstr "Hµadanie nie je implementované pre toto menu."
 
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "Oznaèovanie nie je podporované."
 
@@ -2703,53 +2713,53 @@ msgstr ""
 msgid "Can't write message"
 msgstr "upravi» správu"
 
-#: pager.c:57
+#: pager.c:60
 #, fuzzy
 msgid "Not available in this menu."
 msgstr "V tejto schránke je nová po¹ta."
 
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "PredSt"
 
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "Ïaµ¹St"
 
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "Pozri prílohu"
 
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "Ïaµ¹í"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "Spodok správy je zobrazený."
 
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "Vrch správy je zobrazený."
 
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "Spätné hµadanie: "
 
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "Hµada»: "
 
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "Pomoc sa akurát zobrazuje."
 
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "Nie je ïaµ¹í citovaný text."
 
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "®iadny ïaµ¹í necitovaný text za citátom."
 
diff --git a/po/sv.po b/po/sv.po
index e13c4d91..e51c119a 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-24 22:31+0100\n"
+"POT-Creation-Date: 2000-02-29 23:32+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"
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "Avsluta"
@@ -20,7 +20,7 @@ msgid "Select"
 msgstr "Välj"
 
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Hjälp"
 
@@ -223,16 +223,21 @@ msgstr "Ett fel uppstod n
 msgid "New mail in %s."
 msgstr "Nytt brev i %s."
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr "Det finns inget stöd för utf-8 just nu."
 
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, c-format
 msgid "Can't open %s: %s."
 msgstr "Kan inte öppna %s: %s."
 
-#: charset.c:1131
+#: charset.c:1148
+#, fuzzy, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr "Ett fel uppstod när %s kodades om. Se %s för att återskapa dina data."
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr "Ett fel uppstod när %s kodades om. Se %s för att återskapa dina data."
@@ -661,7 +666,7 @@ msgstr "Tryck p
 msgid " ('?' for list): "
 msgstr " ('?' för lista): "
 
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "Ingen brevlåda är öppen."
 
@@ -669,11 +674,11 @@ msgstr "Ingen brevl
 msgid "There are no messages."
 msgstr "Inga brev."
 
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "Brevlådan kan endast läsas."
 
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 msgid "Function not permitted in attach-message mode."
 msgstr "Otillåten funktion i moden 'bifoga'."
 
@@ -693,7 +698,7 @@ msgstr "
 msgid "Quit"
 msgstr "Avsluta"
 
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "Ta bort"
 
@@ -705,7 +710,7 @@ msgstr "
 msgid "Mail"
 msgstr "Brev"
 
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "Svara"
 
@@ -713,130 +718,130 @@ msgstr "Svara"
 msgid "Group"
 msgstr "Grupp"
 
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Brevlådan har ändrats utanför programmet. Flaggor kan vara felaktiga!"
 
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "Nyy brev i den här brvlådan."
 
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "Inga markerade brev."
 
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "Gå till brev: "
 
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "Argumentet måste vara ett brevs nummer."
 
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "Det brevet är inte synligt."
 
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "Otillåtet brevnummer."
 
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "Radera brev som passar: "
 
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr "Inget begränsande mönster är aktivt."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr "Gräns: %s"
 
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "Begränsning av brev som passar: "
 
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "Avslute Mutt?"
 
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "Markera brev som passar: "
 
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "Återställ brev som passar : "
 
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "Avmarkera brev som passar: "
 
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "Öppna brevlåda för läsning endast"
 
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "Öppna brevlåda"
 
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s är inte en brevlåda."
 
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "Avsluta Mutt utan att spara?"
 
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "Det här är det sista brevet i listan."
 
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "Inga återställda brev."
 
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "Det här är första brevet i listan."
 
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "Sökning fortsatte i början."
 
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "Sökning fortsatte i slutet."
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "Inga nya brev"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "Inga olästa brev"
 
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr " i den här begränsade vyn"
 
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "Inga fler trådar."
 
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "Su ser den första tråden."
 
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "Tråden har olästa brev."
 
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "Trådning är inte aktiverad."
 
@@ -1154,6 +1159,11 @@ msgstr "Ansluter..."
 msgid "Login failed."
 msgstr "Anslutning misslyckades..."
 
+#. now begin login
+#: imap/auth_gss.c:74
+msgid "Authenticating (GSSAPI)..."
+msgstr ""
+
 #: imap/browse.c:93
 #, fuzzy
 msgid "Getting namespaces..."
@@ -1167,7 +1177,7 @@ msgstr "Kontaktar server, l
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr ""
 
@@ -1205,30 +1215,30 @@ msgstr "Skapa %s?"
 msgid "Closing connection to IMAP server..."
 msgstr "Stänger förbindelse med IMAP-server..."
 
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Markerar %d brev som raderade..."
 
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Sparar statusflagga för brev... [%d/%d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "Stänger brevlåda..."
 
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "Tar bort brev från server..."
 
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Prenumerera på %s..."
 
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Avslutar prenumeration på %s..."
@@ -1341,12 +1351,12 @@ msgstr "Ansluter till %s..."
 msgid "preconnect command failed"
 msgstr ""
 
-#: imap/util.c:40
+#: imap/util.c:41
 #, fuzzy
 msgid "Continue?"
 msgstr "(fortsätt)\n"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr ""
@@ -2411,80 +2421,80 @@ msgstr "Kunde inte 
 msgid "Reopening mailbox..."
 msgstr "Återöppnar brevlådan..."
 
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "Hoppa till: "
 
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "Ogiltigt index."
 
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "Inga element."
 
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "Du kan inte rulla längre ner."
 
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "Du kan inte rulla längre upp."
 
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "Du är på sista sidan."
 
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "Du är på första sidan."
 
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "Första elementet visas."
 
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "Sista elementet visas."
 
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "Du är på sista elementet."
 
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "Du är på första elementet."
 
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "Leta efter: "
 
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "Leta efter i omvänd ordning: "
 
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 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:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "Hittades inte."
 
-#: menu.c:803
+#: menu.c:811
 msgid "No tagged entries."
 msgstr "Inga markerade element."
 
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "Sökning kan inte göras från den här menyn."
 
-#: menu.c:901
+#: menu.c:909
 msgid "Jumping is not implemented for dialogs."
 msgstr "Hopp stöds inte för dialoger."
 
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "Markering stöds inte."
 
@@ -2625,52 +2635,52 @@ msgstr "%d sparade"
 msgid "Can't write message"
 msgstr "ändra brevet"
 
-#: pager.c:57
+#: pager.c:60
 msgid "Not available in this menu."
 msgstr "Finns inte i den här menyn."
 
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "Föregående sida"
 
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "Nästa sida"
 
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "Visa bilaga"
 
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "Nästa"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "Slutet av brevet syns."
 
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "Början av brevet syns."
 
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "Sök i omvänd ordning: "
 
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "Sök: "
 
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "Hjälp visas just nu."
 
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "ingen mer citerad text."
 
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "Ingen mer ociterad text efter citerad text."
 
diff --git a/po/uk.po b/po/uk.po
index 649ddc06..868bc40f 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-24 22:31+0100\n"
+"POT-Creation-Date: 2000-02-29 23:32+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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "÷ÉȦÄ"
@@ -24,7 +24,7 @@ msgid "Select"
 msgstr "÷ɦÒ"
 
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "ð¦ÄËÁÚËÁ"
 
@@ -231,16 +231,21 @@ msgstr "
 msgid "New mail in %s."
 msgstr "îÏ×Á ÐÏÛÔÁ × %s."
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr ""
 
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, fuzzy, c-format
 msgid "Can't open %s: %s."
 msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ %s"
 
-#: charset.c:1131
+#: charset.c:1148
+#, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr ""
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr ""
@@ -665,7 +670,7 @@ msgstr "
 msgid " ('?' for list): "
 msgstr " ('?' - ÐÅÒÅ̦Ë): "
 
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "îÅÍÁ¤ צÄËÒÉÔϧ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ."
 
@@ -674,11 +679,11 @@ msgstr "
 msgid "There are no messages."
 msgstr "îÉÔËÁ ÍÁ¤ ÎÅÞÉÔÁΦ ÌÉÓÔÉ."
 
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "ðÏÛÔÏ×Á ÓËÒÉÎØËÁ Ô¦ÌØËÉ ÄÌÑ ÞÉÔÁÎÎÑ"
 
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 #, fuzzy
 msgid "Function not permitted in attach-message mode."
 msgstr "× ÃØÏÍÕ ÒÅÖÉÍÏצ '%c' ΊЦÄÔÒÉÍÕ¤ÔØÓÑ"
@@ -699,7 +704,7 @@ msgstr "
 msgid "Quit"
 msgstr "÷ÉÊÔÉ"
 
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "÷ÉÄ."
 
@@ -711,7 +716,7 @@ msgstr "
 msgid "Mail"
 msgstr "ìÉÓÔ"
 
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "÷¦ÄÐ."
 
@@ -719,130 +724,130 @@ msgstr "
 msgid "Group"
 msgstr "÷Ó¦Í"
 
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÚͦÎÉÌÁ ÚÏ×ΦÛÎÑ ÐÒÏÇÒÁÍÁ. æÌÁÇÉ ÚͦÎÅÎÏ ÔÁËÏÖ."
 
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "îÏ×Á ÐÏÛÔÁ Õ Ã¦Ê ÐÏÛÔÏ×¦Ê ÓËÒÉÎØæ."
 
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "öÏÄÎÏÇÏ ÌÉÓÔÁ ÎÅ ×ÉĦÌÅÎÏ."
 
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "ðÅÒÅÈ¦Ä ÄÏ ÌÉÓÔÁ: "
 
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "áÒÇÕÍÅÎÔ ÐÏ×ÉÎÅÎ ÂÕÔÉ ÎÏÍÅÒÏÍ ÌÉÓÔÁ."
 
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "ãÅÊ ÌÉÓÔ ÎÅ ÍÏÖÎÁ ÐÏÂÁÞÉÔÉ."
 
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "îÅצÒÎÉÊ ÎÏÍÅÒ ÌÉÓÔÁ."
 
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "÷ÉÄÁÌÉÔÉ ÌÉÓÔÉ ÚÁ ÛÁÂÌÏÎÏÍ: "
 
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr ""
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr ""
 
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr ""
 
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "÷ÉÊÔÉ Ú Mutt?"
 
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "÷ÉĦÌÉÔÉ ÌÉÓÔÉ ÚÁ ÛÁÂÌÏÎÏÍ: "
 
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "÷¦ÄÎÏ×ÉÔÉ ÌÉÓÔÉ ÚÁ ÛÁÂÌÏÎÏÍ: "
 
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "úÎÑÔÉ ×ÉĦÌÅÎÎÑ Ú ÌÉÓÔ¦× ÚÁ ÛÁÂÌÏÎÏÍ: "
 
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "÷¦ÄËÒÉÔÉ ÓËÒÉÎØËÕ ÌÉÛÅ ÄÌÑ ÞÉÔÁÎÎÑ"
 
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "÷¦ÄËÒÉÔÉ ÓËÒÉÎØËÕ"
 
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s ÎÅ ¤ ÐÏÛÔÏ×ÏÀ ÓËÒÉÎØËÏÀ."
 
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "ðÏËÉÎÕÔÉ Mutt ÂÅÚ ÚÂÅÒÅÖÅÎÎÑ?"
 
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "ãÅ ÏÓÔÁÎÎ¦Ê ÌÉÓÔ."
 
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "÷Ó¦ ÌÉÓÔÉ ×ÉÄÁÌÅÎÏ."
 
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "ãÅ ÐÅÒÛÉÊ ÌÉÓÔ."
 
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "ðÏÛÕË Ú ÐÏÞÁÔËÕ."
 
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "ðÏÛÕË ×¦Ä Ë¦ÎÃÑ."
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "îÏ×ÉÈ ÌÉÓÔ¦× ÎÅÍÁ¤"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "îÅÞÉÔÁÎÉÈ ÌÉÓÔ¦× ÎÅÍÁ¤"
 
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr " Õ ÃÉÈ ÍÅÖÁÈ ÏÇÌÑÄÕ"
 
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "îÉÔÏË Â¦ÌØÛ ÎÅÍÁ."
 
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "ãÅ ÐÅÒÛÁ ÎÉÔËÁ."
 
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "îÉÔËÁ ÍÁ¤ ÎÅÞÉÔÁΦ ÌÉÓÔÉ."
 
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "óÛÉ×ÁÎÎÑ ÎÅÄÏÓÔÕÐÎÅ."
 
@@ -1154,6 +1159,11 @@ msgstr "
 msgid "Login failed."
 msgstr "òŤÓÔÒÁæÑ..."
 
+#. now begin login
+#: imap/auth_gss.c:74
+msgid "Authenticating (GSSAPI)..."
+msgstr ""
+
 #: imap/browse.c:93
 #, fuzzy
 msgid "Getting namespaces..."
@@ -1166,7 +1176,7 @@ msgstr ""
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "æÁÔÁÌØÎÁ ÐÏÍÉÌËÁ. ì¦ÞÉÌØÎÉË ÌÉÓÔ¦× ÎÅÍÏÖÌÉ×Ï Ó¦ÎÈÒÏΦÚÕ×ÁÔÉ!"
 
@@ -1202,30 +1212,30 @@ msgstr "
 msgid "Closing connection to IMAP server..."
 msgstr "úÁËÒÉÔÔÑ Ú'¤ÄÎÁÎÎÑ Ú ÓÅÒ×ÅÒÏÍ IMAP..."
 
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, fuzzy, c-format
 msgid "Marking %d messages deleted..."
 msgstr "þÉÔÁÎÎÑ %d ÎÏ×ÏÇÏ ÐÏצÄÏÍÌÅÎÎÑ (%d ÂÁÊÔ)..."
 
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "úÂÅÒÅÖÅÎÎÑ ÆÌÁÇ¦× ÓÔÁÔÕÓÕ ÌÉÓÔÁ... [%d/%d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "úÁËÒÉÔÔÑ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ..."
 
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr ""
 
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, fuzzy, c-format
 msgid "Subscribing to %s..."
 msgstr "ëÏЦÀ×ÁÎÎÑ ÄÏ %s..."
 
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, fuzzy, c-format
 msgid "Unsubscribing to %s..."
 msgstr "ú'¤ÄÎÁÎÎÑ Ú %s..."
@@ -1336,12 +1346,12 @@ msgstr "
 msgid "preconnect command failed"
 msgstr ""
 
-#: imap/util.c:40
+#: imap/util.c:41
 #, fuzzy
 msgid "Continue?"
 msgstr "(ÄÁ̦)\n"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr ""
@@ -2434,82 +2444,82 @@ msgstr "
 msgid "Reopening mailbox..."
 msgstr "ðÏ×ÔÏÒΊצÄËÒÉÔÔÑ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ..."
 
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "ðÅÒÅÊÔÉ ÄÏ: "
 
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "îÅצÒÎÉÊ ÎÏÍÅÒ ÐÅÒÅ̦ËÕ."
 
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "öÏÄÎϧ ÐÏÚÉç§."
 
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "äÁ̦ ÎÉÖÞÅ ÐÒÏËÒÕÞÕ×ÁÔÉ ÎÅ ÍÏÖÎÁ."
 
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "äÁ̦ ×ÉÝÅ ÐÒÏËÒÕÞÕ×ÁÔÉ ÎÅ ÍÏÖÎÁ."
 
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "ãÅ ÏÓÔÁÎÎÑ ÓÔÏÒ¦ÎËÁ."
 
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "ãÅ ÐÅÒÛÁ ÓÔÏÒ¦ÎËÁ."
 
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "÷É ÂÁÞÉÔÅ ÐÅÒÛÕ ÐÏÚÉæÀ."
 
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "÷É ÂÁÞÉÔÅ ÏÓÔÁÎÎÀ ÐÏÚÉæÀ."
 
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "ãÅ ÏÓÔÁÎÎÑ ÐÏÚÉæÑ."
 
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "ãÅ ÐÅÒÛÁ ÐÏÚÉæÑ."
 
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "ûÕËÁÔÉ ×ÉÒÁÚ:"
 
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "ú×ÏÒÏÔÎ¦Ê ÐÏÛÕË ×ÉÒÁÚÕ: "
 
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 pattern.c:1102
 msgid "No search pattern."
 msgstr "îÅÍÁ¤ ×ÉÒÁÚÕ ÐÏÛÕËÕ."
 
-#: menu.c:698 pager.c:1868 pager.c:1884 pager.c:1972 pattern.c:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "îÅ ÚÎÁÊÄÅÎÏ."
 
-#: menu.c:803
+#: menu.c:811
 #, fuzzy
 msgid "No tagged entries."
 msgstr "öÏÄÎϧ ÐÏÚÉç§."
 
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "ðÏÛÕË × ÃØÏÍÕ ÍÅÎÀ ÎÅ ÏÒÇÁΦÚÏ×ÁÎÏ."
 
-#: menu.c:901
+#: menu.c:909
 #, fuzzy
 msgid "Jumping is not implemented for dialogs."
 msgstr "ðÏÛÕË × ÃØÏÍÕ ÍÅÎÀ ÎÅ ÏÒÇÁΦÚÏ×ÁÎÏ."
 
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "÷ÉĦÌÅÎÎÑ ÎŠЦÄÔÒÉÍÕ¤ÔØÓÑ."
 
@@ -2651,53 +2661,53 @@ msgstr ""
 msgid "Can't write message"
 msgstr "ÒÅÄÁÇÕ×ÁÔÉ ÌÉÓÔ"
 
-#: pager.c:57
+#: pager.c:60
 #, fuzzy
 msgid "Not available in this menu."
 msgstr "îÏ×Á ÐÏÛÔÁ Õ Ã¦Ê ÐÏÛÔÏ×¦Ê ÓËÒÉÎØæ."
 
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "ðÏÐóÔ"
 
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "îÁÓÔóÔ"
 
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "äÏÄÁÔËÉ"
 
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "îÁÓÔ"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "÷É ÂÁÞÉÔŠ˦ÎÅÃØ ÌÉÓÔÁ."
 
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "÷É ÂÁÞÉÔÅ ÐÏÞÁÔÏË ÌÉÓÔÁ."
 
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "ú×ÏÒÏÔÎ¦Ê ÐÏÛÕË: "
 
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "ðÏÛÕË: "
 
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "ð¦ÄËÁÚËÕ ÚÁÒÁÚ ÐÏËÁÚÁÎÏ."
 
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "ãÉÔÏ×ÁÎÏÇÏ ÔÅËÓÔÕ Â¦ÌØÛ ÎÅÍÁ¤."
 
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "ð¦ÓÌÑ ÃÉÔÏ×ÁÎÏÇÏ ÔÅËÓÔÕ Î¦ÞÏÇÏ ÎÅÍÁ¤."
 
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index 57bd8e14..66903c9f 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-24 22:31+0100\n"
+"POT-Creation-Date: 2000-02-29 23:32+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"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addrbook.c:31 browser.c:41 pager.c:1382 postpone.c:37 query.c:43
+#: addrbook.c:31 browser.c:41 pager.c:1385 postpone.c:37 query.c:43
 #: recvattach.c:57
 msgid "Exit"
 msgstr "Â÷¶}"
@@ -23,7 +23,7 @@ msgid "Select"
 msgstr "¿ï¾Ü"
 
 #: 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
+#: pager.c:1482 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "¨D§U"
 
@@ -225,16 +225,21 @@ msgstr "
 msgid "New mail in %s."
 msgstr "¦b %s ¦³·s«H¥ó¡C"
 
-#: charset.c:1065
+#: charset.c:1066
 msgid "We can't currently handle utf-8 at this point."
 msgstr "§Ú­ÌÁÙ¥¼¯à³B²z utf-8¡C"
 
-#: charset.c:1071 charset.c:1078
+#: charset.c:1072 charset.c:1079
 #, c-format
 msgid "Can't open %s: %s."
 msgstr "µLªk¶}±Ò %s¡G%s."
 
-#: charset.c:1131
+#: charset.c:1148
+#, fuzzy, c-format
+msgid "Error while recoding %s. Leave it unchanged."
+msgstr "·íÂà´«½s½X %s µo¥Í¿ù»~¡C¬Ý %s ¨Ó­×´_§Aªº¸ê®Æ¡C"
+
+#: charset.c:1154
 #, c-format
 msgid "Error while recoding %s. See %s for recovering your data."
 msgstr "·íÂà´«½s½X %s µo¥Í¿ù»~¡C¬Ý %s ¨Ó­×´_§Aªº¸ê®Æ¡C"
@@ -663,7 +668,7 @@ msgstr "
 msgid " ('?' for list): "
 msgstr " (¥Î '?' Åã¥Ü¦Cªí)¡G"
 
-#: curs_main.c:55 curs_main.c:546
+#: curs_main.c:55 curs_main.c:555
 msgid "No mailbox is open."
 msgstr "¨S¦³¤w¶}±Ò«H½c¡C"
 
@@ -671,11 +676,11 @@ msgstr "
 msgid "There are no messages."
 msgstr "¨S¦³«H¥ó¡C"
 
-#: curs_main.c:57 mx.c:1035 pager.c:58 recvattach.c:47
+#: curs_main.c:57 mx.c:1035 pager.c:61 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "«H½c¬O°ßŪªº¡C"
 
-#: curs_main.c:58 pager.c:59 recvattach.c:764
+#: curs_main.c:58 pager.c:62 recvattach.c:764
 msgid "Function not permitted in attach-message mode."
 msgstr "¥\\¯à¦b attach-message ¼Ò¦¡¤U¤£³Q¤ä´©¡C"
 
@@ -695,7 +700,7 @@ msgstr "
 msgid "Quit"
 msgstr "Â÷¶}"
 
-#: curs_main.c:263 pager.c:1389 postpone.c:38
+#: curs_main.c:263 pager.c:1392 postpone.c:38
 msgid "Del"
 msgstr "§R°£"
 
@@ -707,7 +712,7 @@ msgstr "
 msgid "Mail"
 msgstr "«H¥ó"
 
-#: curs_main.c:267 pager.c:1390
+#: curs_main.c:267 pager.c:1393
 msgid "Reply"
 msgstr "¦^ÂÐ"
 
@@ -715,130 +720,130 @@ msgstr "
 msgid "Group"
 msgstr "¸s²Õ"
 
-#: curs_main.c:441
+#: curs_main.c:446
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "«H½c¤w³Q¨ä¥L³~®|§ïÅܹL¡CºX¼Ð¥i¯à¦³¿ù»~¡C"
 
-#: curs_main.c:444 pager.c:1498
+#: curs_main.c:449
 msgid "New mail in this mailbox."
 msgstr "³o­Ó«H½c¤¤¦³·s«H¥ó¡C"
 
-#: curs_main.c:552
+#: curs_main.c:561
 msgid "No tagged messages."
 msgstr "¨S¦³¼Ð°O¤Fªº«H¥ó¡C"
 
-#: curs_main.c:632
+#: curs_main.c:641
 msgid "Jump to message: "
 msgstr "¸õ¨ì«H¥ó¡G"
 
-#: curs_main.c:638
+#: curs_main.c:647
 msgid "Argument must be a message number."
 msgstr "»Ý­n¤@­Ó«H¥ó½s¸¹ªº°Ñ¼Æ¡C"
 
-#: curs_main.c:671
+#: curs_main.c:680
 msgid "That message is not visible."
 msgstr "³o«Ê«H¥óµLªkÅã¥Ü¡C"
 
-#: curs_main.c:674
+#: curs_main.c:683
 msgid "Invalid message number."
 msgstr "µL®Äªº«H¥ó½s¸¹¡C"
 
-#: curs_main.c:687
+#: curs_main.c:696
 msgid "Delete messages matching: "
 msgstr "§R°£²Å¦X³o¼Ë¦¡ªº«H¥ó¡G"
 
-#: curs_main.c:709
+#: curs_main.c:718
 msgid "No limit pattern is in effect."
 msgstr "¨S¦³­­¨î¼Ë¦¡¬O¦³®Äªº¡C"
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:714
+#: curs_main.c:723
 #, c-format
 msgid "Limit: %s"
 msgstr "­­¨î: %s"
 
-#: curs_main.c:723
+#: curs_main.c:732
 msgid "Limit to messages matching: "
 msgstr "­­¨î¥u²Å¦X³o¼Ë¦¡ªº«H¥ó¡G"
 
-#: curs_main.c:753
+#: curs_main.c:762
 msgid "Quit Mutt?"
 msgstr "Â÷¶} Mutt¡H"
 
-#: curs_main.c:864
+#: curs_main.c:873
 msgid "Tag messages matching: "
 msgstr "¼Ð°O«H¥óªº±ø¥ó¡G"
 
-#: curs_main.c:872
+#: curs_main.c:881
 msgid "Undelete messages matching: "
 msgstr "¤Ï§R°£«H¥óªº±ø¥ó¡G"
 
-#: curs_main.c:879
+#: curs_main.c:888
 msgid "Untag messages matching: "
 msgstr "¤Ï¼Ð°O«H¥óªº±ø¥ó¡G"
 
-#: curs_main.c:897
+#: curs_main.c:906
 msgid "Open mailbox in read-only mode"
 msgstr "¥Î°ßŪ¼Ò¦¡¶}±Ò«H½c"
 
-#: curs_main.c:899
+#: curs_main.c:908
 msgid "Open mailbox"
 msgstr "¶}±Ò«H½c"
 
-#: curs_main.c:915 mx.c:454 mx.c:600
+#: curs_main.c:924 mx.c:454 mx.c:600
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s ¤£¬O«H½c¡C"
 
-#: curs_main.c:993
+#: curs_main.c:1002
 msgid "Exit Mutt without saving?"
 msgstr "¤£Àx¦s«KÂ÷¶} Mutt ¶Ü¡H"
 
-#: curs_main.c:1029 curs_main.c:1053
+#: curs_main.c:1038 curs_main.c:1062
 msgid "You are on the last message."
 msgstr "±z¤w¸g¦b³Ì«á¤@«Ê«H¤F¡C"
 
-#: curs_main.c:1036 curs_main.c:1078
+#: curs_main.c:1045 curs_main.c:1087
 msgid "No undeleted messages."
 msgstr "¨S¦³­n¤Ï§R°£ªº«H¥ó¡C"
 
-#: curs_main.c:1071 curs_main.c:1094
+#: curs_main.c:1080 curs_main.c:1103
 msgid "You are on the first message."
 msgstr "±z¤w¸g¦b²Ä¤@«Ê«H¤F¡C"
 
-#: curs_main.c:1166 pattern.c:1123
+#: curs_main.c:1175 pattern.c:1123
 msgid "Search wrapped to top."
 msgstr "·j´M¦Ü¶}ÀY¡C"
 
-#: curs_main.c:1175 pattern.c:1134
+#: curs_main.c:1184 pattern.c:1134
 msgid "Search wrapped to bottom."
 msgstr "·j´M¦Üµ²§À¡C"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No new messages"
 msgstr "¨S¦³·s«H¥ó"
 
-#: curs_main.c:1208
+#: curs_main.c:1217
 msgid "No unread messages"
 msgstr "¨S¦³©|¥¼Åª¨úªº«H¥ó"
 
-#: curs_main.c:1209
+#: curs_main.c:1218
 msgid " in this limited view"
 msgstr " ¦b³o­­©wªºÂsÄý¤¤"
 
-#: curs_main.c:1333
+#: curs_main.c:1342
 msgid "No more threads."
 msgstr "¨S¦³§ó¦hªº§Ç¦C"
 
-#: curs_main.c:1335
+#: curs_main.c:1344
 msgid "You are on the first thread."
 msgstr "±z¤w¸g¦b²Ä¤@­Ó§Ç¦C¤W¡C"
 
-#: curs_main.c:1405
+#: curs_main.c:1414
 msgid "Thread contains unread messages."
 msgstr "§Ç¦C¤¤¦³©|¥¼Åª¨úªº«H¥ó¡C"
 
-#: curs_main.c:1418 flags.c:228 thread.c:661 thread.c:712
+#: curs_main.c:1427 flags.c:228 thread.c:661 thread.c:712
 msgid "Threading is not enabled."
 msgstr "§Ç¦C¥\\¯à©|¥¼±Ò°Ê¡C"
 
@@ -1156,6 +1161,11 @@ msgstr "
 msgid "Login failed."
 msgstr "µn¤J¥¢±Ñ¡C"
 
+#. now begin login
+#: imap/auth_gss.c:74
+msgid "Authenticating (GSSAPI)..."
+msgstr "ÅçÃÒ¤¤ (GSSAPI)¡K"
+
 #: imap/browse.c:93
 #, fuzzy
 msgid "Getting namespaces..."
@@ -1169,7 +1179,7 @@ msgstr "
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:165
+#: imap/command.c:184
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "ÄY­«¿ù»~¡C«H¥ó¼Æ¶q¤£¨ó½Õ¡I"
 
@@ -1205,30 +1215,30 @@ msgstr "
 msgid "Closing connection to IMAP server..."
 msgstr "¥¿¦bÃö³¬»P IMAP ¦øªA¾¹ªº³s½u¡K"
 
-#: imap/imap.c:981
+#: imap/imap.c:991
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "¼Ðñ¤Fªº %d «Ê«H¥ó§R¥h¤F¡K"
 
-#: imap/imap.c:1001
+#: imap/imap.c:1011
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "¥¿¦bÀx¦s«H¥óª¬ºAºX¼Ð¡K [%d/%d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1070
 msgid "Closing mailbox..."
 msgstr "Ãö³¬«H½c¤¤¡K"
 
-#: imap/imap.c:1070
+#: imap/imap.c:1080
 msgid "Expunging messages from server..."
 msgstr "¥¿¦b§R°£¦øªA¾¹¤Wªº«H¥ó¡K"
 
-#: imap/imap.c:1387
+#: imap/imap.c:1410
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "­q¾\\ %s¡K"
 
-#: imap/imap.c:1389
+#: imap/imap.c:1412
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "¨ú®ø­q¾\\ %s¡K"
@@ -1341,12 +1351,12 @@ msgstr "
 msgid "preconnect command failed"
 msgstr "¹w¥ý³s±µ«ü¥O¥¢±Ñ"
 
-#: imap/util.c:40
+#: imap/util.c:41
 #, fuzzy
 msgid "Continue?"
 msgstr "¡]Ä~Äò¡^\n"
 
-#: imap/util.c:46
+#: imap/util.c:47
 #, c-format
 msgid "%s [%s]\n"
 msgstr ""
@@ -2473,80 +2483,80 @@ msgstr "
 msgid "Reopening mailbox..."
 msgstr "­«·s¶}±Ò«H½c¤¤¡K"
 
-#: menu.c:350
+#: menu.c:354
 msgid "Jump to: "
 msgstr "¸õ¨ì¡G"
 
-#: menu.c:359
+#: menu.c:363
 msgid "Invalid index number."
 msgstr "µL®Äªº¯Á¤Þ½s¸¹¡C"
 
-#: 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
+#: menu.c:367 menu.c:385 menu.c:421 menu.c:462 menu.c:478 menu.c:489
+#: menu.c:500 menu.c:542 menu.c:553 menu.c:566 menu.c:579 menu.c:941
 msgid "No entries."
 msgstr "¨S¦³¸ê®Æ¡C"
 
-#: menu.c:378
+#: menu.c:382
 msgid "You cannot scroll down farther."
 msgstr "±zµLªk¦A¦V¤U±²°Ê¤F¡C"
 
-#: menu.c:394
+#: menu.c:398
 msgid "You cannot scroll up farther."
 msgstr "±zµLªk¦A¦V¤W±²°Ê¤F¡C"
 
-#: menu.c:414
+#: menu.c:418
 msgid "You are on the last page."
 msgstr "±z²{¦b¦b³Ì«á¤@­¶¡C"
 
-#: menu.c:436
+#: menu.c:440
 msgid "You are on the first page."
 msgstr "±z²{¦b¦b²Ä¤@­¶¡C"
 
-#: menu.c:515
+#: menu.c:519
 msgid "First entry is shown."
 msgstr "¥¿¦bÅã¥Ü²Ä¤@¶µ¡C"
 
-#: menu.c:535
+#: menu.c:539
 msgid "Last entry is shown."
 msgstr "¥¿¦bÅã¥Ü³Ì«á¤@¶µ¡C"
 
-#: menu.c:586
+#: menu.c:590
 msgid "You are on the last entry."
 msgstr "±z²{¦b¦b³Ì«á¤@¶µ¡C"
 
-#: menu.c:597
+#: menu.c:601
 msgid "You are on the first entry."
 msgstr "±z²{¦b¦b²Ä¤@¶µ¡C"
 
-#: menu.c:657 pattern.c:1069
+#: menu.c:661 pattern.c:1069
 msgid "Search for: "
 msgstr "·j´M¡G"
 
-#: menu.c:658
+#: menu.c:662
 msgid "Reverse search for: "
 msgstr "ªð¦V·j´M¡G"
 
-#: menu.c:668 pattern.c:1102
+#: menu.c:672 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:1167
+#: menu.c:702 pager.c:1857 pager.c:1873 pager.c:1961 pattern.c:1167
 msgid "Not found."
 msgstr "¨S¦³§ä¨ì¡C"
 
-#: menu.c:803
+#: menu.c:811
 msgid "No tagged entries."
 msgstr "¨S¦³¤w¼Ð°Oªº°O¿ý¡C"
 
-#: menu.c:896
+#: menu.c:904
 msgid "Search is not implemented for this menu."
 msgstr "³o­Ó¿ï³æ¤¤¨S¦³·j´M¥\\¯à¡C"
 
-#: menu.c:901
+#: menu.c:909
 msgid "Jumping is not implemented for dialogs."
 msgstr "¹ï¸Ü¼Ò¦¡¤¤¤£¤ä´©¸õÅD¥\\¯à¡C"
 
-#: menu.c:936
+#: menu.c:944
 msgid "Tagging is not supported."
 msgstr "¤£¤ä´©¼Ð°O¥\\¯à¡C"
 
@@ -2687,52 +2697,52 @@ msgstr "%d 
 msgid "Can't write message"
 msgstr "½s¿è«H¥ó¤º®e"
 
-#: pager.c:57
+#: pager.c:60
 msgid "Not available in this menu."
 msgstr "¦b³o­Óµæ³æ¤¤¨S¦³³o­Ó¥\\¯à¡C"
 
-#: pager.c:1383
+#: pager.c:1386
 msgid "PrevPg"
 msgstr "¤W¤@­¶"
 
-#: pager.c:1384
+#: pager.c:1387
 msgid "NextPg"
 msgstr "¤U¤@­¶"
 
-#: pager.c:1388
+#: pager.c:1391
 msgid "View Attachm."
 msgstr "Åã¥Üªþ¥ó¡C"
 
-#: pager.c:1391
+#: pager.c:1394
 msgid "Next"
 msgstr "¤U¤@­Ó"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1780 pager.c:1811 pager.c:1840 pager.c:2060
+#: pager.c:1769 pager.c:1800 pager.c:1829 pager.c:2049
 msgid "Bottom of message is shown."
 msgstr "²{¥¿Åã¥Ü³Ì¤U­±ªº«H¥ó¡C"
 
-#: pager.c:1796 pager.c:1818 pager.c:1829
+#: pager.c:1785 pager.c:1807 pager.c:1818
 msgid "Top of message is shown."
 msgstr "²{¥¿Åã¥Ü³Ì¤W­±ªº«H¥ó¡C"
 
-#: pager.c:1902
+#: pager.c:1891
 msgid "Reverse search: "
 msgstr "¤Ï¦V·j´M¡G"
 
-#: pager.c:1903
+#: pager.c:1892
 msgid "Search: "
 msgstr "·j´M¡G"
 
-#: pager.c:1998
+#: pager.c:1987
 msgid "Help is currently being shown."
 msgstr "²{¥¿Åã¥Ü»¡©ú¤å¥ó¡C"
 
-#: pager.c:2027
+#: pager.c:2016
 msgid "No more quoted text."
 msgstr "¤£¯à¦³¦A¦hªº¤Þ¨¥¡C"
 
-#: pager.c:2040
+#: pager.c:2029
 msgid "No more unquoted text after quoted text."
 msgstr "¦b¤Þ¨¥«á¦³¹L¦hªº«D¤Þ¨¥¤å¦r¡C"
 
@@ -3557,9 +3567,6 @@ msgstr "
 #~ msgid "ignoring empty header field: %s"
 #~ msgstr "¤£²z·|ªÅªº¼ÐÀYÄæ¦ì¡G%s"
 
-#~ msgid "Authenticating (GSSAPI)..."
-#~ msgstr "ÅçÃÒ¤¤ (GSSAPI)¡K"
-
 #, fuzzy
 #~ msgid "Recoding only affetcs text attachments."
 #~ msgstr "¥u­«·s½s½X¨ü¼vÅTªº¤å¦rªþ¥ó"