automatic post-release commit for mutt-1.3.7mutt-1-3-7-rel

23 files changed, 2065 insertions, 2220 deletions

diff --git a/ChangeLog b/ChangeLog
index 9998e4eb..052a180a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,61 @@
+Thu Aug  3 08:24:55 2000  Thomas Roessler  <roessler@guug.de>
+
+	* sendlib.c:
+	Use a correct Envelope from when bouncing with $envelope_from enabled.
+
+	* imap/auth_sasl.c, imap/BUGS, imap/imap.c, imap/imap_ssl.c, mutt_sasl.c:
+	More IMAP fixes from Brendan.
+
+Thu Aug  3 08:24:55 2000  Thomas Roessler  <roessler@guug.de>
+
+	* sendlib.c:
+	Use a correct Envelope from when bouncing with $envelope_from enabled.
+
+	* imap/auth_sasl.c, imap/BUGS, imap/imap.c, imap/imap_ssl.c, mutt_sasl.c:
+	More IMAP fixes from Brendan.
+
+Wed Aug  2 18:03:21 2000  Thomas Roessler  <roessler@guug.de>
+
+	* po/it.po: update
+
+Tue Aug  1 18:04:42 2000  Thomas Roessler  <roessler@guug.de>
+
+	* mx.c: Fix from BC
+
+	* imap/auth.c, imap/auth_gss.c, imap/auth_sasl.c, imap/message.c:
+	Brendan's latest patches.
+
+Mon Jul 31 10:49:00 2000  Thomas Roessler  <roessler@guug.de>
+
+	* po/fr.po: update.
+
+	* m4/gettext.m4, imap/auth_anon.c, imap/auth.c, imap/auth_cram.c, imap/auth_gss.c, imap/auth.h, imap/auth_login.c, imap/auth_sasl.c, imap/command.c, imap/imap.c, imap/imap_private.h, imap/Makefile.am, acconfig.h, account.c, account.h, configure.in, globals.h, init.h, main.c, Makefile.am, mutt_sasl.c, mutt_sasl.h, mutt_socket.c, mutt_socket.h:
+	Brendan Cully's SASL patch.  I hope I didn't miss any files.
+
+Sat Jul 29 16:33:53 2000  Thomas Roessler  <roessler@guug.de>
+
+	* po/id.po: update.
+
+	* imap/README: updated readme file.
+
+	* Makefile.am:
+	Make sure checktypes and makedoc don't depend on the intl library.
+
+	* po/de.po: update.
+
+Fri Jul 28 19:00:31 2000  Thomas Roessler  <roessler@guug.de>
+
+	* po/ru.po, po/sk.po, po/sv.po, po/uk.po, po/zh_TW.Big5.po, po/it.po, po/ko.po, po/nl.po, po/pl.po, po/pt_BR.po, po/eo.po, po/es.po, po/fr.po, po/gl.po, po/id.po, po/cs.po, po/da.po, po/de.po, po/el.po, ChangeLog, reldate.h, VERSION:
+	automatic post-release commit for mutt-1.3.6
+
+	* Makefile.am: parse.h no longer exists, so don't try to distribute it.
+
+	* po/sv.po, po/uk.po, po/zh_TW.Big5.po, po/pt_BR.po, po/ru.po, po/sk.po, po/ko.po, po/nl.po, po/pl.po, po/gl.po, po/id.po, po/it.po, po/el.po, po/eo.po, po/es.po, po/fr.po, po/cs.po, po/da.po, po/de.po, reldate.h, ChangeLog, VERSION:
+	automatic post-release commit for mutt-1.2.5
+
+	* imap/imap.c, imap/imap_private.h, imap/message.c:
+	Use UIDs instead of sequence numbers in IMAP.  (Brendan)
+
 Fri Jul 28 18:57:31 2000  Thomas Roessler  <roessler@guug.de>
 
 	* Makefile.am: parse.h no longer exists, so don't try to distribute it.
diff --git a/VERSION b/VERSION
index 95b25aee..3336003d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.6
+1.3.7
diff --git a/imap/Makefile.am b/imap/Makefile.am
index 8f5c6486..9f5a6fa7 100644
--- a/imap/Makefile.am
+++ b/imap/Makefile.am
@@ -24,6 +24,6 @@ INCLUDES = -I$(top_srcdir) -I../intl
 noinst_LIBRARIES = libimap.a
 noinst_HEADERS = auth.h imap_private.h md5.h message.h $(SSLHEADERS)
 
