From: Johan Svedberg <johan@svedberg.pp.se>
Date: Tue, 17 Aug 2004 13:42:01 +0000 (+0000)
Subject: update
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44752cda7577fabecc2c19fe4a6bebb25cf24e4c;p=neomutt

update
---

diff --git a/po/sv.po b/po/sv.po
index f4a2f0d46..188dac041 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,14 +4,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.5.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-18 12:27+0200\n"
-"PO-Revision-Date: 2004-04-27 16:13+0200\n"
+"POT-Creation-Date: 2004-08-17 13:36+0200\n"
+"PO-Revision-Date: 2004-08-17 14:16%z\n"
 "Last-Translator: Johan Svedberg <johan@svedberg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: account.c:144
 #, c-format
@@ -41,9 +41,9 @@ msgid "Select"
 msgstr "Välj"
 
 #. __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 "Hjälp"
 
@@ -72,7 +72,7 @@ msgstr "Varning: Detta alias kommer kanske inte att fungera. Fixa det?"
 msgid "Address: "
 msgstr "Adress: "
 
-#: alias.c:289 send.c:201
+#: alias.c:289 send.c:202
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr "Fel: '%s' är ett dåligt IDN."
@@ -105,8 +105,8 @@ msgstr "Kan inte para ihop namnmall, forts
 msgid "Mailcap compose entry requires %%s"
 msgstr "\"compose\"-posten i mailcap kräver %%s"
 
-#: attach.c:129 attach.c:259 commands.c:216 compose.c:1297 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 "Fel uppstod vid körning av \"%s\"!"
@@ -151,7 +151,7 @@ msgstr "MIME-typ ej definierad. Kan inte visa bilaga."
 msgid "Cannot create filter"
 msgstr "Kan inte skapa filter"
 
-#: attach.c:667 attach.c:699 attach.c:992 attach.c:1050 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 "Kan inte skapa filter"
@@ -225,7 +225,7 @@ msgstr "Brevl
 msgid "Chdir to: "
 msgstr "Ändra katalog till: "
 
-#: browser.c:957 browser.c:1024
+#: browser.c:952 browser.c:1024
 msgid "Error scanning directory."
 msgstr "Fel vid läsning av katalog."
 
@@ -303,7 +303,7 @@ msgstr "mono: f
 msgid "%s: no such attribute"
 msgstr "%s: attributet finns inte"
 
-#: color.c:696 hook.c:65 hook.c:73 keymap.c:735
+#: color.c:696 hook.c:65 hook.c:73 keymap.c:744
 msgid "too few arguments"
 msgstr "för få argument"
 
@@ -441,356 +441,317 @@ msgstr "Meddelanden kunde inte skrivas ut"
 
 #: 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?: "
+"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 ""
-"Omvänt (d)atum/(f)rån/(m)ot./(ä)re./(t)ill/t(r)åd/(o)sor./(s)tor./(p)oäng?:"
+"Omvänt (d)atum/(f)rån/(m)ot./(ä)re./(t)ill/t(r)åd/(o)sor./(s)tor./(p)oäng/"
+"sp(a)m?: "
 
 #: 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?: "
+"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 ""
-"Sortera (d)atum/(f)rån/(m)ot./(ä)re./(t)ill/t(r)åd/(o)sor./(s)tor./(p)oäng?:"
+"Sortera (d)atum/(f)rån/(m)ot./(ä)re./(t)ill/t(r)åd/(o)sor./(s)tor./(p)oäng/"
+"sp(a)m?: "
 
 #: commands.c:506
-msgid "dfrsotuzc"
-msgstr "dfmätrosp"
+msgid "dfrsotuzcp"
+msgstr "dfmätrospa"
 
-#: commands.c:559
+#: commands.c:563
 msgid "Shell command: "
 msgstr "Skalkommando: "
 
-#: commands.c:701
+#: commands.c:705
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Avkoda-spara%s till brevlåda"
 
-#: commands.c:702
+#: commands.c:706
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Avkoda-kopiera%s till brevlåda"
 
-#: commands.c:703
+#: commands.c:707
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Dekryptera-spara%s till brevlåda"
 
-#: commands.c:704
+#: commands.c:708
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Dekryptera-kopiera%s till brevlåda"
 
-#: commands.c:705
+#: commands.c:709
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Spara%s till brevlåda"
 
-#: commands.c:705
+#: commands.c:709
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Kopiera%s till brevlåda"
 
-#: commands.c:706
+#: commands.c:710
 msgid " tagged"
 msgstr " märkt"
 
-#: commands.c:779
+#: commands.c:783
 #, c-format
 msgid "Copying to %s..."
 msgstr "Kopierar till %s..."
 
-#: commands.c:901
+#: commands.c:905
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Konvertera till %s vid sändning?"
 
-#: commands.c:910
+#: commands.c:914
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "\"Content-Type\" ändrade till %s."
 
-#: commands.c:912
+#: commands.c:916
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Teckenuppsättning ändrad till %s; %s."
 
-#: commands.c:914
+#: commands.c:918
 msgid "not converting"
 msgstr "konverterar inte"
 
-#: commands.c:914
+#: commands.c:918
 msgid "converting"
 msgstr "konverterar"
 
-#: compose.c:42
+#: compose.c:43
 msgid "There are no attachments."
 msgstr "Det finns inga bilagor."
 
-#: compose.c:84
+#: compose.c:85
 msgid "Send"
 msgstr "Skicka"
 
-#: compose.c:85 remailer.c:483
+#: compose.c:86 remailer.c:483
 msgid "Abort"
 msgstr "Avbryt"
 
-#: compose.c:89 compose.c:809
+#: compose.c:90 compose.c:653
 msgid "Attach file"
 msgstr "Bifoga fil"
 
-#: compose.c:90
+#: compose.c:91
 msgid "Descrip"
 msgstr "Beskriv"
 
-#: compose.c:127
+#: compose.c:128
 msgid "Sign, Encrypt"
 msgstr "Signera, Kryptera"
 
-#: compose.c:129
+#: compose.c:130
 msgid "Encrypt"
 msgstr "Kryptera"
 
-#: compose.c:131
+#: compose.c:132
 msgid "Sign"
 msgstr "Signera"
 
-#: compose.c:133
+#: compose.c:134
 msgid "Clear"
 msgstr "Klartext"
 
-#: compose.c:139
+#: compose.c:140
 msgid " (inline)"
 msgstr " (infogat)"
 
-#: compose.c:141
+#: compose.c:142
 msgid " (PGP/MIME)"
 msgstr " (PGP/MIME)"
 
-#: compose.c:149 compose.c:153
+#: compose.c:150 compose.c:154
 msgid " sign as: "
 msgstr " signera som: "
 
