From: Adeodato Simó <asp16@alu.ua.es>
Date: Sat, 15 Jan 2005 07:43:29 +0000 (+0000)
Subject: i18n updates.
X-Git-Tag: mutt-1-5-7-rel~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d4a7ed2523ead8afc59bc2a1694291bf92aa6fe;p=mutt

i18n updates.
---

diff --git a/po/ca.po b/po/ca.po
index 01c6d2f1..b5d13dc3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -594,7 +594,7 @@ msgstr "En clar"
 
 #: compose.c:140
 msgid " (inline)"
-msgstr "(en línia)"
+msgstr " (en línia)"
 
 #: compose.c:142
 msgid " (PGP/MIME)"
diff --git a/po/de.po b/po/de.po
index fc369123..e364912c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,8 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.5.6\n"
-"POT-Creation-Date: 2004-02-01 19:24+0100\n"
-"PO-Revision-Date: 2004-02-02 19:15+0100\n"
+"Project-Id-Version: 1.5.6 CVS 2004-08-17\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-08-17 12:32+0200\n"
+"PO-Revision-Date: 2004-08-17 12:49+0200\n"
 "Last-Translator: Roland Rosenfeld <roland@spinnaker.de>\n"
 "Language-Team: German <mutt-po@mutt.org>\n"
 "MIME-Version: 1.0\n"
@@ -37,9 +38,9 @@ msgid "Select"
 msgstr "Auswählen"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:37 browser.c:43 compose.c:91 curs_main.c:404 mutt_ssl.c:627
+#: addrbook.c:37 browser.c:43 compose.c:92 curs_main.c:404 mutt_ssl.c:627
 #: pager.c:1544 pgpkey.c:517 postpone.c:42 query.c:49 recvattach.c:54
-#: smime.c:415
+#: smime.c:430
 msgid "Help"
 msgstr "Hilfe"
 
@@ -69,7 +70,7 @@ msgstr "Warnung: Dieser Alias-Name k
 msgid "Address: "
 msgstr "Adresse: "
 
-#: alias.c:289 send.c:201
+#: alias.c:289 send.c:202
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr "Fehler: '%s' ist eine fehlerhafte IDN."
@@ -92,69 +93,73 @@ msgstr "Speichern in Datei: "
 msgid "Alias added."
 msgstr "Adresse eingetragen."
 
-#: attach.c:108 attach.c:235 attach.c:462 attach.c:952
+#: attach.c:108 attach.c:240 attach.c:468 attach.c:959
 msgid "Can't match nametemplate, continue?"
 msgstr "Namensschema kann nicht erfüllt werden, fortfahren?"
 
 #. For now, editing requires a file, no piping
-#: attach.c:120
+#: attach.c:121
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "\"compose\"-Eintrag in der Mailcap-Datei erfordert %%s."
 
-#: attach.c:128 attach.c:253 commands.c:216 compose.c:1275 curs_lib.c:149
-#: curs_lib.c:395
+#: attach.c:129 attach.c:259 commands.c:216 compose.c:1141 curs_lib.c:164
+#: curs_lib.c:410
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Fehler beim Ausführen von \"%s\"!"
 
-#: attach.c:138
+#: attach.c:139
 msgid "Failure to open file to parse headers."
 msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu untersuchen."
 
-#: attach.c:169
+#: attach.c:170
 msgid "Failure to open file to strip headers."
 msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu entfernen."
 
-#: attach.c:187
+#: attach.c:179
+msgid "Failure to rename file."
+msgstr "Fehler beim Umbenennen der Datei."
+
+#: attach.c:192
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr ""
 "Kein \"compose\"-Eintrag für %s in der Mailcap-Datei, erzeuge leere Datei."
 
 #. For now, editing requires a file, no piping
-#: attach.c:247
+#: attach.c:253
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "\"edit\"-Eintrag in Mailcap erfordert %%s."
 
-#: attach.c:265
+#: attach.c:271
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Kein \"edit\"-Eintrag für %s in Mailcap."
 
-#: attach.c:428
+#: attach.c:434
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Es gibt keinen passenden Mailcap-Eintrag. Anzeige als Text."
 
-#: attach.c:441
+#: attach.c:447
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Undefinierter MIME-Typ. Kann Anhang nicht anzeigen."
 
-#: attach.c:531
+#: attach.c:537
 msgid "Cannot create filter"
 msgstr "Kann Filter nicht erzeugen."
 
-#: attach.c:660 attach.c:692 attach.c:985 attach.c:1043 handler.c:1556
+#: attach.c:667 attach.c:699 attach.c:992 attach.c:1050 handler.c:1559
 #: pgpkey.c:566 pgpkey.c:755
 msgid "Can't create filter"
 msgstr "Kann Filter nicht erzeugen"
 
-#: attach.c:824
+#: attach.c:831
 msgid "Write fault!"
 msgstr "Schreibfehler!"
 
-#: attach.c:1066
+#: attach.c:1073
 msgid "I don't know how to print that!"
 msgstr "Ich weiß nicht, wie man dies druckt!"
 
@@ -219,7 +224,7 @@ msgstr "Mailbox nicht gel
 msgid "Chdir to: "
 msgstr "Verzeichnis wechseln nach: "
 
-#: browser.c:957 browser.c:1024
+#: browser.c:952 browser.c:1024
 msgid "Error scanning directory."
 msgstr "Fehler beim Einlesen des Verzeichnisses."
 
@@ -298,7 +303,7 @@ msgstr "mono: Zu wenige Parameter."
 msgid "%s: no such attribute"
 msgstr "%s: Attribut unbekannt."
 
-#: color.c:696 hook.c:65 hook.c:73 keymap.c:721
+#: color.c:696 hook.c:65 hook.c:73 keymap.c:744
 msgid "too few arguments"
 msgstr "Zu wenige Parameter."
 
@@ -436,342 +441,314 @@ msgstr "Nachrichten konnten nicht gedruckt werden"
 
 #: commands.c:504
 msgid ""
-"Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
-msgstr ""
-"Umgekehrt (D)at/(A)bs/Ei(n)g/(B)etr/(E)mpf/(F)aden/(u)nsort/(G)röße/Be(w)"
-"ert?: "
+"Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
+"(p)am?: "
+msgstr "Umgekehrt (D)at/(A)bs/Ei(n)g/(B)etr/(E)mpf/(F)aden/(u)nsrt/(G)röße/Be(w)/S(p)am?: "
 
 #: commands.c:505
 msgid ""
-"Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
-msgstr ""
-"Sortieren (D)at/(A)bs/Ei(n)g/(B)etr/(E)mpf/(F)aden/(u)nsort/(G)röße/Be(w)"
-"ert?: "
+"Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
+"am?: "
+msgstr "Sortieren (D)at/(A)bs/Ei(n)g/(B)etr/(E)mpf/(F)aden/(u)nsrt/(G)röße/Be(w)ert/S(p)am?: "
 
 #: commands.c:506
-msgid "dfrsotuzc"
-msgstr "danbefugw"
+msgid "dfrsotuzcp"
+msgstr "danbefugwp"
 
-#: commands.c:559
+#: commands.c:563
 msgid "Shell command: "
 msgstr "Shell-Kommando: "
 
-#: commands.c:701
+#: commands.c:705
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Speichere%s dekodiert in Mailbox"
 
-#: commands.c:702
+#: commands.c:706
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Kopiere%s dekodiert in Mailbox"
 
-#: commands.c:703
+#: commands.c:707
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Speichere%s entschlüsselt in Mailbox"
 
-#: commands.c:704
+#: commands.c:708
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Kopiere%s entschlüsselt in Mailbox"
 
-#: commands.c:705
+#: commands.c:709
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Speichere%s in Mailbox"
 
-#: commands.c:705
+#: commands.c:709
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Kopiere%s in Mailbox"
 
-#: commands.c:706
+#: commands.c:710
 msgid " tagged"
 msgstr " ausgewählte"
 
-#: commands.c:779
+#: commands.c:783
 #, c-format
 msgid "Copying to %s..."
 msgstr "Kopiere nach %s..."
 
-#: commands.c:901
+#: commands.c:905
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Konvertiere beim Senden nach %s?"
 
-#: commands.c:910
+#: commands.c:914
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type in %s abgeändert."
 
-#: commands.c:912
+#: commands.c:916
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Zeichensatz in %s abgeändert; %s."
 
-#: commands.c:914
+#: commands.c:918
 msgid "not converting"
 msgstr "nicht konvertiert"
 
-#: commands.c:914
+#: commands.c:918
 msgid "converting"
 msgstr "konvertiert"
 
-#: compose.c:42
+#: compose.c:43
 msgid "There are no attachments."
 msgstr "Es sind keine Anhänge vorhanden."
 
-#: compose.c:84
+#: compose.c:85
 msgid "Send"
 msgstr "Absenden"
 
-#: compose.c:85 remailer.c:483
+#: compose.c:86 remailer.c:483
 msgid "Abort"
 msgstr "Verwerfen"
 
-#: compose.c:89 compose.c:787
+#: compose.c:90 compose.c:653
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: compose.c:90
+#: compose.c:91
 msgid "Descrip"
 msgstr "Beschr."
 
-#: compose.c:127
+#: compose.c:128
 msgid "Sign, Encrypt"
 msgstr "Signieren, Verschlüsseln"
 
-#: compose.c:129
+#: compose.c:130
 msgid "Encrypt"
 msgstr "Verschlüsseln"
 
-#: compose.c:131
+#: compose.c:132
 msgid "Sign"
 msgstr "Signieren"
 
-#: compose.c:133
+#: compose.c:134
 msgid "Clear"
 msgstr "Klartext"
 
-#: compose.c:140 compose.c:144
+#: compose.c:140
+msgid " (inline)"
+msgstr " (inline)"
+
+#: compose.c:142
+msgid " (PGP/MIME)"
+msgstr " (PGP/MIME)"
+
+#: compose.c:150 compose.c:154
 msgid " sign as: "
 msgstr " signiere als: "
 
-#: compose.c:140 compose.c:144
+#: compose.c:150 compose.c:154
 msgid "<default>"
 msgstr "<Voreinstellung>"
 
-#: compose.c:149
+#: compose.c:162
 msgid "Encrypt with: "
 msgstr "Verschlüsseln mit: "
 
-#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, (i)nline, (k)ein PGP? "
-
-#: compose.c:166
-msgid "esabif"
-msgstr "vsabik"
-
-#. sign (a)s
-#: compose.c:179 compose.c:269
-msgid "Sign as: "
-msgstr "Signiere als: "
-
-#: compose.c:227
-msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
-msgstr ""
-"S/MIME (v)erschl., (s)ign., verschl. (m)it, sign. (a)ls, (b)eides, (k)eins? "
-
-#: compose.c:228
-msgid "eswabf"
-msgstr "vsmabk"
-
-#: compose.c:236
-msgid ""
-"1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
-msgstr ""
-"1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, oder (k)ein S/MIME? "
-
-#: compose.c:238
-msgid "12345f"
-msgstr "12345k"
-
-#: compose.c:351
+#: compose.c:216
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] existiert nicht mehr!"
 
-#: compose.c:359
+#: compose.c:224
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "%s [#%d] wurde verändert. Kodierung neu bestimmen?"
 
-#: compose.c:402
+#: compose.c:267
 msgid "-- Attachments"
 msgstr "-- Anhänge"
 
-#: compose.c:432
+#: compose.c:297
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr "Warnung: '%s' ist eine ungültige IDN."
 
-#: compose.c:455
+#: compose.c:320
 msgid "You may not delete the only attachment."
 msgstr "Der einzige Nachrichtenteil kann nicht gelöscht werden."
 
-#: compose.c:722 send.c:1451
+#: compose.c:588 send.c:1472
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr "Ungültige IDN in \"%s\": '%s'"
 
-#: compose.c:803
+#: compose.c:669
 msgid "Attaching selected files..."
 msgstr "Hänge ausgewählte Dateien an..."
 
-#: compose.c:814
+#: compose.c:680
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Kann %s nicht anhängen!"
 
-#: compose.c:832
+#: compose.c:698
 msgid "Open mailbox to attach message from"
 msgstr "Mailbox, aus der angehängt werden soll"
 
-#: compose.c:870
+#: compose.c:736
 msgid "No messages in that folder."
 msgstr "Keine Nachrichten in diesem Ordner."
 
-#: compose.c:879
+#: compose.c:745
 msgid "Tag the messages you want to attach!"
 msgstr "Bitte markieren Sie die Nachrichten, die Sie anhängen wollen!"
 