-libimap_a_SOURCES = auth.c auth_anon.c auth_login.c c browse.c \
+libimap_a_SOURCES = auth.c auth_anon.c auth_login.c browse.c \
 	command.c imap.c imap.h md5c.c message.c utf7.c \
 	util.c $(GSSSOURCES) $(SASLSOURCES) $(CRAMSOURCES) $(SSLSOURCES)
diff --git a/po/cs.po b/po/cs.po
index cc837a88..2bad1ce9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.11i\n"
-"POT-Creation-Date: 2000-07-28 20:58+0200\n"
+"POT-Creation-Date: 2000-08-03 11:07+0200\n"
 "PO-Revision-Date: 2000-04-03 22:20+0200\n"
 "Last-Translator: Jiří Pavlovský <pavlovsk@ff.cuni.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -21,7 +21,7 @@ msgid "Select"
 msgstr "Volba"
 
 #
-#: addrbook.c:33 browser.c:42 compose.c:92 curs_main.c:376 imap/imap_ssl.c:521
+#: addrbook.c:33 browser.c:42 compose.c:92 curs_main.c:376 imap/imap_ssl.c:520
 #: pager.c:1459 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Nápověda"
@@ -787,7 +787,7 @@ msgid "There are no messages."
 msgstr "Nejsou žádné zprávy."
 
 #
-#: curs_main.c:57 mx.c:1036 pager.c:62 recvattach.c:47
+#: curs_main.c:57 mx.c:1055 pager.c:62 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "Ze schránky je možné pouze číst."
 
@@ -1311,63 +1311,15 @@ msgstr "Nápověda pro %s"
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook hook %s není znám"
 
-#: imap/auth.c:103
-msgid "Authenticating (CRAM-MD5)..."
-msgstr "Ověřuji (CRAM-MD5)..."
-
-#: imap/auth.c:188
-msgid "Authenticating (anonymous)..."
-msgstr "Ověřuji (anonymně)..."
-
-#
-#: imap/auth.c:263
-msgid "IMAP Username: "
-msgstr "Uživatelské jméno na IMAP serveru: "
-
-#: imap/auth.c:279
-msgid "Anonymous authentication not supported."
-msgstr "Anonymní ověřování není podporováno."
-
-#: imap/auth.c:292
-msgid "GSSAPI authentication failed."
-msgstr "GSSAPI ověření se nezdařilo."
-
-#
-#: imap/auth.c:310
-#, c-format
-msgid "CRAM key for %s@%s: "
-msgstr "CRAM klíč pro %s@%s: "
-
-#: imap/auth.c:325
-msgid "CRAM-MD5 authentication failed."
-msgstr "CRAM-MD5 ověření se nezdařilo."
-
-#: imap/auth.c:340
-msgid "Skipping CRAM-MD5 authentication."
-msgstr "Vynechávám CRAM-MD5 ověření."
-
-#
-#: imap/auth.c:352 pop.c:61
-#, c-format
-msgid "Password for %s@%s: "
-msgstr "Heslo pro %s@%s: "
-
-#
-#: imap/auth.c:367 pop.c:72
-msgid "Logging in..."
-msgstr "Probíhá přihlašování..."
-
-#
-#. Login failed, try again
-#: imap/auth.c:389
-msgid "Login failed."
-msgstr "Přihlášení se nezdařilo."
-
 #. now begin login
-#: imap/auth_gss.c:81
+#: imap/auth_gss.c:86
 msgid "Authenticating (GSSAPI)..."
 msgstr "Ověřuji (GSSAPI)..."
 
+#: imap/auth_gss.c:250
+msgid "GSSAPI authentication failed."
+msgstr "GSSAPI ověření se nezdařilo."
+
 #
 #: imap/browse.c:80
 msgid "Getting namespaces..."
@@ -1391,70 +1343,70 @@ msgid "Closing connection to %s..."
 msgstr "Končím spojení s IMAP serverem..."
 
 #
-#: imap/imap.c:294
+#: imap/imap.c:295
 #, c-format
 msgid "Reopening mailbox... %s"
 msgstr "Otevírám schránku znovu... %s"
 
 #
-#: imap/imap.c:497
+#: imap/imap.c:500
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Tento IMAP server je zastaralý. Mutt s ním nebude fungovat."
 
 #