-#: compose.c:149 compose.c:153
+#: compose.c:150 compose.c:154
 msgid "<default>"
 msgstr "<standard>"
 
-#: compose.c:158
+#: compose.c:162
 msgid "Encrypt with: "
 msgstr "Kryptera med: "
 
-#: compose.c:174
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr ""
-"PGP: (k)ryptera, (s)ignera, signera s(o)m, (b)åda, i(n)fogat, eller sk(i)ppa "
-"det?"
-
-#: compose.c:175
-msgid "esabif"
-msgstr "ksobni"
-
-#. sign (a)s
-#: compose.c:188 compose.c:291
-msgid "Sign as: "
-msgstr "Signera som: "
-
-#: compose.c:249
-msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
-msgstr ""
-"S/MIME: (k)ryptera, (s)ignera, signera s(o)m, (b)åda, eller sk(i)ppa det? "
-
-#: compose.c:250
-msgid "eswabf"
-msgstr "ksobi"
-
-#: compose.c:258
-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 eller (g)löm det? "
-
-#: compose.c:260
-msgid "12345f"
-msgstr "12345g"
-
-#: compose.c:373
+#: compose.c:216
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] existerar inte längre!"
 
-#: compose.c:381
+#: compose.c:224
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "%s [#%d] modifierad. Uppdatera kodning?"
 
-#: compose.c:424
+#: compose.c:267
 msgid "-- Attachments"
 msgstr "-- Bilagor"
 
-#: compose.c:454
+#: compose.c:297
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr "Varning: \"%s\" är ett dåligt IDN."
 
-#: compose.c:477
+#: compose.c:320
 msgid "You may not delete the only attachment."
 msgstr "Du får inte ta bort den enda bilagan."
 
-#: compose.c:744 send.c:1458
+#: compose.c:588 send.c:1472
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr "Dåligt IDN i \"%s\": \"%s\""
 
-#: compose.c:825
+#: compose.c:669
 msgid "Attaching selected files..."
 msgstr "Bifogar valda filer..."
 
-#: compose.c:836
+#: compose.c:680
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Kunde inte bifoga %s!"
 
-#: compose.c:854
+#: compose.c:698
 msgid "Open mailbox to attach message from"
 msgstr "Öppna brevlåda att bifoga meddelande från"
 
-#: compose.c:892
+#: compose.c:736
 msgid "No messages in that folder."
 msgstr "Inga meddelanden i den foldern."
 
-#: compose.c:901
+#: compose.c:745
 msgid "Tag the messages you want to attach!"
 msgstr "Märk de meddelanden du vill bifoga!"
 
-#: compose.c:933
+#: compose.c:777
 msgid "Unable to attach!"
 msgstr "Kunde inte bifoga!"
 
-#: compose.c:980
+#: compose.c:824
 msgid "Recoding only affects text attachments."
 msgstr "Omkodning påverkar bara textbilagor."
 
-#: compose.c:985
+#: compose.c:829
 msgid "The current attachment won't be converted."
 msgstr "Den aktiva bilagan kommer inte att bli konverterad."
 
-#: compose.c:987
+#: compose.c:831
 msgid "The current attachment will be converted."
 msgstr "Den aktiva bilagan kommer att bli konverterad."
 
-#: compose.c:1058
+#: compose.c:902
 msgid "Invalid encoding."
 msgstr "Ogiltig kodning."
 
-#: compose.c:1079
+#: compose.c:923
 msgid "Save a copy of this message?"
 msgstr "Spara en kopia detta meddelande?"
 
-#: compose.c:1132
+#: compose.c:976
 msgid "Rename to: "
 msgstr "Byt namn till: "
 
-#: compose.c:1137 editmsg.c:110 sendlib.c:910
+#: compose.c:981 editmsg.c:110 sendlib.c:910
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Kan inte ta status på %s: %s"
 
-#: compose.c:1163
+#: compose.c:1007
 msgid "New file: "
 msgstr "Ny fil: "
 
-#: compose.c:1176
+#: compose.c:1020
 msgid "Content-Type is of the form base/sub"
 msgstr "\"Content-Type\" har formen bas/undertyp"
 
-#: compose.c:1182
+#: compose.c:1026
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Okänd \"Content-Type\" %s"
 
-#: compose.c:1195
+#: compose.c:1039
 #, c-format
 msgid "Can't create file %s"
 msgstr "Kan inte skapa fil %s"
 
-#: compose.c:1203
+#: compose.c:1047
 msgid "What we have here is a failure to make an attachment"
 msgstr "Vad vi har här är ett misslyckande att skapa en bilaga."
 
-#: compose.c:1258
+#: compose.c:1102
 msgid "Postpone this message?"
 msgstr "Skjut upp det här meddelandet?"
 
-#: compose.c:1315
+#: compose.c:1159
 msgid "Write message to mailbox"
 msgstr "Skriv meddelande till brevlåda"
 
-#: compose.c:1318
+#: compose.c:1162
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Skriver meddelande till %s ..."
 
-#: compose.c:1327
+#: compose.c:1171
 msgid "Message written."
 msgstr "Meddelande skrivet."
 
-#: compose.c:1339
+#: compose.c:1183
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "S/MIME redan valt. Rensa och fortsätt? "
 
-#: compose.c:1364
+#: compose.c:1208
 msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP redan valt. Rensa och fortsätt? "
 
-#: crypt.c:65
+#: crypt.c:66
 #, c-format
 msgid " (current time: %c)"
 msgstr " (aktuell tid: %c)"
 
-#: crypt.c:71
+#: crypt.c:72
 #, c-format
 msgid "[-- %s output follows%s --]\n"
 msgstr "[-- %s utdata följer%s --]\n"
 
-#: crypt.c:86
+#: crypt.c:87
 msgid "Passphrase(s) forgotten."
 msgstr "Lösenfrasen glömd."
 
-#: crypt.c:129
-msgid "Enter PGP passphrase:"
-msgstr "Mata in PGP-lösenfras:"
-
-#: crypt.c:147
-msgid "Enter SMIME passphrase:"
-msgstr "Mata in SMIME-lösenfras:"
-
 #. they really want to send it inline... go for it
-#: crypt.c:179 pgpkey.c:559 postpone.c:552
+#: crypt.c:145 pgpkey.c:559
 msgid "Invoking PGP..."
 msgstr "Startar PGP..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:188
+#: crypt.c:154
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr "Meddelande kan inte skickas infogat. Återgå till att använda PGP/MIME?"
 
 #. abort
-#: crypt.c:190 send.c:1410
+#: crypt.c:156 send.c:1424
 msgid "Mail not sent."
 msgstr "Brevet skickades inte."
 
-#: crypt.c:425
+#: crypt.c:392
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "S/MIME-meddelanden utan ledtrådar på innehåll stöds inte."
 