-#: compose.c:911
+#: compose.c:777
 msgid "Unable to attach!"
 msgstr "Kann nicht anhängen!"
 
-#: compose.c:958
+#: compose.c:824
 msgid "Recoding only affects text attachments."
 msgstr "Ändern der Kodierung betrifft nur Textanhänge."
 
-#: compose.c:963
+#: compose.c:829
 msgid "The current attachment won't be converted."
 msgstr "Der aktuelle Anhang wird nicht konvertiert werden."
 
-#: compose.c:965
+#: compose.c:831
 msgid "The current attachment will be converted."
 msgstr "Der aktuelle Anhang wird konvertiert werden."
 
-#: compose.c:1036
+#: compose.c:902
 msgid "Invalid encoding."
 msgstr "Ungültige Kodierung."
 
-#: compose.c:1057
+#: compose.c:923
 msgid "Save a copy of this message?"
 msgstr "Soll eine Kopie dieser Nachricht gespeichert werden?"
 
-#: compose.c:1110
+#: compose.c:976
 msgid "Rename to: "
 msgstr "Umbenennen in: "
 
-#: compose.c:1115 editmsg.c:110 sendlib.c:910
+#: compose.c:981 editmsg.c:110 sendlib.c:910
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Kann Verzeichniseintrag für Datei %s nicht lesen: %s"
 
-#: compose.c:1141
+#: compose.c:1007
 msgid "New file: "
 msgstr "Neue Datei: "
 
-#: compose.c:1154
+#: compose.c:1020
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type ist von der Form Basis/Untertyp."
 
-#: compose.c:1160
+#: compose.c:1026
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Unbekannter Content-Type %s."
 
-#: compose.c:1173
+#: compose.c:1039
 #, c-format
 msgid "Can't create file %s"
 msgstr "Kann Datei %s nicht anlegen."
 
-#: compose.c:1181
+#: compose.c:1047
 msgid "What we have here is a failure to make an attachment"
 msgstr "Anhang kann nicht erzeugt werden."
 
-#: compose.c:1236
+#: compose.c:1102
 msgid "Postpone this message?"
 msgstr "Nachricht zurückstellen?"
 
-#: compose.c:1293
+#: compose.c:1159
 msgid "Write message to mailbox"
 msgstr "Schreibe Nachricht in Mailbox"
 
-#: compose.c:1296
+#: compose.c:1162
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Schreibe Nachricht nach %s ..."
 
-#: compose.c:1305
+#: compose.c:1171
 msgid "Message written."
 msgstr "Nachricht geschrieben."
 
-#: compose.c:1317
+#: compose.c:1183
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "S/MIME bereits ausgewählt. Löschen und weiter?"
 
-#: compose.c:1342
+#: compose.c:1208
 msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP bereits ausgewählt. Löschen und weiter?"
 
-#: crypt.c:65
+#: crypt.c:66
 #, c-format
 msgid " (current time: %c)"
 msgstr " (aktuelle Zeit: %c)"
 
-#: crypt.c:71
+#: crypt.c:72
 #, c-format
 msgid "[-- %s output follows%s --]\n"
 msgstr "[-- %s Ausgabe folgt%s --]\n"
 
-#: crypt.c:86
+#: crypt.c:87
 msgid "Passphrase(s) forgotten."
 msgstr "Mantra(s) vergessen."
 
-#: crypt.c:129
-msgid "Enter PGP passphrase:"
-msgstr "PGP-Mantra eingeben:"
-
-#: crypt.c:147
-msgid "Enter SMIME passphrase:"
-msgstr "S/MIME-Mantra eingeben:"
-
-#: crypt.c:192
-msgid "Create a traditional (inline) PGP message?"
-msgstr "Erzeuge eine veraltete (inline) PGP Nachricht?"
-
-#: crypt.c:200 pgpkey.c:559 postpone.c:547
+#. they really want to send it inline... go for it
+#: crypt.c:145 pgpkey.c:559
 msgid "Invoking PGP..."
 msgstr "Rufe PGP auf..."
 
-#: crypt.c:434
+#. otherwise inline won't work...ask for revert
+#: crypt.c:154
+msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
+msgstr "Nachricht kann nicht inline verschickt werden. PGP/MIME verwenden?"
+
+#. abort
+#: crypt.c:156 send.c:1424
+msgid "Mail not sent."
+msgstr "Nachricht nicht verschickt."
+
+#: crypt.c:392
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 "S/MIME Nachrichten ohne Hinweis auf den Inhalt werden nicht unterstützt."
 
-#: crypt.c:653 crypt.c:697
+#: crypt.c:611 crypt.c:655
 msgid "Trying to extract PGP keys...\n"
 msgstr "Versuche PGP Keys zu extrahieren...\n"
 
-#: crypt.c:677 crypt.c:717
+#: crypt.c:635 crypt.c:675
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Versuche S/MIME Zertifikate zu extrahieren...\n"
 
-#: crypt.c:838
+#: crypt.c:796
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -779,7 +756,7 @@ msgstr ""
 "[-- Fehler: Inkonsistente multipart/signed Struktur! --]\n"
 "\n"
 
-#: crypt.c:860
+#: crypt.c:818
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -788,7 +765,7 @@ msgstr ""
 "[-- Fehler: Unbekanntes multipart/signed Protokoll %s! --]\n"
 "\n"
 
-#: crypt.c:900
+#: crypt.c:858
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -798,7 +775,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:912
+#: crypt.c:870
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -806,7 +783,7 @@ msgstr ""
 "[-- Die folgenden Daten sind signiert --]\n"
 "\n"
 
-#: crypt.c:918
+#: crypt.c:876
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -814,7 +791,7 @@ msgstr ""
 "[-- Warnung: Kann keine Unterschriften finden. --]\n"
 "\n"
 
-#: crypt.c:924
+#: crypt.c:882
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -822,28 +799,28 @@ msgstr ""
 "\n"
 "[-- Ende der signierten Daten --]\n"
 
-#: curs_lib.c:157
+#: curs_lib.c:172
 msgid "yes"
 msgstr "ja"
 
-#: curs_lib.c:158
+#: curs_lib.c:173
 msgid "no"
 msgstr "nein"
 
 #. restore blocking operation
-#: curs_lib.c:254
+#: curs_lib.c:269
 msgid "Exit Mutt?"
 msgstr "Mutt verlassen?"
 
-#: curs_lib.c:347 mutt_socket.c:520 mutt_ssl.c:321
+#: curs_lib.c:362 mutt_socket.c:520 mutt_ssl.c:321
 msgid "unknown error"
 msgstr "unbekannter Fehler"
 
-#: curs_lib.c:367
+#: curs_lib.c:382
 msgid "Press any key to continue..."
 msgstr "Bitte drücken Sie eine Taste..."
 
-#: curs_lib.c:411
+#: curs_lib.c:426
 msgid " ('?' for list): "
 msgstr " (für eine Liste '?' eingeben): "
 
@@ -915,7 +892,7 @@ msgstr "Mailbox wurde von au
 msgid "No tagged messages."
 msgstr "Keine markierten Nachrichten."
 
-#: curs_main.c:653 menu.c:896
+#: curs_main.c:653 menu.c:890
 msgid "Nothing to do."
 msgstr "Nichts zu erledigen."
 
@@ -998,11 +975,11 @@ msgstr "Alle Nachrichten gel
 msgid "You are on the first message."
 msgstr "Sie sind bereits auf der ersten Nachricht."
 
-#: curs_main.c:1333 pattern.c:1286
+#: curs_main.c:1333 pattern.c:1292
 msgid "Search wrapped to top."
 msgstr "Suche von vorne begonnen."
 
-#: curs_main.c:1342 pattern.c:1297
+#: curs_main.c:1342 pattern.c:1303
 msgid "Search wrapped to bottom."
 msgstr "Suche von hinten begonnen."
 
@@ -1018,7 +995,7 @@ msgstr "Keine ungelesenen Nachrichten"
 msgid " in this limited view"
 msgstr " in dieser begrenzten Ansicht."
 
-#: curs_main.c:1405 pager.c:2337
+#: curs_main.c:1405 pager.c:2348
 msgid "Can't change 'important' flag on POP server."
 msgstr "Kann 'Wichtig'-Markierung auf dem POP-Server nicht ändern."
 
@@ -1030,8 +1007,8 @@ msgstr "Keine weiteren Diskussionsf
 msgid "You are on the first thread."
 msgstr "Sie haben bereits den ersten Diskussionsfaden ausgewählt."
 
-#: curs_main.c:1597 curs_main.c:1629 flags.c:289 thread.c:1014 thread.c:1069
-#: thread.c:1124
+#: curs_main.c:1597 curs_main.c:1629 flags.c:289 thread.c:1018 thread.c:1073
+#: thread.c:1128
 msgid "Threading is not enabled."
 msgstr "Darstellung von Diskussionsfäden ist nicht eingeschaltet."
 
@@ -1188,61 +1165,61 @@ msgstr "[-- Anhang #%d"
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Typ: %s/%s, Kodierung: %s, Größe: %s --]\n"
 
-#: handler.c:1527
+#: handler.c:1530
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Automatische Anzeige mittels %s --]\n"
 
-#: handler.c:1528
+#: handler.c:1531
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Automatische Anzeige mittels: %s"
 
-#: handler.c:1560
+#: handler.c:1563
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Kann %s nicht ausführen. --]\n"
 
-#: handler.c:1578 handler.c:1599
+#: handler.c:1581 handler.c:1602
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Fehlerausgabe von %s --]\n"
 
-#: handler.c:1636
+#: handler.c:1639
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Fehler: message/external-body hat keinen access-type Parameter --]\n"
 
-#: handler.c:1655
+#: handler.c:1658
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Dieser %s/%s-Anhang "
 
-#: handler.c:1662
+#: handler.c:1665
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(Größe %s Byte) "
 
-#: handler.c:1664
+#: handler.c:1667
 msgid "has been deleted --]\n"
 msgstr "wurde gelöscht --]\n"
 
-#: handler.c:1669
+#: handler.c:1672
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- am %s --]\n"
 
-#: handler.c:1674
+#: handler.c:1677
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- Name: %s --]\n"
 
-#: handler.c:1687 handler.c:1703
+#: handler.c:1690 handler.c:1706
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- Dieser %s/%s-Anhang ist nicht in der Nachricht enthalten, --]\n"
 
-#: handler.c:1689
+#: handler.c:1692
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
@@ -1250,34 +1227,34 @@ msgstr ""
 "[-- und die zugehörige externe Quelle --]\n"
 "[-- existiert nicht mehr. --]\n"
 
-#: handler.c:1707
+#: handler.c:1710
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- und die angegebene Zugangsmethode %s wird nicht unterstützt --]\n"
 
-#: handler.c:1815
+#: handler.c:1818
 msgid "Error: multipart/signed has no protocol."
 msgstr "Fehler: multipart/signed ohne \"protocol\"-Parameter."
 
-#: handler.c:1825
+#: handler.c:1828
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Fehler: multipart/encrypted ohne \"protocol\"-Parameter!"
 
-#: handler.c:1865
+#: handler.c:1868
 msgid "Unable to open temporary file!"
 msgstr "Konnte temporäre Datei nicht öffnen!"
 
-#: handler.c:1925
+#: handler.c:1929
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s wird nicht unterstützt "
 
-#: handler.c:1930
+#: handler.c:1934
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(benutzen Sie '%s', um diesen Teil anzuzeigen)"
 
-#: handler.c:1932
+#: handler.c:1936
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(Tastaturbindung für 'view-attachments' benötigt!)"
 
@@ -1320,6 +1297,7 @@ msgid "Help for %s"
 msgstr "Hilfe für %s"
 
 #: hook.c:242
+#, c-format
 msgid "unhook: Can't do unhook * from within a hook."
 msgstr "unhook: Innerhalb eines hook kann kein unhook * aufgerufen werden."
 
@@ -1379,11 +1357,11 @@ msgstr "Anmeldung gescheitert..."
 msgid "Authenticating (%s)..."
 msgstr "Authentifiziere (%s)..."
 
-#: imap/auth_sasl.c:199 pop_auth.c:172
+#: imap/auth_sasl.c:208 pop_auth.c:172
 msgid "SASL authentication failed."
 msgstr "SASL Authentifizierung fehlgeschlagen."
 
-#: imap/browse.c:64 imap/imap.c:533
+#: imap/browse.c:64 imap/imap.c:534
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s ist ein ungültiger IMAP Pfad"
@@ -1445,66 +1423,62 @@ msgstr "Sichere Verbindung mittels TLS?"
 msgid "Could not negotiate TLS connection"
 msgstr "Konnte keine TLS-Verbindung realisieren"
 