-#: imap/imap.c:701
+#: imap/imap.c:697
 #, c-format
 msgid "Selecting %s..."
 msgstr "Volím %s..."
 
 #
 #. STATUS not supported
-#: imap/imap.c:868
+#: imap/imap.c:864
 msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "Ke schránkám na tomto IMAP serveru nelze připojovat."
 
 #
 #. command failed cause folder doesn't exist
-#: imap/imap.c:877 imap/message.c:547 muttlib.c:1126
+#: imap/imap.c:873 imap/message.c:555 muttlib.c:1126
 #, c-format
 msgid "Create %s?"
 msgstr "Vytvořit %s?"
 
 #
-#: imap/imap.c:911
+#: imap/imap.c:907
 msgid "Closing connection to IMAP server..."
 msgstr "Končím spojení s IMAP serverem..."
 
 #
-#: imap/imap.c:1074
+#: imap/imap.c:1070
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Mažu zprávy (počet: %d)..."
 
 #
-#: imap/imap.c:1093
+#: imap/imap.c:1089
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Ukládám příznaky stavu zprávy... [%d/%d]"
 
 #
-#: imap/imap.c:1149
+#: imap/imap.c:1145
 msgid "Expunging messages from server..."
 msgstr "Odstraňuji zprávy ze serveru..."
 
 #
-#: imap/imap.c:1178
+#: imap/imap.c:1174
 msgid "Closing mailbox..."
 msgstr "Uzavírám schránku..."
 
 #
-#: imap/imap.c:1447
+#: imap/imap.c:1443
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Přihlašuji %s..."
 
 #
-#: imap/imap.c:1449
+#: imap/imap.c:1445
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Odhlašuji %s..."
@@ -1478,135 +1430,135 @@ msgid "SSL disabled due the lack of entropy"
 msgstr "SSL vypnuto kvůli nedostatku náhodných dat"
 
 #
-#: imap/imap_ssl.c:237
+#: imap/imap_ssl.c:236
 msgid "Unable to get certificate from peer"
 msgstr "Certifikát od serveru nelze získat"
 
 #
-#: imap/imap_ssl.c:248
+#: imap/imap_ssl.c:247
 #, c-format
 msgid "SSL connection using %s"
 msgstr "SSL spojení pomocí %s"
 
 #
-#: imap/imap_ssl.c:277
+#: imap/imap_ssl.c:276
 msgid "Unknown"
 msgstr "Neznámý"
 
 #
-#: imap/imap_ssl.c:302
+#: imap/imap_ssl.c:301
 msgid "[unable to calculate]"
 msgstr "[nelze spočítat]"
 
 #
-#: imap/imap_ssl.c:320
+#: imap/imap_ssl.c:319
 #, fuzzy
 msgid "[invalid date]"
 msgstr "Hodnota %s je nesprávná."
 
-#: imap/imap_ssl.c:395
+#: imap/imap_ssl.c:394
 msgid "Server certificate is not yet valid"
 msgstr ""
 
-#: imap/imap_ssl.c:402
+#: imap/imap_ssl.c:401
 #, fuzzy
 msgid "Server certificate has expired"
 msgstr "Tento certifikát vydal:"
 
-#: imap/imap_ssl.c:475
+#: imap/imap_ssl.c:474
 msgid "This certificate belongs to:"
 msgstr "Tento certifikát patří:"
 
-#: imap/imap_ssl.c:485
+#: imap/imap_ssl.c:484
 msgid "This certificate was issued by:"
 msgstr "Tento certifikát vydal:"
 
-#: imap/imap_ssl.c:495
+#: imap/imap_ssl.c:494
 #, fuzzy
 msgid "This certificate is valid"
 msgstr "Tento certifikát vydal:"
 
-#: imap/imap_ssl.c:496
+#: imap/imap_ssl.c:495
 #, c-format
 msgid "   from %s"
 msgstr ""
 
-#: imap/imap_ssl.c:498
+#: imap/imap_ssl.c:497
 #, c-format
 msgid "     to %s"
 msgstr ""
 
-#: imap/imap_ssl.c:504
+#: imap/imap_ssl.c:503
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Otisk klíče: %s"
 
-#: imap/imap_ssl.c:506
+#: imap/imap_ssl.c:505
 msgid "SSL Certificate check"
 msgstr "Kontrola SSL certifikátu"
 