-#: crypt.c:644 crypt.c:688
+#: crypt.c:611 crypt.c:655
 msgid "Trying to extract PGP keys...\n"
 msgstr "Försöker att extrahera PGP-nycklar...\n"
 
-#: crypt.c:668 crypt.c:708
+#: crypt.c:635 crypt.c:675
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Försöker att extrahera S/MIME-certifikat...\n"
 
-#: crypt.c:829
+#: crypt.c:796
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -798,7 +759,7 @@ msgstr ""
 "[-- Fel: Inkonsekvent \"multipart/signed\" struktur! --]\n"
 "\n"
 
-#: crypt.c:851
+#: crypt.c:818
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -807,7 +768,7 @@ msgstr ""
 "[-- Fel: Okänt \"multipart/signed\" protokoll %s! --]\n"
 "\n"
 
-#: crypt.c:891
+#: crypt.c:858
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -817,7 +778,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:903
+#: crypt.c:870
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -825,7 +786,7 @@ msgstr ""
 "[-- Följande data är signerat --]\n"
 "\n"
 
-#: crypt.c:909
+#: crypt.c:876
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -833,7 +794,7 @@ msgstr ""
 "[-- Varning: Kan inte hitta några signaturer. --]\n"
 "\n"
 
-#: crypt.c:915
+#: crypt.c:882
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -841,28 +802,28 @@ msgstr ""
 "\n"
 "[-- Slut på signerat data --]\n"
 
-#: curs_lib.c:157
+#: curs_lib.c:172
 msgid "yes"
 msgstr "ja"
 
-#: curs_lib.c:158
+#: curs_lib.c:173
 msgid "no"
 msgstr "nej"
 
 #. restore blocking operation
-#: curs_lib.c:254
+#: curs_lib.c:269
 msgid "Exit Mutt?"
 msgstr "Avsluta Mutt?"
 
-#: 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 "okänt fel"
 
-#: curs_lib.c:367
+#: curs_lib.c:382
 msgid "Press any key to continue..."
 msgstr "Tryck på valfri tangent för att fortsätta..."
 
-#: curs_lib.c:411
+#: curs_lib.c:426
 msgid " ('?' for list): "
 msgstr " (\"?\" för lista): "
 
@@ -1017,11 +978,11 @@ msgstr "Inga 
 msgid "You are on the first message."
 msgstr "Du är på det första meddelandet."
 
-#: curs_main.c:1333 pattern.c:1289
+#: curs_main.c:1333 pattern.c:1292
 msgid "Search wrapped to top."
 msgstr "Sökning fortsatte i början."
 
-#: curs_main.c:1342 pattern.c:1300
+#: curs_main.c:1342 pattern.c:1303
 msgid "Search wrapped to bottom."
 msgstr "Sökning fortsatte i slutet."
 
@@ -1049,8 +1010,8 @@ msgstr "Inga fler tr
 msgid "You are on the first thread."
 msgstr "Du är på den första tråden."
 
-#: 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 "Trådning är inte aktiverad."
 
@@ -1156,6 +1117,7 @@ msgid "could not write temporary mail folder: %s"
 msgstr "kunde inte skriva tillfällig brevfolder: %s"
 
 #: editmsg.c:101
+#, c-format
 msgid "could not truncate temporary mail folder: %s"
 msgstr "kunde inte stympa tillfällig brevfolder: %s"
 
@@ -1204,60 +1166,61 @@ msgstr "[-- Bilaga #%d"
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Typ: %s/%s, Kodning: %s, Storlek: %s --]\n"
 
-#: handler.c:1527
+#: handler.c:1530
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Automatisk visning med %s --]\n"
 
-#: handler.c:1528
+#: handler.c:1531
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Kommando för automatisk visning: %s"
 
-#: handler.c:1560
+#: handler.c:1563
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Kan inte köra %s. --]\n"
 
-#: handler.c:1578 handler.c:1599
+#: handler.c:1581 handler.c:1602
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- Automatisk visning av standardfel gällande %s --]\n"
 
-#: handler.c:1636
+#: handler.c:1639
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
-msgstr "[-- Fel: \"message/external-body\" har ingen åtkomsttypsparameter --]\n"
+msgstr ""
+"[-- Fel: \"message/external-body\" har ingen åtkomsttypsparameter --]\n"
 
-#: handler.c:1655
+#: handler.c:1658
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- Den här %s/%s bilagan "
 
-#: handler.c:1662
+#: handler.c:1665
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(storlek %s byte)"
 
-#: handler.c:1664
+#: handler.c:1667
 msgid "has been deleted --]\n"
 msgstr "har raderats --]\n"
 
-#: handler.c:1669
+#: handler.c:1672
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- på %s --]\n"
 
-#: handler.c:1674
+#: handler.c:1677
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- namn: %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 "[-- Den här %s/%s bilagan är inte inkluderad, --]\n"
 
-#: handler.c:1689
+#: handler.c:1692
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
@@ -1265,34 +1228,34 @@ msgstr ""
 "[-- och den indikerade externa källan har --]\n"
 "[-- utgått. --]\n"
 
-#: handler.c:1707
+#: handler.c:1710
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- och den indikerade åtkomsttypen %s stöds inte --]\n"
 
-#: handler.c:1815
+#: handler.c:1818
 msgid "Error: multipart/signed has no protocol."
 msgstr "Fel: \"multipart/signed\" har inget protokoll."
 
-#: handler.c:1825
+#: handler.c:1828
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Fel: \"multipart/encrypted\" har ingen protokollsparameter!"
 
-#: handler.c:1865
+#: handler.c:1868
 msgid "Unable to open temporary file!"
 msgstr "Kunde inte öppna tillfällig fil!"
 
-#: handler.c:1925
+#: handler.c:1929
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s stöds inte "
 