-#: imap/imap.c:564
+#: imap/imap.c:565
 #, c-format
 msgid "Selecting %s..."
 msgstr "Wähle %s aus..."
 
-#: imap/imap.c:690
+#: imap/imap.c:691
 msgid "Error opening mailbox"
 msgstr "Fehler beim Öffnen der Mailbox"
 
 #. STATUS not supported
-#: imap/imap.c:744
+#: imap/imap.c:745
 msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "Kann auf diesem IMAP-Server zu Mailboxen nichts hinzufügen."
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:753 imap/message.c:600 muttlib.c:1206
+#: imap/imap.c:754 imap/message.c:600 muttlib.c:1222
 #, c-format
 msgid "Create %s?"
 msgstr "%s erstellen?"
 
-#: imap/imap.c:789
-msgid "Closing connection to IMAP server..."
-msgstr "Beende Verbindung zum IMAP-Server..."
-
-#: imap/imap.c:952 pop.c:461
+#: imap/imap.c:940 pop.c:461
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Markiere %d Nachrichten zum Löschen..."
 
-#: imap/imap.c:961
+#: imap/imap.c:949
 msgid "Expunge failed"
 msgstr "Löschen fehlgeschlagen"
 
-#: imap/imap.c:976
+#: imap/imap.c:964
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Speichere Nachrichten-Status-Indikatoren... [%d/%d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1048
 msgid "Expunging messages from server..."
 msgstr "Lösche Nachrichten auf dem Server..."
 
-#: imap/imap.c:1065
+#: imap/imap.c:1053
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE fehlgeschlagen"
 
-#: imap/imap.c:1099
+#: imap/imap.c:1087
 msgid "CLOSE failed"
 msgstr "CLOSE fehlgeschlagen"
 
-#: imap/imap.c:1342
+#: imap/imap.c:1330
 msgid "Bad mailbox name"
 msgstr "Unzulässiger Mailbox Name"
 
-#: imap/imap.c:1354
+#: imap/imap.c:1342
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Abonniere %s..."
 
-#: imap/imap.c:1356
+#: imap/imap.c:1344
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Beende Abonnement von %s..."
@@ -1552,182 +1526,187 @@ msgstr "Kopiere Nachricht %d nach %s..."
 msgid "Continue?"
 msgstr "Weiter?"
 
-#: init.c:611
+#: init.c:381
+#, c-format
+msgid "Bad regexp: %s"
+msgstr "Fehlerhafte regexp: %s"
+
+#: init.c:624
+msgid "spam: no matching pattern"
+msgstr "Spam: kein passendes Muster"
+
+#: init.c:626
+msgid "nospam: no matching pattern"
+msgstr "nospam: kein passendes Muster"
+
+#: init.c:789
 msgid "alias: no address"
 msgstr "alias: Keine Adresse"
 
-#: init.c:651
+#: init.c:834
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Warnung: Ungültige IDN '%s' in Alias '%s'.\n"
 
-#: init.c:714
+#: init.c:912
 msgid "invalid header field"
 msgstr "my_hdr: Ungültiges Kopf-Feld"
 
-#: init.c:767
+#: init.c:965
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: Unbekannte Sortiermethode"
 
-#: init.c:879
+#: init.c:1077
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): Fehler in regulärem Ausdruck: %s\n"
 
-#: init.c:944
+#: init.c:1142
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: Unbekannte Variable."
 
-#: init.c:953
+#: init.c:1151
+#, c-format
 msgid "prefix is illegal with reset"
 msgstr "Präfix ist bei \"reset\" nicht zulässig."
 
-#: init.c:959
+#: init.c:1157
+#, c-format
 msgid "value is illegal with reset"
 msgstr "Wertzuweisung ist bei \"reset\" nicht zulässig."
 
-#: init.c:998
+#: init.c:1196
 #, c-format
 msgid "%s is set"
 msgstr "%s ist gesetzt."
 
-#: init.c:998
+#: init.c:1196
 #, c-format
 msgid "%s is unset"
 msgstr "%s ist nicht gesetzt."
 
-#: init.c:1201
+#: init.c:1399
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: Ungültiger Mailbox-Typ"
 
-#: init.c:1226 init.c:1271
+#: init.c:1424 init.c:1469
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: Ungültiger Wert"
 
-#: init.c:1312
+#: init.c:1510
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: Unbekannter Typ."
 
-#: init.c:1338
+#: init.c:1536
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: Unbekannter Typ"
 
-#: init.c:1375
-#, c-format
-msgid "%s: stat: %s"
-msgstr "%s: stat: %s"
-
-#: init.c:1380
-#, c-format
-msgid "%s: not a regular file"
-msgstr "%s: keine normale Datei"
-
-#: init.c:1395
+#: init.c:1595
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Fehler in %s, Zeile %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1411
+#: init.c:1618
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: Fehler in %s"
 
-#: init.c:1412
+#: init.c:1619
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: Lesevorgang abgebrochen, zu viele Fehler in %s"
 
-#: init.c:1426
+#: init.c:1633
 #, c-format
 msgid "source: error at %s"
 msgstr "source: Fehler bei %s"
 
-#: init.c:1431
+#: init.c:1638
 msgid "source: too many arguments"
 msgstr "source: Zu viele Argumente"
 
-#: init.c:1482
+#: init.c:1689
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: Unbekanntes Kommando"
 
-#: init.c:1871
+#: init.c:2078
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Fehler in Kommandozeile: %s\n"
 
-#: init.c:1920
+#: init.c:2127
 msgid "unable to determine home directory"
 msgstr "Kann Home-Verzeichnis nicht bestimmen."
 
-#: init.c:1928
+#: init.c:2135
 msgid "unable to determine username"
 msgstr "Kann Nutzernamen nicht bestimmen."
 
-#: keymap.c:455
+#: keymap.c:459
 msgid "Macro loop detected."
 msgstr "Makro-Schleife!"
 
-#: keymap.c:660 keymap.c:668
+#: keymap.c:669 keymap.c:677
 msgid "Key is not bound."
 msgstr "Taste ist nicht belegt."
 
-#: keymap.c:672
+#: keymap.c:681
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Taste ist nicht belegt. Drücken Sie '%s' für Hilfe."
 
-#: keymap.c:683
+#: keymap.c:692
 msgid "push: too many arguments"
 msgstr "push: Zu viele Argumente"
 
-#: keymap.c:704
+#: keymap.c:722
 #, c-format
 msgid "%s: no such menu"
 msgstr "Menü \"%s\" existiert nicht"
 
-#: keymap.c:713
+#: keymap.c:737
 msgid "null key sequence"
 msgstr "Leere Tastenfolge"
 
-#: keymap.c:792
+#: keymap.c:824
 msgid "bind: too many arguments"
 msgstr "bind: Zu viele Argumente"
 
-#: keymap.c:807
+#: keymap.c:847
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s: Funktion unbekannt"
 
-#: keymap.c:830
+#: keymap.c:871
 msgid "macro: empty key sequence"
 msgstr "macro: Leere Tastenfolge"
 
-#: keymap.c:841
+#: keymap.c:882
 msgid "macro: too many arguments"
 msgstr "macro: Zu viele Parameter"
 
-#: keymap.c:871
+#: keymap.c:918
 msgid "exec: no arguments"
 msgstr "exec: Keine Parameter"
 
-#: keymap.c:891
+#: keymap.c:938
 #, c-format
 msgid "%s: no such function"
 msgstr "%s: Funktion unbekannt"
 
-#: keymap.c:912
+#: keymap.c:959
 msgid "Enter keys (^G to abort): "
 msgstr "Schlüssel eingeben (^G zum Abbrechen): "
 
-#: keymap.c:917
+#: keymap.c:964
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr "Char = %s, Oktal = %o, Dezimal = %d"
@@ -2516,7 +2495,7 @@ msgstr "Integer 
 msgid "Out of memory!"
 msgstr "Kein Speicher verfügbar!"
 
-#: main.c:46
+#: main.c:47
 msgid ""
 "To contact the developers, please mail to <mutt-dev@mutt.org>.\n"
 "To report a bug, please use the flea(1) utility.\n"
@@ -2525,7 +2504,7 @@ msgstr ""
 "eine Nachricht (in englisch) an <mutt-dev@mutt.org>.\n"
 "Um einen Bug zu melden, verwenden Sie bitte das Programm flea(1).\n"
 
-#: main.c:50
+#: main.c:51
 msgid ""
 "Copyright (C) 1996-2002 Michael R. Elkins and others.\n"
 "Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n"
@@ -2538,7 +2517,7 @@ msgstr ""
 "Sie können es unter bestimmten Bedingungen weitergeben; starten Sie\n"
 "`mutt -vv' für weitere Details.\n"
 
-#: main.c:56
+#: main.c:57
 msgid ""
 "Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -2593,7 +2572,7 @@ msgstr ""
 "    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  "
 "02111, USA.\n"
 
-#: main.c:94
+#: main.c:95
 msgid ""
 "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
@@ -2663,7 +2642,7 @@ msgstr ""
 "  -Z\t\tÖffne erste Mailbox mit neuen Nachrichten oder beenden\n"
 "  -h\t\tDiese Hilfe"
 
-#: main.c:162
+#: main.c:163
 msgid ""
 "\n"
 "Compile options:"
@@ -2671,47 +2650,47 @@ msgstr ""
 "\n"
 "Einstellungen bei der Compilierung:"
 
-#: main.c:454
+#: main.c:455
 msgid "Error initializing terminal."
 msgstr "Kann Terminal nicht initialisieren."
 
-#: main.c:559
+#: main.c:560
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Debugging auf Ebene %d.\n"
 
-#: main.c:561
+#: main.c:562
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG war beim Kompilieren nicht definiert.  Ignoriert.\n"
 
-#: main.c:706
+#: main.c:710
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s existiert nicht. Neu anlegen?"
 
-#: main.c:710
+#: main.c:714
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Kann %s nicht anlegen: %s."
 
-#: main.c:755
+#: main.c:759
 msgid "No recipients specified.\n"
 msgstr "Keine Empfänger angegeben.\n"
 
-#: main.c:841
+#: main.c:845
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: Kann Datei nicht anhängen.\n"
 
-#: main.c:861
+#: main.c:865
 msgid "No mailbox with new mail."
 msgstr "Keine Mailbox mit neuen Nachrichten."
 
-#: main.c:870
+#: main.c:874
 msgid "No incoming mailboxes defined."
 msgstr "Keine Eingangs-Mailboxen definiert."
 
-#: main.c:897
+#: main.c:901
 msgid "Mailbox is empty."
 msgstr "Mailbox ist leer."
 
@@ -2770,126 +2749,126 @@ msgstr "Konnte Mailbox nicht erneut 
 msgid "Reopening mailbox..."
 msgstr "Öffne Mailbox erneut..."
 
-#: menu.c:413
+#: menu.c:407
 msgid "Jump to: "
 msgstr "Springe zu: "
 
-#: menu.c:422
+#: menu.c:416
 msgid "Invalid index number."
 msgstr "Ungültige Indexnummer."
 
-#: menu.c:426 menu.c:444 menu.c:480 menu.c:521 menu.c:537 menu.c:548
-#: menu.c:559 menu.c:601 menu.c:612 menu.c:625 menu.c:638 menu.c:1033
+#: menu.c:420 menu.c:438 menu.c:474 menu.c:515 menu.c:531 menu.c:542
+#: menu.c:553 menu.c:595 menu.c:606 menu.c:619 menu.c:632 menu.c:1027
 msgid "No entries."
 msgstr "Keine Einträge"
 
-#: menu.c:441
+#: menu.c:435
 msgid "You cannot scroll down farther."
 msgstr "Sie können nicht weiter nach unten gehen."
 
-#: menu.c:457
+#: menu.c:451
 msgid "You cannot scroll up farther."
 msgstr "Sie können nicht weiter nach oben gehen."
 
-#: menu.c:477
+#: menu.c:471
 msgid "You are on the last page."
 msgstr "Sie sind auf der letzten Seite."
 
-#: menu.c:499
+#: menu.c:493
 msgid "You are on the first page."
 msgstr "Sie sind auf der ersten Seite."
 
-#: menu.c:578
+#: menu.c:572
 msgid "First entry is shown."
 msgstr "Der erste Eintrag wird angezeigt."
 
-#: menu.c:598
+#: menu.c:592
 msgid "Last entry is shown."
 msgstr "Der letzte Eintrag wird angezeigt."
 
