Updated Swedish translation.

2001-05-26  Christian Rose  <menthos@menthos.com>

	* po/sv.po: Updated Swedish translation.

svn path=/trunk/; revision=10009

2 files changed, 1737 insertions, 1128 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index f315e79135..95b2d15b4e 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-26  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
 2001-05-26  Pablo Saratxaga <pablo@mandrakesoft.com>
 
 	* az.po: Updated Azeri file
diff --git a/po/sv.po b/po/sv.po
index 6e673b86d0..bc95bd10ce 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,24 +5,24 @@
 # Christian Rose <menthos@menthos.com>, 2000-2001.
 # Martin Norbäck <d95mback@dtek.chalmers.se>, 2001.
 #
-# $Id: sv.po,v 1.73 2001/05/10 01:58:19 menthos Exp $
+# $Id: sv.po,v 1.74 2001/05/26 15:19:15 menthos Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-05-10 03:55+0200\n"
-"PO-Revision-Date: 2001-05-10 03:57+0200\n"
+"POT-Creation-Date: 2001-05-26 17:11+0200\n"
+"PO-Revision-Date: 2001-05-26 17:14+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\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"
 
-#: addressbook/backend/ebook/e-card.c:3278
+#: addressbook/backend/ebook/e-card.c:3314
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3280
+#: addressbook/backend/ebook/e-card.c:3316
 msgid ""
 "\n"
 "Name: "
@@ -30,7 +30,7 @@ msgstr ""
 "\n"
 "Namn: "
 
-#: addressbook/backend/ebook/e-card.c:3281
+#: addressbook/backend/ebook/e-card.c:3317
 msgid ""
 "\n"
 "  Prefix:     "
@@ -38,7 +38,7 @@ msgstr ""
 "\n"
 "  Prefix:     "
 
-#: addressbook/backend/ebook/e-card.c:3282
+#: addressbook/backend/ebook/e-card.c:3318
 msgid ""
 "\n"
 "  Given:      "
@@ -46,7 +46,7 @@ msgstr ""
 "\n"
 "  Förnamn:    "
 
-#: addressbook/backend/ebook/e-card.c:3283
+#: addressbook/backend/ebook/e-card.c:3319
 msgid ""
 "\n"
 "  Additional: "
@@ -54,7 +54,7 @@ msgstr ""
 "\n"
 "  Andranamn:  "
 
-#: addressbook/backend/ebook/e-card.c:3284
+#: addressbook/backend/ebook/e-card.c:3320
 msgid ""
 "\n"
 "  Family:     "
@@ -62,7 +62,7 @@ msgstr ""
 "\n"
 "  Efternamn:  "
 
-#: addressbook/backend/ebook/e-card.c:3285
+#: addressbook/backend/ebook/e-card.c:3321
 msgid ""
 "\n"
 "  Suffix:     "
@@ -70,7 +70,7 @@ msgstr ""
 "\n"
 "  Suffix:     "
 
-#: addressbook/backend/ebook/e-card.c:3299
+#: addressbook/backend/ebook/e-card.c:3335
 msgid ""
 "\n"
 "Birth Date: "
@@ -78,7 +78,7 @@ msgstr ""
 "\n"
 "Födelsedatum: "
 
-#: addressbook/backend/ebook/e-card.c:3310
+#: addressbook/backend/ebook/e-card.c:3346
 msgid ""
 "\n"
 "Address:"
@@ -86,7 +86,7 @@ msgstr ""
 "\n"
 "Adress:"
 
-#: addressbook/backend/ebook/e-card.c:3312
+#: addressbook/backend/ebook/e-card.c:3348
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -94,7 +94,7 @@ msgstr ""
 "\n"
 "  Box:           "
 
-#: addressbook/backend/ebook/e-card.c:3313
+#: addressbook/backend/ebook/e-card.c:3349
 msgid ""
 "\n"
 "  Ext:         "
@@ -102,7 +102,7 @@ msgstr ""
 "\n"
 "  Anknytning:    "
 
-#: addressbook/backend/ebook/e-card.c:3314
+#: addressbook/backend/ebook/e-card.c:3350
 msgid ""
 "\n"
 "  Street:      "
@@ -110,7 +110,7 @@ msgstr ""
 "\n"
 "  Gatuadress:    "
 
-#: addressbook/backend/ebook/e-card.c:3315
+#: addressbook/backend/ebook/e-card.c:3351
 msgid ""
 "\n"
 "  City:        "
@@ -118,7 +118,7 @@ msgstr ""
 "\n"
 "  Ort:           "
 
-#: addressbook/backend/ebook/e-card.c:3316
+#: addressbook/backend/ebook/e-card.c:3352
 msgid ""
 "\n"
 "  Region:      "
@@ -126,7 +126,7 @@ msgstr ""
 "\n"
 "  Region:        "
 
-#: addressbook/backend/ebook/e-card.c:3317
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "  Postal Code: "
@@ -134,7 +134,7 @@ msgstr ""
 "\n"
 "  Postnummer:    "
 
-#: addressbook/backend/ebook/e-card.c:3318
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Country:     "
@@ -142,7 +142,7 @@ msgstr ""
 "\n"
 "  Land:          "
 
-#: addressbook/backend/ebook/e-card.c:3331
+#: addressbook/backend/ebook/e-card.c:3367
 msgid ""
 "\n"
 "Delivery Label: "
@@ -150,7 +150,7 @@ msgstr ""
 "\n"
 "Leveransetikett: "
 
-#: addressbook/backend/ebook/e-card.c:3343
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Telephones:\n"
@@ -158,7 +158,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3346
+#: addressbook/backend/ebook/e-card.c:3382
 msgid ""
 "\n"
 "Telephone:"
@@ -166,7 +166,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3370
+#: addressbook/backend/ebook/e-card.c:3406
 msgid ""
 "\n"
 "E-mail:\n"
@@ -174,7 +174,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3373
+#: addressbook/backend/ebook/e-card.c:3409
 msgid ""
 "\n"
 "E-mail:"
@@ -182,7 +182,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3392
+#: addressbook/backend/ebook/e-card.c:3428
 msgid ""
 "\n"
 "Mailer: "
@@ -190,7 +190,7 @@ msgstr ""
 "\n"
 "E-postprogram: "
 
-#: addressbook/backend/ebook/e-card.c:3398
+#: addressbook/backend/ebook/e-card.c:3434
 msgid ""
 "\n"
 "Time Zone: "
@@ -198,7 +198,7 @@ msgstr ""
 "\n"
 "Tidszon: "
 
-#: addressbook/backend/ebook/e-card.c:3406
+#: addressbook/backend/ebook/e-card.c:3442
 msgid ""
 "\n"
 "Geo Location: "
@@ -206,7 +206,7 @@ msgstr ""
 "\n"
 "Geografisk plats: "
 
-#: addressbook/backend/ebook/e-card.c:3410
+#: addressbook/backend/ebook/e-card.c:3446
 msgid ""
 "\n"
 "Business Role: "
@@ -214,7 +214,7 @@ msgstr ""
 "\n"
 "Yrkesroll: "
 
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3458
 msgid ""
 "\n"
 "Org: "
@@ -222,7 +222,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3423
+#: addressbook/backend/ebook/e-card.c:3459
 msgid ""
 "\n"
 "  Name:  "
@@ -230,7 +230,7 @@ msgstr ""
 "\n"
 "  Namn:    "
 
-#: addressbook/backend/ebook/e-card.c:3424
+#: addressbook/backend/ebook/e-card.c:3460
 msgid ""
 "\n"
 "  Unit:  "
@@ -238,7 +238,7 @@ msgstr ""
 "\n"
 "  Enhet:   "
 
-#: addressbook/backend/ebook/e-card.c:3425
+#: addressbook/backend/ebook/e-card.c:3461
 msgid ""
 "\n"
 "  Unit2: "
@@ -246,7 +246,7 @@ msgstr ""
 "\n"
 "  Enhet 2: "
 
-#: addressbook/backend/ebook/e-card.c:3426
+#: addressbook/backend/ebook/e-card.c:3462
 msgid ""
 "\n"
 "  Unit3: "
@@ -254,7 +254,7 @@ msgstr ""
 "\n"
 "  Enhet 3: "
 
-#: addressbook/backend/ebook/e-card.c:3427
+#: addressbook/backend/ebook/e-card.c:3463
 msgid ""
 "\n"
 "  Unit4: "
@@ -262,7 +262,7 @@ msgstr ""
 "\n"
 "  Enhet 4: "
 
-#: addressbook/backend/ebook/e-card.c:3431
+#: addressbook/backend/ebook/e-card.c:3467
 msgid ""
 "\n"
 "Categories: "
@@ -270,7 +270,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3432
+#: addressbook/backend/ebook/e-card.c:3468
 msgid ""
 "\n"
 "Comment: "
@@ -288,7 +288,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3445
+#: addressbook/backend/ebook/e-card.c:3481
 msgid ""
 "\n"
 "Unique String: "
@@ -296,7 +296,7 @@ msgstr ""
 "\n"
 "Unik sträng: "
 
-#: addressbook/backend/ebook/e-card.c:3448
+#: addressbook/backend/ebook/e-card.c:3484
 msgid ""
 "\n"
 "Public Key: "
@@ -304,16 +304,16 @@ msgstr ""
 "\n"
 "Publik nyckel: "
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3745
 msgid "Multiple VCards"
 msgstr "Flera VCard"
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3753
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard för %s"
 
-#: addressbook/backend/ebook/e-destination.c:232
+#: addressbook/backend/ebook/e-destination.c:244
 msgid "???"
 msgstr "???"
 
@@ -436,7 +436,7 @@ msgid "Web page address:"
 msgstr "Webbsideadress:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:84
 msgid "_Add"
 msgstr "_Lägg till"
 
@@ -461,9 +461,10 @@ msgid "_Company:"
 msgstr "_Företag:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:640 mail/mail-config.glade.h:75
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: mail/folder-browser.c:715 mail/mail-config.glade.h:85
+#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:103
+#: ui/evolution-task-editor-dialog.xml.h:69 ui/evolution-tasks.xml.h:9
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "_Ta bort"
 
@@ -516,7 +517,7 @@ msgid "This contact belongs to these categories:"
 msgstr "Denna kontakt tillhör dessa kategorier:"
 
 #: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/widgets/e-addressbook-view.c:745
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -530,7 +531,7 @@ msgid "Business 2"
 msgstr "Företag 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Business Fax"
 msgstr "Företagsfax"
 
@@ -556,12 +557,12 @@ msgid "Home 2"
 msgstr "Hem 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "Home Fax"
 msgstr "Fax hem"
 
 #: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -571,17 +572,16 @@ msgstr "Mobil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1254
 #: addressbook/contact-editor/e-contact-editor.c:1312
-#: mail/mail-config.glade.h:40
 msgid "Other"
 msgstr "Annat"
 
 #: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Other Fax"
 msgstr "Annan fax"
 
 #: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Pager"
 msgstr "Personsökare"
 
@@ -590,12 +590,12 @@ msgid "Primary"
 msgstr "Primär"
 
 #: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Telex"
 msgstr "Telex"
 
@@ -604,12 +604,12 @@ msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Email 3"
 msgstr "E-post 3"
 
@@ -626,7 +626,7 @@ msgid "Edit Full"
 msgstr "Redigera fullständigt namn"
 
 #: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Full Name"
 msgstr "Fullständigt namn"
 
@@ -746,25 +746,16 @@ msgstr "_Suffix:"
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: addressbook/gui/component/addressbook.c:242
-msgid "As _Minicards"
-msgstr "Som _minikort"
-
-#: addressbook/gui/component/addressbook.c:248
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Som _tabell"
-
-#: addressbook/gui/component/addressbook.c:408
+#: addressbook/gui/component/addressbook.c:361
 #, c-format
 msgid "Enter password for %s"
 msgstr "Ange lösenord för %s"
 
-#: addressbook/gui/component/addressbook.c:436
+#: addressbook/gui/component/addressbook.c:389
 msgid "Unable to open addressbook"
 msgstr "Kan inte öppna adressboken"
 
-#: addressbook/gui/component/addressbook.c:443
+#: addressbook/gui/component/addressbook.c:396
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -774,7 +765,7 @@ msgstr ""
 "att du har angett en felaktig URI eller att LDAP-servern är\n"
 "onåbar"
 
-#: addressbook/gui/component/addressbook.c:448
+#: addressbook/gui/component/addressbook.c:401
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -786,7 +777,7 @@ msgstr ""
 "programmet från CVS-källkod efter det att du har hämtat\n"
 "OpenLDAP från länken nedan.\n"
 
-#: addressbook/gui/component/addressbook.c:456
+#: addressbook/gui/component/addressbook.c:409
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -794,19 +785,19 @@ msgstr ""
 "Vi kunde inte öppna denna adressbok. Kontrollera att sökvägen\n"
 "existerar och att du har rätt att komma åt den."
 
-#: addressbook/gui/component/addressbook.c:607 calendar/gui/gnome-cal.c:233
+#: addressbook/gui/component/addressbook.c:569 calendar/gui/gnome-cal.c:233
 msgid "Any field contains"
 msgstr "Något fält innehåller"
 
-#: addressbook/gui/component/addressbook.c:608
+#: addressbook/gui/component/addressbook.c:570
 msgid "Name contains"
 msgstr "Namnet innehåller"
 
-#: addressbook/gui/component/addressbook.c:609
+#: addressbook/gui/component/addressbook.c:571
 msgid "Email contains"
 msgstr "E-postadressen innehåller"
 
-#: addressbook/gui/component/addressbook.c:752
+#: addressbook/gui/component/addressbook.c:715
 msgid "The URI that the Folder Browser will display"
 msgstr "URI:n som mappbläddraren kommer att visa"
 
@@ -829,102 +820,102 @@ msgstr "Ingen (anonymt läge)"
 #: addressbook/gui/component/addressbook-config.c:165
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Lösenord"
 
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
+#: addressbook/gui/component/addressbook-config.c:168
 msgid "Unknown auth type"
 msgstr "Okänd autentiseringstyp"
 
-#: addressbook/gui/component/addressbook-config.c:179
+#: addressbook/gui/component/addressbook-config.c:177
 msgid "Base"
 msgstr "Bas"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:179
 msgid "One"
 msgstr "En"
 
-#: addressbook/gui/component/addressbook-config.c:183
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "Subtree"
 msgstr "Underträd"
 
-#: addressbook/gui/component/addressbook-config.c:186
+#: addressbook/gui/component/addressbook-config.c:184
 msgid "Unknown scope type"
 msgstr "Okänd omfattningstyp"
 
-#: addressbook/gui/component/addressbook-config.c:353
+#: addressbook/gui/component/addressbook-config.c:349
 msgid "Bind DN:"
 msgstr "Bind-DN:"
 
-#: addressbook/gui/component/addressbook-config.c:354
+#: addressbook/gui/component/addressbook-config.c:350
 msgid "FIXME Bind DN Help text here"
 msgstr "FIXME Bind DN-hjälptext här"
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:60
 msgid "Remember this password"
 msgstr "Kom ihåg detta lösenord"
 
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:33
 msgid "Host:"
 msgstr "Värd:"
 
-#: addressbook/gui/component/addressbook-config.c:407
+#: addressbook/gui/component/addressbook-config.c:404
 msgid "FIXME Host help text here."
 msgstr "FIXME Värd-hjälptext här."
 
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr "FIXME POrt-hjälptext här."
-
-#: addressbook/gui/component/addressbook-config.c:414
+#: addressbook/gui/component/addressbook-config.c:406
 msgid "Root DN:"
 msgstr "Rot-DN:"
 
-#: addressbook/gui/component/addressbook-config.c:415
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "FIXME Root DN help text here."
 msgstr "FIXME Root DN-hjälptext här."
 
-#: addressbook/gui/component/addressbook-config.c:435
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Port:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "FIXME POrt-hjälptext här."
+
+#: addressbook/gui/component/addressbook-config.c:432
 msgid "Search Scope:"
 msgstr "Sökomfattning:"
 