-#: handler.c:1930
+#: handler.c:1934
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(använd \"%s\" för att visa den här delen)"
 
-#: handler.c:1932
+#: handler.c:1936
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(\"view-attachments\" måste knytas till tangent!)"
 
@@ -1335,7 +1298,6 @@ msgid "Help for %s"
 msgstr "Hjälp för %s"
 
 #: hook.c:242
-#, c-format
 msgid "unhook: Can't do unhook * from within a hook."
 msgstr "\"unhook\": Kan inte göra \"unhook *\" inifrån en \"hook\"."
 
@@ -1391,14 +1353,15 @@ msgid "Login failed."
 msgstr "Inloggning misslyckades."
 
 #: imap/auth_sasl.c:112
+#, c-format
 msgid "Authenticating (%s)..."
 msgstr "Verifierar (%s)..."
 
-#: imap/auth_sasl.c:201 pop_auth.c:172
+#: imap/auth_sasl.c:208 pop_auth.c:172
 msgid "SASL authentication failed."
 msgstr "SASL-verifiering misslyckades."
 
-#: 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 är en ogiltig IMAP-sökväg"
@@ -1460,66 +1423,62 @@ msgstr "S
 msgid "Could not negotiate TLS connection"
 msgstr "Kunde inte förhandla fram TLS-anslutning"
 
-#: imap/imap.c:564
+#: imap/imap.c:565
 #, c-format
 msgid "Selecting %s..."
 msgstr "Väljer %s..."
 
-#: imap/imap.c:690
+#: imap/imap.c:691
 msgid "Error opening mailbox"
 msgstr "Fel vid öppning av brevlåda"
 
 #. STATUS not supported
-#: imap/imap.c:744
+#: imap/imap.c:745
 msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "Kunde inte lägga till IMAP-brevlådor på den här servern."
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:753 imap/message.c:600 muttlib.c:1215
+#: imap/imap.c:754 imap/message.c:600 muttlib.c:1222
 #, c-format
 msgid "Create %s?"
 msgstr "Skapa %s?"
 
-#: imap/imap.c:789
-msgid "Closing connection to IMAP server..."
-msgstr "Stänger anslutning till IMAP-server..."
-
-#: imap/imap.c:952 pop.c:461
+#: imap/imap.c:940 pop.c:461
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "Märker %d meddelanden som raderade..."
 
-#: imap/imap.c:961
+#: imap/imap.c:949
 msgid "Expunge failed"
 msgstr "Radering misslyckades"
 
-#: imap/imap.c:976
+#: imap/imap.c:964
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Sparar statusflaggor för meddelanden... [%d/%d]"
 
-#: imap/imap.c:1060
+#: imap/imap.c:1048
 msgid "Expunging messages from server..."
 msgstr "Raderar meddelanden från server..."
 
-#: imap/imap.c:1065
+#: imap/imap.c:1053
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE misslyckades"
 
-#: imap/imap.c:1099
+#: imap/imap.c:1087
 msgid "CLOSE failed"
 msgstr "CLOSE misslyckades"
 
-#: imap/imap.c:1342
+#: imap/imap.c:1330
 msgid "Bad mailbox name"
 msgstr "Dåligt namn på brevlåda"
 
-#: imap/imap.c:1354
+#: imap/imap.c:1342
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "Prenumererar på %s..."
 
-#: imap/imap.c:1356
+#: imap/imap.c:1344
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Avslutar prenumeration på %s..."
@@ -1565,173 +1524,185 @@ msgstr "Kopierar meddelande %d till %s..."
 msgid "Continue?"
 msgstr "Fortsätt?"
 
-#: init.c:611
+#: init.c:381
+#, c-format
+msgid "Bad regexp: %s"
+msgstr "Dåligt reguljärt uttryck: %s"
+
+#: init.c:624
+msgid "spam: no matching pattern"
+msgstr "spam: inget matchande mönster"
+
+#: init.c:626
+msgid "nospam: no matching pattern"
+msgstr "nospam: inget matchande mönster"
+
+#: init.c:789
 msgid "alias: no address"
 msgstr "alias: ingen adress"
 
-#: init.c:651
+#: init.c:834
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Varning: Dåligt IDN \"%s\" i alias \"%s\".\n"
 
-#: init.c:714
+#: init.c:912
 msgid "invalid header field"
 msgstr "ogiltigt huvudfält"
 
-#: init.c:767
+#: init.c:965
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: okänd sorteringsmetod"
 
-#: init.c:879
+#: init.c:1077
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): fel i reguljärt uttryck: %s\n"
 
-#: init.c:944
+#: init.c:1142
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: okänd variabel"
 
-#: init.c:953
-#, c-format
+#: init.c:1151
 msgid "prefix is illegal with reset"
 msgstr "prefix är otillåtet med \"reset\""
 
-#: init.c:959
-#, c-format
+#: init.c:1157
 msgid "value is illegal with reset"
 msgstr "värde är otillåtet med \"reset\""
 
-#: init.c:998
+#: init.c:1196
 #, c-format
 msgid "%s is set"
 msgstr "%s är satt"
 
-#: init.c:998
+#: init.c:1196
 #, c-format
 msgid "%s is unset"
 msgstr "%s är inte satt"
 
-#: init.c:1201
+#: init.c:1399
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s: ogiltig typ av brevlåda"
 
-#: init.c:1226 init.c:1271
+#: init.c:1424 init.c:1469
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: ogiltigt värde"
 
-#: init.c:1312
+#: init.c:1510
+#, c-format
 msgid "%s: Unknown type."
 msgstr "%s: Okänd typ."
 
-#: init.c:1338
+#: init.c:1536
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: okänd typ"
 
-#: init.c:1394
+#: init.c:1595
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Fel i %s, rad %d: %s"
 
 #. the muttrc source keyword
-#: init.c:1417
+#: init.c:1618
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: fel i %s"
 
-#: init.c:1418
+#: init.c:1619
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: läsningen avbruten pga för många fel i %s"
 
-#: init.c:1432
+#: init.c:1633
 #, c-format
 msgid "source: error at %s"
 msgstr "source: fel vid %s"
 
-#: init.c:1437
+#: init.c:1638
 msgid "source: too many arguments"
 msgstr "source: för många parametrar"
 
-#: init.c:1488
+#: init.c:1689
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: okänt kommando"
 
-#: init.c:1877
+#: init.c:2078
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Fel i kommandorad: %s\n"
 
-#: init.c:1926
+#: init.c:2127
 msgid "unable to determine home directory"
 msgstr "kunde inte avgöra hemkatalog"
 
-#: init.c:1934
+#: init.c:2135
 msgid "unable to determine username"
 msgstr "kunde inte avgöra användarnamn"
 
-#: keymap.c:455
+#: keymap.c:459
 msgid "Macro loop detected."
 msgstr "Oändlig slinga i macro upptäckt."
 
-#: keymap.c:660 keymap.c:668
+#: keymap.c:669 keymap.c:677
 msgid "Key is not bound."
 msgstr "Tangent är inte knuten."
 
-#: keymap.c:672
+#: keymap.c:681
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Tangent är inte knuten. Tryck \"%s\" för hjälp."
 
-#: keymap.c:683
+#: keymap.c:692
 msgid "push: too many arguments"
 msgstr "push: för många parametrar"
 
-#: keymap.c:713
+#: keymap.c:722
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s: ingen sådan meny"
 
-#: keymap.c:728
+#: keymap.c:737
 msgid "null key sequence"
 msgstr "tom tangentsekvens"
 
-#: keymap.c:808
+#: keymap.c:824
 msgid "bind: too many arguments"
 msgstr "bind: för många parametrar"
 
-#: keymap.c:831
+#: keymap.c:847
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s: ingen sådan funktion i tabell"
 
-#: keymap.c:855
+#: keymap.c:871
 msgid "macro: empty key sequence"
 msgstr "macro: tom tangentsekvens"
 
-#: keymap.c:866
+#: keymap.c:882
 msgid "macro: too many arguments"
 msgstr "macro: för många parametrar"
 
-#: keymap.c:902
+#: keymap.c:918
 msgid "exec: no arguments"
 msgstr "exec: inga parametrar"
 
-#: keymap.c:922
+#: keymap.c:938
 #, c-format
 msgid "%s: no such function"
 msgstr "%s: ingen sådan funktion"
 
-#: keymap.c:943
+#: keymap.c:959
 msgid "Enter keys (^G to abort): "
 msgstr "Ange nycklar (^G för att avbryta): "
 
-#: keymap.c:948
+#: keymap.c:964
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr "Tecken = %s, Oktal = %o, Decimal = %d"
@@ -2520,7 +2491,7 @@ msgstr "Heltals
 msgid "Out of memory!"
 msgstr "Slut på minne!"
 
-#: 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"
@@ -2529,7 +2500,7 @@ msgstr ""
 "org>.\n"
 "För att rapportera ett fel, var vänlig använd verktyget 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"
@@ -2541,7 +2512,7 @@ msgstr ""
 "Mutt är fri mjukvara, och du är välkommen att sprida det vidare\n"
 "under vissa villkor; kör `mutt -vv' för detaljer.\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"
@@ -2596,7 +2567,7 @@ msgstr ""
 "    Foundation,Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, "
 "USA.\n"
 
-#: main.c:94
+#: main.c:95
 msgid ""
 "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
@@ -2634,8 +2605,8 @@ msgid ""
 msgstr ""
 "usage: mutt [ -nRyzZ ] [ -e <kommando> ] [ -F <fil> ] [ -m <typ> ] [ -f "
 "<fil> ]\n"
-"       mutt [ -nR ] [ -e <kommando> ] [ -F <fil> ] -Q <variabel> [ -Q <variabel> ] "
-"[...]\n"
+"       mutt [ -nR ] [ -e <kommando> ] [ -F <fil> ] -Q <variabel> [ -Q "
+"<variabel> ] [...]\n"
 "       mutt [ -nR ] [ -e <kommando> ] [ -F <fil> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
 "       mutt [ -nx ] [ -e <kommando> ] [ -a <fil> ] [ -F <fil> ] [ -H <fil> ] "
@@ -2658,8 +2629,8 @@ msgstr ""
 "  -p\t\tåterkalla ett uppskjutet meddelande\n"
 "  -Q <variabel>\tundersök värdet på en konfigurationsvariabel\n"
 "  -R\t\töppna brevlåda i skrivskyddat läge\n"
-"  -s <ämne>\tange ett ämne (måste vara inom citationstecken om det innehåller "
-"blanksteg)\n"
+"  -s <ämne>\tange ett ämne (måste vara inom citationstecken om det "
+"innehåller blanksteg)\n"
 "  -v\t\tvisa version och definitioner vid kompileringen\n"
 "  -x\t\tsimulera mailx's sändläge\n"
 "  -y\t\tvälj en brevlåda specifierad i din \"mailboxes\"-lista\n"
@@ -2668,7 +2639,7 @@ msgstr ""
 "om inget finns\n"
 "  -h\t\tden här hjälptexten"
 
-#: main.c:162
+#: main.c:163
 msgid ""
 "\n"
 "Compile options:"
@@ -2676,47 +2647,47 @@ msgstr ""
 "\n"
 "Kompileringsval:"
 
-#: main.c:454
+#: main.c:455
 msgid "Error initializing terminal."
 msgstr "Fel vid initiering av terminalen."
 
-#: main.c:559
+#: main.c:560
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "Avlusning på nivå %d.\n"
 
-#: main.c:561
+#: main.c:562
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "DEBUG var inte valt vid kompilering. Ignoreras.\n"
 
-#: main.c:706
+#: main.c:710
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s finns inte. Skapa den?"
 
-#: main.c:710
+#: main.c:714
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Kan inte skapa %s: %s."
 
-#: main.c:755
+#: main.c:759
 msgid "No recipients specified.\n"
 msgstr "Inga mottagare angivna.\n"
 
-#: main.c:841
+#: main.c:845
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: kunde inte bifoga fil.\n"
 
-#: main.c:861
+#: main.c:865
 msgid "No mailbox with new mail."
 msgstr "Ingen brevlåda med nya brev."
 
-#: main.c:870
+#: main.c:874
 msgid "No incoming mailboxes defined."
 msgstr "Inga inkommande brevlådor definierade."
 
-#: main.c:897
+#: main.c:901
 msgid "Mailbox is empty."
 msgstr "Brevlådan är tom."
 
@@ -2821,19 +2792,19 @@ msgstr "Du 
 msgid "You are on the first entry."
 msgstr "Du är på den första posten."
 
-#: menu.c:714 pattern.c:1235
+#: menu.c:714 pattern.c:1238
 msgid "Search for: "
 msgstr "Sök efter: "
 
-#: menu.c:715 pattern.c:1236
+#: menu.c:715 pattern.c:1239
 msgid "Reverse search for: "
 msgstr "Sök i omvänd ordning efter: "
 
-#: menu.c:725 pattern.c:1268
+#: menu.c:725 pattern.c:1271
 msgid "No search pattern."
 msgstr "Inget sökmönster."
 
-#: menu.c:755 pager.c:1925 pager.c:1941 pager.c:2049 pattern.c:1333
+#: menu.c:755 pager.c:1925 pager.c:1941 pager.c:2049 pattern.c:1336
 msgid "Not found."
 msgstr "Hittades inte."
 
@@ -2853,49 +2824,49 @@ msgstr "Hoppning 
 msgid "Tagging is not supported."
 msgstr "Märkning stöds inte."
 
-#: mh.c:655
+#: mh.c:655 mh.c:798
 #, c-format
 msgid "Reading %s... %d"
 msgstr "Läser %s... %d"
 
-#: mh.c:1041
+#: mh.c:1045
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): kunde inte sätta tid på fil"
 