-#: imap/imap_ssl.c:509
+#: imap/imap_ssl.c:508
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(o)dmítnout, akceptovat pouze (t)eď, akceptovat (v)ždy "
 
-#: imap/imap_ssl.c:510
+#: imap/imap_ssl.c:509
 msgid "roa"
 msgstr "otv"
 
-#: imap/imap_ssl.c:514
+#: imap/imap_ssl.c:513
 msgid "(r)eject, accept (o)nce"
 msgstr "(o)dmítnout, akceptovat pouze (t)eď "
 
-#: imap/imap_ssl.c:515
+#: imap/imap_ssl.c:514
 msgid "ro"
 msgstr "ot"
 
 #
-#: imap/imap_ssl.c:519 pgpkey.c:442
+#: imap/imap_ssl.c:518 pgpkey.c:442
 msgid "Exit  "
 msgstr "Ukončit  "
 
-#: imap/imap_ssl.c:544
+#: imap/imap_ssl.c:543
 msgid "Warning: Couldn't save certificate"
 msgstr "Varování: Certifikát nelze uložit"
 
-#: imap/imap_ssl.c:546
+#: imap/imap_ssl.c:545
 msgid "Certificate saved"
 msgstr "Certifikát uložen"
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:72
+#: imap/message.c:71
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Z IMAP serveru této verze hlavičky nelze stahovat."
 
 #
-#: imap/message.c:90
+#: imap/message.c:89
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Stahuji hlavičky zpráv... [%d/%d]"
 
 #
-#: imap/message.c:222
+#: imap/message.c:229
 msgid "Fetching message..."
 msgstr "Stahuji zprávu..."
 
-#: imap/message.c:259
+#: imap/message.c:266
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 
 #
-#: imap/message.c:439
+#: imap/message.c:447
 msgid "Uploading message ..."
 msgstr "Posílám zprávu..."
 
 #
-#: imap/message.c:525
+#: imap/message.c:533
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Kopíruji zprávy (%d) do %s..."
 
 #
-#: imap/message.c:529
+#: imap/message.c:537
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Kopíruji zprávu %d do %s..."
@@ -2887,55 +2839,55 @@ msgstr ""
 "Přeloženo s volbami:"
 
 #
-#: main.c:413
+#: main.c:412
 msgid "Error initializing terminal."
 msgstr "Chyba při inicializaci terminálu."
 
 #
-#: main.c:512
+#: main.c:511
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Úroveň ladění je %d.\n"
 
 #
-#: main.c:514
+#: main.c:513
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "při překladu programu nebylo 'DEBUG' definováno. Ignoruji.\n"
 
-#: main.c:633
+#: main.c:632
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s neexistuje. Mám ho vytvořit?"
 
 #
-#: main.c:637
+#: main.c:636
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "%s nelze vytvořit: %s"
 
 #
-#: main.c:676
+#: main.c:675
 msgid "No recipients specified.\n"
 msgstr "Nejsou specifikováni žádní příjemci.\n"
 
 #
-#: main.c:749
+#: main.c:748
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "Soubor %s nelze připojit.\n"
 
 #
-#: main.c:769
+#: main.c:768
 msgid "No mailbox with new mail."
 msgstr "V žádné schránce není nová pošta."
 
 #
-#: main.c:778
+#: main.c:777
 msgid "No incoming mailboxes defined."
 msgstr "Není definována žádná schránka přijímající novou poštu."
 
 #
-#: main.c:809
+#: main.c:808
 msgid "Mailbox is empty."
 msgstr "Schránka je prázdná."
 
@@ -3126,24 +3078,24 @@ msgid "Append messages to %s?"
 msgstr "Připojit zprávy do %s?"
 
 #
-#: mutt_socket.c:251
+#: mutt_socket.c:247
 #, fuzzy, c-format
 msgid "Looking up %s..."
 msgstr "Kopíruji do %s..."
 
 #
-#: mutt_socket.c:258
+#: mutt_socket.c:254
 #, fuzzy, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Adresu počítače %s nelze nalézt."
 
 #
-#: mutt_socket.c:264
+#: mutt_socket.c:260
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Připojuji se k %s..."
 
-#: mutt_socket.c:284
+#: mutt_socket.c:280
 #, fuzzy
 msgid "Preconnect command failed."
 msgstr "příkaz před spojením selhal"
@@ -3213,65 +3165,65 @@ msgid "Move read messages to %s?"
 msgstr "Přesunout přečtené zprávy do %s?"
 
 #