-#: addressbook/gui/component/addressbook-config.c:489
+#: addressbook/gui/component/addressbook-config.c:479
 msgid "Authentication:"
 msgstr "Autentisering:"
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr "Avancerade LDAP-alternativ"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:53
 msgid "Path:"
 msgstr "Sökväg:"
 
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:523
 msgid "FIXME Path Help text here"
 msgstr "FIXME Sökvägshjälptext här"
 
-#: addressbook/gui/component/addressbook-config.c:513
+#: addressbook/gui/component/addressbook-config.c:528
 msgid "Create path if it doesn't exist."
 msgstr "Skapa sökvägen om den inte finns."
 
-#: addressbook/gui/component/addressbook-config.c:647
+#: addressbook/gui/component/addressbook-config.c:662
 msgid "Edit Addressbook"
 msgstr "Redigera adressbok"
 
-#: addressbook/gui/component/addressbook-config.c:649
+#: addressbook/gui/component/addressbook-config.c:664
 msgid "Add Addressbook"
 msgstr "Lägg till adressbok"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/component/addressbook-config.c:682
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -932,22 +923,22 @@ msgstr ""
 "Markera den typ av adressbok du har och ange den relevanta informationen om "
 "den."
 
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
+#: addressbook/gui/component/addressbook-config.c:688
+#: mail/mail-config.glade.h:43
 msgid "Name:"
 msgstr "Namn:"
 
-#: addressbook/gui/component/addressbook-config.c:672
+#: addressbook/gui/component/addressbook-config.c:689
 msgid "FIXME Name help text here"
 msgstr "FIXME Namnhjälptext här"
 
-#: addressbook/gui/component/addressbook-config.c:674
+#: addressbook/gui/component/addressbook-config.c:691
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: addressbook/gui/component/addressbook-config.c:675
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Description help text here"
 msgstr "FIXME Beskrivningshjälptext här"
 
@@ -956,19 +947,20 @@ msgid "Addressbook Sources"
 msgstr "Adressbokskällor"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:622
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
-#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:18
+#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:23
+#: mail/message-browser.c:211 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:22
+#: ui/evolution-task-editor-dialog.xml.h:18 ui/evolution-tasks.xml.h:3
 msgid "Delete"
 msgstr "Ta bort"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:28
 msgid "Edit"
 msgstr "Redigera"
 
@@ -993,12 +985,12 @@ msgid "Enable Queries (Dangerous!)"
 msgstr "Använd frågor (farligt!)"
 
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
+#: addressbook/gui/component/select-names/e-select-names-popup.c:281
 msgid "Edit Contact Info"
 msgstr "Redigera kontaktinformation"
 
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
+#: addressbook/gui/component/select-names/e-select-names-popup.c:347
 msgid "Add to Contacts"
 msgstr "Lägg till i kontakter"
 
@@ -1046,17 +1038,21 @@ msgstr "Fabrik för Evolutions adressbokskomponent."
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabrik för adressbokstestkontrollen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
+#: addressbook/gui/component/select-names/e-select-names-popup.c:161
 #: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
 #: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
 msgid "Remove"
 msgstr "Ta bort"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
+#: addressbook/gui/component/select-names/e-select-names-popup.c:176
 msgid "Remove All"
 msgstr "Ta bort alla"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Send HTML Mail?"
+msgstr "Skicka HTML-post?"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Evolutions adressboks namnvalsgränssnitt."
@@ -1082,7 +1078,7 @@ msgid "Select name from:"
 msgstr "Välj namn från:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:148
+#: mail/mail-search.c:242
 msgid "Search"
 msgstr "Sök"
 
@@ -1194,142 +1190,148 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:557
+#: addressbook/gui/widgets/e-addressbook-view.c:617
 msgid "Save as VCard"
 msgstr "Spara som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:618
 msgid "Send contact to other"
 msgstr "Skicka kontakt till annan"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:619
 msgid "Send message to contact"
 msgstr "Skicka meddelande till kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576 mail/message-browser.c:200
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:55 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:620 mail/message-browser.c:208
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:65 ui/evolution-tasks.xml.h:6
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:621
 msgid "Print Envelope"
 msgstr "Skriv ut kuvert"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "* Click here to add a contact *"
 msgstr "* Klicka här för att lägga till en kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "File As"
 msgstr "Arkivera som"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Primary Phone"
 msgstr "Primär telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Assistant Phone"
 msgstr "Sekreterartelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Phone"
 msgstr "Företagstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Callback Phone"
 msgstr "Tillbakaringningstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Company Phone"
 msgstr "Företagets telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone"
 msgstr "Hemtelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Business Address"
 msgstr "Företagsadress"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Home Address"
 msgstr "Hemadress"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Business Phone 2"
 msgstr "Företagstelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Home Phone 2"
 msgstr "Hemtelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Other Phone"
 msgstr "Annan telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Other Address"
 msgstr "Annan adress"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Web Site"
 msgstr "Webbsida"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Department"
 msgstr "Avdelning"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:741
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:742
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:743
 msgid "Profession"
 msgstr "Yrke"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:744
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:746
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:747
 msgid "Spouse"
 msgstr "Partner"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:748
 msgid "Note"
 msgstr "Notering"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:749
 msgid "Free-busy URL"
 msgstr "Ledig/Upptagen-URL"
 
@@ -1337,7 +1339,7 @@ msgstr "Ledig/Upptagen-URL"
 msgid "Save in addressbook"
 msgstr "Spara i adressboken"
 
-#: addressbook/gui/widgets/e-minicard-view.c:469
+#: addressbook/gui/widgets/e-minicard-view.c:216
 msgid ""
 "\n"
 "\n"
@@ -1595,17 +1597,17 @@ msgstr ""
 "OAF-installation."
 
 #: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/e-calendar-table.c:322
 msgid "Public"
 msgstr "Publikt"
 
 #: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/e-calendar-table.c:323
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/e-calendar-table.c:324
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
@@ -1633,54 +1635,54 @@ msgstr "V"
 
 #: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:694
+#: calendar/gui/e-calendar-table.c:344 mail/message-list.c:696
 msgid "High"
 msgstr "Hög"
 
 #: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
 #: calendar/gui/calendar-model.c:1574
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:693
+#: calendar/gui/e-calendar-table.c:345 mail/message-list.c:695
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:692
+#: calendar/gui/e-calendar-table.c:346 mail/message-list.c:694
 msgid "Low"
 msgstr "Låg"
 
 #: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:398
 msgid "Transparent"
 msgstr "Genomskinlig"
 
 #: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/e-calendar-table.c:397
 msgid "Opaque"
 msgstr "Ogenomskinlig"
 
 #: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:418
 msgid "Not Started"
 msgstr "Inte startad"
 
 #: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:419
 msgid "In Progress"
 msgstr "Pågår"
 
 #: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:420
 msgid "Completed"
 msgstr "Färdigt"
 
 #: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:421 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Avbruten"
@@ -1715,10 +1717,10 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:976
+#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:321
+#: calendar/gui/e-calendar-table.c:396 mail/mail-account-gui.c:976
 #: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1198
+#: mail/mail-config.glade.h:46 shell/e-shell-view.c:1318
 #: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
 #: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
 msgid "None"
@@ -1746,7 +1748,7 @@ msgstr ""
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1064
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:347
 msgid "Undefined"
 msgstr "Odefinierad"
 
@@ -1797,7 +1799,7 @@ msgstr "<b>Fel vid inläsning av kalender</b>"
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Fel vid inläsning av kalender:<br>Stödjer inte metoden."
 
-#: calendar/gui/calendar-summary.c:622
+#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:24
 msgid "Display"
 msgstr "Visa"
 
@@ -1836,7 +1838,7 @@ msgstr "Ingen sammanfattning finns tillgänglig."
 #: calendar/gui/dialogs/alarm-notify.glade.h:1
 #: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
+#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Stäng"
 
@@ -1918,7 +1920,7 @@ msgid "Display options"
 msgstr "Visningsalternativ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:154
 msgid "Due Date"
 msgstr "Förfallodatum"
 
@@ -1981,12 +1983,12 @@ msgid "Overdue Items:"
 msgstr "Objekt som skulle ha utförts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:54
 msgid "Pick a color"
 msgstr "Välj en färg"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:157
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -2089,37 +2091,52 @@ msgid "minutes before they occur."
 msgstr "minuter innan de sker."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:88
 msgid "seconds."
 msgstr "sekunder."
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Är du säker på att du vill ta bort mötet \"%s\""
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Är du säker på att du vill ta bort detta namnlösa möte?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Är du säker på att du vill ta bort uppgiften \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Är du säker på att du vill ta bort denna namnlösa uppgift?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Är du säker på att du vill ta bort dagboksposten \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Är du säker på att du vill ta bort denna namnlösa dagbokspost?"
 
+#: calendar/gui/dialogs/delete-comp.c:120
+#, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Är du säker på att du vill ta bort %d möten?"
+
+#: calendar/gui/dialogs/delete-comp.c:125
+#, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Är du säker på att du vill ta bort %d uppgifter?"
+
+#: calendar/gui/dialogs/delete-comp.c:130
+#, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Är du säker på att du vill ta bort %d dagboksposter?"
+
 #: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
 msgstr "Vill du spara ändringar?"
@@ -2153,7 +2170,7 @@ msgid "% Comp_lete:"
 msgstr "% färdig_t:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:150
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Klassifikation"
@@ -2220,129 +2237,125 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:149
 msgid "Categories"
 msgstr "Kategorier"
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:151
 msgid "Completion Date"
 msgstr "Färdigdatum"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:152
 msgid "End Date"
 msgstr "Slutdatum"
 
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:153
 msgid "Start Date"
 msgstr "Startdatum"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:155
 msgid "Geographical Position"
 msgstr "Geografisk position"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:156
 msgid "Percent complete"
 msgstr "Procent klar"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:158
 msgid "Summary"
 msgstr "Sammanfattning"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:159
 msgid "Transparency"
 msgstr "Genomskinlighet"
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:160
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:161
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.c:170
+#: calendar/gui/e-calendar-table.c:162
 msgid "Click here to add a task"
 msgstr "Klicka här för att lägga till en uppgift"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:366
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:367
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:368
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:369
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:370
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:371
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:372
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:373
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:374
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:375
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:376
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Markera som färdig"
-
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Markera uppgiften som färdig"
-
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "Redigera denna uppgift..."
+#: calendar/gui/e-calendar-table.c:736
+msgid "Edit this task"
+msgstr "Redigera denna uppgift"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Redigera uppgiften"
+#: calendar/gui/e-calendar-table.c:738
+msgid "Mark as complete"
+msgstr "Markera som färdig"
 
-#: calendar/gui/e-calendar-table.c:560
+#: calendar/gui/e-calendar-table.c:739
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "Ta bort denna uppgift"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
-msgstr "Ta bort uppgiften"
+#: calendar/gui/e-calendar-table.c:744
+msgid "Mark tasks as complete"
+msgstr "Markera uppgifterna som färdiga"
+
+#: calendar/gui/e-calendar-table.c:745 ui/evolution-tasks.xml.h:4
+msgid "Delete selected tasks"
+msgstr "Ta bort markerade uppgifter"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
@@ -2381,37 +2394,37 @@ msgstr "%d %b"
 msgid "New Appointment"
 msgstr "Nytt möte"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3279
 msgid "New All Day Event"
 msgstr "Nytt heldagsarrangemang"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3284
 msgid "Go to Today"
 msgstr "Gå till idag"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3286
 msgid "Go to Date..."
 msgstr "Gå till datum..."
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
+#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3292
+#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:12
 msgid "Open"
 msgstr "Öppna"
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3294
 msgid "Delete this Appointment"
 msgstr "Ta bort detta möte"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
+#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3296
 #: ui/evolution-event-editor.xml.h:45
 msgid "Schedule Meeting"
 msgstr "Boka möte"
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3309
 msgid "Make this Occurrence Movable"
 msgstr "Gör denna förekomst flyttbar"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3311
 msgid "Delete this Occurrence"
 msgstr "Ta bort denna förekomst"
 
@@ -2505,7 +2518,7 @@ msgstr "--till--"
 msgid "Calendar Message"
 msgstr "Kalendermeddelande"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Datum:"
 
@@ -2610,25 +2623,25 @@ msgstr ""
 "tid"
 
 #: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1086
+#: mail/message-list.c:1088
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:181 calendar/gui/e-tasks.c:525
+#: calendar/gui/e-tasks.c:558
 msgid "All"
 msgstr "Alla"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:187
 msgid "Category:"
 msgstr "Kategori:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:333
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunde inte läsa in uppgifterna i \"%s\""
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:345
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som krävs för att läsa in \"%s\" stöds inte"
@@ -2844,7 +2857,7 @@ msgstr "för alltid"
 msgid "hour(s)"
 msgstr "timme/timmar"
 
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:87
 msgid "minute(s)"
 msgstr "minut(er)"
 
@@ -2868,11 +2881,11 @@ msgstr "vecka"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+#: calendar/gui/e-week-view.c:3277 calendar/gui/e-week-view.c:3300
 msgid "New Appointment..."
 msgstr "Nytt möte..."
 
-#: calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3313
 msgid "Delete All Occurrences"
 msgstr "Ta bort alla förekomster"
 
@@ -3181,13 +3194,12 @@ msgstr "Aktuellt år (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1547
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:57
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1452
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:24
 msgid "Print Preview"
 msgstr "Förhandsgranska"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/tasks-control.c:136
 msgid "The URI of the tasks folder to display"
 msgstr "URI:t som uppgiftsmappen ska visa"
 
@@ -3233,26 +3245,123 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
-#: camel/camel-cipher-context.c:169
+#: calendar/pcs/query.c:218
+msgid "time-now expects 0 arguments"
+msgstr "time-now förväntar sig 0 argument"
+
+#: calendar/pcs/query.c:242
+msgid "make-time expects 1 argument"
+msgstr "make-time förväntar sig 1 argument"
+
+#: calendar/pcs/query.c:247
+msgid "make-time expects argument 1 to be a string"
+msgstr "make-time förväntar sig att argument 1 är en sträng"
+
+#: calendar/pcs/query.c:255
+msgid "make-time argument 1 must be an ISO 8601 date/time string"
+msgstr ""
+"argument 1 till make-time måste vara en datum-/tidssträng enligt ISO 8601"
+
+#: calendar/pcs/query.c:281
+msgid "time-add-day expects 2 arguments"
+msgstr "time-add-day förväntar sig 2 argument"
+
+#: calendar/pcs/query.c:286
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr "time-add-day förväntar sig att argument 1 är en time_t"
+
+#: calendar/pcs/query.c:293
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr "time-add-day förväntar sig att argument 2 är ett heltal"
+
+#: calendar/pcs/query.c:318
+msgid "time-day-begin expects 1 argument"
+msgstr "time-day-begin förväntar sig 1 argument"
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr "time-day-begin förväntar sig att argument 1 är en time_t"
+
+#: calendar/pcs/query.c:348
+msgid "time-day-end expects 1 argument"
+msgstr "time-day-end förväntar sig 1 argument"
+
+#: calendar/pcs/query.c:353
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr "time-day-end förväntar sig att argument 1 är en time_t"
+
+#: calendar/pcs/query.c:389
+msgid "get-vtype expects 0 arguments"
+msgstr "get-vtype förväntar sig 0 argument"
+
+#: calendar/pcs/query.c:472
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr "occur-in-time-range? förväntar sig 2 argument"
+
+#: calendar/pcs/query.c:477
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr "occur-in-time-range? förväntar sig att argument 1 är en time_t"
+
+#: calendar/pcs/query.c:484
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr "occur-in-time-range? förväntar sig att argument 2 är en time_t"
+
+#: calendar/pcs/query.c:611
+msgid "contains? expects 2 arguments"
+msgstr "contains? förväntar sig 2 argument"
+
+#: calendar/pcs/query.c:616
+msgid "contains? expects argument 1 to be a string"
+msgstr "contains? förväntar sig att argument 1 är en sträng"
+
+#: calendar/pcs/query.c:623
+msgid "contains? expects argument 2 to be a string"
+msgstr "contains? förväntar sig att argument 2 är en sträng"
+
+#: calendar/pcs/query.c:640
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
+"\"description\""
+msgstr ""
+"contains? förväntar sig att argument 1 är ett av \"any\", \"summary\", eller "
+"\"description\""
+
+#: calendar/pcs/query.c:678
+msgid "has-categories? expects at least 1 argument"
+msgstr "has-categories? förväntar sig minst 1 argument"
+
+#: calendar/pcs/query.c:684
+msgid "has-categories? expects all arguments to be strings"
+msgstr "has-categories? förväntar sig att alla argument är strängar"
+
+#: calendar/pcs/query.c:932
+msgid "Evaluation of the search expression did not yield a boolean value"
+msgstr "Evaluering av sökuttrycket gav inget booleskt värde"
+
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Signering stöds inte av detta chiffer"
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr "Klarsignering stöds inte av detta chiffer"
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr "Verifiering stöds inte av detta chiffer"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr "Kryptering stöds inte av detta chiffer"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering stöds inte av detta chiffer"
 