-#: menu.c:649
+#: menu.c:643
 msgid "You are on the last entry."
 msgstr "Sie sind auf dem letzten Eintrag."
 
-#: menu.c:660
+#: menu.c:654
 msgid "You are on the first entry."
 msgstr "Sie sind auf dem ersten Eintrag"
 
-#: menu.c:720 pattern.c:1232
+#: menu.c:714 pattern.c:1238
 msgid "Search for: "
 msgstr "Suche nach: "
 
-#: menu.c:721 pattern.c:1233
+#: menu.c:715 pattern.c:1239
 msgid "Reverse search for: "
 msgstr "Suche rückwärts nach: "
 
-#: menu.c:731 pattern.c:1265
+#: menu.c:725 pattern.c:1271
 msgid "No search pattern."
 msgstr "Kein Suchmuster."
 
-#: menu.c:761 pager.c:1925 pager.c:1941 pager.c:2049 pattern.c:1330
+#: menu.c:755 pager.c:1925 pager.c:1941 pager.c:2049 pattern.c:1336
 msgid "Not found."
 msgstr "Nicht gefunden."
 
-#: menu.c:885
+#: menu.c:879
 msgid "No tagged entries."
 msgstr "Keine markierten Einträge."
 
-#: menu.c:990
+#: menu.c:984
 msgid "Search is not implemented for this menu."
 msgstr "In diesem Menü kann nicht gesucht werden."
 
-#: menu.c:995
+#: menu.c:989
 msgid "Jumping is not implemented for dialogs."
 msgstr "Springen in Dialogen ist nicht möglich."
 
-#: menu.c:1036
+#: menu.c:1030
 msgid "Tagging is not supported."
 msgstr "Markieren wird nicht unterstützt."
 
-#: mh.c:655
+#: mh.c:655 mh.c:798
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Lese %s... %d"
 
-#: mh.c:1041
+#: mh.c:1045
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): kann Zeitstempel der Datei nicht setzen"
 
-#: muttlib.c:835
+#: muttlib.c:842
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr "Datei ist ein Verzeichnis, darin abspeichern? [(j)a, (n)ein, (a)lle]"
 
-#: muttlib.c:835
+#: muttlib.c:842
 msgid "yna"
 msgstr "jna"
 
-#: muttlib.c:851
+#: muttlib.c:858
 msgid "File is a directory, save under it?"
 msgstr "Datei ist ein Verzeichnis, darin abspeichern?"
 
-#: muttlib.c:857
+#: muttlib.c:864
 msgid "File under directory: "
 msgstr "Datei in diesem Verzeichnis: "
 
-#: muttlib.c:869
+#: muttlib.c:876
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "Datei existiert, (u)eberschreiben, (a)nhängen, a(b)brechen?"
 
-#: muttlib.c:869
+#: muttlib.c:876
 msgid "oac"
 msgstr "uab"
 
-#: muttlib.c:1171
+#: muttlib.c:1187
 msgid "Can't save message to POP mailbox."
 msgstr "Kann Nachricht nicht in POP Mailbox schreiben."
 
-#: muttlib.c:1180
+#: muttlib.c:1196
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s ist keine Mailbox!"
 
-#: muttlib.c:1186
+#: muttlib.c:1202
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Nachricht an %s anhängen?"
@@ -2982,6 +2961,7 @@ msgid "Unknown"
 msgstr "unbekannt"
 
 #: mutt_ssl.c:406
+#, c-format
 msgid "[unable to calculate]"
 msgstr "[kann nicht berechnet werden]"
 
@@ -3006,6 +2986,7 @@ msgid "This certificate was issued by:"
 msgstr "Dieses Zertifikat wurde ausgegeben von:"
 
 #: mutt_ssl.c:601
+#, c-format
 msgid "This certificate is valid"
 msgstr "Dieses Zertifikat ist gültig"
 
@@ -3044,7 +3025,7 @@ msgstr "(z)ur
 msgid "ro"
 msgstr "ze"
 
-#: mutt_ssl.c:625 pgpkey.c:510 smime.c:410
+#: mutt_ssl.c:625 pgpkey.c:510 smime.c:425
 msgid "Exit  "
 msgstr "Ende  "
 
@@ -3213,101 +3194,106 @@ msgstr "Kein weiterer zitierter Text."
 msgid "No more unquoted text after quoted text."
 msgstr "Kein weiterer eigener Text nach zitiertem Text."
 
-#: parse.c:597
+#: parse.c:598
 msgid "multipart message has no boundary parameter!"
 msgstr "Mehrteilige Nachricht hat keinen \"boundary\"-Parameter!"
 
-#: pattern.c:238
+#: pattern.c:240
 #, c-format
 msgid "Error in expression: %s"
 msgstr "Fehler in Ausdruck: %s"
 
-#: pattern.c:348
+#: pattern.c:350
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "Ungültiger Tag: %s"
 
-#: pattern.c:362
+#: pattern.c:364
 #, c-format
 msgid "Invalid month: %s"
 msgstr "Ungültiger Monat: %s"
 
 #. getDate has its own error message, don't overwrite it here
-#: pattern.c:514
+#: pattern.c:516
 #, c-format
 msgid "Invalid relative date: %s"
 msgstr "Ungültiges relatives Datum: %s"
 
-#: pattern.c:528
+#: pattern.c:530
 msgid "error in expression"
 msgstr "Fehler in Ausdruck."
 
-#: pattern.c:734 pattern.c:842
+#: pattern.c:736 pattern.c:844
 #, c-format
 msgid "error in pattern at: %s"
 msgstr "Fehler in Muster bei: %s"
 
-#: pattern.c:782
+#: pattern.c:784
 #, c-format
 msgid "%c: invalid command"
 msgstr "%c: Ungültiges Kommando"
 
-#: pattern.c:788
+#: pattern.c:790
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr "%c: Wird in diesem Modus nicht unterstützt."
 
-#: pattern.c:801
+#: pattern.c:803
+#, c-format
 msgid "missing parameter"
 msgstr "Fehlender Parameter"
 
-#: pattern.c:817
+#: pattern.c:819
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "Unpassende Klammern: %s"
 
-#: pattern.c:849
+#: pattern.c:851
 msgid "empty pattern"
 msgstr "Leeres Muster"
 
-#: pattern.c:1051
+#: pattern.c:1057
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "Fehler: Unbekannter Muster-Operator %d (Bitte Bug melden)."
 
-#: pattern.c:1120 pattern.c:1251
+#: pattern.c:1126 pattern.c:1257
 msgid "Compiling search pattern..."
 msgstr "Compiliere Suchmuster..."
 
-#: pattern.c:1134
+#: pattern.c:1140
 msgid "Executing command on matching messages..."
 msgstr "Führe Kommando aus..."
 
-#: pattern.c:1196
+#: pattern.c:1202
 msgid "No messages matched criteria."
 msgstr "Keine Nachrichten haben Kriterium erfüllt."
 
-#: pattern.c:1289
+#: pattern.c:1295
 msgid "Search hit bottom without finding match"
 msgstr "Suche hat Ende erreicht, ohne Treffer zu erzielen."
 
-#: pattern.c:1300
+#: pattern.c:1306
 msgid "Search hit top without finding match"
 msgstr "Suche hat Anfang erreicht, ohne Treffer zu erzielen."
 
-#: pattern.c:1322
+#: pattern.c:1328
 msgid "Search interrupted."
 msgstr "Suche unterbrochen."
 
-#: pgp.c:73
+#: pgp.c:86
+msgid "Enter PGP passphrase:"
+msgstr "PGP-Mantra eingeben:"
+
+#: pgp.c:100
 msgid "PGP passphrase forgotten."
 msgstr "PGP-Mantra vergessen."
 
-#: pgp.c:308
+#: pgp.c:337
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Fehler: Kann keinen PGP-Prozeß erzeugen! --]\n"
 
-#: pgp.c:337 pgp.c:554 pgp.c:755
+#: pgp.c:366 pgp.c:583 pgp.c:784
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3315,7 +3301,7 @@ msgstr ""
 "[-- Ende der PGP-Ausgabe --]\n"
 "\n"
 
-#: pgp.c:352
+#: pgp.c:381
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -3323,11 +3309,11 @@ msgstr ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 
-#: pgp.c:354
+#: pgp.c:383
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 
-#: pgp.c:356
+#: pgp.c:385
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -3335,19 +3321,19 @@ msgstr ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 
-#: pgp.c:381
+#: pgp.c:410
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr "[-- END PGP MESSAGE --]\n"
 
-#: pgp.c:383
+#: pgp.c:412
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- END PGP PUBLIC KEY BLOCK --]\n"
 
-#: pgp.c:385
+#: pgp.c:414
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr "[-- END PGP SIGNED MESSAGE --]\n"
 
-#: pgp.c:412
+#: pgp.c:441
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -3355,11 +3341,11 @@ msgstr ""
 "[-- Fehler: Konnte Anfang der PGP-Nachricht nicht finden! --]\n"
 "\n"
 
-#: pgp.c:662
+#: pgp.c:691
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Interner Fehler. Bitte <roessler@does-not-exist.org> informieren."
 
-#: pgp.c:722
+#: pgp.c:751
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3367,7 +3353,7 @@ msgstr ""
 "[-- Fehler: Konnte PGP-Subprozeß nicht erzeugen! --]\n"
 "\n"
 
-#: pgp.c:821
+#: pgp.c:850
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -3375,11 +3361,11 @@ msgstr ""
 "[-- Fehler: Fehlerhafte PGP/MIME-Nachricht! --]\n"
 "\n"
 
-#: pgp.c:834
+#: pgp.c:863
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- Fehler: Konnte Temporärdatei nicht anlegen! --]\n"
 
-#: pgp.c:843
+#: pgp.c:872
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
@@ -3387,28 +3373,50 @@ msgstr ""
 "[-- Die folgenden Daten sind PGP/MIME-verschlüsselt --]\n"
 "\n"
 
-#: pgp.c:863
+#: pgp.c:892
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr "[-- Ende der PGP/MIME-verschlüsselten Daten --]\n"
 
-#: pgp.c:913
+#: pgp.c:942
 msgid "Can't open PGP subprocess!"
 msgstr "Kann PGP-Subprozeß nicht erzeugen!"
 
-#: pgp.c:1057
+#: pgp.c:1086
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "Benutze KeyID = \"%s\" für %s?"
 
-#: pgp.c:1091 smime.c:654 smime.c:781
+#: pgp.c:1120 smime.c:669 smime.c:796
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "KeyID für %s: "
 
-#: pgp.c:1345
+#: pgp.c:1374
 msgid "Can't invoke PGP"
 msgstr "Kann PGP nicht aufrufen"
 
+#: pgp.c:1468
+#, c-format
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, %s, (k)ein PGP? "
+
+#: pgp.c:1469
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+#: pgp.c:1469
+msgid "(i)nline"
+msgstr "(i)nline"
+
+#: pgp.c:1471
+msgid "esabifc"
+msgstr "vsabikc"
+
+#. sign (a)s
+#: pgp.c:1486 smime.c:1989
+msgid "Sign as: "
+msgstr "Signiere als: "
+
 #: pgpinvoke.c:303
 msgid "Fetching PGP key..."
 msgstr "Hole PGP Schlüssel..."
@@ -3419,7 +3427,7 @@ msgstr ""
 "Alles passenden Schlüssel sind veraltet, zurückgezogen oder deaktiviert."
 
 #. __STRCAT_CHECKED__
-#: pgpkey.c:512 smime.c:412
+#: pgpkey.c:512 smime.c:427
 msgid "Select  "
 msgstr "Auswahl  "
 
@@ -3496,6 +3504,7 @@ msgid "Looking for keys matching \"%s\"..."
 msgstr "Suche nach Schlüsseln, die auf \"%s\" passen..."
 
 #: pop.c:86 pop_lib.c:197
+#, c-format
 msgid "Command TOP is not supported by server."
 msgstr "Das Kommando TOP wird vom Server nicht unterstützt."
 
@@ -3504,6 +3513,7 @@ msgid "Can't write header to temporary file!"
 msgstr "Kann Header nicht in temporäre Datei schreiben!"
 
 #: pop.c:194 pop_lib.c:199
+#, c-format
 msgid "Command UIDL is not supported by server."
 msgstr "Kommando UIDL wird vom Server nicht unterstützt."
 
@@ -3567,6 +3577,7 @@ msgid "APOP authentication failed."
 msgstr "APOP Authentifizierung fehlgeschlagen."
 
 #: pop_auth.c:264