-#: mx.c:815 mx.c:1051
+#: mx.c:818 mx.c:1070
 #, c-format
 msgid "Purge %d deleted message?"
 msgstr "Zahodit smazané zprávy (%d)?"
 
 #
-#: mx.c:815 mx.c:1051
+#: mx.c:818 mx.c:1070
 #, c-format
 msgid "Purge %d deleted messages?"
 msgstr "Zahodit smazané zprávy (%d)?"
 
 #
-#: mx.c:836
+#: mx.c:842
 #, c-format
 msgid "Moving read messages to %s..."
 msgstr "Přesunuji přečtené zprávy do %s..."
 
 #
-#: mx.c:887 mx.c:1042
+#: mx.c:900 mx.c:1061
 msgid "Mailbox is unchanged."
 msgstr "Obsah schránky nebyl změněn."
 
 #
-#: mx.c:917
+#: mx.c:936
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
 msgstr "ponecháno: %d, přesunuto: %d, smazáno: %d"
 
 #
-#: mx.c:920 mx.c:1084
+#: mx.c:939 mx.c:1103
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "ponecháno: %d, smazáno: %d"
 
 #
-#: mx.c:1027
+#: mx.c:1046
 #, c-format
 msgid " Press '%s' to toggle write"
 msgstr " Stiskněte `%s' pro zapnutí zápisu"
 
 #
-#: mx.c:1029
+#: mx.c:1048
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "Použijte 'toggle-write' pro zapnutí zápisu!"
 
 #
-#: mx.c:1031
+#: mx.c:1050
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Schránka má vypnut zápis. %s"
 
 #
-#: mx.c:1081
+#: mx.c:1100
 #, fuzzy
 msgid "Mailbox checkpointed."
 msgstr "Schránka byla smazána."
 
 #
-#: mx.c:1369
+#: mx.c:1388
 msgid "Can't write message"
 msgstr "Zprávu nelze uložit"
 
@@ -3756,6 +3708,17 @@ msgid "POP Username: "
 msgstr "Uživatelské jméno na IMAP serveru: "
 
 #
+#: pop.c:61
+#, c-format
+msgid "Password for %s@%s: "
+msgstr "Heslo pro %s@%s: "
+
+#
+#: pop.c:72
+msgid "Logging in..."
+msgstr "Probíhá přihlašování..."
+
+#
 #: pop.c:109
 #, fuzzy, c-format
 msgid "Login failed: %s"
@@ -4288,6 +4251,33 @@ msgstr "Rodičovská zpráva není v omezeném zobrazení viditelná.."
 msgid "Parent message is not available."
 msgstr "Rodičovská zpráva není dostupná."
 
+#~ msgid "Authenticating (CRAM-MD5)..."
+#~ msgstr "Ověřuji (CRAM-MD5)..."
+
+#~ msgid "Authenticating (anonymous)..."
+#~ msgstr "Ověřuji (anonymně)..."
+
+#
+#~ msgid "IMAP Username: "
+#~ msgstr "Uživatelské jméno na IMAP serveru: "
+
+#~ msgid "Anonymous authentication not supported."
+#~ msgstr "Anonymní ověřování není podporováno."
+
+#
+#~ msgid "CRAM key for %s@%s: "
+#~ msgstr "CRAM klíč pro %s@%s: "
+
+#~ msgid "CRAM-MD5 authentication failed."
+#~ msgstr "CRAM-MD5 ověření se nezdařilo."
+
+#~ msgid "Skipping CRAM-MD5 authentication."
+#~ msgstr "Vynechávám CRAM-MD5 ověření."
+
+#
+#~ msgid "Login failed."
+#~ msgstr "Přihlášení se nezdařilo."
+
 #
 #~ msgid "[-- Error: unexpected end of file! --]\n"
 #~ msgstr "[-- Chyba: neočekávaný konec souboru! --]\n"
diff --git a/po/da.po b/po/da.po
index 76a568c5..3b5e908f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt-1.3.5i \n"
-"POT-Creation-Date: 2000-07-28 20:58+0200\n"
+"POT-Creation-Date: 2000-08-03 11:07+0200\n"
 "PO-Revision-Date: 2000-07-09 10:49+02:00\n"
 "Last-Translator: Byrial Jensen <byrial@image.dk>, Morten Bo Johansen "
 "<mojo@image.dk> \n"