+#: camel/camel-disco-store.c:271
+msgid "You must be working online to complete this operation"
+msgstr "Du måste vara ansluten för att kunna genomföra detta"
+
 #: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
 msgid "Syncing folders"
 msgstr "Synkroniserar mappar"
@@ -3423,54 +3532,54 @@ msgstr "(Okänt fel)"
 msgid "Error copying mail temp file: %s"
 msgstr "Fel vid kopierande av temporär brevfil: %s"
 
-#: camel/camel-pgp-context.c:188
+#: camel/camel-pgp-context.c:190
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Ange din %s-lösenordsfras för %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Ange din %s-lösenordsfras"
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:511
 msgid "No plaintext to sign."
 msgstr "Ingen klartext att signera."
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1055 camel/camel-pgp-context.c:1267
+#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
+#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
 msgid "No password provided."
 msgstr "Inget lösenord angavs."
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1062
-#: camel/camel-pgp-context.c:1274
+#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
+#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
+#: camel/camel-pgp-context.c:1276
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunde inte skapa rör till GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:683
 msgid "No plaintext to clearsign."
 msgstr "Ingen klartext att klarsignera."
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:873
 msgid "No plaintext to verify."
 msgstr "Ingen klartext att verifiera."
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:890
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Kunde inte skapa temporär fil: %s"
 
-#: camel/camel-pgp-context.c:1045
+#: camel/camel-pgp-context.c:1047
 msgid "No plaintext to encrypt."
 msgstr "Ingen klartext att kryptera."
 
-#: camel/camel-pgp-context.c:1071
+#: camel/camel-pgp-context.c:1073
 msgid "No recipients specified"
 msgstr "Inga avsändare är angivna"
 
-#: camel/camel-pgp-context.c:1259
+#: camel/camel-pgp-context.c:1261
 msgid "No ciphertext to decrypt."
 msgstr "Ingen kryptotext att dekryptera."
 
@@ -3710,9 +3819,64 @@ msgstr ""
 "Kunde inte skapa katalogen %s:\n"
 "%s"
 
+#: camel/camel-smime-context.c:195
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "Ange ditt lösenord för %s"
+
+#: camel/camel-smime-context.c:211
+msgid "Error hashing password."
+msgstr "Fel vid hashning av lösenord."
+
+#: camel/camel-smime-context.c:220
+msgid "Invalid password."
+msgstr "Ogiltigt lösenord."
+
+#: camel/camel-smime-context.c:328
+#, c-format
+msgid "Could not sign: certificate not found for \"%s\"."
+msgstr "Kunde inte signera: certifikat hittades inte för \"%s\"."
+
+#: camel/camel-smime-context.c:344
+msgid "Could not sign: failed to create content info."
+msgstr "Kunde inte signera: misslyckades med att skapa innehållsinformation."
+
+#: camel/camel-smime-context.c:351
+msgid "Could not sign: failed to create signing context."
+msgstr "Kunde inte signera: misslyckades med att skapa signeringssammanhang."
+
+#: camel/camel-smime-context.c:357
+msgid "Could not sign: failed to create signature."
+msgstr "Kunde inte signera: misslyckades med att skapa signatur."
+
+#: camel/camel-smime-context.c:384
+msgid "'clearsign' is not supported by S/MIME."
+msgstr "\"klartextsignering\" stöds inte av S/MIME."
+
+#: camel/camel-smime-context.c:529
+msgid "Could not encrypt: failed to create enveloped data."
+msgstr "Kunde inte kryptera: misslyckades med att skapa kuvertdata."
+
+#: camel/camel-smime-context.c:536
+msgid "Could not encrypt: failed to create encryption context."
+msgstr "Kunde inte kryptera: misslyckades med att skapa krypteringssammanhang."
+
+#: camel/camel-smime-context.c:571
+#, c-format
+msgid "Could not encrypt data: invalid user key: \"%s\"."
+msgstr "Kunde inte kryptera data: ogiltig användarnyckel: \"%s\"."
+
+#: camel/camel-smime-context.c:577
+msgid "Could not encrypt: encoding failed."
+msgstr "Kunde inte kryptera: kodning misslyckades."
+
+#: camel/camel-smime-context.c:627
+msgid "Failed to decrypt: Unknown"
+msgstr "Misslyckades med att dekryptera: Okänd"
+
 #. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
+#: camel/camel-store.c:378 mail/mail-ops.c:1008 mail/mail-ops.c:1015
+#: mail/mail-ops.c:1033 mail/mail-ops.c:1034
 msgid "Trash"
 msgstr "Papperskorg"
 
@@ -3736,7 +3900,7 @@ msgstr ""
 "Land: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3751,6 +3915,15 @@ msgstr ""
 "\n"
 "Vill du acceptera ändå?"
 
+#: camel/camel-tcp-stream-openssl.c:423
+#, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr ""
+"Utställare: %s\n"
+"Ämne: %s"
+
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -3817,18 +3990,18 @@ msgstr "Kunde inte läsa in sammanfattning för %s"
 msgid "Scanning IMAP folder"
 msgstr "Genomsöker IMAP-mappen"
 
-#: camel/providers/imap/camel-imap-folder.c:1045
-#: camel/providers/imap/camel-imap-folder.c:1279
+#: camel/providers/imap/camel-imap-folder.c:1047
+#: camel/providers/imap/camel-imap-folder.c:1281
 msgid "This message is not currently available"
 msgstr "Detta meddelande är inte tillgängligt för tillfället"
 
-#: camel/providers/imap/camel-imap-folder.c:1073
-#: camel/providers/imap/camel-imap-folder.c:1312
+#: camel/providers/imap/camel-imap-folder.c:1075
+#: camel/providers/imap/camel-imap-folder.c:1314
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
 # Låter konstigt?
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:13
 msgid "Checking for new mail"
 msgstr "Kontrollerar ny e-post"
 
@@ -3837,7 +4010,7 @@ msgstr "Kontrollerar ny e-post"
 msgid "Check for new messages in all folders"
 msgstr "Kontrollerar nya meddelanden i alla mappar"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:551
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:599
 msgid "Folders"
 msgstr "Mappar"
 
@@ -3902,7 +4075,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:803 mail/mail-local.c:337
+#: camel/providers/imap/camel-imap-store.c:803 mail/mail-local.c:334
 #, c-format
 msgid "No such folder %s"
 msgstr "Det finns ingen mapp %s"
@@ -3975,20 +4148,18 @@ msgstr "Kunde inte ta bort mappindexfilen \"%s\": %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunde inte lägga till meddelandet i sammanfattningen: okänd orsak"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan inte lägga till meddelande i mapp för brevlådekatalog: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3997,14 +4168,14 @@ msgstr ""
 "Kan inte hämta meddelande: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
 msgid "No such message"
 msgstr "Det finns inget sådant meddelande"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Ogiltigt meddelandeinnehåll"
 
@@ -4072,9 +4243,9 @@ msgstr "Kan inte öppna brevlåda: %s %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan inte lägga till meddelande till mbox-fil: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4083,11 +4254,11 @@ msgstr ""
 "Kan inte hämta meddelande: %s från mappen %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen verkar vara obotligt skadad."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Meddelandebyggande misslyckades: Trasig brevlåda?"
 
@@ -4152,7 +4323,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "Kan inte sammanfatta mapp: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
+#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1589
 msgid "Synchronising folder"
 msgstr "Synkroniserar mapp"
 
@@ -4205,8 +4376,7 @@ msgstr "Kunde inte byta namn på mapp: %s"
 msgid "Unknown error: %s"
 msgstr "Okänt fel: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan inte lägga till meddelande i mh-mapp: %s: %s"
@@ -4338,7 +4508,7 @@ msgstr "Lämna meddelanden på servern"
 msgid "Delete after %s day(s)"
 msgstr "Ta bort efter %s dag(ar)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
@@ -4433,7 +4603,7 @@ msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:67
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4487,7 +4657,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "E-postleverans via programmet sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:62
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4665,68 +4835,72 @@ msgstr "Fel vid skapande av SASL-autentiseringsobjekt."
 msgid "AUTH request timed out: %s"
 msgstr "AUTH-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:805
+#: camel/providers/smtp/camel-smtp-transport.c:764
+msgid "AUTH request failed."
+msgstr "AUTH-begäran misslyckades."
+
+#: camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Bad authentication response from server.\n"
 msgstr "Felaktigt autentiseringssvar från servern.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:831
+#: camel/providers/smtp/camel-smtp-transport.c:835
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM-begäran gjorde time-out: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:854
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Fel i MAIL FROM-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:879
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO-begäran gjorde time-out: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:898
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Fel i RCPT TO-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:925
+#: camel/providers/smtp/camel-smtp-transport.c:929
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA-begäran gjorde time-out: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:944
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Fel i DATA-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:959
-#: camel/providers/smtp/camel-smtp-transport.c:977
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:981
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA-skickande gjorde time-out: meddelandeslut: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:996
+#: camel/providers/smtp/camel-smtp-transport.c:1000
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Fel i DATA-svar: meddelandeslut: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1020
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1062
+#: camel/providers/smtp/camel-smtp-transport.c:1066
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT-begäran gjorde time-out: %s: inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1085
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Fel i QUIT-svar: %s: inte ödesdigert"
@@ -4756,7 +4930,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:123
 msgid "attachment"
 msgstr "bilaga"
 
@@ -4777,7 +4951,8 @@ msgstr "Lägg till bilaga..."
 msgid "Attach a file to the message"
 msgstr "Bifoga en fil till meddelandet"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1086
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:9
+#: mail/message-list.c:1088
 msgid "Attachment"
 msgstr "Bilaga"
 
@@ -4801,7 +4976,28 @@ msgstr "MIME-typ:"
 msgid "Send as:"
 msgstr "Skicka som:"
 
-#: composer/e-msg-composer.c:527
+#: composer/e-msg-composer.c:546
+#, c-format
+msgid ""
+"This version of Evolution was not built with support for S/MIME.\n"
+"You may wish to instead use PGP to %s your document."
+msgstr ""
+"Denna version av Evolution byggdes inte med stöd för S/MIME.\n"
+"Du kanske istället vill använda PGP för att %s ditt dokument."
+
+#: composer/e-msg-composer.c:548
+msgid "sign and encrypt"
+msgstr "signera och kryptera"
+
+#: composer/e-msg-composer.c:549
+msgid "sign"
+msgstr "signera"
+
+#: composer/e-msg-composer.c:549
+msgid "encrypt"
+msgstr "kryptera"
+
+#: composer/e-msg-composer.c:601
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4810,21 +5006,21 @@ msgstr ""
 "Kunde inte öppna signaturfilen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:774
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: composer/e-msg-composer.c:711
+#: composer/e-msg-composer.c:785
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fel vid sparande av filen: %s"
 
-#: composer/e-msg-composer.c:731
+#: composer/e-msg-composer.c:805
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid inläsning av filen: %s"
 
-#: composer/e-msg-composer.c:803
+#: composer/e-msg-composer.c:877
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -4832,12 +5028,12 @@ msgstr ""
 "Kan inte öppna mallmappen för detta konto.\n"
 "Vill du använda standardmappen för mallar?"
 
-#: composer/e-msg-composer.c:861 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
+#: composer/e-msg-composer.c:935 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:228
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:941
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4847,27 +5043,27 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: composer/e-msg-composer.c:892
+#: composer/e-msg-composer.c:966
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:1018
+#: composer/e-msg-composer.c:1122
 msgid "That file does not exist."
 msgstr "Den filen finns inte."
 
-#: composer/e-msg-composer.c:1028
+#: composer/e-msg-composer.c:1132
 msgid "That is not a regular file."
 msgstr "Det är ingen vanlig fil."
 
-#: composer/e-msg-composer.c:1038
+#: composer/e-msg-composer.c:1142
 msgid "That file exists but is not readable."
 msgstr "Den filen finns, men är inte läsbar."
 
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:1152
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Filen verkade åtkomlig, men open(2) misslyckades."
 
-#: composer/e-msg-composer.c:1070
+#: composer/e-msg-composer.c:1174
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4875,64 +5071,64 @@ msgstr ""
 "Filen är mycket stor (större än 100kB).\n"
 "Är du säker på att du vill infoga den?"
 
-#: composer/e-msg-composer.c:1091
+#: composer/e-msg-composer.c:1195
 msgid "An error occurred while reading the file."
 msgstr "Ett fel uppstod vid läsning av filen."
 
-#: composer/e-msg-composer.c:1392 composer/e-msg-composer.c:1735
+#: composer/e-msg-composer.c:1558 composer/e-msg-composer.c:1903
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:1826
+#: composer/e-msg-composer.c:1994
 msgid "Could not create composer window."
 msgstr "Kunde inte skapa fönster för meddelanderedigering."
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:324
 msgid "Click here for the address book"
 msgstr "Klicka här för att ta fram adressboken"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+#: composer/e-msg-composer-hdrs.c:355
 msgid "From:"
 msgstr "Från:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+#: composer/e-msg-composer-hdrs.c:361
 msgid "Reply-To:"
-msgstr "Svara-Till:"
+msgstr "Svara till:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:372
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+#: composer/e-msg-composer-hdrs.c:386
 msgid "To:"
 msgstr "Till:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Cc:"
-msgstr "Cc:"
+msgstr "Kopia:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Ange adresserna som ska få en kopia av meddelandet"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Bcc:"
-msgstr "Bcc:"
+msgstr "Blindkopia:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:395
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5077,63 +5273,67 @@ msgstr ""
 "\n"
 "Lämna fältet tomt för att få standardsidan."
 
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
+#: executive-summary/component/e-summary-url.c:70
+#: executive-summary/component/e-summary-url.c:75
+#: executive-summary/component/e-summary-url.c:82
 #, c-format
 msgid "Open %s with the default GNOME application"
 msgstr "Öppna %s med det program som är standard i Gnome"
 
-#: executive-summary/component/e-summary-url.c:70
+#: executive-summary/component/e-summary-url.c:71
 #, c-format
 msgid "Open %s with the default GNOME web browser"
 msgstr "Öppna %s med standardwebbläsaren i Gnome"
 
-#: executive-summary/component/e-summary-url.c:71
+#: executive-summary/component/e-summary-url.c:72
 #, c-format
 msgid "Send an email to %s"
 msgstr "Skicka e-post till %s"
 
-#: executive-summary/component/e-summary-url.c:72
+#: executive-summary/component/e-summary-url.c:73
 #, c-format
 msgid "Change the view to %s"
 msgstr "Ändra vy till %s"
 
-#: executive-summary/component/e-summary-url.c:73
+#: executive-summary/component/e-summary-url.c:74
 #, c-format
 msgid "Run %s"
 msgstr "Kör %s"
 
-#: executive-summary/component/e-summary-url.c:75
+#: executive-summary/component/e-summary-url.c:76
 #, c-format
 msgid "Close %s"
 msgstr "Stäng %s"
 
-#: executive-summary/component/e-summary-url.c:76
+#: executive-summary/component/e-summary-url.c:77
 #, c-format
 msgid "Move %s to the left"
 msgstr "Flytta %s till vänster"
 
-#: executive-summary/component/e-summary-url.c:77
+#: executive-summary/component/e-summary-url.c:78
 #, c-format
 msgid "Move %s to the right"
 msgstr "Flytta %s till höger"
 