-#: muttlib.c:835
+#: muttlib.c:842
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr "Filen är en katalog, spar i den? [(j)a, n(ej), (a)lla]"
 
-#: 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 "Filen är en katalog, spar i den?"
 
-#: muttlib.c:857
+#: muttlib.c:864
 msgid "File under directory: "
 msgstr "Fil i katalog: "
 
-#: muttlib.c:869
+#: muttlib.c:876
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "Filen finns, skriv (ö)ver, (l)ägg till, eller (a)vbryt?"
 
-#: muttlib.c:869
+#: muttlib.c:876
 msgid "oac"
 msgstr "öla"
 
-#: muttlib.c:1180
+#: muttlib.c:1187
 msgid "Can't save message to POP mailbox."
 msgstr "Kan inte spara meddelande till POP-brevlåda."
 
-#: muttlib.c:1189
+#: muttlib.c:1196
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s är inte en brevlåda!"
 
-#: muttlib.c:1195
+#: muttlib.c:1202
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Lägg till meddelanden till %s?"
@@ -2988,7 +2959,6 @@ msgid "Unknown"
 msgstr "Okänd"
 
 #: mutt_ssl.c:406
-#, c-format
 msgid "[unable to calculate]"
 msgstr "[kan inte beräkna]"
 
@@ -3013,7 +2983,6 @@ msgid "This certificate was issued by:"
 msgstr "Det här certifikatet utfärdades av:"
 
 #: mutt_ssl.c:601