@@ -24,7 +24,7 @@ msgstr "Tilbage"
 msgid "Select"
 msgstr "Vćlg"
 
-#: addrbook.c:33 browser.c:42 compose.c:92 curs_main.c:376 imap/imap_ssl.c:521
+#: addrbook.c:33 browser.c:42 compose.c:92 curs_main.c:376 imap/imap_ssl.c:520
 #: pager.c:1459 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Hjćlp"
@@ -648,7 +648,7 @@ msgstr "Ingen brevbakke er ĺben."
 msgid "There are no messages."
 msgstr "Der er ingen breve."
 
-#: curs_main.c:57 mx.c:1036 pager.c:62 recvattach.c:47
+#: curs_main.c:57 mx.c:1055 pager.c:62 recvattach.c:47
 msgid "Mailbox is read-only."
 msgstr "Brevbakken er skrivebeskyttet."
 
@@ -1086,58 +1086,15 @@ msgstr "Hjćlp for %s"
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook: ukendt hooktype: %s"
 
-#: imap/auth.c:103
-msgid "Authenticating (CRAM-MD5)..."
-msgstr "Godkender (CRAM-MD5)..."
-
-#: imap/auth.c:188
-msgid "Authenticating (anonymous)..."
-msgstr "Godkender (anonym)..."
-
-#: imap/auth.c:263
-msgid "IMAP Username: "
-msgstr "IMAP-brugernavn: "
-
-#: imap/auth.c:279
-msgid "Anonymous authentication not supported."
-msgstr "Anonym godkendelse ikke understřttet."
-
-#: imap/auth.c:292
-msgid "GSSAPI authentication failed."
-msgstr "GSSAPI-godkendelse slog fejl."
-
-#: imap/auth.c:310
-#, c-format
-msgid "CRAM key for %s@%s: "
-msgstr "CRAM-nřgle for %s@%s:"
-
-#: imap/auth.c:325
-msgid "CRAM-MD5 authentication failed."
-msgstr "CRAM-MD5-godkendelse slog fejl."
-
-#: imap/auth.c:340
-msgid "Skipping CRAM-MD5 authentication."
-msgstr "Springer over CRAM-MD5-godkendelse."
-
-#: imap/auth.c:352 pop.c:61
-#, c-format
-msgid "Password for %s@%s: "
-msgstr "Adgangskode for %s@%s: "
-
-#: imap/auth.c:367 pop.c:72
-msgid "Logging in..."
-msgstr "Logger ind..."
-
-#. Login failed, try again
-#: imap/auth.c:389
-msgid "Login failed."
-msgstr "Login slog fejl."
-
 #. now begin login
-#: imap/auth_gss.c:81
+#: imap/auth_gss.c:86
 msgid "Authenticating (GSSAPI)..."
 msgstr "Godkender (GSSAPI)..."
 
+#: imap/auth_gss.c:250
+msgid "GSSAPI authentication failed."
+msgstr "GSSAPI-godkendelse slog fejl."
+
 #: imap/browse.c:80
 msgid "Getting namespaces..."
 msgstr "Henter navnerum..."
@@ -1158,59 +1115,59 @@ msgstr "Kritisk fejl. Antal breve er ikke som forventet!"
 msgid "Closing connection to %s..."
 msgstr "Lukker forbindelsen til %s..."
 
-#: imap/imap.c:294
+#: imap/imap.c:295
 #, c-format
 msgid "Reopening mailbox... %s"
 msgstr "Genĺbner brevbakke ... %s"
 
-#: imap/imap.c:497
+#: imap/imap.c:500
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Forćldet IMAP-tjener. Mutt kan ikke bruge den."
 
-#: imap/imap.c:701
+#: imap/imap.c:697
 #, c-format
 msgid "Selecting %s..."
 msgstr "Vćlger %s ..."
 
 #. STATUS not supported
-#: imap/imap.c:868
+#: imap/imap.c:864
 msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "Kunne ikke fřje til IMAP-brevbakker pĺ denne tjener."
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:877 imap/message.c:547 muttlib.c:1126
+#: imap/imap.c:873 imap/message.c:555 muttlib.c:1126
 #, c-format
 msgid "Create %s?"
 msgstr "Opret %s?"
 
-#: imap/imap.c:911
+#: imap/imap.c:907
 msgid "Closing connection to IMAP server..."
 msgstr "Lukker forbindelsen til IMAP-tjeneren ..."
 