-#: executive-summary/component/e-summary-url.c:78
+#: executive-summary/component/e-summary-url.c:79
 #, c-format
 msgid "Move %s into the previous row"
 msgstr "Flytta %s till föregående rad"
 
-#: executive-summary/component/e-summary-url.c:79
+#: executive-summary/component/e-summary-url.c:80
 #, c-format
 msgid "Move %s into the next row"
 msgstr "Flytta %s till nästa rad"
 
-#: executive-summary/component/e-summary-url.c:80
+#: executive-summary/component/e-summary-url.c:81
 #, c-format
 msgid "Configure %s"
 msgstr "Konfigura %s"
 
+#: executive-summary/component/e-summary-url.c:554
+msgid "page"
+msgstr "sida"
+
 #: executive-summary/component/executive-summary-config.glade.h:1
 msgid "Appearance"
 msgstr "Utseende"
@@ -5191,19 +5391,19 @@ msgstr "Testa tjänsten"
 msgid "Error"
 msgstr "Fel"
 
-#: executive-summary/test-service/rdf-summary.c:768
+#: executive-summary/test-service/rdf-summary.c:775
 msgid "Update automatically"
 msgstr "Uppdatera automatiskt"
 
-#: executive-summary/test-service/rdf-summary.c:778
+#: executive-summary/test-service/rdf-summary.c:785
 msgid "Update now"
 msgstr "Uppdatera nu"
 
-#: executive-summary/test-service/rdf-summary.c:788
+#: executive-summary/test-service/rdf-summary.c:795
 msgid "Update every "
 msgstr "Uppdatera var "
 
-#: executive-summary/test-service/rdf-summary.c:796
+#: executive-summary/test-service/rdf-summary.c:806
 #: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr "minut"
@@ -5591,7 +5791,7 @@ msgid "Replied to"
 msgstr "Svarade till"
 
 #: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1086
+#: mail/message-list.c:1088
 msgid "Score"
 msgstr "Poäng"
 
@@ -5623,7 +5823,7 @@ msgstr "börjar med"
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1087
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:767 mail/message-list.c:1089
 msgid "Subject"
 msgstr "Ämne"
 
@@ -5651,101 +5851,173 @@ msgstr "Redigera regel"
 msgid "Score Rules"
 msgstr "Poängregler"
 
-#: mail/component-factory.c:336
+#: importers/elm-importer.c:512 importers/evolution-gnomecard-importer.c:238
+#: importers/netscape-importer.c:780 importers/pine-importer.c:646
+#: shell/e-shell-importer.c:652 shell/importer/import.glade.h:4
+msgid "Import"
+msgstr "Importera"
+
+#: importers/elm-importer.c:517 importers/netscape-importer.c:785
+#: importers/pine-importer.c:651
+msgid "Mail"
+msgstr "E-post"
+
+#: importers/elm-importer.c:521
+msgid "Elm Aliases"
+msgstr "Elm-alias"
+
+#: importers/elm-importer.c:528 importers/evolution-gnomecard-importer.c:250
+#: importers/netscape-importer.c:807 importers/pine-importer.c:668
+msgid "Don't ask me again"
+msgstr "Fråga mig inte igen"
+
+#: importers/elm-importer.c:561
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution har hittat e-postfiler från Elm.\n"
+"Vill du importera dem till Evolution?"
+
+#: importers/elm-importer.c:579
+msgid "Elm mail"
+msgstr "Elm-epost"
+
+#: importers/evolution-gnomecard-importer.c:243 importers/pine-importer.c:661
+msgid "Addressbook"
+msgstr "Adressbok"
+
+#: importers/evolution-gnomecard-importer.c:275
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution har hittat GnomeCard-filer.\n"
+"Vill du importera dem till Evolution?"
+
+#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+msgid "Settings"
+msgstr "Inställningar"
+
+#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1364
+msgid "Filters"
+msgstr "Filter"
+
+#: importers/netscape-importer.c:800
+msgid "Addressbooks"
+msgstr "Adressböcker"
+
+#: importers/netscape-importer.c:847
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution har hittat Netscape-epostfiler.\n"
+"Vill du importera dem till Evolution?"
+
+#: importers/pine-importer.c:705
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution har hittat Pine-epostfiler.\n"
+"Vill du importera dem till Evolution?"
+
+#: importers/pine-importer.c:723
+msgid "Pine mail"
+msgstr "Pine-epost"
+
+#: mail/component-factory.c:412
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan inte initiera Evolutions e-postkomponent."
 
-#: mail/component-factory.c:409
+#: mail/component-factory.c:538
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lager hos skal"
 
-#: mail/folder-browser.c:268
+#: mail/folder-browser.c:329
 msgid "Store search as vFolder"
 msgstr "Lagra sökning som vMapp"
 
-#: mail/folder-browser.c:576 ui/evolution-mail.xml.h:91
+#: mail/folder-browser.c:653
 msgid "VFolder on _Subject"
 msgstr "Virtuell mapp på _ämnesrad"
 
-#: mail/folder-browser.c:579 ui/evolution-mail.xml.h:89
+#: mail/folder-browser.c:656
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på _avsändare"
 
-#: mail/folder-browser.c:582 ui/evolution-mail.xml.h:90
+#: mail/folder-browser.c:659
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på _mottagare"
 
-#: mail/folder-browser.c:585 ui/evolution-mail.xml.h:88
+#: mail/folder-browser.c:662
 msgid "VFolder on Mailing _List"
 msgstr "Virtuell mapp på sänd_lista"
 
-#: mail/folder-browser.c:591
+#: mail/folder-browser.c:668
 msgid "Filter on Sub_ject"
 msgstr "Filtrera på _ämnesrad"
 
-#: mail/folder-browser.c:594
+#: mail/folder-browser.c:671
 msgid "Filter on Sen_der"
 msgstr "Filtrera på _avsändare"
 
-#: mail/folder-browser.c:597
+#: mail/folder-browser.c:674
 msgid "Filter on Re_cipients"
 msgstr "Filtrera på _mottagare"
 
-#: mail/folder-browser.c:600
+#: mail/folder-browser.c:677
 msgid "Filter on _Mailing List"
 msgstr "Filtrera på sä_ndlista"
 
-#: mail/folder-browser.c:609
+#: mail/folder-browser.c:686
 msgid "_Open"
 msgstr "_Öppna"
 
-#: mail/folder-browser.c:611
+#: mail/folder-browser.c:688
 msgid "Resend"
 msgstr "Skicka om"
 
-#: mail/folder-browser.c:613 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:113 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:690 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail.xml.h:118 ui/evolution-tasks.xml.h:11
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: mail/folder-browser.c:615 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:692 ui/evolution-event-editor.xml.h:69
+#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:10
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: mail/folder-browser.c:620
+#: mail/folder-browser.c:697 ui/evolution-mail.xml.h:117
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsändaren"
 
-#: mail/folder-browser.c:622 ui/evolution-mail.xml.h:66
+#: mail/folder-browser.c:699 ui/evolution-mail.xml.h:72
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: mail/folder-browser.c:624 ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:701
 msgid "_Forward"
 msgstr "_Vidarebefordra"
 
-#: mail/folder-browser.c:626
-msgid "Forward _inline"
-msgstr "Vidarebefordra _inuti"
-
-#: mail/folder-browser.c:629 ui/evolution-mail.xml.h:40
+#: mail/folder-browser.c:704
 msgid "Mar_k as Read"
 msgstr "Mär_k som läst"
 
-#: mail/folder-browser.c:631 ui/evolution-mail.xml.h:44
+#: mail/folder-browser.c:706
 msgid "Mark as U_nread"
 msgstr "Markera som _oläst"
 
-#: mail/folder-browser.c:636 ui/evolution-mail.xml.h:107
+#: mail/folder-browser.c:711
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp..."
 
-#: mail/folder-browser.c:638 ui/evolution-mail.xml.h:96
+#: mail/folder-browser.c:713
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: mail/folder-browser.c:642 ui/evolution-mail.xml.h:118
+#: mail/folder-browser.c:717 ui/evolution-mail.xml.h:121
 msgid "_Undelete"
 msgstr "_Ångra borttagning"
 
@@ -5753,38 +6025,38 @@ msgstr "_Ångra borttagning"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:652 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:727
 msgid "Apply Filters"
 msgstr "Tillämpa filter"
 
-#: mail/folder-browser.c:656
+#: mail/folder-browser.c:731
 msgid "Create Ru_le From Message"
 msgstr "Skapa rege_l från meddelande"
 
-#: mail/folder-browser.c:795
+#: mail/folder-browser.c:870
 msgid "Filter on Mailing List"
 msgstr "Filtrera på sändlista"
 
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:871
 msgid "VFolder on Mailing List"
 msgstr "Virtuell mapp på sändlista"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:873
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrera på sändlista (%s)"
 
-#: mail/folder-browser.c:799
+#: mail/folder-browser.c:874
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Virtuell mapp på sändlista (%s)"
 
-#: mail/folder-browser-factory.c:213
+#: mail/folder-browser-factory.c:196
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper för \"%s\""
 
-#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:198 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Egenskaper"
@@ -5892,7 +6164,7 @@ msgstr " (standard)"
 msgid "Disable"
 msgstr "Stäng av"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:30
 msgid "Enable"
 msgstr "Slå på"
 
@@ -5905,7 +6177,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "Är du säker på att du vill ta bort detta diskussionsgruppskonto?"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#: mail/mail-accounts.c:568
 msgid "Evolution Account Manager"
 msgstr "Evolutions kontohanterare"
 
@@ -5933,7 +6205,7 @@ msgstr "Sändlistan %s"
 msgid "Add Filter Rule"
 msgstr "Lägg till filterregel"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5943,9 +6215,9 @@ msgstr ""
 "Du har inte konfigurerat e-postklienten.\n"
 "Du måste göra detta innan du kan skicka,\n"
 "ta emot eller skriva nya brev.\n"
-"Vill du konfigurera det nu?"
+"Vill du konfigurera den nu?"
 
-#: mail/mail-callbacks.c:149
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5953,7 +6225,7 @@ msgstr ""
 "Du måste konfigurera en identititet\n"
 "innan du kan skriva brev."
 
-#: mail/mail-callbacks.c:161
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5961,11 +6233,11 @@ msgstr ""
 "Du måste konfigurera en e-posttransport\n"
 "innan du kan skriva brev."
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:202
 msgid "You have not set a mail transport method"
 msgstr "Du har inte angivit någon e-posttransportmetod"
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5973,37 +6245,37 @@ msgstr ""
 "Detta meddelande har ingen ämnesrad.\n"
 "Vill du verkligen skicka?"
 
-#: mail/mail-callbacks.c:311
+#: mail/mail-callbacks.c:308
 msgid "You must specify recipients in order to send this message."
 msgstr "Du måste ange mottagare för att kunna skicka detta meddelande."
 
-#: mail/mail-callbacks.c:354
+#: mail/mail-callbacks.c:351
 msgid "You must configure an account before you can send this email."
 msgstr "Du måste konfigurera ett konto innan du kan skicka brevet."
 
-#: mail/mail-callbacks.c:593
+#: mail/mail-callbacks.c:599
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "Den %s skrev %s:"
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:761
 msgid "Forwarded message:\n"
 msgstr "Vidarebefordrat meddelande:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:855
 msgid "Move message(s) to"
 msgstr "Flytta meddelande(n) till"
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:857
 msgid "Copy message(s) to"
 msgstr "Kopiera meddelande(n) till"
 
-#: mail/mail-callbacks.c:1156
+#: mail/mail-callbacks.c:1022
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Är du säker på att du vill redigera alla %d meddelanden?"
 
-#: mail/mail-callbacks.c:1178
+#: mail/mail-callbacks.c:1044
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6011,7 +6283,7 @@ msgstr ""
 "Du kan bara redigera meddelanden\n"
 "som du sparat i mappen Drafts."
 
-#: mail/mail-callbacks.c:1212
+#: mail/mail-callbacks.c:1078
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6019,20 +6291,20 @@ msgstr ""
 "Du kan bara skicka om meddelanden\n"
 "som du sparat i mappen Sent."
 
-#: mail/mail-callbacks.c:1224
+#: mail/mail-callbacks.c:1090
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Är du säker på att du vill skicka om alla %d meddelanden?"
 
-#: mail/mail-callbacks.c:1245
+#: mail/mail-callbacks.c:1111
 msgid "No Message Selected"
 msgstr "Inget meddelande markerat"
 
-#: mail/mail-callbacks.c:1271 mail/mail-display.c:90
+#: mail/mail-callbacks.c:1145 mail/mail-display.c:93
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: mail/mail-callbacks.c:1275 mail/mail-display.c:94
+#: mail/mail-callbacks.c:1149 mail/mail-display.c:97
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -6040,15 +6312,15 @@ msgstr ""
 "Det finns redan en fil med det namnet.\n"
 "Ska den skrivas över?"
 
-#: mail/mail-callbacks.c:1319
+#: mail/mail-callbacks.c:1193
 msgid "Save Message As..."
 msgstr "Spara meddelande som..."
 
-#: mail/mail-callbacks.c:1321
+#: mail/mail-callbacks.c:1195
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:1456
+#: mail/mail-callbacks.c:1354
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6057,25 +6329,21 @@ msgstr ""
 "Fel vid läsning av filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1466
-msgid "Filters"
-msgstr "Filter"
-
-#: mail/mail-callbacks.c:1507 ui/evolution-mail.xml.h:56
+#: mail/mail-callbacks.c:1412
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/mail-callbacks.c:1554
+#: mail/mail-callbacks.c:1459
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
-#: mail/mail-callbacks.c:1632
+#: mail/mail-callbacks.c:1554
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Är du säker på att du vill öppna alla %d meddelanden i separata fönster?"
 
-#: mail/mail-config.c:1127 mail/mail-config.c:1130
+#: mail/mail-config.c:1227 mail/mail-config.c:1230
 msgid "Connecting to server..."
 msgstr "Ansluter till server..."
 
@@ -6152,19 +6420,27 @@ msgid "Accounts"
 msgstr "Konton"
 
 #: mail/mail-config.glade.h:8
+msgid "Always load images off the net"
+msgstr "Läs alltid in bilder från nätet"
+
+#: mail/mail-config.glade.h:10
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "Authentication Type: "
 msgstr "Autentiseringstyp: "
 
 # Låter konstigt
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "Automatically check for new mail every"
 msgstr "Kontrollera ny e-post var"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
+msgid "Composer"
+msgstr "Redigerare"
+
+#: mail/mail-config.glade.h:15
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6179,163 +6455,191 @@ msgstr ""
 "\n"
 "Klicka på \"Slutför\" för att spara dina inställningar."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:21
 msgid "De_fault"
 msgstr "Sta_ndard"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
+msgid "Default \"Forward\" style is: "
+msgstr "Standardstil för vidarebefordran är: "
+
+#: mail/mail-config.glade.h:25
 msgid "Done"
 msgstr "Klar"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:26
 msgid "Drafts"
 msgstr "Mallar"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:27
 msgid "Drafts folder:"
 msgstr "Mallmapp:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:29
 msgid "Email Address:"
 msgstr "E-postadress:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:31
 msgid "Full Name:"
 msgstr "Fullständigt namn:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
-msgstr "Markera citat med "
+#: mail/mail-config.glade.h:32
+msgid "Highlight citations with"
+msgstr "Markera citat med"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:34
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:35
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:36
+msgid "In HTML mail"
+msgstr "I HTML-brev"
+
+#: mail/mail-config.glade.h:37
+msgid "Inline"
+msgstr "Inuti"
+
+#: mail/mail-config.glade.h:38
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:39
+msgid "Load images if sender is in addressbook"
+msgstr "Läs in bilder om avsändaren finns i adressboken"
+
+#: mail/mail-config.glade.h:40
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:41
 msgid "Make this my default account"
 msgstr "Gör detta till mitt standardkonto"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:42
 msgid "Mark messages as \"Read\" after:"
 msgstr "Markera meddelanden som \"Läst\" efter: "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:44