+#, c-format
 msgid "Command USER is not supported by server."
 msgstr "Kommando USER wird vom Server nicht unterstützt."
 
@@ -3599,7 +3610,7 @@ msgstr "Zur
 msgid "No postponed messages."
 msgstr "Keine zurückgestellten Nachrichten."
 
-#: postpone.c:438 postpone.c:459 postpone.c:488
+#: postpone.c:438 postpone.c:459 postpone.c:493
 msgid "Illegal PGP header"
 msgstr "Unzulässiger PGP-Header"
 
@@ -3607,7 +3618,11 @@ msgstr "Unzul
 msgid "Illegal S/MIME header"
 msgstr "Unzulässiger S/MIME Header"
 
-#: postpone.c:554
+#: postpone.c:552
+msgid "Decrypting message..."
+msgstr "Entschlüssle Nachricht..."
+
+#: postpone.c:561
 msgid "Decryption failed."
 msgstr "Entschlüsselung gescheitert."
 
@@ -3632,6 +3647,7 @@ msgid "Query command not defined."
 msgstr "Kein Abfragekommando definiert."
 
 #: query.c:286
+#, c-format
 msgid "Query"
 msgstr "Abfrage"
 
@@ -3754,7 +3770,7 @@ msgstr "Kann %s nicht anlegen."
 msgid "Can't find any tagged messages."
 msgstr "Es sind keine Nachrichten markiert."
 
-#: recvcmd.c:745 send.c:707
+#: recvcmd.c:745 send.c:711
 msgid "No mailing lists found!"
 msgstr "Keine Mailing-Listen gefunden!"
 
@@ -3851,11 +3867,11 @@ msgstr "score: Zu wenige Parameter."
 msgid "score: too many arguments"
 msgstr "score: Zu viele Parameter."
 
-#: send.c:247
+#: send.c:248
 msgid "No subject, abort?"
 msgstr "Kein Betreff, abbrechen?"
 
-#: send.c:249
+#: send.c:250
 msgid "No subject, aborting."
 msgstr "Kein Betreff, breche ab."
 
@@ -3864,12 +3880,12 @@ msgstr "Kein Betreff, breche ab."
 #. * to send a message to only the sender of the message.  This
 #. * provides a way to do that.
 #.
-#: send.c:483
+#: send.c:484
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "Antworte an %s%s?"
 
-#: send.c:517
+#: send.c:518
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "Antworte an %s%s?"
@@ -3877,87 +3893,82 @@ msgstr "Antworte an %s%s?"
 #. This could happen if the user tagged some messages and then did
 #. * a limit such that none of the tagged message are visible.
 #.
-#: send.c:682
+#: send.c:686
 msgid "No tagged messages are visible!"
 msgstr "Keine markierten Nachrichten sichtbar!"
 
-#: send.c:733
+#: send.c:737
 msgid "Include message in reply?"
 msgstr "Nachricht in Antwort zitieren?"
 
-#: send.c:738
+#: send.c:742
 msgid "Including quoted message..."
 msgstr "Binde zitierte Nachricht ein..."
 
-#: send.c:748
+#: send.c:752
 msgid "Could not include all requested messages!"
 msgstr "Konnte nicht alle gewünschten Nachrichten zitieren!"
 
-#: send.c:762
+#: send.c:766
 msgid "Forward as attachment?"
 msgstr "Als Anhang weiterleiten?"
 
-#: send.c:766
+#: send.c:770
 msgid "Preparing forwarded message..."
 msgstr "Bereite Nachricht zum Weiterleiten vor..."
 
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:1062
+#: send.c:1066
 msgid "Recall postponed message?"
 msgstr "Zurückgestellte Nachricht weiterbearbeiten?"
 
-#: send.c:1336
+#: send.c:1357
 msgid "Edit forwarded message?"
 msgstr "Weitergeleitete Nachricht editieren?"
 
-#: send.c:1359
+#: send.c:1380
 msgid "Abort unmodified message?"
 msgstr "Unveränderte Nachricht verwerfen?"
 
-#: send.c:1361
+#: send.c:1382
 msgid "Aborted unmodified message."
 msgstr "Unveränderte Nachricht verworfen."
 
-#. abort
-#: send.c:1403
-msgid "Mail not sent."
-msgstr "Nachricht nicht verschickt."
-
-#: send.c:1430
+#: send.c:1451
 msgid "Message postponed."
 msgstr "Nachricht zurückgestellt."
 
-#: send.c:1439
+#: send.c:1460
 msgid "No recipients are specified!"
 msgstr "Es wurden keine Empfänger angegeben!"
 
-#: send.c:1444
+#: send.c:1465
 msgid "No recipients were specified."
 msgstr "Es wurden keine Empfänger angegeben!"
 
-#: send.c:1460
+#: send.c:1481
 msgid "No subject, abort sending?"
 msgstr "Kein Betreff, Versand abbrechen?"
 
-#: send.c:1464
+#: send.c:1485
 msgid "No subject specified."
 msgstr "Kein Betreff."
 
-#: send.c:1526
+#: send.c:1547
 msgid "Sending message..."
 msgstr "Verschicke Nachricht..."
 
-#: send.c:1667
+#: send.c:1688
 msgid "Could not send the message."
 msgstr "Konnte Nachricht nicht verschicken."
 
-#: send.c:1672
+#: send.c:1693
 msgid "Mail sent."
 msgstr "Nachricht verschickt."
 
-#: send.c:1672
+#: send.c:1693
 msgid "Sending in background."
 msgstr "Verschicke im Hintergrund."
 
@@ -4009,98 +4020,102 @@ msgstr "Signal %s... Abbruch.\n"
 msgid "Caught signal %d...  Exiting.\n"
 msgstr "Signal %d... Abbruch.\n"
 
-#: smime.c:300
+#: smime.c:105
+msgid "Enter SMIME passphrase:"
+msgstr "S/MIME-Mantra eingeben:"
+
+#: smime.c:315
 msgid "Trusted   "
 msgstr "Vertr.würd"
 
-#: smime.c:303
+#: smime.c:318
 msgid "Verified  "
 msgstr "Geprüft   "
 
-#: smime.c:306
+#: smime.c:321
 msgid "Unverified"
 msgstr "Ungeprüft "
 
-#: smime.c:309
+#: smime.c:324
 msgid "Expired   "
 msgstr "Veraltet  "
 
-#: smime.c:312
+#: smime.c:327
 msgid "Revoked   "
 msgstr "Zurückgez."
 
-#: smime.c:315
+#: smime.c:330
 msgid "Invalid   "
 msgstr "Ungültig  "
 
-#: smime.c:318
+#: smime.c:333
 msgid "Unknown   "
 msgstr "Unbekannt "
 
-#: smime.c:347
+#: smime.c:362
 msgid "Enter keyID: "
 msgstr "KeyID eingeben: "
 
-#: smime.c:370
+#: smime.c:385
 #, c-format
 msgid "S/MIME certificates matching \"%s\"."
 msgstr "S/MIME Zertifikate, die zu \"%s\" passen."
 
-#: smime.c:519 smime.c:588 smime.c:609
+#: smime.c:534 smime.c:603 smime.c:624
 #, c-format
 msgid "ID %s is unverified. Do you want to use it for %s ?"
 msgstr "ID %s ist ungeprüft. Möchten Sie sie für %s verwenden?"
 
-#: smime.c:523 smime.c:592
+#: smime.c:538 smime.c:607
 #, c-format
 msgid "Use (untrusted!) ID %s for %s ?"
 msgstr "Benutze (nicht vertrauenswürdige!) ID %s für %s?"
 
-#: smime.c:526 smime.c:595
+#: smime.c:541 smime.c:610
 #, c-format
 msgid "Use ID %s for %s ?"
 msgstr "Benutze ID = %s für %s?"
 
-#: smime.c:621
+#: smime.c:636
 #, c-format
 msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
 msgstr "Warnung: Sie vertrauen ID %s noch nicht. (Taste drücken für weiter)"
 
-#: smime.c:787
+#: smime.c:802
 #, c-format
 msgid "No (valid) certificate found for %s."
 msgstr "Kein (gültiges) Zertifikat für %s gefunden."
 
-#: smime.c:842 smime.c:870 smime.c:935 smime.c:979 smime.c:1044 smime.c:1119
+#: smime.c:857 smime.c:885 smime.c:950 smime.c:994 smime.c:1059 smime.c:1134
 msgid "Error: unable to create OpenSSL subprocess!"
 msgstr "Fehler: Kann keinen OpenSSL Prozeß erzeugen!"
 
-#: smime.c:1197
+#: smime.c:1212
 msgid "no certfile"
 msgstr "keine Zertifikat-Datei"
 
-#: smime.c:1200
+#: smime.c:1215
 msgid "no mbox"
 msgstr "keine Mailbox"
 
 #. fatal error while trying to encrypt message
-#: smime.c:1343
+#: smime.c:1358
 msgid "No output from OpenSSL.."
 msgstr "Keine Ausgabe von OpenSSL.."
 
-#: smime.c:1381
+#: smime.c:1396
 msgid "Warning: Intermediate certificate not found."
 msgstr "Warnung: Zwischenzertifikat nicht gefunden."
 
-#: smime.c:1426
+#: smime.c:1441
 msgid "Can't open OpenSSL subprocess!"
 msgstr "Kann OpenSSL-Unterprozeß nicht erzeugen!"
 
-#: smime.c:1464
+#: smime.c:1479
 msgid "No output from OpenSSL..."
 msgstr "Keine Ausgabe von OpenSSL..."
 
-#: smime.c:1629 smime.c:1751
+#: smime.c:1644 smime.c:1766
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4108,19 +4123,19 @@ msgstr ""
 "[-- Ende der OpenSSL-Ausgabe --]\n"
 "\n"
 
-#: smime.c:1712 smime.c:1722
+#: smime.c:1727 smime.c:1737
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Fehler: Kann keinen OpenSSL-Unterprozeß erzeugen! --]\n"
 
-#: smime.c:1755
+#: smime.c:1770
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- Die folgenden Daten sind S/MIME-verschlüsselt --]\n"
 
-#: smime.c:1758
+#: smime.c:1773
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- Die folgenden Daten sind S/MIME signiert --]\n"
 
-#: smime.c:1822
+#: smime.c:1837
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4128,7 +4143,7 @@ msgstr ""
 "\n"
 "[-- Ende der S/MIME-verschlüsselten Daten --]\n"
 
-#: smime.c:1824
+#: smime.c:1839
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4136,11 +4151,35 @@ msgstr ""
 "\n"
 "[-- Ende der S/MIME signierten Daten --]\n"
 
-#: sort.c:202
+#: smime.c:1943
+msgid ""
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
+msgstr ""
+"S/MIME (v)erschl., (s)ign., verschl. (m)it, sign. (a)ls, (b)eides, (k)eins? "
+
+#: smime.c:1944
+msgid "eswabfc"
+msgstr "vsmabkc"
+
+#: smime.c:1953
+msgid ""
+"1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
+msgstr ""
+"1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, oder (k)ein S/MIME? "
+
+#: smime.c:1955
+msgid "12345f"
+msgstr "12345k"
+
+#: smime.c:1979
+msgid "Can't sign: No key specified. Use Sign As."
+msgstr "Kann nicht signieren: Kein Schlüssel angegeben. Verwenden Sie \"sign. als\"."
+
+#: sort.c:255
 msgid "Sorting mailbox..."
 msgstr "Sortiere Mailbox..."
 
-#: sort.c:239
+#: sort.c:292
 msgid "Could not find sorting function! [report this bug]"
 msgstr "Sortierfunktion nicht gefunden! (bitte Bug melden)"
 
@@ -4148,14 +4187,26 @@ msgstr "Sortierfunktion nicht gefunden! (bitte Bug melden)"
 msgid "(no mailbox)"
 msgstr "(keine Mailbox)"
 
-#: thread.c:1081
+#: thread.c:1085
 msgid "Parent message is not visible in this limited view."
 msgstr "Bezugsnachricht ist in dieser begrenzten Sicht nicht sichtbar."
 
-#: thread.c:1087
+#: thread.c:1091
 msgid "Parent message is not available."
 msgstr "Bezugsnachricht ist nicht verfügbar."
 
+#~ msgid "Create a traditional (inline) PGP message?"
+#~ msgstr "Erzeuge eine veraltete (inline) PGP Nachricht?"
+
+#~ msgid "Closing connection to IMAP server..."
+#~ msgstr "Beende Verbindung zum IMAP-Server..."
+
+#~ msgid "%s: stat: %s"
+#~ msgstr "%s: stat: %s"
+
+#~ msgid "%s: not a regular file"
+#~ msgstr "%s: keine normale Datei"
+
 #~ msgid "Invoking OpenSSL..."
 #~ msgstr "Rufe OpenSSL auf..."
 