-#, c-format
 msgid "This certificate is valid"
 msgstr "Det här certifikatet är giltigt"
 
@@ -3052,7 +3021,7 @@ msgstr "(f)
 msgid "ro"
 msgstr "fg"
 
-#: mutt_ssl.c:625 pgpkey.c:510 smime.c:410
+#: mutt_ssl.c:625 pgpkey.c:510 smime.c:425
 msgid "Exit  "
 msgstr "Avsluta "
 
@@ -3221,102 +3190,105 @@ msgstr "Ingen mer citerad text."
 msgid "No more unquoted text after quoted text."
 msgstr "Ingen mer ociterad text efter citerad text."
 
-#: parse.c:597
+#: parse.c:598
 msgid "multipart message has no boundary parameter!"
 msgstr "\"multipart\"-meddelande har ingen avgränsningsparameter!"
 
-#: pattern.c:239
+#: pattern.c:240
 #, c-format
 msgid "Error in expression: %s"
 msgstr "Fel i uttryck: %s"
 
-#: pattern.c:349
+#: pattern.c:350
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "Ogiltig dag i månaden: %s"
 
-#: pattern.c:363
+#: pattern.c:364
 #, c-format
 msgid "Invalid month: %s"
 msgstr "Ogiltig månad: %s"
 
 #. getDate has its own error message, don't overwrite it here
-#: pattern.c:515
+#: pattern.c:516
 #, c-format
 msgid "Invalid relative date: %s"
 msgstr "Ogiltigt relativt datum: %s"
 
-#: pattern.c:529
+#: pattern.c:530
 msgid "error in expression"
 msgstr "fel i uttryck"
 
-#: pattern.c:735 pattern.c:843
+#: pattern.c:736 pattern.c:844
 #, c-format
 msgid "error in pattern at: %s"
 msgstr "fel i mönster vid: %s"
 
-#: pattern.c:783
+#: pattern.c:784
 #, c-format
 msgid "%c: invalid command"
 msgstr "%c: ogiltigt kommando"
 
-#: pattern.c:789
+#: pattern.c:790
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr "%c: stöds inte i det här läget"
 
-#: pattern.c:802
-#, c-format
+#: pattern.c:803
 msgid "missing parameter"
 msgstr "saknar parameter"
 
-#: pattern.c:818
+#: pattern.c:819
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "missmatchande parentes: %s"
 
-#: pattern.c:850
+#: pattern.c:851
 msgid "empty pattern"
 msgstr "tomt mönster"
 
-#: pattern.c:1054
+#: pattern.c:1057
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "fel: okänd operation %d (rapportera det här felet)."
 
-#: pattern.c:1123 pattern.c:1254
+#: pattern.c:1126 pattern.c:1257
 msgid "Compiling search pattern..."
 msgstr "Kompilerar sökmönster..."
 
-#: pattern.c:1137
+#: pattern.c:1140
 msgid "Executing command on matching messages..."
 msgstr "Kör kommando på matchande meddelanden..."
 
-#: pattern.c:1199
+#: pattern.c:1202
 msgid "No messages matched criteria."
 msgstr "Inga meddelanden matchade kriteriet."
 
-#: pattern.c:1292
+#: pattern.c:1295
 msgid "Search hit bottom without finding match"
 msgstr "Sökning nådde slutet utan att hitta träff"
 
-#: pattern.c:1303
+#: pattern.c:1306
 msgid "Search hit top without finding match"
 msgstr "Sökning nådde början utan att hitta träff"
 
-#: pattern.c:1325
+#: pattern.c:1328
 msgid "Search interrupted."
 msgstr "Sökning avbruten."
 
-#: pgp.c:73
+#: pgp.c:86
+msgid "Enter PGP passphrase:"
+msgstr "Mata in PGP-lösenfras:"
+
+#: pgp.c:100
 msgid "PGP passphrase forgotten."
 msgstr "PGP-lösenfras glömd."
 
-#: pgp.c:308
+#: pgp.c:337
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Fel: kunde inte skapa PGP-underprocess! --]\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"
@@ -3324,7 +3296,7 @@ msgstr ""
 "[-- Slut på PGP-utdata --]\n"
 "\n"
 
-#: pgp.c:352
+#: pgp.c:381
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -3332,11 +3304,11 @@ msgstr ""
 "[-- PGP-MEDDELANDE BÖRJAR --]\n"
 "\n"
 
-#: pgp.c:354
+#: pgp.c:383
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- START PÅ BLOCK MED PUBLIK PGP-NYCKEL --]\n"
 
-#: pgp.c:356
+#: pgp.c:385
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -3344,19 +3316,19 @@ msgstr ""
 "[-- START PÅ PGP-SIGNERAT MEDDELANDE --]\n"
 "\n"
 
-#: pgp.c:381
+#: pgp.c:410
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr "[-- PGP-MEDDELANDE SLUTAR --]\n"
 
-#: pgp.c:383
+#: pgp.c:412
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- SLUT PÅ BLOCK MED PUBLIK PGP-NYCKEL --]\n"
 
-#: pgp.c:385
+#: pgp.c:414
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr "[-- SLUT PÅ PGP-SIGNERAT MEDDELANDE --]\n"
 
-#: pgp.c:412
+#: pgp.c:441
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -3364,11 +3336,11 @@ msgstr ""
 "[-- Fel: kunde inte hitta början av PGP-meddelande! --]\n"
 "\n"
 
-#: pgp.c:662
+#: pgp.c:691
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Internt fel. Informera <roessler@does-not-exist.org>."
 
-#: pgp.c:722
+#: pgp.c:751
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3376,7 +3348,7 @@ msgstr ""
 "[-- Fel: kunde inte skapa en PGP-underprocess! --]\n"
 "\n"
 
-#: pgp.c:821
+#: pgp.c:850
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -3384,11 +3356,11 @@ msgstr ""
 "[-- Fel: missformat PGP/MIME-meddelande! --]\n"
 "\n"
 