+msgid "Never load images off the net"
+msgstr "Läs aldrig in bilder från nätet"
+
+#: mail/mail-config.glade.h:45
 msgid "News"
 msgstr "Diskussionsgrupper"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
 msgid "Optional Information"
 msgstr "Valfri information"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:48
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:49
+msgid "PGP"
+msgstr "PGP"
+
+#: mail/mail-config.glade.h:50
 msgid "PGP binary path:"
 msgstr "Sökväg till PGP-programmet:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:55
 msgid "Qmail maildir "
 msgstr "Qmail-epostkatalog "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:56
+msgid "Quoted"
+msgstr "Citerad"
+
+#: mail/mail-config.glade.h:57
 msgid "Receiving Email"
 msgstr "Tar emot e-post"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:58
 msgid "Receiving Mail"
 msgstr "Tar emot e-post"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:59
 msgid "Receiving Options"
 msgstr "Alternativ för mottagning"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:61
 msgid "Required Information"
 msgstr "Obligatorisk information"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:63
 msgid "Select PGP binary"
 msgstr "Välj PGP-program"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:64
 msgid "Send mail in HTML format by default."
 msgstr "Skicka brev i HTML-format som standard."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:65
 msgid "Sending Email"
 msgstr "Skickar e-post"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:66
 msgid "Sending Mail"
 msgstr "Skickar e-post"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:68
 msgid "Sent"
 msgstr "Skickat"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:69
 msgid "Sent and Draft Messages"
 msgstr "Skickade meddelanden och mallar"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:70
 msgid "Sent messages folder:"
 msgstr "Mapp för skickade meddelanden:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:71
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:72
 msgid "Server Type: "
 msgstr "Servertyp: "
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:73
 msgid "Server requires authentication"
 msgstr "Servern kräver autentisering"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:74
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:75
 msgid "Sources"
 msgstr "Källor"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:76
 msgid "Special Folders"
 msgstr "Specialmappar"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:77
 msgid "Standard Unix mbox"
 msgstr "Standard Unix-brevlåda"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:78
 msgid "Type"
 msgstr "Typ"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:79
 msgid "Use secure connection (SSL)"
 msgstr "Använd säker anslutning (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:80
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:81
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6345,157 +6649,209 @@ msgstr ""
 "\n"
 "Klicka på \"Nästa\" för att börja. "
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:32
+#: mail/mail-config.glade.h:86 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:47 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:48
 msgid "_Edit"
-msgstr "R_edigera"
+msgstr "_Redigera"
+
+#: mail/mail-crypto.c:59
+msgid "Could not create a PGP signature context."
+msgstr "Kunde inte skapa ett PGP-signatursammanhang."
+
+#: mail/mail-crypto.c:84
+msgid "Could not create a PGP verification context."
+msgstr "Kunde inte skapa ett PGP-verifieringssammanhang."
+
+#: mail/mail-crypto.c:113
+msgid "Could not create a PGP encryption context."
+msgstr "Kunde inte skapa ett PGP-krypteringssammanhang."
+
+#: mail/mail-crypto.c:138
+msgid "Could not create a PGP decryption context."
+msgstr "Kunde inte skapa ett PGP-dekrypteringssammanhang."
+
+#: mail/mail-crypto.c:169
+msgid "Could not create a S/MIME signature context."
+msgstr "Kunde inte skapa ett S/MIME-signatursammanhang."
+
+#: mail/mail-crypto.c:195
+msgid "Could not create a S/MIME verification context."
+msgstr "Kunde inte skapa ett S/MIME-verifieringssammanhang."
 
-#: mail/mail-display.c:194
+#: mail/mail-crypto.c:225
+msgid "Could not create a S/MIME encryption context."
+msgstr "Kunde inte skapa ett S/MIME-krypteringssammanhang."
+
+#: mail/mail-crypto.c:251
+msgid "Could not create a S/MIME decryption context."
+msgstr "Kunde inte skapa S/MIME-krypteringssammanhang."
+
+#: mail/mail-display.c:197
 msgid "Save Attachment"
 msgstr "Spara bilaga"
 
-#: mail/mail-display.c:234
+#: mail/mail-display.c:237
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunde inte skapa temporär katalog: %s"
 
-#: mail/mail-display.c:295
+#: mail/mail-display.c:298
 msgid "Save to Disk..."
 msgstr "Spara till disk..."
 
-#: mail/mail-display.c:297
+#: mail/mail-display.c:300
 #, c-format
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:302
 msgid "View Inline"
 msgstr "Visa inuti"
 