-#: imap/imap.c:1074
+#: imap/imap.c:1070
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Markerer %d breve slettet"
 
-#: imap/imap.c:1093
+#: imap/imap.c:1089
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Gemmer brevstatus-indikatorer ... [%d/%d]"
 
-#: imap/imap.c:1149
+#: imap/imap.c:1145
 msgid "Expunging messages from server..."
 msgstr "Sletter breve pĺ tjener ..."
 
-#: imap/imap.c:1178
+#: imap/imap.c:1174
 msgid "Closing mailbox..."
 msgstr "Lukker brevbakke ..."
 
-#: imap/imap.c:1447
+#: imap/imap.c:1443
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Abonnerer pĺ %s..."
 
-#: imap/imap.c:1449
+#: imap/imap.c:1445
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Afmelder abonnement pĺ %s..."
@@ -1233,122 +1190,122 @@ msgstr ""
 msgid "SSL disabled due the lack of entropy"
 msgstr "SSL sat ud af funktion pga. mangel pĺ entropi"
 
-#: imap/imap_ssl.c:237
+#: imap/imap_ssl.c:236
 msgid "Unable to get certificate from peer"
 msgstr "Ude af stand til at hente certifikat fra tjener"
 
-#: imap/imap_ssl.c:248
+#: imap/imap_ssl.c:247
 #, c-format
 msgid "SSL connection using %s"
 msgstr "Bruger %s til en SSL-forbindelse"
 
-#: imap/imap_ssl.c:277
+#: imap/imap_ssl.c:276
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: imap/imap_ssl.c:302
+#: imap/imap_ssl.c:301
 msgid "[unable to calculate]"
 msgstr "[kan ikke beregne]"
 
-#: imap/imap_ssl.c:320
+#: imap/imap_ssl.c:319
 msgid "[invalid date]"
 msgstr "[ugyldig dato]"
 
-#: imap/imap_ssl.c:395
+#: imap/imap_ssl.c:394
 msgid "Server certificate is not yet valid"
 msgstr "Tjener-certifikat er endnu ikke gyldigt"
 
-#: imap/imap_ssl.c:402
+#: imap/imap_ssl.c:401
 msgid "Server certificate has expired"
 msgstr "Tjener-certifikat er udlřbet"
 
-#: imap/imap_ssl.c:475
+#: imap/imap_ssl.c:474
 msgid "This certificate belongs to:"
 msgstr "Dette certifikat tilhřrer:"
 
-#: imap/imap_ssl.c:485
+#: imap/imap_ssl.c:484
 msgid "This certificate was issued by:"
 msgstr "Dette certifikat er udstedt af:"
 
-#: imap/imap_ssl.c:495
+#: imap/imap_ssl.c:494
 msgid "This certificate is valid"
 msgstr "Dette certifikat er gyldigt"
 
-#: imap/imap_ssl.c:496
+#: imap/imap_ssl.c:495
 #, c-format
 msgid "   from %s"
 msgstr "   fra %s"
 
-#: imap/imap_ssl.c:498
+#: imap/imap_ssl.c:497
 #, c-format
 msgid "     to %s"
 msgstr "     til %s"
 
-#: imap/imap_ssl.c:504
+#: imap/imap_ssl.c:503
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Fingeraftryk: %s"
 
-#: imap/imap_ssl.c:506
+#: imap/imap_ssl.c:505
 msgid "SSL Certificate check"
 msgstr "Tjek af SSL-certifikat"
 
-#: imap/imap_ssl.c:509
+#: imap/imap_ssl.c:508
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(a)fvis, (g)odkend denne gang, (v)arig godkendelse"
 
-#: imap/imap_ssl.c:510
+#: imap/imap_ssl.c:509
 msgid "roa"
 msgstr "agv"
 
-#: imap/imap_ssl.c:514
+#: imap/imap_ssl.c:513
 msgid "(r)eject, accept (o)nce"
 msgstr "(a)fvis, (g)odkend denne gang"
 
-#: imap/imap_ssl.c:515
+#: imap/imap_ssl.c:514
 msgid "ro"
 msgstr "ag"
 
-#: imap/imap_ssl.c:519 pgpkey.c:442
+#: imap/imap_ssl.c:518 pgpkey.c:442
 msgid "Exit  "
 msgstr "Afslut "
 