diff --git a/po/it.po b/po/it.po
index d72135d0..7ea249f0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,19 +1,20 @@
 # Translation for mutt.
 # Copyright (C) 1998-2001 Marco d'Itri
 # Marco d'Itri <md@linux.it>, 2000.
-#
 # $Id$
-#
+# 
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: mutt-1.3.23\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-01 19:24+0100\n"
-"PO-Revision-Date: 2002-01-19 21:09+0100\n"
+"PO-Revision-Date: 2004-08-22 22:12+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8-bit"
 
 #: account.c:144
 #, c-format
@@ -68,7 +69,7 @@ msgstr "Hai gi
 
 #: alias.c:254
 msgid "Warning: This alias name may not work.  Fix it?"
-msgstr ""
+msgstr "Attenzione: il nome di questo alias può non funzionare. Correggerlo?"
 
 #: alias.c:279
 msgid "Address: "
@@ -77,7 +78,7 @@ msgstr "Indirizzo: "
 #: alias.c:289 send.c:201
 #, c-format
 msgid "Error: '%s' is a bad IDN."
-msgstr ""
+msgstr "Errore: '%s' non è un IDN valido."
 
 #: alias.c:301
 msgid "Personal name: "
@@ -260,9 +261,8 @@ msgid "Error trying to view file"
 msgstr "C'è stato un errore nella visualizzazione del file"
 
 #: buffy.c:442
-#, fuzzy
 msgid "New mail in "
-msgstr "Nuova posta in %s."
+msgstr "Nuova posta in "
 
 #: color.c:322
 #, c-format
@@ -336,22 +336,20 @@ msgid "Could not copy message"
 msgstr "Impossibile copiare il messaggio"
 
 #: commands.c:182
-#, fuzzy
 msgid "S/MIME signature successfully verified."
-msgstr "Firma PGP verificata con successo."
+msgstr "Firma S/MIME verificata con successo."
 
 #: commands.c:184
 msgid "S/MIME certificate owner does not match sender."
-msgstr ""
+msgstr "Il proprietario del certificato S/MIME non corrisponde al mittente."
 
 #: commands.c:187 commands.c:198
 msgid "Warning: Part of this message has not been signed."
-msgstr ""
+msgstr "Attenzione: una parte di questo messaggio non è stata firmata."
 
 #: commands.c:189
-#, fuzzy
 msgid "S/MIME signature could NOT be verified."
-msgstr "Non è stato possibile verificare la firma PGP."
+msgstr "Non è stato possibile verificare la firma S/MIME."
 
 #: commands.c:196
 msgid "PGP signature successfully verified."
@@ -371,7 +369,7 @@ msgstr "Rimbalza il messaggio a: "
 
 #: commands.c:244 recvcmd.c:145
 msgid "Bounce tagged messages to: "
-msgstr "Rimbalza i messaggi a: "
+msgstr "Rimbalza i messaggi segnati a: "
 
 #: commands.c:259 recvcmd.c:154
 msgid "Error parsing address!"
@@ -380,7 +378,7 @@ msgstr "Errore nella lettura dell'indirizzo!"
 #: commands.c:267 recvcmd.c:162
 #, c-format
 msgid "Bad IDN: '%s'"
-msgstr ""
+msgstr "IDN non valido: '%s'"
 
 #: commands.c:278 recvcmd.c:176
 #, c-format
@@ -393,14 +391,12 @@ msgid "Bounce messages to %s"
 msgstr "Rimbalza i messaggi a %s"
 
 #: commands.c:294 recvcmd.c:192
-#, fuzzy
 msgid "Message not bounced."
-msgstr "Messaggio rimbalzato."
+msgstr "Messaggio non rimbalzato."
 
 #: commands.c:294 recvcmd.c:192
-#, fuzzy
 msgid "Messages not bounced."
-msgstr "Messaggi rimbalzati."
+msgstr "Messaggi non rimbalzati."
 
 #: commands.c:304 recvcmd.c:211
 msgid "Message bounced."
@@ -574,18 +570,16 @@ msgid "<default>"
 msgstr "<predefinito>"
 
 #: compose.c:149
-#, fuzzy
 msgid "Encrypt with: "
-msgstr "Crittografa"
+msgstr "Cifra con: "
 
 #: compose.c:165
-#, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "cifra(e), firma(s), firma come(a), entrambi(b), in l(i)nea , annulla(f) "
+msgstr "PGP: cifra(e), firma(s), firma (c)ome, entram(b)i, in l(i)nea, (a)nnullare? "
 
 #: compose.c:166
 msgid "esabif"
-msgstr "esabif"
+msgstr "escbia"
 
 #. sign (a)s
 #: compose.c:179 compose.c:269
@@ -593,24 +587,24 @@ msgid "Sign as: "
 msgstr "Firma come: "
 
 #: compose.c:227
-#, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "cifra(e), firma(s), firma come(a), entrambi(b), annulla(f) "
+msgstr ""
+"S/MIME: cifra(e), firma(s), firma c(o)n, firma (c)ome, entram(b)i, (a)nnullare? "
 
 #: compose.c:228
-#, fuzzy
 msgid "eswabf"
-msgstr "esabf"
+msgstr "esocba"
 
 #: compose.c:236
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
+"1: DES, 2: Triplo DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (a)nnullare? "
 
 #: compose.c:238
 msgid "12345f"
-msgstr ""
+msgstr "12345a"
 
 #: compose.c:351
 #, c-format
@@ -629,7 +623,7 @@ msgstr "-- Allegati"
 #: compose.c:432
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
-msgstr ""
+msgstr "Attenzione: '%s' è un IDN non valido."
 
 #: compose.c:455
 msgid "You may not delete the only attachment."
@@ -638,7 +632,7 @@ msgstr "Non puoi cancellare l'unico allegato."
 #: compose.c:722 send.c:1451
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
-msgstr ""
+msgstr "IDN non valido in \"%s\": '%s'"
 
 #: compose.c:803
 msgid "Attaching selected files..."
@@ -727,7 +721,7 @@ msgstr "Salva il messaggio nella mailbox"
 #: compose.c:1296
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "Scrivo il messaggio in %s ..."
+msgstr "Scrivo il messaggio in %s..."
 
 #: compose.c:1305
 msgid "Message written."
@@ -735,40 +729,37 @@ msgstr "Messaggio scritto."
 
 #: compose.c:1317
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr ""
+msgstr "S/MIME già selezionato. Annullare & continuare? "
 
 #: compose.c:1342
 msgid "PGP already selected. Clear & continue ? "
-msgstr ""
+msgstr "PGP già selezionato. Annullare & continuare? "
 
 #: crypt.c:65
 #, c-format
 msgid " (current time: %c)"
-msgstr ""
+msgstr " (orario attuale: %c)"
 
 #: crypt.c:71
-#, fuzzy, c-format
+#, c-format
 msgid "[-- %s output follows%s --]\n"
-msgstr "[-- Segue l'output di PGP (ora attuale: %c) --]\n"
+msgstr "[-- Segue l'output di %s%s --]\n"
 
 #: crypt.c:86
-#, fuzzy
 msgid "Passphrase(s) forgotten."
-msgstr "Passphrase di PGP dimenticata."
+msgstr "Passphrase dimenticata/e."
 
 #: crypt.c:129
 msgid "Enter PGP passphrase:"
 msgstr "Inserisci la passphrase di PGP:"
 
 #: crypt.c:147
-#, fuzzy
 msgid "Enter SMIME passphrase:"
-msgstr "Inserisci la passphrase di PGP:"
+msgstr "Inserisci la passphrase per S/MIME:"
 
 #: crypt.c:192
-#, fuzzy
 msgid "Create a traditional (inline) PGP message?"
-msgstr "Creo un messaggio application/pgp?"
+msgstr "Creare un messaggio PGP tradizionale (inline)?"
 
 #: crypt.c:200 pgpkey.c:559 postpone.c:547
 msgid "Invoking PGP..."
@@ -776,15 +767,15 @@ msgstr "Eseguo PGP..."
 
 #: crypt.c:434
 msgid "S/MIME messages with no hints on content are unsupported."
-msgstr ""
+msgstr "I messaggi S/MIME senza suggerimenti del contenuto non sono gestiti."
 
 #: crypt.c:653 crypt.c:697
 msgid "Trying to extract PGP keys...\n"
-msgstr ""
+msgstr "Cerco di estrarre le chiavi PGP...\n"
 
 #: crypt.c:677 crypt.c:717
 msgid "Trying to extract S/MIME certificates...\n"
-msgstr ""
+msgstr "Cerco di estrarre i certificati S/MIME...\n"
 
 #: crypt.c:838
 msgid ""
@@ -810,7 +801,6 @@ msgstr "[-- Attenzione: impossibile verificare firme %s/%s. --]\n"
 
 #. Now display the signed body
 #: crypt.c:912
-#, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -827,11 +817,12 @@ msgstr ""
 "\n"
 
 #: crypt.c:924
-#, fuzzy
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
-msgstr "[-- Fine dei dati firmati --]\n"
+msgstr ""
+"\n"
+"[-- Fine dei dati firmati --]\n"
 
 #: curs_lib.c:157
 msgid "yes"
@@ -928,9 +919,8 @@ msgid "No tagged messages."
 msgstr "Nessun messaggio segnato."
 
 #: curs_main.c:653 menu.c:896
-#, fuzzy
 msgid "Nothing to do."
-msgstr "Mi connetto a %s..."
+msgstr "Niente da fare."
 
 #: curs_main.c:739
 msgid "Jump to message: "
@@ -1132,7 +1122,7 @@ msgstr "Non ci sono linee nel messaggio.\n"
 #: edit.c:440
 #, c-format
 msgid "Bad IDN in %s: '%s'\n"
-msgstr ""
+msgstr "IDN non valido in %s: '%s'\n"
 
 #: edit.c:458
 #, c-format
@@ -1150,9 +1140,9 @@ msgid "could not write temporary mail folder: %s"
 msgstr "impossibile scrivere il folder temporaneo: %s"
 
 #: editmsg.c:101
-#, fuzzy, c-format
+#, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "impossibile scrivere il folder temporaneo: %s"
+msgstr "impossibile troncare il folder temporaneo: %s"
 
 #: editmsg.c:116
 msgid "Message file is empty!"
@@ -1204,7 +1194,7 @@ msgstr "[-- Tipo: %s/%s, Codifica: %s, Dimensioni: %s --]\n"
 #: handler.c:1527
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- Visualizza automaticamente con %s --]\n"
+msgstr "[-- Visualizzato automaticamente con %s --]\n"
 
 #: handler.c:1528
 #, c-format
@@ -1219,7 +1209,7 @@ msgstr "[-- Impossibile eseguire %s. --]\n"
 #: handler.c:1578 handler.c:1599
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- Stderr dell'autoview di %s --]\n"
+msgstr "[-- stderr dell'autoview di %s --]\n"
 
 #: handler.c:1636
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
@@ -1386,9 +1376,9 @@ msgid "Login failed."
 msgstr "Login fallito."
 
 #: imap/auth_sasl.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "Authenticating (%s)..."
-msgstr "Autenticazione in corso (APOP)..."
+msgstr "Autenticazione in corso (%s)..."
 
 #: imap/auth_sasl.c:199 pop_auth.c:172
 msgid "SASL authentication failed."
@@ -1446,7 +1436,7 @@ msgstr "Questo server IMAP 
 #: imap/imap.c:398
 #, c-format
 msgid "Unexpected response received from server: %s"
-msgstr ""
+msgstr "È stata ricevuta dal server una risposta inattesa: %s"
 
 #: imap/imap.c:418 pop_lib.c:280
 msgid "Secure connection with TLS?"
@@ -1545,7 +1535,7 @@ msgstr "L'indice dei messaggi non 
 
 #: imap/message.c:466
 msgid "Uploading message ..."
-msgstr "Mando il messaggio ..."
+msgstr "Mando il messaggio..."
 
 #: imap/message.c:576
 #, c-format
@@ -1555,7 +1545,7 @@ msgstr "Copio %d messaggi in %s..."
 #: imap/message.c:580
 #, c-format
 msgid "Copying message %d to %s..."
-msgstr "Copio il messaggio %d in %s ..."
+msgstr "Copio il messaggio %d in %s..."
 
 #: imap/util.c:239
 msgid "Continue?"