-#: mail/mail-display.c:334
+#: mail/mail-display.c:337
 msgid "External Viewer"
 msgstr "Externt visningsprogram"
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:360
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visa inuti (med %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:364
 msgid "Hide"
 msgstr "Göm"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:989
+msgid "Loading message content"
+msgstr "Läser in meddelandeinnehåll"
+
+#: mail/mail-display.c:1283
 msgid "Open link in browser"
 msgstr "Öppna länk i webbläsare"
 
-#: mail/mail-display.c:1109
+#: mail/mail-display.c:1285
 msgid "Save as (FIXME)"
 msgstr "Spara som (FIXME)"
 
-#: mail/mail-display.c:1111
+#: mail/mail-display.c:1287
 msgid "Copy location (FIXME)"
 msgstr "Kopiera plats (FIXME)"
 
-#: mail/mail-format.c:522
+#: mail/mail-format.c:527
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:573
 msgid "Could not parse MIME message. Displaying as source."
-msgstr "Kunde inte tolka MIME-meddelande. Visar som källa."
+msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
 
-#: mail/mail-format.c:771
-msgid "Loading message content"
-msgstr "Läser in meddelandeinnehåll"
+#: mail/mail-format.c:640 mail/message-list.c:1089
+msgid "Date"
+msgstr "Datum"
+
+#: mail/mail-format.c:756 mail/message-list.c:1089
+msgid "From"
+msgstr "Från"
+
+#: mail/mail-format.c:759
+msgid "Reply-To"
+msgstr "Svara till"
+
+#: mail/mail-format.c:762 mail/message-list.c:1090
+msgid "To"
+msgstr "Till"
+
+#: mail/mail-format.c:765
+msgid "Cc"
+msgstr "Kopia"
 
-#: mail/mail-format.c:1080
+#: mail/mail-format.c:1075
 msgid "No GPG/PGP program configured."
 msgstr "Inget GPG/PGP-program är konfigurerat."
 
-#: mail/mail-format.c:1095
+#: mail/mail-format.c:1090
 msgid "Encrypted message not displayed"
 msgstr "Krypterat meddelande visas inte"
 
-#: mail/mail-format.c:1101
+#: mail/mail-format.c:1096
 msgid "Encrypted message"
 msgstr "Krypterat meddelande"
 
-#: mail/mail-format.c:1102
+#: mail/mail-format.c:1097
 msgid "Click icon to decrypt."
 msgstr "Klicka på ikonen för att dekryptera."
 
-#: mail/mail-format.c:1192 mail/mail-format.c:1580
+#: mail/mail-format.c:1153
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Detta meddelande är digitalt signerat och har befunnits äkta."
 
-#: mail/mail-format.c:1200 mail/mail-format.c:1588
+#: mail/mail-format.c:1161
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Detta meddelande är digitalt signerat men äktheten kan inte bevisas."
 
-#: mail/mail-format.c:1801
+#: mail/mail-format.c:1791
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/mail-format.c:1813
+#: mail/mail-format.c:1803
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pekare till lokal fil (%s) giltig på platsen \"%s\""
 
-#: mail/mail-format.c:1817
+#: mail/mail-format.c:1807
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/mail-format.c:1851
+#: mail/mail-format.c:1841
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okänd extern data (typen \"%s\")"
 
-#: mail/mail-format.c:1856
+#: mail/mail-format.c:1846
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
-#: mail/mail-local.c:509
+#: mail/mail-local.c:505
 #, c-format
 msgid "Opening '%s'"
 msgstr "Öppnar \"%s\""
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:785
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Byter format på mappen \"%s\" till \"%s\""
 
-#: mail/mail-local.c:791
+#: mail/mail-local.c:789
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Byt format på mappen \"%s\" till \"%s\""
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:812
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerar mapp"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:841
 msgid "Closing current folder"
 msgstr "Stänger aktuell mapp"
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:873
 msgid "Renaming old folder and opening"
 msgstr "Byter namn på gammal mapp och öppnar"
 
-#: mail/mail-local.c:893
+#: mail/mail-local.c:891
 msgid "Creating new folder"
 msgstr "Skapar ny mapp"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:905
 msgid "Copying messages"
 msgstr "Kopierar meddelanden"
 
-#: mail/mail-local.c:924
+#: mail/mail-local.c:922
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6504,7 +6860,7 @@ msgstr ""
 "Kan inte spara metadata för mapp; du kommer antagligen att\n"
 "upptäcka att du inte kan öppna denna mapp längre: %s"
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:961
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6512,6 +6868,11 @@ msgstr ""
 "Om du inte längre kan öppna denna brevlåda måste\n"
 "du kanske reparera den manuellt."
 
+#: mail/mail-local.c:1047
+#, c-format
+msgid "Reconfigure %s"
+msgstr "Konfigura om %s"
+
 #: mail/mail-mt.c:190
 #, c-format
 msgid ""
@@ -6565,66 +6926,81 @@ msgstr "Färdig."
 msgid "Saving message to folder"
 msgstr "Sparar meddelande till mappen"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:915
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 msgid "Copying"
 msgstr "Kopierar"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:993
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
-#: mail/mail-ops.c:1154
+#: mail/mail-ops.c:1155
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
+#: mail/mail-ops.c:1196 mail/mail-ops.c:1334
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1263
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagringsutrymmet %s"
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1402
+#, c-format
+msgid "Removing folder %s"
+msgstr "Byter namn på mappen %s"
+
+#: mail/mail-ops.c:1486
+#, c-format
+msgid "Moving folder %s to %s"
+msgstr "Flyttar mappen %s till %s"
+
+#: mail/mail-ops.c:1488
+#, c-format
+msgid "Copying folder %s to %s"
+msgstr "Kopierar mappen %s till %s"
+
+#: mail/mail-ops.c:1641
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1690
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1757
 msgid "Retrieving messages"
 msgstr "Hämtar meddelanden"
 
-#: mail/mail-ops.c:1575
+#: mail/mail-ops.c:1767
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Hämtar meddelande nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1649
+#: mail/mail-ops.c:1841
 msgid "Saving messages"
 msgstr "Sparar meddelanden"
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1920
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6633,12 +7009,12 @@ msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1741
+#: mail/mail-ops.c:1933
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Sparar meddelande %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6647,11 +7023,11 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: mail/mail-ops.c:1844
+#: mail/mail-ops.c:2036
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6660,41 +7036,44 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1872
+#: mail/mail-ops.c:2064
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: mail/mail-ops.c:1939
+#: mail/mail-ops.c:2131
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar från %s"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Sök"
-
-#: mail/mail-search.c:167
-#, c-format
-msgid "Search \"%s\""
-msgstr "Sök i \"%s\""
+#: mail/mail-search.c:138
+msgid "(Untitled Message)"
+msgstr "(Namnlöst meddelande)"
 
-#: mail/mail-search.c:169
-msgid "Search Untitled Message"
-msgstr "Sök namnlöst meddelande"
+#: mail/mail-search.c:268
+msgid "Find in Message"
+msgstr "Sök i meddelande"
 
-#: mail/mail-search.c:184
+#: mail/mail-search.c:298
 msgid "Case Sensitive"
 msgstr "Gör skillnad på gemener/VERSALER"
 
-#: mail/mail-search.c:185
+#: mail/mail-search.c:299
 msgid "Search Forward"
 msgstr "Sök vidare"
 
-#: mail/mail-search.c:192
+#: mail/mail-search.c:316
 msgid "Find:"
 msgstr "Sök:"
 
+#: mail/mail-search.c:319
+msgid "Matches:"
+msgstr "Träffar:"
+
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Sök"
+
 #: mail/mail-send-recv.c:138
 msgid "Cancelling..."
 msgstr "Avbryter..."
@@ -6731,30 +7110,30 @@ msgstr "Inkomplett meddelande skrevs på rör!"
 msgid "Mail Summary"
 msgstr "E-postsammanfattning"
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:145
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kunde inte skapa temporärt meddelandefält \"%s\": %s"
 
-#: mail/mail-tools.c:188
+#: mail/mail-tools.c:192
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (vidarebefordrat meddelande)"
 
-#: mail/mail-tools.c:198
+#: mail/mail-tools.c:202
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (inget ämne)"
 
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:219
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidarebefordrat meddelande - %s"
 
-#: mail/mail-tools.c:217
+#: mail/mail-tools.c:221
 msgid "Forwarded message (no subject)"
 msgstr "Vidarebefordrat meddelande (inget ämne)"
 
-#: mail/mail-tools.c:424
+#: mail/mail-tools.c:428
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
@@ -6767,144 +7146,132 @@ msgstr ""
 msgid "VFolders"
 msgstr "Virtuella mappar"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:438
 msgid "New VFolder"
 msgstr "Ny virtuell mapp"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:64
+#: mail/message-browser.c:197 ui/evolution-mail.xml.h:70
 msgid "Reply"
 msgstr "Svara"
 
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:70
+#: mail/message-browser.c:197
 msgid "Reply to the sender of this message"
 msgstr "Svara till avsändaren av det här meddelandet"
 
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:65
+#: mail/message-browser.c:200 ui/evolution-mail.xml.h:71
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:68
+#: mail/message-browser.c:200
 msgid "Reply to all recipients of this message"
 msgstr "Svara till alla mottagare av det här meddelandet"
 
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
+#: mail/message-browser.c:203 ui/evolution-mail.xml.h:33
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
+#: mail/message-browser.c:203
 msgid "Forward this message"
 msgstr "Vidarebefordra detta meddelande"
 
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:61
+#: mail/message-browser.c:208
 msgid "Print the selected message"
 msgstr "Skriv ut det markerade meddelandet"
 
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
+#: mail/message-browser.c:211
 msgid "Delete this message"
 msgstr "Ta bort detta meddelande"
 
-#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:54 ui/evolution-task-editor-dialog.xml.h:36
+#: mail/message-browser.c:216 ui/evolution-event-editor.xml.h:33
+#: ui/evolution-mail.xml.h:64 ui/evolution-task-editor-dialog.xml.h:36
 msgid "Previous"
 msgstr "Föregående"
 
-#: mail/message-browser.c:208
+#: mail/message-browser.c:216
 msgid "Previous message"
 msgstr "Föregående meddelande"
 
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:50
+#: mail/message-browser.c:219 ui/evolution-calendar.xml.h:18
+#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:57
 #: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "Nästa"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:219
 msgid "Next message"
 msgstr "Nästa meddelande"
 
-#: mail/message-list.c:682
+#: mail/message-list.c:684
 msgid "Unseen"
 msgstr "Oläst"
 
-#: mail/message-list.c:683
+#: mail/message-list.c:685
 msgid "Seen"
 msgstr "Läst"
 
-#: mail/message-list.c:684
+#: mail/message-list.c:686
 msgid "Answered"
 msgstr "Besvarad"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:687
 msgid "Multiple Unseen Messages"
 msgstr "Flera olästa meddelanden"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:688
 msgid "Multiple Messages"
 msgstr "Flera meddelanden"
 
-#: mail/message-list.c:690
+#: mail/message-list.c:692
 msgid "Lowest"
 msgstr "Lägsta"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:693
 msgid "Lower"
 msgstr "Lägre"
 
-#: mail/message-list.c:695
+#: mail/message-list.c:697
 msgid "Higher"
 msgstr "Högre"
 
-#: mail/message-list.c:696
+#: mail/message-list.c:698
 msgid "Highest"
 msgstr "Högsta"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:953
+#: mail/message-list.c:955
 msgid "Today %l:%M %p"
 msgstr "Idag %k.%M"
 
-#: mail/message-list.c:962
+#: mail/message-list.c:964
 msgid "Yesterday %l:%M %p"
 msgstr "Igår %k.%M"
 
-#: mail/message-list.c:974
+#: mail/message-list.c:976
 msgid "%a %l:%M %p"
 msgstr "%a %k.%M"
 
-#: mail/message-list.c:982
+#: mail/message-list.c:984
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k.%M"
 
-#: mail/message-list.c:984
+#: mail/message-list.c:986
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:1086
+#: mail/message-list.c:1088
 msgid "Flagged"
 msgstr "Flaggad"
 
-#: mail/message-list.c:1087
-msgid "From"
-msgstr "Från"
-
-#: mail/message-list.c:1087
-msgid "Date"
-msgstr "Datum"
-
-#: mail/message-list.c:1087
+#: mail/message-list.c:1089
 msgid "Received"
 msgstr "Mottaget"
 
-#: mail/message-list.c:1088
-msgid "To"
-msgstr "Till"
-
-#: mail/message-list.c:1088
+#: mail/message-list.c:1090
 msgid "Size"
 msgstr "Storlek"
 
@@ -6912,7 +7279,7 @@ msgstr "Storlek"
 msgid "User canceled operation."
 msgstr "Användaren avbröt åtgärden."
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mapp"
 
@@ -7021,12 +7388,12 @@ msgstr ""
 "katalogen. Var vänlig och flytta den så att\n"
 "Evolutions användarfiler kan installeras."
 
-#: shell/e-shell.c:388
+#: shell/e-shell.c:390
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan inte lägga upp lokal plats för sparande -- %s"
 
-#: shell/e-shell.c:1273
+#: shell/e-shell.c:1270
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -7035,6 +7402,24 @@ msgstr ""
 "Hoppsan! Vyn för \"%s\" dog oväntat. :-(\n"
 "Det här betyder antagligen att komponenten %s har kraschat."
 
+#: shell/e-shell-folder-commands.c:239
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr "Ange en mapp att kopiera mappen \"%s\" till:"
+
+#: shell/e-shell-folder-commands.c:244
+msgid "Copy folder"
+msgstr "Kopieringsmapp"
+
+#: shell/e-shell-folder-commands.c:281
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr "Ange en mapp att flytta mappen \"%s\" till:"
+
+#: shell/e-shell-folder-commands.c:286
+msgid "Move folder"
+msgstr "Flyttningsmapp"
+
 #: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
@@ -7060,7 +7445,7 @@ msgstr ""
 "Den valda typen av mapp är inte giltig för\n"
 "den begärda åtgärden."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:328
 msgid "New..."
 msgstr "Ny..."
 
@@ -7068,51 +7453,174 @@ msgstr "Ny..."
 msgid "(Untitled)"
 msgstr "(Namnlös)"
 
-#: shell/e-shell-view.c:148
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Välj den fil som du vill importera till Evolution, och välj vilken typ av "
+"fil det är i listan.\n"
+"\n"
+"Du kan välja \"Automatisk\" om du inte vet, så kommer Evolution att försöka "
+"reda ut det."
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Importerar %s\n"
+"Importören är inte redo.\n"
+"Väntar 5 sekunder med nytt försök."
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Importerar %s\n"
+"Importerar objekt %d."
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Det finns ingen importör som kan hantera\n"
+"%s"
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "Importerar"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Importerar %s.\n"
+"Startar %s"
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr "Fel vid start av %s"
+
+#: shell/e-shell-importer.c:403
+#, c-format
+msgid "Error loading %s"
+msgstr "Fel vid inläsning av %s"
+
+#: shell/e-shell-importer.c:418
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Importerar %s\n"
+"Importerar objekt 1."
+
+#: shell/e-shell-importer.c:489
+msgid "Automatic"
+msgstr "Automatisk"
+
+#: shell/e-shell-importer.c:539
+msgid "Filename:"
+msgstr "Filnamn:"
+
+#: shell/e-shell-importer.c:544 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Välj en fil"
+
+#: shell/e-shell-importer.c:554
+msgid "File type:"
+msgstr "Filtyp:"
+
+#: shell/e-shell-importer.c:600
+msgid "Select folder"
+msgstr "Välj mapp"
+
+#: shell/e-shell-importer.c:601
+msgid "Select a destination folder for importing this data"
+msgstr "Välj en destinationsmapp för importen av denna data"
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr "Kopplar från anslutningar..."
+
+#: shell/e-shell-view.c:167
 msgid "(No folder displayed)"
 msgstr "(Ingen mapp visas)"
 
-#: shell/e-shell-view.c:1203
+#: shell/e-shell-view.c:1323
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1205
+#: shell/e-shell-view.c:1325
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view.c:1363
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution är just nu ansluten. Klicka på denna knapp för att koppla från."
+
+#: shell/e-shell-view.c:1370
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution håller på att koppla från."
+
+#: shell/e-shell-view.c:1376
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution är just nu frånkopplad. Klicka på denna knapp för att ansluta."
+
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy hittades inte i din $PATH."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:185
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kunde inte köras."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:230
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:232
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
-"Evolution är en svit av grupprogram\n"
-"för e-post, kalender- och kontakthantering\n"
+"Evolution är en svit av grupprogram för\n"
+"e-post, kalender- och kontakthantering\n"
 "inom Gnome-skrivbordsmiljön."
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:421
 msgid "Go to folder..."
 msgstr "Gå till mapp..."
 
-#: shell/e-shell-view-menu.c:562
+#: shell/e-shell-view-menu.c:422
+msgid "Select the folder that you want to open"
+msgstr "Markera den mapp som du vill öppna"
+
+#: shell/e-shell-view-menu.c:602
 msgid "Work online"
 msgstr "Arbeta ansluten"
 
-#: shell/e-shell-view-menu.c:574 shell/e-shell-view-menu.c:586
+#: shell/e-shell-view-menu.c:614 shell/e-shell-view-menu.c:626
 msgid "Work offline"
 msgstr "Arbeta frånkopplad"
 
@@ -7241,16 +7749,6 @@ msgstr "Åtgärden stöds inte"
 msgid "The specified type is not supported in this storage"
 msgstr "Den angivna typen stöds inte i detta lager"
 
-#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:46
-msgid "_View"
-msgstr "_Visa"
-
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr "Visa den markade mappen"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Mappnamn:"
@@ -7267,103 +7765,6 @@ msgstr "Ange var mappen ska skapas:"
 msgid "The Evolution shell."
 msgstr "Evolutionskalet."
 
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Välj den fil som du vill importera till Evolution, och välj vilken typ av "
-"fil det är i listan.\n"
-"\n"
-"Du kan välja \"Automatisk\" om du inte vet, så kommer Evolution att försöka "
-"reda ut det."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importerar %s\n"
-"Importören är inte redo.\n"
-"Väntar 5 sekunder med nytt försök."
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importerar %s\n"
-"Importerar objekt %d."
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Det finns ingen importör som kan hantera\n"
-"%s"
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Importerar"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importerar %s.\n"
-"Startar %s"
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "Fel vid start av %s"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Fel vid inläsning av %s"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importerar %s\n"
-"Importerar objekt 1."
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "Automatisk"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Filnamn:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Välj en fil"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Filtyp:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Importera"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klicka på \"Importera\" för att börja importera filen till Evolution. "
@@ -7453,70 +7854,62 @@ msgstr "Skicka felsökningsinformation från alla komponenter till en fil."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:1
 msgid "Create new contact"
 msgstr "Skapa ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Ta bort en kontakt"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Sök"
+#: ui/evolution-addressbook.xml.h:3
+msgid "Delete selected contacts"
+msgstr "Ta bort markerade kontakter"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Sök efter en kontakt"
-
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:4
 msgid "New contact"
 msgstr "Ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:53
+#: ui/evolution-addressbook.xml.h:5 ui/evolution-mail.xml.h:63
 msgid "Previews the message to be printed"
 msgstr "Förhandsgranskar meddelandet som ska skrivas ut"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
-msgstr "Skriv ut kontakter"
+#: ui/evolution-addressbook.xml.h:8
+msgid "Print selected contacts"
+msgstr "Skriv ut markerade kontakter"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:84
+#: ui/evolution-addressbook.xml.h:9
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:10
 msgid "Stop Loading"
 msgstr "Stoppa inläsning"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:11
 msgid "View All"
 msgstr "Visa alla"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:12
 msgid "View all contacts"
 msgstr "Visa alla kontakter"
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:13
 msgid "_Addressbook Sources..."
 msgstr "_Adressbokskällor..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:14
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:42
 #: ui/evolution-contact-editor.xml.h:15
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:16
 msgid "_Search for contacts"
 msgstr "_Sök kontakter"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:45
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:44
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:88
+#: ui/evolution.xml.h:64
 msgid "_Tools"
 msgstr "_Verktyg"
 
@@ -7600,7 +7993,7 @@ msgstr "Skriv ut kalender"
 msgid "Print this Calendar"
 msgstr "Skriv ut denna kalender"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:19
 msgid "Save As"
 msgstr "Spara som"
 
@@ -7650,7 +8043,7 @@ msgid "_Month"
 msgstr "_Månad"
 
 #: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:58
 msgid "_New"
 msgstr "_Ny"
 
@@ -7684,12 +8077,12 @@ msgid "Print this item"
 msgstr "Skriv ut detta objekt"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:62 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Skriv ut..."
 
 #: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:20
 #: ui/evolution-task-editor-dialog.xml.h:51
 msgid "Save _As..."
 msgstr "Spara so_m..."
@@ -7716,13 +8109,13 @@ msgid "Send _message to contact..."
 msgstr "Skicka _meddelande till kontakt..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:33
+#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Arkiv"
 
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:55
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Spara"
@@ -7771,7 +8164,7 @@ msgstr "Stäng detta möte"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "K_opiera till mapp... (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:8
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Kopiera"
@@ -7856,7 +8249,7 @@ msgstr "Skrivar_inställning..."
 msgid "Print Setup"
 msgstr "Skrivarinställningar"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:18
 #: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
 msgid "Save"
 msgstr "Spara"
@@ -7865,7 +8258,7 @@ msgstr "Spara"
 msgid "Save the appointment and close the dialog box"
 msgstr "Spara mötet och stäng dialogrutan"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:24
 #: ui/evolution-task-editor-dialog.xml.h:53
 msgid "Save the current file"
 msgstr "Spara aktuell fil"
@@ -7878,8 +8271,7 @@ msgstr "Boka _möte"
 msgid "Schedule some sort of a meeting"
 msgstr "Boka någon typ av möte"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
 msgid "Select All"
 msgstr "Markera allt"
 
@@ -7895,18 +8287,17 @@ msgstr "Ställ in sidinställningarna för din aktuella skrivare"
 msgid "Task _Request (FIXME)"
 msgstr "_Uppgiftsbegäran (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "_Om..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:30
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:44
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "S_täng"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:44
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
@@ -7914,13 +8305,13 @@ msgstr "_Kontakt (FIXME)"
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:45
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "Fels_ök"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:37
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:50
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:53
 msgid "_Help"
 msgstr "_Hjälp"
 
@@ -7952,8 +8343,8 @@ msgstr "_Anteckna (FIXME)"
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:115
+#: ui/evolution-task-editor-dialog.xml.h:83 ui/evolution.xml.h:60
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
@@ -7962,7 +8353,7 @@ msgid "_Select All"
 msgstr "_Markera allt"
 
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:63
 msgid "_Task (FIXME)"
 msgstr "_Uppgift (FIXME)"
 
@@ -7970,6 +8361,11 @@ msgstr "_Uppgift (FIXME)"
 msgid "_Unread Item (FIXME)"
 msgstr "O_läst objekt (FIXME)"
 
+#: ui/evolution-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:57
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:65
+msgid "_View"
+msgstr "_Visa"
+
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Add Service"
 msgstr "Lägg till tjänst"
@@ -7990,29 +8386,33 @@ msgstr "Inställningar för sammanfattningen..."
 msgid "New Mail"
 msgstr "Ny post"
 
+#: ui/evolution-mail.xml.h:1
+msgid "Apply filter rules to the selected messages"
+msgstr "Verkställ filterregler på det markerade meddelandet"
+
 #: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
-msgstr "Verkställ alla nya filter på e-posten i denna brevlåda"
+msgid "Cancel"
+msgstr "Avbryt"
 
 #: ui/evolution-mail.xml.h:3
+msgid "Cancel the current mail operation"
+msgstr "Avbryt aktuell e-postoperation"
+
+#: ui/evolution-mail.xml.h:4
 msgid "Change the properties of this folder"
 msgstr "Ändra egenskaperna för denna mapp"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:5
 msgid "Compose"
 msgstr "Skriv"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Skriv ett nytt meddelande"
-
 #: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "Konfigura mapp..."
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Skriv ett svar till alla mottagare av det markerade meddelandet"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Kopiera meddelandet till en ny mapp"
+#: ui/evolution-mail.xml.h:7
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Skriv ett svar till avsändaren av det markerade meddelandet"
 
 #: ui/evolution-mail.xml.h:9
 msgid "Copy selected messages to another folder"
@@ -8022,306 +8422,396 @@ msgstr "Kopiera markerade meddelanden till en annan mapp"
 msgid "Create _Virtual Folder From Message"
 msgstr "Skapa _virtuell mapp från meddelande"
 
+#: ui/evolution-mail.xml.h:11
+msgid "Create a rule to filter messages from this sender"
+msgstr "Skapa en regel för att filtrera meddelanden från denna avsändare"
+
 #: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
-msgstr "Ta bort det markerade meddelandet"
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Skapa en regel för att filtrera meddelanden till dessa mottagare"
+
+#: ui/evolution-mail.xml.h:13
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Skapa en regel för att filtrera meddelanden till denna sändlista"
 
 #: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr "Visa alla meddelandehuvuden"
+msgid "Create a rule to filter messages with this subject"
+msgstr "Skapa en regel för att filtrera meddelanden med denna ämnesrad"
 
 #: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "Redigera meddelande"
+msgid "Create a virtual folder for these recipients"
+msgstr "Skapa en virtuell mapp för dessa mottagare"
 
 #: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
-msgstr "Redigera det aktuella meddelandet"
+msgid "Create a virtual folder for this mailing list"
+msgstr "Skapa en virtuell mapp för denna sändlista"
 
 #: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "Töm _papperskorgen"
+msgid "Create a virtual folder for this sender"
+msgstr "Skapa en virtuell mapp för denna avsändare"
 
 #: ui/evolution-mail.xml.h:18
-msgid "Expunge"
-msgstr "Töm"
+msgid "Create a virtual folder for this subject"
+msgstr "Skapa en virtuell mapp för detta ämne"
 
 #: ui/evolution-mail.xml.h:19
+msgid "Create or edit mail accounts and other preferences"
+msgstr "Skapa eller redigera e-postkonton och andra inställningar"
+
+#: ui/evolution-mail.xml.h:20
+msgid "Create or edit rules for filtering new mail"
+msgstr "Skapa eller redigera regler för filtrering av ny post"
+
+#: ui/evolution-mail.xml.h:21
+msgid "Create or edit virtual folder definitions"
+msgstr "Skapa eller redigera definitioner för virtuella mappar"
+
+#: ui/evolution-mail.xml.h:23
+msgid "Display the next message"
+msgstr "Visa nästa meddelande"
+
+#: ui/evolution-mail.xml.h:24
+msgid "Display the previous message"
+msgstr "Visa föregående meddelande"
+
+#: ui/evolution-mail.xml.h:25
+msgid "Empty _Trash"
+msgstr "Töm _papperskorgen"
+
+#: ui/evolution-mail.xml.h:26
 msgid "Filter on Mailing _List"
 msgstr "Filtrera på sänd_lista"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:27
 msgid "Filter on Se_nder"
 msgstr "Filtrera på _avsändare"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:28
 msgid "Filter on _Recipients"
 msgstr "Filtrera på _mottagare"
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:29
 msgid "Filter on _Subject"
 msgstr "Filtrera på _ämnesrad"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "Ta bort alla brev som är markerade för borttagning för gott"
+#: ui/evolution-mail.xml.h:30
+msgid "Force images in HTML mail to be loaded"
+msgstr "Tvinga att bilder i HTML-epost läses in"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:31
 msgid "Forget _Passwords"
 msgstr "Glöm _lösenord"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:32
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr "Glöm ihågkomna lösenord så att du frågas efter dem igen"
+
+#: ui/evolution-mail.xml.h:34
 msgid "Forward As"
 msgstr "Vidarebefordra som"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward inline"
-msgstr "Vidarebefordra inuti"
+#: ui/evolution-mail.xml.h:35
+msgid "Forward _Attached"
+msgstr "Vidarebefordra som _bilaga"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr "Vidarebefordra det markerade brevet till någon"
+#: ui/evolution-mail.xml.h:36
+msgid "Forward _Inline"
+msgstr "Vidarebefordra _inuti"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr ""
-"Vidarebefordra detta meddelande inuti ditt brev, så att du kan redigera det"
+#: ui/evolution-mail.xml.h:37
+msgid "Forward _Quoted"
+msgstr "Vidarebefordra _citerat"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "Fullständiga _huvuden"
+#: ui/evolution-mail.xml.h:38
+msgid "Forward the selected message in the body of a new message"
+msgstr ""
+"Vidarebefordra det markerade meddelandet i texten på ett nytt meddelande"
 
-#: ui/evolution-mail.xml.h:32
-msgid "Go to the next message"
-msgstr "Gå till nästa meddelande"
+#: ui/evolution-mail.xml.h:39
+msgid "Forward the selected message quoted like a reply"
+msgstr "Vidarebefordra det markerade meddelandet citerat som ett svar"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Go to the previous message"
-msgstr "Gå till föregående meddelande"
+#: ui/evolution-mail.xml.h:40
+msgid "Forward the selected message to someone"
+msgstr "Vidarebefordra det markerade meddelandet till någon"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Hide Deleted Messages"
-msgstr "Göm borttagna meddelanden"
+#: ui/evolution-mail.xml.h:41
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Vidarebefordra det markerade meddelandet till någon som en bilaga"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:42
 msgid "Hide S_elected Messages"
 msgstr "Göm _markerade meddelanden"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:43
 msgid "Hide _Deleted Messages"
 msgstr "Göm _borttagna meddelanden"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:44
 msgid "Hide _Read messages"
 msgstr "Göm _lästa meddelanden"
 
-#: ui/evolution-mail.xml.h:38
-msgid "Invert Selection"
-msgstr "Omvänd markering"
+#: ui/evolution-mail.xml.h:45
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr "Göm borttagna meddelanden istället för att visa dem överstrukna"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:46
+msgid "Load _Images"
+msgstr "Läs in _bilder"
+
+#: ui/evolution-mail.xml.h:47
 msgid "Manage _Subscriptions..."
 msgstr "Hantera _prenumerationer..."
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:48
+msgid "Mar_k As Read"
+msgstr "Mar_kera som läst"
+
+#: ui/evolution-mail.xml.h:49
 msgid "Mark All as R_ead"
 msgstr "Markera alla som _lästa"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark As Read"
-msgstr "Markera som läst"
-
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:50
 msgid "Mark As U_nread"
 msgstr "Markera som _oläst"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:51
+msgid "Mark all visible messages as read"
+msgstr "Markera alla synliga meddelanden som lästa"
+
+#: ui/evolution-mail.xml.h:52
 msgid "Mark the selected messages as having been read"
 msgstr "Markera de markerade meddelandena som lästa"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:53
 msgid "Mark the selected messages as not having been read"
 msgstr "Markera de markerade meddelandena som olästa"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:54
+msgid "Mark the selected messages for deletion"
+msgstr "Markera de markerade meddelandena för borttagning"
+
+#: ui/evolution-mail.xml.h:55
 msgid "Move"
 msgstr "Flytta"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Move message to a new folder"
-msgstr "Flytta meddelandet till en ny mapp"
-
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:56
 msgid "Move selected messages to another folder"
 msgstr "Flytta markerade meddelanden till en annan mapp"
 
-#: ui/evolution-mail.xml.h:51
-msgid "Open in New Window"
-msgstr "Öppna i nytt fönster"
-
-#: ui/evolution-mail.xml.h:52
-msgid "Open the current message in a new window"
-msgstr "Öppna det aktuella meddelandet i ett nytt fönster"
-
 #: ui/evolution-mail.xml.h:58
-msgid "Print Preview of message..."
-msgstr "Förhandsgranska meddelande..."
+msgid "Open a window for composing a mail message"
+msgstr "Öppna ett fönster för skrivning av ett e-postmeddelande"
 
 #: ui/evolution-mail.xml.h:59
-msgid "Print message to the printer"
-msgstr "Skriv ut meddelandet på skrivaren"
+msgid "Open the selected message in a new window"
+msgstr "Öppna det markerade meddelandet i ett nytt fönster"
 
 #: ui/evolution-mail.xml.h:60
-msgid "Print message..."
-msgstr "Skriv ut meddelande..."
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Öppna det markerade meddelandet i redigeraren för återsändning av det"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Redirect (FIXME: implement me)"
-msgstr "Omdirigera (FIXME: implementera mig)"
+#: ui/evolution-mail.xml.h:61
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Radera alla borttagna meddelanden från alla mappar permanent"
+
+#: ui/evolution-mail.xml.h:62
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Radera alla borttagna meddelanden från denna mapp permanent"
+
+#: ui/evolution-mail.xml.h:66
+msgid "Print Message..."
+msgstr "Skriv ut meddelande..."
 
 #: ui/evolution-mail.xml.h:67
-msgid "Reply to all"
-msgstr "Svara till alla"
+msgid "Print Preview..."
+msgstr "Förhandsgranska..."
+
+#: ui/evolution-mail.xml.h:68
+msgid "Print message to the printer"
+msgstr "Skriv ut meddelandet på skrivaren"
 
 #: ui/evolution-mail.xml.h:69
-msgid "Reply to sender"
-msgstr "Svara till avsändaren"
+msgid "Redirect (FIXME: implement me)"
+msgstr "Omdirigera (FIXME: implementera mig)"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:73
 msgid "S_earch Message"
 msgstr "S_ök meddelande"
 
-#: ui/evolution-mail.xml.h:72
-msgid "S_ource"
-msgstr "_Källa"
+#: ui/evolution-mail.xml.h:74
+msgid "Save the message as a text file"
+msgstr "Spara meddelandet som en textfil"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Save the message into a new file"
-msgstr "Spara meddelandet i en ny fil"
+#: ui/evolution-mail.xml.h:75
+msgid "Search for text in the body of the displayed message"
+msgstr "Sök efter text i meddelandetexten på det visade meddelandet"
 
-#: ui/evolution-mail.xml.h:75 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:76 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Markera _alla"
 
-#: ui/evolution-mail.xml.h:76
+#: ui/evolution-mail.xml.h:77
 msgid "Select _Thread"
 msgstr "Markera _tråd"
 
-#: ui/evolution-mail.xml.h:77
-msgid "Send / Receive"
-msgstr "Skicka / Ta emot"
-
 #: ui/evolution-mail.xml.h:78
-msgid "Send a reply to the person who sent you this mail"
-msgstr "Skicka ett svar till personen som skickade dig detta brev"
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
+"Markera alla och endast de meddelanden som inte är markerade för tillfället"
 
 #: ui/evolution-mail.xml.h:79
-msgid "Send a single mail in reply to all the selected mail"
-msgstr "Skicka ett enda brev som svar på alla de markerade breven"
+msgid "Select all messages in the same thread as the selected message"
+msgstr "Markera alla meddelanden i samma tråd som det markerade meddelandet"
 
 #: ui/evolution-mail.xml.h:80
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr ""
-"Skicka kölagd e-post\n"
-"    och hämta ny e-post"
+msgid "Select all visible messages"
+msgstr "Markera alla synliga meddelanden"
+
+#: ui/evolution-mail.xml.h:81
+msgid "Send / Receive"
+msgstr "Skicka / Ta emot"
 
 #: ui/evolution-mail.xml.h:82
 msgid "Send queued mail and retrieve new mail"
 msgstr "Skicka kölagd e-post och hämta ny e-post"
 
 #: ui/evolution-mail.xml.h:83
+msgid "Show Email _Source"
+msgstr "Visa e-post_källkod"
+
+#: ui/evolution-mail.xml.h:84
+msgid "Show Full _Headers"
+msgstr "Visa fullständiga _huvuden"
+
+#: ui/evolution-mail.xml.h:85
 msgid "Show _All"
 msgstr "Visa _alla"
 
-#: ui/evolution-mail.xml.h:85
+#: ui/evolution-mail.xml.h:86
+msgid "Show message in the normal style"
+msgstr "Visa meddelanden i normal stil"
+
+#: ui/evolution-mail.xml.h:87
+msgid "Show message with all email headers"
+msgstr "Visa meddelande med alla e-posthuvuden"
+
+#: ui/evolution-mail.xml.h:88
+msgid "Show messages that have been temporarily hidden"
+msgstr "Visa meddelanden som har gömts tillfälligt"
+
+#: ui/evolution-mail.xml.h:89
+msgid "Show the raw email source of the message"
+msgstr "Visa den råa e-postkällkoden till meddelandet"
+
+#: ui/evolution-mail.xml.h:90
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Prenumerera eller säg upp prenumeration på mappar på fjärrservrar"
+
+#: ui/evolution-mail.xml.h:91
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Göm alla meddelanden temporärt som redan har lästs"
+
+#: ui/evolution-mail.xml.h:92
+msgid "Temporarily hide the selected messages"
+msgstr "Göm de markerade meddelandena temporärt"
+
+#: ui/evolution-mail.xml.h:93
 msgid "Threaded Message list"
 msgstr "Trådad meddelandelista"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail.xml.h:94
 msgid "Un-delete the selected messages"
 msgstr "Ångra borttagning av de markerade meddelandena"
 
-#: ui/evolution-mail.xml.h:87
-msgid "Undelete"
-msgstr "Ångra borttagning"
+#: ui/evolution-mail.xml.h:95
+msgid "VFolder on Mailing _List..."
+msgstr "Virtuell mapp på sänd_lista..."
 
-#: ui/evolution-mail.xml.h:92
-msgid "View Raw Message Source"
-msgstr "Visa rå meddelandekälla"
+#: ui/evolution-mail.xml.h:96
+msgid "VFolder on Se_nder..."
+msgstr "Virtuell mapp på _avsändare..."
 
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail.xml.h:97
+msgid "VFolder on _Recipients..."
+msgstr "Virtuell mapp på _mottagare..."
+
+#: ui/evolution-mail.xml.h:98
+msgid "VFolder on _Subject..."
+msgstr "Virtuell mapp på _ämnesrad..."
+
+#: ui/evolution-mail.xml.h:99
 msgid "Virtual Folder _Editor..."
 msgstr "R_edigerare för virtuella mappar..."
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail.xml.h:100
 msgid "_Apply Filters"
 msgstr "Tillämp_a filter"
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Attachment"
-msgstr "_Bilaga"
+#: ui/evolution-mail.xml.h:101
+msgid "_Copy to Folder"
+msgstr "_Kopiera till mapp"
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail.xml.h:102
 msgid "_Create Filter From Message"
 msgstr "_Skapa filter från meddelande"
 
-#: ui/evolution-mail.xml.h:99
+#: ui/evolution-mail.xml.h:104
 msgid "_Expunge"
 msgstr "T_öm"
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail.xml.h:105
 msgid "_Filters..."
 msgstr "_Filter..."
 
-#: ui/evolution-mail.xml.h:101 ui/evolution.xml.h:34
+#: ui/evolution-mail.xml.h:106 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "_Mapp"
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Inline"
-msgstr "_Inuti"
+#: ui/evolution-mail.xml.h:107
+msgid "_Forward Message"
+msgstr "_Vidarebefordra meddelande"
 
-#: ui/evolution-mail.xml.h:104 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:108 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Om_vänd markering"
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail.xml.h:109
 msgid "_Mail Message"
 msgstr "_Posta meddelande"
 
-#: ui/evolution-mail.xml.h:106
+#: ui/evolution-mail.xml.h:110
 msgid "_Mail Settings..."
 msgstr "_E-postinställningar..."
 
-#: ui/evolution-mail.xml.h:108
-msgid "_Open Selected Items"
-msgstr "_Öppna markerade objekt"
-
-#: ui/evolution-mail.xml.h:110
-msgid "_Quoted"
-msgstr "_Citerad"
-
 #: ui/evolution-mail.xml.h:111
-msgid "_Reply"
-msgstr "_Svara"
+msgid "_Message Display"
+msgstr "_Meddelandevisning"
 
 #: ui/evolution-mail.xml.h:112
-msgid "_Resend Messages"
-msgstr "Skicka _om meddelanden"
+msgid "_Move to Folder"
+msgstr "_Flytta till mapp"
+
+#: ui/evolution-mail.xml.h:113
+msgid "_Normal Display"
+msgstr "_Normal visning"
 
 #: ui/evolution-mail.xml.h:114
-msgid "_Save Message As..."
-msgstr "Spara meddelande so_m..."
+msgid "_Open Message"
+msgstr "_Öppna meddelande"
 
-#: ui/evolution-mail.xml.h:115
+#: ui/evolution-mail.xml.h:116
+msgid "_Re-send Message"
+msgstr "Skicka _om meddelande"
+
+#: ui/evolution-mail.xml.h:119
 msgid "_Send / Receive"
 msgstr "_Skicka / Ta emot"
 
-#: ui/evolution-mail.xml.h:116
-msgid "_Threaded"
-msgstr "_Trådat"
+#: ui/evolution-mail.xml.h:120
+msgid "_Threaded Message List"
+msgstr "_Trådad meddelandelista"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -8333,146 +8823,166 @@ msgid "Close the current file"
 msgstr "Stäng aktuell fil"
 
 #: ui/evolution-message-composer.xml.h:5
+msgid "Delete all but signature"
+msgstr "Ta bort allt utom signatur"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Kryptera detta meddelande med PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr "Kryptera detta meddelande med ditt S/MIME-krypteringscertifikat"
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
 msgid "Insert a file as text into the message"
 msgstr "Infoga en fil som text i meddelandet"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert text file..."
 msgstr "Infoga textfil..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Öppna en fil"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:14
 msgid "PGP Encrypt"
 msgstr "PGP-kryptera"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Sign"
 msgstr "PGP-signera"
 
+#: ui/evolution-message-composer.xml.h:16
+msgid "S/MIME Encrypt"
+msgstr "S/MIME-kryptera"
+
 #: ui/evolution-message-composer.xml.h:17
+msgid "S/MIME Sign"
+msgstr "S/MIME-signera"
+
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _Draft"
 msgstr "Spara _utkast"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr "Spara i map_p... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Spara i mapp..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Spara aktuell fil med ett annat namn"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Spara meddelandet i angiven mapp"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Skicka"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Skicka senar_e"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Skicka senar_e"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Skicka brevet i HTML-format"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Skicka meddelandet senare"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Skicka meddelandet nu"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Skicka detta meddelande nu"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Visa/göm bilaga"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Visa _bilagor"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Visa bilagor"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Signera detta meddelande med din PGP-nyckel"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Signera detta meddelande med ditt S/MIME-signaturcertifikat"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Växla om blindkopiefältet ska visas"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Växla om kopiefältet ska visas"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Växla om frånväljaren ska visas"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Växla om svara-till-fältet ska visas"
+msgstr "Växla om svara till-fältet ska visas"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Bcc Field"
 msgstr "_Blindkopiefältet"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Cc Field"
 msgstr "_Kopiefältet"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+msgid "_Delete all"
+msgstr "_Ta bort alla"
+
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "_Frånfältet"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Insert text file... (FIXME)"
 msgstr "_Infoga textfil... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Open..."
 msgstr "_Öppna..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Reply-To Field"
-msgstr "_Svara-till-fältet"
+msgstr "_Svara till-fältet"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:56
 msgid "_Security"
 msgstr "_Säkerhet"
 
@@ -8508,6 +9018,10 @@ msgstr "Säg upp prenumeration"
 msgid "Assig_n Task (FIXME)"
 msgstr "Tilldela _uppgift (FIXME)"
 
+#: ui/evolution-task-editor-dialog.xml.h:23
+msgid "Find"
+msgstr "Sök"
+
 #: ui/evolution-task-editor-dialog.xml.h:24
 msgid "Find Again"
 msgstr "Sök igen"
@@ -8564,7 +9078,7 @@ msgstr "Ångra"
 msgid "Undo the last action"
 msgstr "Ångra den senaste åtgärden"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:42
 msgid "_Appointment (FIXME)"
 msgstr "_Möte (FIXME)"
 
@@ -8580,19 +9094,19 @@ msgstr "_Svara (FIXME)"
 msgid "Create a new task"
 msgstr "Skapa en ny uppgift"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
 msgid "New Task"
 msgstr "Ny uppgift"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 msgid "Save task as something else"
 msgstr "Spara uppgift som något annat"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:8
 msgid "Tasks Preferences..."
 msgstr "Inställningar för uppgifter..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "_Task"
 msgstr "_Uppgift"
 
@@ -8600,144 +9114,212 @@ msgstr "_Uppgift"
 msgid "About Evolution..."
 msgstr "Om Evolution..."
 
+#: ui/evolution.xml.h:2
+msgid "Add to _Shortcut Bar"
+msgstr "Lägg till i _genvägsraden"
+
 #: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
+msgstr "Ändra namnet på denna mapp"
+
+#: ui/evolution.xml.h:4
+msgid "Change the properties for this folder"
+msgstr "Ändra egenskaperna för denna mapp"
+
+#: ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Stäng detta fönster"
 
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:7
+msgid "Copy this folder"
+msgstr "Kopiera denna mapp"
+
+#: ui/evolution.xml.h:8
+msgid "Create _New Folder..."
+msgstr "Skapa _ny mapp..."
+
+#: ui/evolution.xml.h:9
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Skapa en länk till denna mapp i genvägsraden"
+
+#: ui/evolution.xml.h:10
+msgid "Create a new folder"
+msgstr "Skapa en ny mapp"
+
+#: ui/evolution.xml.h:11
 msgid "Customi_ze Toolbars..."
 msgstr "An_passa verktygsrader..."
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:12
 msgid "Customize"
 msgstr "Anpassa"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:13
 msgid "Customize toolbars"
 msgstr "Anpassa verktygsrader"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Visa en annan mapp"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Avsluta"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+msgid "Evolution _FAQ"
+msgstr "Evolution-_FAQ"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
-msgstr "Evolution_fönster"
+msgstr "Evolutionf_önster"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:18
 msgid "Evolution bar _shortcut"
 msgstr "Evolutiongenväg för _rader"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:19
 msgid "Exit the program"
-msgstr "Avlsuta programmet"
+msgstr "Avsluta programmet"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:20
 msgid "Getting _Started"
 msgstr "Komma i _gång"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:21
 msgid "Import an external file format"
 msgstr "Importera ett externt filformat"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:22
 msgid "Main toolbar"
 msgstr "Huvudverktygsrad"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:23
+msgid "Move this folder to another place"
+msgstr "Flytta denna mapp till ett annat ställe"
+
+#: ui/evolution.xml.h:24
+msgid "Open in New Window"
+msgstr "Öppna i nytt fönster"
+
+#: ui/evolution.xml.h:25
+msgid "Open in New _Window"
+msgstr "Öppna i nytt _fönster"
+
+#: ui/evolution.xml.h:26
+msgid "Open this folder in an other window"
+msgstr "Öppna denna mapp i ett annat fönster"
+
+#: ui/evolution.xml.h:27
 msgid "Show information about Evolution"
 msgstr "Visa information om Evolution"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Skicka felrapport"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 msgid "Submit _Bug Report"
 msgstr "Skicka _felrapport"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
 msgid "Submit bug report using Bug Buddy."
 msgstr "Skicka felrapport med Bug-Buddy."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:31
 msgid "Toggle"
 msgstr "Växla"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the folder bar"
 msgstr "Växla om mappraden ska visas"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:33
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Växla om genvägsraden ska visas"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:34
 msgid "Toggle whether we are working offline."
 msgstr "Växla om vi arbetar frånkopplade."
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:35
 msgid "Using the C_ontact Manager"
 msgstr "Använda k_ontakthanteraren"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:36
 msgid "Using the _Calendar"
 msgstr "Använda _kalendern"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:37
 msgid "Using the _Mailer"
 msgstr "Använda _e-postdelen"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:38
+msgid "View the selected folder"
+msgstr "Visa den markade mappen"
+
+#: ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:40
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:41
 msgid "_Actions"
 msgstr "_Åtgärder"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:45
+msgid "_Copy..."
+msgstr "_Kopiera..."
+
+#: ui/evolution.xml.h:47
+msgid "_Delete this folder"
+msgstr "_Ta bort denna mapp"
+
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "_Mapprad"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:52
 msgid "_Go to Folder..."
 msgstr "_Gå till mapp..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:54
 msgid "_Import file..."
 msgstr "_Infoga fil..."
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:55
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:56
 msgid "_Mail message"
 msgstr "_Posta meddelande"
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:57
+msgid "_Move..."
+msgstr "_Flytta..."
+
+#: ui/evolution.xml.h:59
 msgid "_New Folder"
 msgstr "_Ny mapp"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:61
+msgid "_Rename..."
+msgstr "_Byt namn..."
+
+#: ui/evolution.xml.h:62
 msgid "_Shortcut Bar"
 msgstr "_Genvägsraden"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:66
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+msgid "Address Cards"
 msgstr "Adresskort"
 
 #: views/addressbook/galview.xml.h:2
@@ -8851,11 +9433,11 @@ msgstr "Alla deltagare"
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
-#: widgets/menus/gal-view-menus.c:176
+#: widgets/menus/gal-view-menus.c:207
 msgid "_Current View"
 msgstr "_Aktuell vy"
 
-#: widgets/menus/gal-view-menus.c:202
+#: widgets/menus/gal-view-menus.c:248
 msgid "Define Views"
 msgstr "Definiera vyer"
 
@@ -8956,6 +9538,119 @@ msgstr "init_corba(): kunde inte initiera GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
+#~ msgid "Delete a contact"
+#~ msgstr "Ta bort en kontakt"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Som _minikort"
+
+#~ msgid "As _Table"
+#~ msgstr "Som _tabell"
+
+#~ msgid "Mark Complete"
+#~ msgstr "Markera som färdig"
+
+#~ msgid "Edit the task"
+#~ msgstr "Redigera uppgiften"
+
+#~ msgid "Find a contact"
+#~ msgstr "Sök efter en kontakt"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Search \"%s\""
+#~ msgstr "Sök i \"%s\""
+
+#~ msgid "Apply any new filters to the mail in this box"
+#~ msgstr "Verkställ alla nya filter på e-posten i denna brevlåda"
+
+#~ msgid "Compose a new message"
+#~ msgstr "Skriv ett nytt meddelande"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "Konfigura mapp..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Kopiera meddelandet till en ny mapp"
+
+#~ msgid "Display all of the message headers"
+#~ msgstr "Visa alla meddelandehuvuden"
+
+#~ msgid "Edit the current message"
+#~ msgstr "Redigera det aktuella meddelandet"
+
+#~ msgid "Expunge"
+#~ msgstr "Töm"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr "Ta bort alla brev som är markerade för borttagning för gott"
+
+#~ msgid "Forward inline"
+#~ msgstr "Vidarebefordra inuti"
+
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr ""
+#~ "Vidarebefordra detta meddelande inuti ditt brev, så att du kan redigera det"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Göm borttagna meddelanden"
+
+#~ msgid "Invert Selection"
+#~ msgstr "Omvänd markering"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Flytta meddelandet till en ny mapp"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Förhandsgranska meddelande..."
+
+#~ msgid "Reply to all"
+#~ msgstr "Svara till alla"
+
+#~ msgid "Reply to sender"
+#~ msgstr "Svara till avsändaren"
+
+#~ msgid "S_ource"
+#~ msgstr "_Källkod"
+
+#~ msgid "Send a reply to the person who sent you this mail"
+#~ msgstr "Skicka ett svar till personen som skickade dig detta brev"
+
+#~ msgid "Send a single mail in reply to all the selected mail"
+#~ msgstr "Skicka ett enda brev som svar på alla de markerade breven"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "Skicka kölagd e-post\n"
+#~ "    och hämta ny e-post"
+
+#~ msgid "Undelete"
+#~ msgstr "Ångra borttagning"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Visa rå meddelandekällkod"
+
+#~ msgid "_Attachment"
+#~ msgstr "_Bilaga"
+
+#~ msgid "_Open Selected Items"
+#~ msgstr "_Öppna markerade objekt"
+
+#~ msgid "_Reply"
+#~ msgstr "_Svara"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "Spara meddelande so_m..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_Trådat"
+
+#~ msgid "Send the message now"
+#~ msgstr "Skicka meddelandet nu"
+
 #~ msgid ""
 #~ "We were unable to open this addressbook.  This either\n"
 #~ "means you have entered an incorrect URI, or have tried\n"
@@ -8982,39 +9677,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "%s is not a selectable folder"
 #~ msgstr "%s är inte en mapp som kan väljas"
 
-#~ msgid "You must be working online to complete this operation"
-#~ msgstr "Du måste vara ansluten för att kunna genomföra detta"
-
-#~ msgid ""
-#~ "Evolution has found Elm mail files.\n"
-#~ "Would you like to import them into Evolution?"
-#~ msgstr ""
-#~ "Evolution har hittat e-postfiler från Elm.\n"
-#~ "Vill du importera dem till Evolution?"
-
-#~ msgid "Elm mail"
-#~ msgstr "Elm-epost"
-
-#~ msgid ""
-#~ "Evolution has found Netscape mail files.\n"
-#~ "Would you like them to be imported into Evolution?"
-#~ msgstr ""
-#~ "Evolution har hittat Netscape-epostfiler.\n"
-#~ "Vill du importera dem till Evolution?"
-
-#~ msgid ""
-#~ "Evolution has found Pine mail files.\n"
-#~ "Would you like to import them into Evolution?"
-#~ msgstr ""
-#~ "Evolution har hittat Pine-epostfiler.\n"
-#~ "Vill du importera dem till Evolution?"
-
-#~ msgid "Pine mail"
-#~ msgstr "Pine-epost"
-
-#~ msgid "Don't ask me again"
-#~ msgstr "Fråga mig inte igen"
-
 #~ msgid "Advanced ..."
 #~ msgstr "Avancerat..."
 
@@ -9145,9 +9807,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Kerberos"
 #~ msgstr "Kerberos"
 
-#~ msgid "Mail"
-#~ msgstr "E-post"
-
 #~ msgid "Mail Account"
 #~ msgstr "Epostkonton"
 
@@ -9172,12 +9831,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Required"
 #~ msgstr "Krävs"
 
-#~ msgid "Save password"
-#~ msgstr "Spara lösenord"
-
-#~ msgid "Select signature file"
-#~ msgstr "Välj signaturfil"
-
 #~ msgid "Server type:"
 #~ msgstr "Servertyp:"
 
@@ -9185,7 +9838,7 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "Signatur:"
 
 #~ msgid "Source"
-#~ msgstr "Källa"
+#~ msgstr "Källkod"
 
 #~ msgid "Transport"
 #~ msgstr "Transport"
@@ -9239,9 +9892,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "<unknown>"
 #~ msgstr "<okänt>"
 
-#~ msgid "Message _Display"
-#~ msgstr "Meddelande_visning"
-
 #~ msgid "_Message Hiding"
 #~ msgstr "_Meddelandegömning"
 
@@ -9498,9 +10148,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Corrupted message from dispatching thread?"
 #~ msgstr "Trasigt meddelande från döende tråd?"
 
-#~ msgid "Could not create dialog box."
-#~ msgstr "Kunde inte skapa dialogfönster."
-
 #~ msgid ""
 #~ "Cannot open location `%s':\n"
 #~ "%s"
@@ -9574,9 +10221,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Show the _Shortcut Bar"
 #~ msgstr "Visa _genvägsraden"
 
-#~ msgid "_Settings"
-#~ msgstr "_Inställningar"
-
 #~ msgid "Find _Again"
 #~ msgstr "Sök ige_n..."
 
@@ -9592,9 +10236,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_Redo"
 #~ msgstr "_Gör om"
 
-#~ msgid "_Replace..."
-#~ msgstr "_Ersätt..."
-
 #~ msgid "_Toolbars"
 #~ msgstr "_Verktygsrader"
 
@@ -9622,9 +10263,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_Audio"
 #~ msgstr "_Ljud"
 
-#~ msgid "_Display"
-#~ msgstr "_Visa"
-
 #~ msgid "_Mail"
 #~ msgstr "_E-post"
 
@@ -9638,9 +10276,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ "Kunde inte öppna filen %s:\n"
 #~ "%s"
 
-#~ msgid "Cancel"
-#~ msgstr "Avbryt"
-
 #~ msgid "Open a calendar"
 #~ msgstr "Öppna en kalender"
 
@@ -9752,9 +10387,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Hide from Sender"
 #~ msgstr "Göm för avsändaren"
 
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Göm ämnesraden \"%s\""
-
 #~ msgid "Hide from Sender <%s>"
 #~ msgstr "Göm för avsändaren <%s>"
 
@@ -9762,7 +10394,7 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "Du har inte konfigurerat några e-postkällor"
 
 #~ msgid "Reply-to:"
-#~ msgstr "Svara-till:"
+#~ msgstr "Svara till:"
 
 #~ msgid ""
 #~ "Enter your name and email address to be used in outgoing mail. You may also, "
@@ -9823,7 +10455,7 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "Redigera identitet"
 
 #~ msgid "Edit Source"
-#~ msgstr "Redigera källa"
+#~ msgstr "Redigera källkod"
 
 #~ msgid "Add News Server"
 #~ msgstr "Lägg till diskussionsgruppsserver"
@@ -9855,24 +10487,15 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "News Sources"
 #~ msgstr "Diskussionsgruppskällor"
 
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Skicka meddelanden som HTML"
-
 #~ msgid "No GPG/PGP support available in this copy of Evolution."
 #~ msgstr "Det finns inget stöd för GPG/PGP i denna kopia av Evolution."
 
 #~ msgid "_Source"
-#~ msgstr "_Källa"
-
-#~ msgid "Mail Source"
-#~ msgstr "E-postkälla"
+#~ msgstr "_Källkod"
 
 #~ msgid "Sending a message without a subject"
 #~ msgstr "Skickar ett meddelande utan en ämnesrad"
 
-#~ msgid "Send a message without a subject"
-#~ msgstr "Skicka ett meddelande utan en ämnesrad"
-
 #~ msgid "Mark messages in folder \"%s\""
 #~ msgstr "Markera meddelanden i mappen \"%s\""
 
@@ -10140,9 +10763,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Cannot copy data to output file: %s"
 #~ msgstr "Kan inte kopiera data till utdatafil: %s"
 
-#~ msgid "Could not load or create summary"
-#~ msgstr "Kunde inte läsa in eller skapa sammanfattning"
-
 #~ msgid "Cannot append message to mh folder: %s"
 #~ msgstr "Kan inte lägga till meddelande i mh-mapp: %s"
 
@@ -10176,9 +10796,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Kan inte initiera Evolutions hashfunktion för e-postlagring."
 
-#~ msgid "Forward as Attachment"
-#~ msgstr "Vidarebefordra som bilaga"
-
 #~ msgid "Set Flag"
 #~ msgstr "Ställ flagga"
 
@@ -10216,9 +10833,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_New appointment..."
 #~ msgstr "_Nytt möte..."
 
-#~ msgid "_Create New Folder..."
-#~ msgstr "_Skapa ny mapp..."
-
 #~ msgid "Create to-do item"
 #~ msgstr "Skapa att-göra-objekt"
 
@@ -10350,15 +10964,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "Känner inte till protokoll för att öppna URI:n \"%s\""
 
-#~ msgid "_Copy to Folder"
-#~ msgstr "_Kopiera till mapp"
-
-#~ msgid "_Move to Folder"
-#~ msgstr "_Flytta till mapp"
-
-#~ msgid "Forward Message"
-#~ msgstr "Vidarebefordra meddelande"
-
 #~ msgid "Copy Message"
 #~ msgstr "Kopiera meddelande"