-#: imap/imap_ssl.c:544
+#: imap/imap_ssl.c:543
 msgid "Warning: Couldn't save certificate"
 msgstr "Advarsel: Kunne ikke gemme certifikat"
 
-#: imap/imap_ssl.c:546
+#: imap/imap_ssl.c:545
 msgid "Certificate saved"
 msgstr "Certifikat gemt"
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:72
+#: imap/message.c:71
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Kan ikke hente brevhoveder fra denne version IMAP-tjener."
 
-#: imap/message.c:90
+#: imap/message.c:89
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Henter brevhoveder ... [%d/%d]"
 
-#: imap/message.c:222
+#: imap/message.c:229
 msgid "Fetching message..."
 msgstr "Henter brev ..."
 
-#: imap/message.c:259
+#: imap/message.c:266
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 
-#: imap/message.c:439
+#: imap/message.c:447
 msgid "Uploading message ..."
 msgstr "Uploader brev ..."
 
-#: imap/message.c:525
+#: imap/message.c:533
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "Kopierer %d breve til %s..."
 
-#: imap/message.c:529
+#: imap/message.c:537
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "Kopierer brev %d til %s..."
@@ -2409,47 +2366,47 @@ msgstr ""
 "\n"
 "Tilvalg ved oversćttelsen:"
 
-#: main.c:413
+#: main.c:412
 msgid "Error initializing terminal."
 msgstr "Kan ikke klargřre terminal."
 
-#: main.c:512
+#: main.c:511
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Afluser pĺ niveau %d.\n"
 
-#: main.c:514
+#: main.c:513
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG blev ikke defineret ved oversćttelsen. Ignoreret.\n"
 
-#: main.c:633
+#: main.c:632
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s findes ikke. Opret?"
 
-#: main.c:637
+#: main.c:636
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Kan ikke oprette %s: %s."
 
-#: main.c:676
+#: main.c:675
 msgid "No recipients specified.\n"
 msgstr "Ingen angivelse af modtagere.\n"
 
-#: main.c:749
+#: main.c:748
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: kan ikke vedlćgge fil.\n"
 
-#: main.c:769
+#: main.c:768
 msgid "No mailbox with new mail."
 msgstr "Ingen brevbakke med nye breve."
 
-#: main.c:778
+#: main.c:777
 msgid "No incoming mailboxes defined."
 msgstr "Ingen indbakker er defineret"
 
-#: main.c:809
+#: main.c:808
 msgid "Mailbox is empty."
 msgstr "Brevbakken er tom."
 
@@ -2606,22 +2563,22 @@ msgstr "%s er ingen brevbakke"
 msgid "Append messages to %s?"
 msgstr "Tilfřj breve til %s?"
 
-#: mutt_socket.c:251
+#: mutt_socket.c:247
 #, fuzzy, c-format
 msgid "Looking up %s..."
 msgstr "Kopierer til %s..."
 
-#: mutt_socket.c:258
+#: mutt_socket.c:254
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Kunne ikke finde vćrten \"%s\""
 
-#: mutt_socket.c:264
+#: mutt_socket.c:260
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Forbinder til %s..."
 
-#: mutt_socket.c:284
+#: mutt_socket.c:280
 #, fuzzy
 msgid "Preconnect command failed."
 msgstr "IMAP \"preconnect\"-kommando slog fejl"
@@ -2679,55 +2636,55 @@ msgstr "Kan ikke synkronisere brevbakke %s!"
 msgid "Move read messages to %s?"
 msgstr "Flyt lćste breve til %s?"
 
-#: mx.c:815 mx.c:1051
+#: mx.c:818 mx.c:1070
 #, c-format
 msgid "Purge %d deleted message?"
 msgstr "Fjern %d slettet brev?"
 
-#: mx.c:815 mx.c:1051
+#: mx.c:818 mx.c:1070
 #, c-format
 msgid "Purge %d deleted messages?"
 msgstr "Fjern %d slettede breve?"
 
-#: mx.c:836
+#: mx.c:842
 #, c-format
 msgid "Moving read messages to %s..."
 msgstr "Flytter lćste breve til %s..."
 
-#: mx.c:887 mx.c:1042
+#: mx.c:900 mx.c:1061
 msgid "Mailbox is unchanged."
 msgstr "Brevbakken er ućndret."
 
-#: mx.c:917
+#: mx.c:936
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d beholdt, %d flyttet, %d slettet."
 
-#: mx.c:920 mx.c