@@ -1568,7 +1558,7 @@ msgstr "alias: nessun indirizzo"
 #: init.c:651
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
-msgstr ""
+msgstr "Attenzione: l'IDN '%s' nell'alias '%s' non è valido.\n"
 
 #: init.c:714
 msgid "invalid header field"
@@ -1618,9 +1608,9 @@ msgid "%s: invalid value"
 msgstr "%s: valore non valido"
 
 #: init.c:1312
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Unknown type."
-msgstr "%s: tipo sconosciuto"
+msgstr "%s: tipo sconosciuto."
 
 #: init.c:1338
 #, c-format
@@ -1628,14 +1618,14 @@ msgid "%s: unknown type"
 msgstr "%s: tipo sconosciuto"
 
 #: init.c:1375
-#, fuzzy, c-format
+#, c-format
 msgid "%s: stat: %s"
-msgstr "Impossibile fare stat di %s: %s"
+msgstr "%s: stat: %s"
 
 #: init.c:1380
-#, fuzzy, c-format
+#, c-format
 msgid "%s: not a regular file"
-msgstr "%s non è un file regolare."
+msgstr "%s: non è un file regolare"
 
 #: init.c:1395
 #, c-format
@@ -1733,14 +1723,13 @@ msgid "%s: no such function"
 msgstr "%s: la funzione non esiste"
 
 #: keymap.c:912
-#, fuzzy
 msgid "Enter keys (^G to abort): "
-msgstr "Inserisci il keyID per %s: "
+msgstr "Inserisci i tasti (^G per annullare): "
 
 #: keymap.c:917
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
-msgstr ""
+msgstr "Car = %s, Ottale = %o, Decimale = %d"
 
 #: keymap_alldefs.h:5
 msgid "null operation"
@@ -1748,7 +1737,7 @@ msgstr "operazione nulla"
 
 #: keymap_alldefs.h:6
 msgid "end of conditional execution (noop)"
-msgstr ""
+msgstr "fine dell'esecuzione condizionata (noop)"
 
 #: keymap_alldefs.h:7
 msgid "force viewing of attachment using mailcap"
@@ -1796,9 +1785,8 @@ msgstr ""
 "visualizza tutte le mailbox o solo quelle a cui si è iscritti (solo IMAP)"
 
 #: keymap_alldefs.h:18
-#, fuzzy
 msgid "list mailboxes with new mail"
-msgstr "Nessuna mailbox con nuova posta."
+msgstr "elenca le mailbox con nuova posta"
 
 #: keymap_alldefs.h:19
 msgid "change directories"
@@ -2025,9 +2013,8 @@ msgid "move the cursor to the end of the word"
 msgstr "sposta il cursore alla fine della parola"
 
 #: keymap_alldefs.h:75
-#, fuzzy
 msgid "scroll down through the history list"
-msgstr "spostati in alto attraverso l'history"
+msgstr "spostati in basso attraverso l'history"
 
 #: keymap_alldefs.h:76
 msgid "scroll up through the history list"
@@ -2051,7 +2038,7 @@ msgstr "cancella la parola davanti al cursore"
 
 #: keymap_alldefs.h:81
 msgid "quote the next typed key"
-msgstr "proteggi il prossimo tasto digitato"
+msgstr "proteggi il successivo tasto digitato"
 
 #: keymap_alldefs.h:82
 msgid "transpose character under cursor with previous"
@@ -2175,28 +2162,27 @@ msgstr "mostra solo i messaggi corrispondenti al modello"
 
 #: keymap_alldefs.h:112
 msgid "jump to the next new message"
-msgstr "salta al prossimo messaggio nuovo"
+msgstr "salta al successivo nuovo messaggio"
 
 #: keymap_alldefs.h:113
-#, fuzzy
 msgid "jump to the next new or unread message"
-msgstr "salta al prossimo messaggio non letto"
+msgstr "salta al successivo messaggio nuovo o non letto"
 
 #: keymap_alldefs.h:114
 msgid "jump to the next subthread"
-msgstr "salta al prossimo subthread"
+msgstr "salta al subthread successivo"
 
 #: keymap_alldefs.h:115
 msgid "jump to the next thread"
-msgstr "salta al prossimo thread"
+msgstr "salta al thread successivo"
 
 #: keymap_alldefs.h:116
 msgid "move to the next undeleted message"
-msgstr "salta al prossimo messaggio de-cancellato"
+msgstr "salta al messaggio de-cancellato successivo"
 
 #: keymap_alldefs.h:117
 msgid "jump to the next unread message"
-msgstr "salta al prossimo messaggio non letto"
+msgstr "salta al successivo messaggio non letto"
 
 #: keymap_alldefs.h:118
 msgid "jump to parent message in thread"
@@ -2219,9 +2205,8 @@ msgid "jump to the previous new message"
 msgstr "salta al precedente messaggio nuovo"
 
 #: keymap_alldefs.h:123
-#, fuzzy
 msgid "jump to the previous new or unread message"
-msgstr "salta al precedente messaggio non letto"
+msgstr "salta al precedente messaggio nuovo o non letto"
 
 #: keymap_alldefs.h:124
 msgid "jump to the previous unread message"
@@ -2261,7 +2246,7 @@ msgstr "spostati in mezzo alla pagina"
 
 #: keymap_alldefs.h:133
 msgid "move to the next entry"
-msgstr "spostati alla prossima voce"
+msgstr "spostati alla voce successiva"
 
 #: keymap_alldefs.h:134
 msgid "scroll down one line"
@@ -2269,7 +2254,7 @@ msgstr "spostati una riga in basso"
 
 #: keymap_alldefs.h:135
 msgid "move to the next page"
-msgstr "spostati alla prossima pagina"
+msgstr "spostati alla pagina successiva"
 
 #: keymap_alldefs.h:136
 msgid "jump to the bottom of the message"
@@ -2353,11 +2338,11 @@ msgstr "cerca all'indietro una espressione regolare"
 
 #: keymap_alldefs.h:156
 msgid "search for next match"
-msgstr "cerca la prossima corrispondenza"
+msgstr "cerca la successiva corrispondenza"
 
 #: keymap_alldefs.h:157
 msgid "search for next match in opposite direction"
-msgstr "cerca la prossima corrispondenza nella direzione opposta"
+msgstr "cerca la successiva corrispondenza nella direzione opposta"
 
 #: keymap_alldefs.h:158
 msgid "toggle search pattern coloring"
@@ -2381,12 +2366,11 @@ msgstr "segna la voce corrente"
 
 #: keymap_alldefs.h:163
 msgid "apply next function to tagged messages"
-msgstr "applica la prossima funzione ai messaggi segnati"
+msgstr "applica la funzione successiva ai messaggi segnati"
 
 #: keymap_alldefs.h:164
-#, fuzzy
 msgid "apply next function ONLY to tagged messages"
-msgstr "applica la prossima funzione ai messaggi segnati"
+msgstr "applica la successiva funzione SOLO ai messaggi segnati"
 
 #: keymap_alldefs.h:165
 msgid "tag the current subthread"
@@ -2438,7 +2422,7 @@ msgstr "mostra gli allegati MIME"
 
 #: keymap_alldefs.h:177
 msgid "display the keycode for a key press"
-msgstr ""
+msgstr "mostra il keycode per un tasto premuto"
 
 #: keymap_alldefs.h:178
 msgid "show currently active limit pattern"
@@ -2498,7 +2482,7 @@ msgstr "Seleziona l'elemento precedente della catena"
 
 #: keymap_alldefs.h:192
 msgid "Select the next element of the chain"
-msgstr "Seleziona il prossimo elemento della catena"
+msgstr "Seleziona il successivo elemento della catena"
 
 #: keymap_alldefs.h:193
 msgid "send the message through a mixmaster remailer chain"
@@ -2513,23 +2497,20 @@ msgid "make decrypted copy"
 msgstr "fai una copia decodificata"
 
 #: keymap_alldefs.h:196
-#, fuzzy
 msgid "wipe passphrase(s) from memory"
-msgstr "cancella la passphrase PGP dalla memoria"
+msgstr "cancella la/le passphrase dalla memoria"
 
 #: keymap_alldefs.h:197
-#, fuzzy
 msgid "extract supported public keys"
-msgstr "estrai le chiavi pubbliche PGP"
+msgstr "estra le chiavi pubbliche PGP"
 
 #: keymap_alldefs.h:198
-#, fuzzy
 msgid "show S/MIME options"
-msgstr "mostra le opzioni PGP"
+msgstr "mostra le opzioni S/MIME"
 
 #: lib.c:60
 msgid "Integer overflow -- can't allocate memory!"
-msgstr ""
+msgstr "Overflow intero.-- impossibile allocare memoria!"
 
 #: lib.c:67 lib.c:82 lib.c:114
 msgid "Out of memory!"
@@ -2544,20 +2525,18 @@ msgstr ""
 "Per segnalare un bug usa il programma flea(1).\n"
 
 #: main.c:50
-#, fuzzy
 msgid ""
 "Copyright (C) 1996-2002 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-2001 Michael R. Elkins e altri.\n"
+"Copyright (C) 1996-2002 Michael R. Elkins e altri.\n"
 "Mutt non ha ALCUNA GARANZIA; usare `mutt -vv' per i dettagli.\n"
 "Mutt è software libero e sei invitato a ridistribuirlo\n"
 "sotto certe condizioni; scrivere `mutt -vv' per i dettagli.\n"
 
 #: main.c:56
-#, fuzzy
 msgid ""
 "Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -2584,13 +2563,13 @@ msgid ""
 "    along with this program; if not, write to the Free Software\n"
 "    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
 msgstr ""
-"Copyright (C) 1996-2001 Michael R. Elkins <me@cs.hmc.edu>\n"
-"Copyright (C) 1996-2001 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2001 Thomas Roessler <roessler@guug.de>\n"
-"Copyright (C) 1998-2001 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2001 Brendan Cully <brendan@kublai.com>\n"
-"Copyright (C) 1999-2001 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
-"Copyright (C) 2000-2001 Edmund Grimley Evans <edmundo@rano.org>\n"
+"Copyright (C) 1996-2002 Michael R. Elkins <me@cs.hmc.edu>\n"
+"Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
+"Copyright (C) 1997-2002 Thomas Roessler <roessler@guug.de>\n"
+"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
+"Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
 "Molti altri non menzionati qui hanno contribuito con codice, correzioni\n"
 "e suggerimenti.\n"
@@ -2610,7 +2589,6 @@ msgstr ""
 "    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
 
 #: main.c:94
-#, fuzzy
 msgid ""
 "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
@@ -2647,12 +2625,16 @@ msgid ""
 "  -h\t\tthis help message"
 msgstr ""
 "uso: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <tipo> ] [ -f <file> ]\n"
-"\tmutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ -i "
-"<file> ] [ -s <sogg> ] [ -b <indir> ] [ -c <indir> ] <indir> [ ... ]\n"
-"\tmutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"\tmutt -v[v]\n"
-"\n"
+"····· ·mutt·[·-nR·]·[·-e·<cmd>·]·[·-F·<file>·]·-Q·<query>·[·-Q·<query>·]·"
+"[...]\n"
+"·······mutt·[·-nR·]·[·-e·<cmd>·]·[·-F·<file>·]·-A·<alias>·[·-A·<alias>·]·"
+"[...]\n"
+"·······mutt·[·-nx·]·[·-e·<cmd>·]·[·-a·<file>·]·[·-F·<file>·]·[·-H·<file>·]·"
+"[·-i·<file>·]·[·-s·<subj>·]·[·-b·<indir>·]·[·-c·<indir>·]·<indir>·[·...·]\n"
+"·······mutt·[·-n·]·[·-e·<cmd>·]·[·-F·<file>·]·-p\n"
+"·······mutt·-v[v]\n\n"
 "opzioni\n"
+"  -A <alias>\tespande l'alias indicato\n"
 "  -a <file>\tallega un file al messaggio\n"
 "  -b <indir>\tindirizzo in blind carbon copy (BCC)\n"
 "  -c <indir>\tindirizzo in carbon copy (CC)\n"
@@ -2863,16 +2845,15 @@ msgstr "Leggo %s... %d"
 
 #: mh.c:1041
 msgid "maildir_commit_message(): unable to set time on file"
-msgstr ""
+msgstr "maildir_commit_message():·impossibile impostare l'orario del file"
 
 #: muttlib.c:835
-#, fuzzy
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Il file è una directory, salvo lì dentro?"
+msgstr "Il file è una directory, salvo lì dentro? [(s)ì, (n)o, (t)utti]"
 
 #: muttlib.c:835
 msgid "yna"