-#: pgp.c:834
+#: pgp.c:863
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- Fel: kunde inte skapa tillfällig fil! --]\n"
 
-#: pgp.c:843
+#: pgp.c:872
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
@@ -3396,28 +3368,50 @@ msgstr ""
 "[-- Följande data är PGP/MIME-krypterad --]\n"
 "\n"
 
-#: pgp.c:863
+#: pgp.c:892
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr "[-- Slut på PGP/MIME-krypterad data --]\n"
 
-#: pgp.c:913
+#: pgp.c:942
 msgid "Can't open PGP subprocess!"
 msgstr "Kan inte öppna PGP-underprocess!"
 
-#: pgp.c:1057
+#: pgp.c:1086
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "Använd nyckel-ID = \"%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 "Ange nyckel-ID för %s: "
 
-#: pgp.c:1345
+#: pgp.c:1374
 msgid "Can't invoke PGP"
 msgstr "Kan inte starta PGP"
 
+#: pgp.c:1468
+#, c-format
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "PGP (k)ryptera, (s)ignera, signera s(o)m, (b)åda %s, eller (r)ensa? "
+
+#: pgp.c:1469
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+#: pgp.c:1469
+msgid "(i)nline"
+msgstr "(i)nfogat"
+
+#: pgp.c:1471
+msgid "esabifc"
+msgstr "ksobr"
+
+#. sign (a)s
+#: pgp.c:1486 smime.c:1989
+msgid "Sign as: "
+msgstr "Signera som: "
+
 #: pgpinvoke.c:303
 msgid "Fetching PGP key..."
 msgstr "Hämtar PGP-nyckel..."
@@ -3427,7 +3421,7 @@ msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Alla matchande nycklar är utgångna, återkallade, eller inaktiverade."
 
 #. __STRCAT_CHECKED__
-#: pgpkey.c:512 smime.c:412
+#: pgpkey.c:512 smime.c:427
 msgid "Select  "
 msgstr "Välj  "
 
@@ -3503,7 +3497,6 @@ msgid "Looking for keys matching \"%s\"..."
 msgstr "Söker efter nycklar som matchar \"%s\"..."
 
 #: pop.c:86 pop_lib.c:197
-#, c-format
 msgid "Command TOP is not supported by server."
 msgstr "Kommandot TOP stöds inte av servern."
 
@@ -3512,7 +3505,6 @@ msgid "Can't write header to temporary file!"
 msgstr "Kan inte skriva huvud till tillfällig fil!"
 
 #: pop.c:194 pop_lib.c:199
-#, c-format
 msgid "Command UIDL is not supported by server."
 msgstr "Kommandot UIDL stöds inte av servern."
 
@@ -3576,7 +3568,6 @@ msgid "APOP authentication failed."
 msgstr "APOP-verifiering misslyckades."
 
 #: pop_auth.c:264
-#, c-format
 msgid "Command USER is not supported by server."
 msgstr "Kommandot USER stöds inte av servern."
 
@@ -3617,7 +3608,11 @@ msgstr "Otill
 msgid "Illegal S/MIME header"
 msgstr "Otillåtet S/MIME-huvud"
 
-#: postpone.c:559
+#: postpone.c:552
+msgid "Decrypting message..."
+msgstr "Dekrypterar meddelande..."
+
+#: postpone.c:561
 msgid "Decryption failed."
 msgstr "Dekryptering misslyckades."
 
@@ -3642,7 +3637,6 @@ msgid "Query command not defined."
 msgstr "Sökkommando ej definierat."
 
 #: query.c:286
-#, c-format
 msgid "Query"
 msgstr "Sökning"
 
@@ -3751,7 +3745,6 @@ msgstr "Vidarebefordra som bilagor?"
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr "Kan inte avkoda alla märkta bilagor. MIME-vidarebefordra de övriga?"
 
-
 #: recvcmd.c:583
 msgid "Forward MIME encapsulated?"
 msgstr "Vidarebefordra MIME inkapslat?"
@@ -3765,7 +3758,7 @@ msgstr "Kan inte skapa %s."
 msgid "Can't find any tagged messages."
 msgstr "Kan inte hitta några märkta meddelanden."
 
-#: recvcmd.c:745 send.c:707
+#: recvcmd.c:745 send.c:711
 msgid "No mailing lists found!"
 msgstr "Inga sändlistor hittades!"
 
@@ -3861,11 +3854,11 @@ msgstr "score: f
 msgid "score: too many arguments"
 msgstr "score: för många parametrar"
 
-#: send.c:247
+#: send.c:248
 msgid "No subject, abort?"
 msgstr "Inget ärende, avbryt?"
 
-#: send.c:249
+#: send.c:250
 msgid "No subject, aborting."
 msgstr "Inget ärende, avbryter."
 
@@ -3874,12 +3867,12 @@ msgstr "Inget 
 #. * 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 "Svara till %s%s?"
 
-#: send.c:517
+#: send.c:518
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "Svara till %s%s?"
@@ -3887,82 +3880,82 @@ msgstr "Svara till %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 "Inga märkta meddelanden är synliga!"
 
-#: send.c:733
+#: send.c:737
 msgid "Include message in reply?"
 msgstr "Inkludera meddelande i svar?"
 
-#: send.c:738
+#: send.c:742
 msgid "Including quoted message..."
 msgstr "Inkluderar citerat meddelande..."
 
-#: send.c:748
+#: send.c:752
 msgid "Could not include all requested messages!"
 msgstr "Kunde inte inkludera alla begärda meddelanden!"
 
-#: send.c:762
+#: send.c:766
 msgid "Forward as attachment?"
 msgstr "Vidarebefordra som bilaga?"
 
-#: send.c:766
+#: send.c:770
 msgid "Preparing forwarded message..."
 msgstr "Förbereder vidarebefordrat meddelande..."
 
 #. 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 "Återkalla uppskjutet meddelande?"
 
-#: send.c:1343
+#: send.c:1357
 msgid "Edit forwarded message?"
 msgstr "Redigera vidarebefordrat meddelande?"
 
-#: send.c:1366
+#: send.c:1380
 msgid "Abort unmodified message?"
 msgstr "Meddelandet har inte ändrats. Avbryt?"
 
-#: send.c:1368
+#: send.c:1382
 msgid "Aborted unmodified message."
 msgstr "Meddelandet har inte ändrats. Avbröt."
 
-#: send.c:1437
+#: send.c:1451
 msgid "Message postponed."
 msgstr "Meddelande uppskjutet."
 
-#: send.c:1446
+#: send.c:1460
 msgid "No recipients are specified!"
 msgstr "Inga mottagare är angivna!"
 
-#: send.c:1451
+#: send.c:1465
 msgid "No recipients were specified."
 msgstr "Inga mottagare blev angivna."
 