-msgstr ""
+msgstr "yna"
 
 #: muttlib.c:851
 msgid "File is a directory, save under it?"
@@ -2885,7 +2866,7 @@ msgstr "File nella directory: "
 #: muttlib.c:869
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr ""
-"Il file esiste, lo s(o)vrascrivo, (a)ccodo, o (c) annullo l'operazione?"
+"Il file esiste, lo s(o)vrascrivo, (a)ccodo, o (c)ancello l'operazione?"
 
 #: muttlib.c:869
 msgid "oac"
@@ -2926,7 +2907,7 @@ msgstr "Errore parlando a %s (%s)"
 #: mutt_socket.c:416 mutt_socket.c:473
 #, c-format
 msgid "Bad IDN \"%s\"."
-msgstr ""
+msgstr "L'IDN \"%s\" non è valido."
 
 #: mutt_socket.c:423 mutt_socket.c:480
 #, c-format
@@ -3041,7 +3022,7 @@ msgstr "Controllo del certificato SSL"
 
 #: mutt_ssl.c:615
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr "(r)ifiuta, accetta s(o)lo adesso, (a)ccetta sempre"
+msgstr "(r)ifiuta, accetta questa v(o)lta, (a)ccetta sempre"
 
 #: mutt_ssl.c:616
 msgid "roa"
@@ -3049,7 +3030,7 @@ msgstr "roa"
 
 #: mutt_ssl.c:620
 msgid "(r)eject, accept (o)nce"
-msgstr "(r)ifiuta, accetta s(o)lo adesso"
+msgstr "(r)ifiuta, accetta questa v(o)lta"
 
 #: mutt_ssl.c:621
 msgid "ro"
@@ -3173,7 +3154,7 @@ msgstr "Impossibile scrivere il messaggio"
 
 #: mx.c:1535
 msgid "Integer overflow -- can't allocate memory."
-msgstr ""
+msgstr "Overflow intero -- impossibile allocare memoria."
 
 #: pager.c:53
 msgid "Not available in this menu."
@@ -3363,9 +3344,8 @@ msgstr ""
 "\n"
 
 #: pgp.c:662
-#, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
-msgstr "Errore interno. Informa <roessler@guug.de>."
+msgstr "Errore interno. Informa <roessler@does-not-exist.org>."
 
 #: pgp.c:722
 msgid ""
@@ -3420,9 +3400,8 @@ msgid "Fetching PGP key..."
 msgstr "Prendo la chiave PGP..."
 
 #: pgpkey.c:486
-#, fuzzy
 msgid "All matching keys are expired, revoked, or disabled."
-msgstr "Tutte le chiavi corrispondenti sono scadute o revocate."
+msgstr "Tutte le chiavi corrispondenti sono scadute, revocate o disattivate."
 
 #. __STRCAT_CHECKED__
 #: pgpkey.c:512 smime.c:412
@@ -3609,14 +3588,12 @@ msgid "Illegal PGP header"
 msgstr "Header PGP non consentito"
 
 #: postpone.c:479
-#, fuzzy
 msgid "Illegal S/MIME header"
-msgstr "Header PGP non consentito"
+msgstr "Header S/MIME non consentito"
 
 #: postpone.c:554
-#, fuzzy
 msgid "Decryption failed."
-msgstr "Login fallito."
+msgstr "Decifratura fallita."
 
 #: query.c:46
 msgid "New Query"
@@ -3699,9 +3676,8 @@ msgid "Print attachment?"
 msgstr "Stampo l'allegato?"
 
 #: recvattach.c:938
-#, fuzzy
 msgid "Can't decrypt encrypted message!"
-msgstr "Non ci sono messaggi segnati."
+msgstr "Impossibile decifrare il messaggio cifrato!"
 
 #: recvattach.c:951
 msgid "Attachments"
@@ -3716,9 +3692,8 @@ msgid "Can't delete attachment from POP server."
 msgstr "Impossibile cancellare l'allegato dal server POP"
 
 #: recvattach.c:1056
-#, fuzzy
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "La cancellazione degli allegati da messaggi PGP non è gestita."
+msgstr "La cancellazione di allegati da messaggi cifrati non è gestita."
 
 #: recvattach.c:1075 recvattach.c:1092
 msgid "Only deletion of multipart attachments is supported."
@@ -3729,14 +3704,12 @@ msgid "You may only bounce message/rfc822 parts."
 msgstr "Puoi rimbalzare solo parti message/rfc822."
 
 #: recvcmd.c:213
-#, fuzzy
 msgid "Error bouncing message!"
-msgstr "Errore durante l'invio del messaggio."
+msgstr "Errore durante l'invio del messaggio!"
 
 #: recvcmd.c:213
-#, fuzzy
 msgid "Error bouncing messages!"
-msgstr "Errore durante l'invio del messaggio."
+msgstr "Errore durante l'invio del messaggio!"
 
 #: recvcmd.c:413
 #, c-format
@@ -3919,9 +3892,8 @@ msgid "Recall postponed message?"
 msgstr "Richiamo il messaggio rimandato?"
 
 #: send.c:1336
-#, fuzzy
 msgid "Edit forwarded message?"
-msgstr "Preparo il messaggio inoltrato..."
+msgstr "Modificare il messaggio da inoltrare?"
 
 #: send.c:1359
 msgid "Abort unmodified message?"
@@ -4003,7 +3975,7 @@ msgstr "Output del processo di consegna"
 #: sendlib.c:2263
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
-msgstr ""
+msgstr "Trovato l'IDN %s non valido preparando l'header resent-from"
 
 #: signal.c:39
 #, c-format
@@ -4022,146 +3994,133 @@ msgstr "Preso il segnale %d...  Esco.\n"
 
 #: smime.c:300
 msgid "Trusted   "
-msgstr ""
+msgstr "Fidato    "
 
 #: smime.c:303
 msgid "Verified  "
-msgstr ""
+msgstr "Verificato  "
 
 #: smime.c:306
 msgid "Unverified"
-msgstr ""
+msgstr "Non verificato"
 
 #: smime.c:309
-#, fuzzy
 msgid "Expired   "
-msgstr "Esci  "
+msgstr "Scaduto   "
 
 #: smime.c:312
 msgid "Revoked   "
-msgstr ""
+msgstr "Revocato   "
 
 #: smime.c:315
-#, fuzzy
 msgid "Invalid   "
-msgstr "Mese non valido: %s"
+msgstr "Non valido   "
 
 #: smime.c:318
-#, fuzzy
 msgid "Unknown   "
-msgstr "Sconosciuto"
+msgstr "Sconosciuto   "
 
 #: smime.c:347
-#, fuzzy
 msgid "Enter keyID: "
-msgstr "Inserisci il keyID per %s: "
+msgstr "Inserisci il keyID: "
 
 #: smime.c:370
-#, fuzzy, c-format
+#, c-format
 msgid "S/MIME certificates matching \"%s\"."
-msgstr "Chiavi PGP corrispondenti a \"%s\"."
+msgstr "Certificati S/MIME corrispondenti a \"%s\"."
 
 #: smime.c:519 smime.c:588 smime.c:609
 #, c-format
 msgid "ID %s is unverified. Do you want to use it for %s ?"
-msgstr ""
+msgstr "L'ID %s non è verificato. Vuoi usarlo per %s?"
 
 #: smime.c:523 smime.c:592
-#, fuzzy, c-format
+#, c-format
 msgid "Use (untrusted!) ID %s for %s ?"
-msgstr "Uso il keyID \"%s\" per %s?"
+msgstr "Uso l'ID %s (non fidato!) per %s?"
 
 #: smime.c:526 smime.c:595
-#, fuzzy, c-format
+#, c-format
 msgid "Use ID %s for %s ?"
-msgstr "Uso il keyID \"%s\" per %s?"
+msgstr "Uso l'ID %s per %s?"
 
 #: smime.c:621
 #, c-format
 msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
-msgstr ""
+msgstr "Attenzione: non hai ancora deciso di fidarti dell'ID %s. (premere un tasto per continuare)"
 
 #: smime.c:787
 #, c-format
 msgid "No (valid) certificate found for %s."
-msgstr ""
+msgstr "Non è stato trovato un certificato (valido) per %s."
 
 #: smime.c:842 smime.c:870 smime.c:935 smime.c:979 smime.c:1044 smime.c:1119
-#, fuzzy
 msgid "Error: unable to create OpenSSL subprocess!"
-msgstr "[-- Errore: impossibile creare il sottoprocesso PGP --]\n"
+msgstr "Errore: impossibile creare il sottoprocesso di OpenSSL!"
 
 #: smime.c:1197
-#, fuzzy
 msgid "no certfile"
-msgstr "Impossibile creare il filtro"
+msgstr "manca il file del certificato"
 
 #: smime.c:1200
-#, fuzzy
 msgid "no mbox"
-msgstr "(nessuna mailbox)"
+msgstr "manca la mailbox"
 
 #. fatal error while trying to encrypt message
 #: smime.c:1343
 msgid "No output from OpenSSL.."
-msgstr ""
+msgstr "Nessun output da OpenSSL."
 
 #: smime.c:1381
-#, fuzzy
 msgid "Warning: Intermediate certificate not found."
-msgstr "Attenzione: impossibile salvare il certificato"
+msgstr "Attenzione: certificato intermedio non trovato."
 
 #: smime.c:1426
-#, fuzzy
 msgid "Can't open OpenSSL subprocess!"
-msgstr "Impossibile aprire il sottoprocesso PGP!"
+msgstr "Impossibile aprire il sottoprocesso di OpenSSL!"
 
 #: smime.c:1464
 msgid "No output from OpenSSL..."
-msgstr ""
+msgstr "Nessun output da OpenSSL..."
 
 #: smime.c:1629 smime.c:1751
-#, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
 msgstr ""
-"[-- Fine dell'output di PGP --]\n"
+"[-- Fine dell'output di OpenSSL --]\n"
 "\n"
 
 #: smime.c:1712 smime.c:1722
-#, fuzzy
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
-msgstr "[-- Errore: impossibile creare il sottoprocesso PGP --]\n"
+msgstr "[-- Errore: impossibile creare il sottoprocesso di OpenSSL! --]\n"
 
 #: smime.c:1755
-#, fuzzy
 msgid "[-- The following data is S/MIME encrypted --]\n"
-msgstr "[-- I seguenti dati sono cifrati con PGP/MIME  --]\n"
+msgstr "[-- I seguenti dati sono cifrati con S/MIME --]\n"
 
 #: smime.c:1758
-#, fuzzy
 msgid "[-- The following data is S/MIME signed --]\n"
-msgstr ""
-"[-- I seguenti dati sono firmati --]\n"
-"\n"
+msgstr "[-- I seguenti dati sono firmati con S/MIME --]\n"
 
 #: smime.c:1822
-#, fuzzy
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
-msgstr "[-- Fine dei dati cifrati con PGP/MIME  --]\n"
+msgstr ""
+"\n"
+"[-- Fine dei dati cifrati con S/MIME --]\n"
 
 #: smime.c:1824
-#, fuzzy
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
-msgstr "[-- Fine dei dati firmati --]\n"
+msgstr ""
+"\n"
+"[-- Fine dei dati firmati com S/MIME. --]\n"
 
 #: sort.c:202
-msgid "Sorting mailbox..."
+msgid "Sorting mailZbox..."
 msgstr "Ordino la mailbox..."
 
 #: sort.c:239
@@ -4180,20 +4139,3 @@ msgstr "Il messaggio padre non 
 msgid "Parent message is not available."
 msgstr "Il messaggio padre non è disponibile."
 
-#, fuzzy
-#~ msgid "Invoking OpenSSL..."
-#~ msgstr "Eseguo PGP..."
-
-#~ msgid "Bounce message to %s...?"
-#~ msgstr "Rimbalzo il messaggio a %s...?"
-
-#~ msgid "Bounce messages to %s...?"
-#~ msgstr "Rimbalzo i messaggi a %s...?"
-
-#, fuzzy
-#~ msgid "ewsabf"
-#~ msgstr "esabf"
-
-#, fuzzy
-#~ msgid "Certificate *NOT* added."
-#~ msgstr "Certificato salvato"
diff --git a/po/sv.po b/po/sv.po
index 188dac04..c803cfe9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3405,7 +3405,7 @@ msgstr "(i)nfogat"
 
 #: pgp.c:1471
 msgid "esabifc"
-msgstr "ksobr"
+msgstr "ksobir"
 
 #. sign (a)s
 #: pgp.c:1486 smime.c:1989