-#: send.c:1467
+#: send.c:1481
 msgid "No subject, abort sending?"
 msgstr "Inget ärende, avbryt sändning?"
 
-#: send.c:1471
+#: send.c:1485
 msgid "No subject specified."
 msgstr "Inget ärende angivet."
 
-#: send.c:1533
+#: send.c:1547
 msgid "Sending message..."
 msgstr "Skickar meddelande..."
 
-#: send.c:1674
+#: send.c:1688
 msgid "Could not send the message."
 msgstr "Kunde inte skicka meddelandet."
 
-#: send.c:1679
+#: send.c:1693
 msgid "Mail sent."
 msgstr "Brevet skickat."
 
-#: send.c:1679
+#: send.c:1693
 msgid "Sending in background."
 msgstr "Skickar i bakgrunden."
 
@@ -4014,100 +4007,104 @@ msgstr "F
 msgid "Caught signal %d...  Exiting.\n"
 msgstr "Fångade signal %d...  Avslutar.\n"
 
-#: smime.c:300
+#: smime.c:105
+msgid "Enter SMIME passphrase:"
+msgstr "Mata in SMIME-lösenfras:"
+
+#: smime.c:315
 msgid "Trusted   "
 msgstr "Betrodd   "
 
-#: smime.c:303
+#: smime.c:318
 msgid "Verified  "
 msgstr "Verifierad   "
 
-#: smime.c:306
+#: smime.c:321
 msgid "Unverified"
 msgstr "Overifierad"
 
-#: smime.c:309
+#: smime.c:324
 msgid "Expired   "
 msgstr "Utgången   "
 
-#: smime.c:312
+#: smime.c:327
 msgid "Revoked   "
 msgstr "Återkallad   "
 
-#: smime.c:315
+#: smime.c:330
 msgid "Invalid   "
 msgstr "Ogiltig   "
 
-#: smime.c:318
+#: smime.c:333
 msgid "Unknown   "
 msgstr "Okänd   "
 
-#: smime.c:347
+#: smime.c:362
 msgid "Enter keyID: "
 msgstr "Ange nyckel-ID: "
 
-#: smime.c:370
+#: smime.c:385
 #, c-format
 msgid "S/MIME certificates matching \"%s\"."
 msgstr "S/MIME-certifikat som matchar \"%s\"."
 
-#: 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:t %s är overifierad. Vill du använda det till %s?"
 
-#: smime.c:523 smime.c:592
+#: smime.c:538 smime.c:607
 #, c-format
 msgid "Use (untrusted!) ID %s for %s ?"
 msgstr "Använd (obetrott!) ID %s till %s?"
 
-#: smime.c:526 smime.c:595
+#: smime.c:541 smime.c:610
 #, c-format
 msgid "Use ID %s for %s ?"
 msgstr "Använd ID %s till %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 ""
 "Varning: Du har ännu inte valt att lita på ID %s. (valfri tangent för att "
 "fortsätta)"
 
-#: smime.c:787
+#: smime.c:802
 #, c-format
 msgid "No (valid) certificate found for %s."
 msgstr "Inga (giltiga) certifikat hittades för %s."
 
-#: 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 "Fel: kunde inte skapa S/MIME-underprocess!"
 
-#: smime.c:1197
+#: smime.c:1212
 msgid "no certfile"
 msgstr "ingen certifikatfil"
 
-#: smime.c:1200
+#: smime.c:1215
 msgid "no mbox"
 msgstr "ingen mbox"
 
 #. fatal error while trying to encrypt message
-#: smime.c:1343
+#: smime.c:1358
 msgid "No output from OpenSSL.."
 msgstr "Ingen utdata från OpenSSL..."
 
-#: smime.c:1381
+#: smime.c:1396
 msgid "Warning: Intermediate certificate not found."
 msgstr "Varning: Temporärt certifikat hittas inte."
 
-#: smime.c:1426
+#: smime.c:1441
 msgid "Can't open OpenSSL subprocess!"
 msgstr "Kan inte öppna OpenSSL-underprocess!"
 
-#: smime.c:1464
+#: smime.c:1479
 msgid "No output from OpenSSL..."
 msgstr "Ingen utdata från OpenSSL..."
 
-#: smime.c:1629 smime.c:1751
+#: smime.c:1644 smime.c:1766
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4115,23 +4112,23 @@ msgstr ""
 "[-- Slut på utdata från OpenSSL --]\n"
 "\n"
 
-#: smime.c:1712 smime.c:1722
+#: smime.c:1727 smime.c:1737
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Fel: kunde inte skapa OpenSSL-underprocess! --]\n"
 
-#: smime.c:1755
+#: smime.c:1770
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- Följande data är S/MIME-krypterad --]\n"
 "\n"
 
-#: smime.c:1758
+#: smime.c:1773
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- Följande data är S/MIME-signerad --]\n"
 "\n"
 
-#: smime.c:1822
+#: smime.c:1837
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4139,7 +4136,7 @@ msgstr ""
 "\n"
 "[-- Slut på S/MIME-krypterad data. --]\n"
 
-#: smime.c:1824
+#: smime.c:1839
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4147,11 +4144,36 @@ msgstr ""
 "\n"
 "[-- Slut på S/MIME-signerad data. --]\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 (k)ryptera, (s)ignera, kryptera (m)ed, signera s(o)m, (b)åda, eller "
+"(r)ensa? "
+
+#: smime.c:1944
+msgid "eswabfc"
+msgstr "ksmobr"
+
+#: 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 eller (g)löm det? "
+
+#: smime.c:1955
+msgid "12345f"
+msgstr "12345g"
+
+#: smime.c:1979
+msgid "Can't sign: No key specified. Use Sign As."
+msgstr "Kan inte signera: Inget nyckel angiven. Använd signera som."
+
+#: sort.c:255
 msgid "Sorting mailbox..."
 msgstr "Sorterar brevlåda..."
 
-#: sort.c:239
+#: sort.c:292
 msgid "Could not find sorting function! [report this bug]"
 msgstr "Kunde inte hitta sorteringsfunktion! [Rapportera det här felet]"
 
@@ -4159,10 +4181,13 @@ msgstr "Kunde inte hitta sorteringsfunktion! [Rapportera det h
 msgid "(no mailbox)"
 msgstr "(ingen brevlåda)"
 
-#: thread.c:1081
+#: thread.c:1085
 msgid "Parent message is not visible in this limited view."
 msgstr "Första meddelandet är inte synligt i den här begränsade vyn"
 
-#: thread.c:1087
+#: thread.c:1091
 msgid "Parent message is not available."
 msgstr "Första meddelandet är inte tillgängligt."
+
+#~ msgid "Closing connection to IMAP server..."
+#~ msgstr "Stänger anslutning till IMAP-server..."