Updated Swedish translation.

svn path=/trunk/; revision=9240

2 files changed, 1886 insertions, 1556 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 27b215191e..e23961d1bd 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-11  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
 2001-04-11  Matthias Warkus  <mawarkus@gnome.org>
 
 	* de.po: Commit to be sure.
diff --git a/po/sv.po b/po/sv.po
index 96af3d4560..a084247fca 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.65 2001/03/25 21:56:31 menthos Exp $
+# $Id: sv.po,v 1.66 2001/04/11 16:29:27 menthos Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-03-25 23:55+0200\n"
-"PO-Revision-Date: 2001-03-25 23:55+0200\n"
+"POT-Creation-Date: 2001-04-11 18:27+0200\n"
+"PO-Revision-Date: 2001-04-11 18:28+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:3255
+#: addressbook/backend/ebook/e-card.c:3269
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3257
+#: addressbook/backend/ebook/e-card.c:3271
 msgid ""
 "\n"
 "Name: "
@@ -30,7 +30,7 @@ msgstr ""
 "\n"
 "Namn: "
 
-#: addressbook/backend/ebook/e-card.c:3258
+#: addressbook/backend/ebook/e-card.c:3272
 msgid ""
 "\n"
 "  Prefix:     "
@@ -38,7 +38,7 @@ msgstr ""
 "\n"
 "  Prefix:     "
 
-#: addressbook/backend/ebook/e-card.c:3259
+#: addressbook/backend/ebook/e-card.c:3273
 msgid ""
 "\n"
 "  Given:      "
@@ -46,7 +46,7 @@ msgstr ""
 "\n"
 "  Förnamn:    "
 
-#: addressbook/backend/ebook/e-card.c:3260
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "  Additional: "
@@ -54,7 +54,7 @@ msgstr ""
 "\n"
 "  Andranamn:  "
 
-#: addressbook/backend/ebook/e-card.c:3261
+#: addressbook/backend/ebook/e-card.c:3275
 msgid ""
 "\n"
 "  Family:     "
@@ -62,7 +62,7 @@ msgstr ""
 "\n"
 "  Efternamn:  "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3276
 msgid ""
 "\n"
 "  Suffix:     "
@@ -70,7 +70,7 @@ msgstr ""
 "\n"
 "  Suffix:     "
 
-#: addressbook/backend/ebook/e-card.c:3276
+#: addressbook/backend/ebook/e-card.c:3290
 msgid ""
 "\n"
 "Birth Date: "
@@ -78,7 +78,7 @@ msgstr ""
 "\n"
 "Födelsedatum: "
 
-#: addressbook/backend/ebook/e-card.c:3287
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "Address:"
@@ -86,7 +86,7 @@ msgstr ""
 "\n"
 "Adress:"
 
-#: addressbook/backend/ebook/e-card.c:3289
+#: addressbook/backend/ebook/e-card.c:3303
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -94,7 +94,7 @@ msgstr ""
 "\n"
 "  Box:           "
 
-#: addressbook/backend/ebook/e-card.c:3290
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "  Ext:         "
@@ -102,7 +102,7 @@ msgstr ""
 "\n"
 "  Anknytning:    "
 
-#: addressbook/backend/ebook/e-card.c:3291
+#: addressbook/backend/ebook/e-card.c:3305
 msgid ""
 "\n"
 "  Street:      "
@@ -110,7 +110,7 @@ msgstr ""
 "\n"
 "  Gatuadress:    "
 
-#: addressbook/backend/ebook/e-card.c:3292
+#: addressbook/backend/ebook/e-card.c:3306
 msgid ""
 "\n"
 "  City:        "
@@ -118,7 +118,7 @@ msgstr ""
 "\n"
 "  Ort:           "
 
-#: addressbook/backend/ebook/e-card.c:3293
+#: addressbook/backend/ebook/e-card.c:3307
 msgid ""
 "\n"
 "  Region:      "
@@ -126,7 +126,7 @@ msgstr ""
 "\n"
 "  Region:        "
 
-#: addressbook/backend/ebook/e-card.c:3294
+#: addressbook/backend/ebook/e-card.c:3308
 msgid ""
 "\n"
 "  Postal Code: "
@@ -134,7 +134,7 @@ msgstr ""
 "\n"
 "  Postnummer:    "
 
-#: addressbook/backend/ebook/e-card.c:3295
+#: addressbook/backend/ebook/e-card.c:3309
 msgid ""
 "\n"
 "  Country:     "
@@ -142,7 +142,7 @@ msgstr ""
 "\n"
 "  Land:          "
 
-#: addressbook/backend/ebook/e-card.c:3308
+#: addressbook/backend/ebook/e-card.c:3322
 msgid ""
 "\n"
 "Delivery Label: "
@@ -150,7 +150,7 @@ msgstr ""
 "\n"
 "Leveransetikett: "
 
-#: addressbook/backend/ebook/e-card.c:3320
+#: addressbook/backend/ebook/e-card.c:3334
 msgid ""
 "\n"
 "Telephones:\n"
@@ -158,7 +158,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Telephone:"
@@ -166,7 +166,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3347
+#: addressbook/backend/ebook/e-card.c:3361
 msgid ""
 "\n"
 "E-mail:\n"
@@ -174,7 +174,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3350
+#: addressbook/backend/ebook/e-card.c:3364
 msgid ""
 "\n"
 "E-mail:"
@@ -182,7 +182,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3369
+#: addressbook/backend/ebook/e-card.c:3383
 msgid ""
 "\n"
 "Mailer: "
@@ -190,7 +190,7 @@ msgstr ""
 "\n"
 "E-postprogram: "
 
-#: addressbook/backend/ebook/e-card.c:3375
+#: addressbook/backend/ebook/e-card.c:3389
 msgid ""
 "\n"
 "Time Zone: "
@@ -198,7 +198,7 @@ msgstr ""
 "\n"
 "Tidszon: "
 
-#: addressbook/backend/ebook/e-card.c:3383
+#: addressbook/backend/ebook/e-card.c:3397
 msgid ""
 "\n"
 "Geo Location: "
@@ -206,7 +206,7 @@ msgstr ""
 "\n"
 "Geografisk plats: "
 
-#: addressbook/backend/ebook/e-card.c:3387
+#: addressbook/backend/ebook/e-card.c:3401
 msgid ""
 "\n"
 "Business Role: "
@@ -214,7 +214,7 @@ msgstr ""
 "\n"
 "Yrkesroll: "
 
-#: addressbook/backend/ebook/e-card.c:3399
+#: addressbook/backend/ebook/e-card.c:3413
 msgid ""
 "\n"
 "Org: "
@@ -222,7 +222,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3400
+#: addressbook/backend/ebook/e-card.c:3414
 msgid ""
 "\n"
 "  Name:  "
@@ -230,7 +230,7 @@ msgstr ""
 "\n"
 "  Namn:    "
 
-#: addressbook/backend/ebook/e-card.c:3401
+#: addressbook/backend/ebook/e-card.c:3415
 msgid ""
 "\n"
 "  Unit:  "
@@ -238,7 +238,7 @@ msgstr ""
 "\n"
 "  Enhet:   "
 
-#: addressbook/backend/ebook/e-card.c:3402
+#: addressbook/backend/ebook/e-card.c:3416
 msgid ""
 "\n"
 "  Unit2: "
@@ -246,7 +246,7 @@ msgstr ""
 "\n"
 "  Enhet 2: "
 
-#: addressbook/backend/ebook/e-card.c:3403
+#: addressbook/backend/ebook/e-card.c:3417
 msgid ""
 "\n"
 "  Unit3: "
@@ -254,7 +254,7 @@ msgstr ""
 "\n"
 "  Enhet 3: "
 
-#: addressbook/backend/ebook/e-card.c:3404
+#: addressbook/backend/ebook/e-card.c:3418
 msgid ""
 "\n"
 "  Unit4: "
@@ -262,7 +262,7 @@ msgstr ""
 "\n"
 "  Enhet 4: "
 
-#: addressbook/backend/ebook/e-card.c:3408
+#: addressbook/backend/ebook/e-card.c:3422
 msgid ""
 "\n"
 "Categories: "
@@ -270,7 +270,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3409
+#: addressbook/backend/ebook/e-card.c:3423
 msgid ""
 "\n"
 "Comment: "
@@ -288,7 +288,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3436
 msgid ""
 "\n"
 "Unique String: "
@@ -296,7 +296,7 @@ msgstr ""
 "\n"
 "Unik sträng: "
 
-#: addressbook/backend/ebook/e-card.c:3425
+#: addressbook/backend/ebook/e-card.c:3439
 msgid ""
 "\n"
 "Public Key: "
@@ -312,15 +312,15 @@ msgstr "Fabrik för import av GnomeCard-filer till Evolution."
 msgid "Imports GnomeCard files into Evolution."
 msgstr "Importerar GnomeCard-filer till Evolution."
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:40
+#: addressbook/gui/component/addressbook-factory.c:43
 #: calendar/conduits/calendar/calendar-conduit.c:1151
 #: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
+#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr "Kunde inte initiera Bonobo"
 
@@ -353,7 +353,7 @@ msgstr "Kunde inte läsa pilotens adressprogramblock"
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
 #: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Lägg till"
 
@@ -394,7 +394,6 @@ msgstr "Spara som:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
 msgid "General"
 msgstr "Allmänt"
 
@@ -411,7 +410,7 @@ msgid "Phone Types"
 msgstr "Telefontyper"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "Primary Email"
 msgstr "Primär e-post"
 
@@ -424,7 +423,7 @@ msgid "Web page address:"
 msgstr "Webbsideadress:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:74
 msgid "_Add"
 msgstr "_Lägg till"
 
@@ -449,8 +448,8 @@ msgid "_Company:"
 msgstr "_Företag:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:83 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:59 ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:60 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Ta bort"
 
@@ -502,126 +501,122 @@ msgstr "De_tta är postadressen"
 msgid "Delete Contact?"
 msgstr "Ta bort kontakten?"
 
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/contact-editor/e-contact-editor.c:603
 msgid "This contact belongs to these categories:"
 msgstr "Denna kontakt tillhör dessa kategorier:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:628
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1297
-#: addressbook/gui/widgets/e-addressbook-view.c:608
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Business"
 msgstr "Företag"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/contact-editor/e-contact-editor.c:1244
 msgid "Business 2"
 msgstr "Företag 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:613
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
 msgstr "Företagsfax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Callback"
 msgstr "Tillbakaringning"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:612
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1248
 msgid "Company"
 msgstr "Företag"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/contact-editor/e-contact-editor.c:1298
-#: addressbook/gui/widgets/e-addressbook-view.c:609
+#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
 msgid "Home"
 msgstr "Hem"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:616
+#: addressbook/contact-editor/e-contact-editor.c:1250
 msgid "Home 2"
 msgstr "Hem 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:614
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Home Fax"
 msgstr "Fax hem"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:617
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/contact-editor/e-contact-editor.c:1253
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1299
-#: addressbook/gui/widgets/e-addressbook-view.c:618
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
+#: addressbook/contact-editor/e-contact-editor.c:1254
+#: addressbook/contact-editor/e-contact-editor.c:1312
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
 msgid "Other"
 msgstr "Annat"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Other Fax"
 msgstr "Annan fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:619
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Pager"
 msgstr "Personsökare"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:607
+#: addressbook/contact-editor/e-contact-editor.c:1257
 msgid "Primary"
 msgstr "Primär"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1260
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:620
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:668
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:621
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:215
+#: addressbook/contact-editor/e-contact-quick-add.c:223
 msgid "Contact Quick-Add"
 msgstr "Snabbinläggning av kontakt"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:217
+#: addressbook/contact-editor/e-contact-quick-add.c:225
 msgid "Edit Full"
 msgstr "Redigera fullständigt namn"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:254
+#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/widgets/e-addressbook-view.c:643
 msgid "Full Name"
 msgstr "Fullständigt namn"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:260
+#: addressbook/contact-editor/e-contact-quick-add.c:268
 msgid "E-mail"
 msgstr "E-post"
 
@@ -737,25 +732,25 @@ msgstr "_Suffix:"
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:241
 msgid "As _Minicards"
 msgstr "Som _minikort"
 
-#: addressbook/gui/component/addressbook.c:243
+#: addressbook/gui/component/addressbook.c:247
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Som _tabell"
 
-#: addressbook/gui/component/addressbook.c:413
+#: addressbook/gui/component/addressbook.c:399
 #, c-format
 msgid "Enter password for %s"
 msgstr "Ange lösenord för %s"
 
-#: addressbook/gui/component/addressbook.c:441
+#: addressbook/gui/component/addressbook.c:427
 msgid "Unable to open addressbook"
 msgstr "Kan inte öppna adressboken"
 
-#: addressbook/gui/component/addressbook.c:446
+#: addressbook/gui/component/addressbook.c:432
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -776,149 +771,149 @@ msgstr ""
 "vill kunna använda LDAP måste du hämta och installera\n"
 "OpenLDAP och kompilera om och installera Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:569
+#: addressbook/gui/component/addressbook.c:555
 msgid "Show All"
 msgstr "Visa alla"
 
-#: addressbook/gui/component/addressbook.c:571
+#: addressbook/gui/component/addressbook.c:557
 msgid "Advanced..."
 msgstr "Avancerat..."
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:587
 msgid "Any field contains"
 msgstr "Något fält innehåller"
 
-#: addressbook/gui/component/addressbook.c:602
+#: addressbook/gui/component/addressbook.c:588
 msgid "Name contains"
 msgstr "Namnet innehåller"
 
-#: addressbook/gui/component/addressbook.c:603
+#: addressbook/gui/component/addressbook.c:589
 msgid "Email contains"
 msgstr "E-postadressen innehåller"
 
-#: addressbook/gui/component/addressbook.c:746
+#: addressbook/gui/component/addressbook.c:732
 msgid "The URI that the Folder Browser will display"
 msgstr "URI:n som mappbläddraren kommer att visa"
 
-#: addressbook/gui/component/addressbook-storage.c:95
+#: addressbook/gui/component/addressbook-storage.c:99
 msgid "Other Contacts"
 msgstr "Andra kontakter"
 
-#: addressbook/gui/component/addressbook-config.c:143
+#: addressbook/gui/component/addressbook-config.c:148
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
-#: addressbook/gui/component/addressbook-config.c:145
+#: addressbook/gui/component/addressbook-config.c:150
 msgid "File"
 msgstr "Fil"
 
-#: addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/addressbook-config.c:153
 msgid "Unknown addressbook type"
 msgstr "Okänd adressbokstyp"
 
-#: addressbook/gui/component/addressbook-config.c:158
+#: addressbook/gui/component/addressbook-config.c:163
 msgid "None (anonymous mode)"
 msgstr "Ingen (anonymt läge)"
 
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-provider.c:75
+#: 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:293
-#: camel/providers/pop3/camel-pop3-provider.c:69
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
 msgid "Password"
 msgstr "Lösenord"
 
-#: addressbook/gui/component/addressbook-config.c:162
+#: addressbook/gui/component/addressbook-config.c:167
 msgid "SASL"
 msgstr "SASL"
 
-#: addressbook/gui/component/addressbook-config.c:165
+#: addressbook/gui/component/addressbook-config.c:170
 msgid "Unknown auth type"
 msgstr "Okänd autentiseringstyp"
 
-#: addressbook/gui/component/addressbook-config.c:174
+#: addressbook/gui/component/addressbook-config.c:179
 msgid "Base"
 msgstr "Bas"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "One"
 msgstr "En"
 
-#: addressbook/gui/component/addressbook-config.c:178
+#: addressbook/gui/component/addressbook-config.c:183
 msgid "Subtree"
 msgstr "Underträd"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:186
 msgid "Unknown scope type"
 msgstr "Okänd omfattningstyp"
 
-#: addressbook/gui/component/addressbook-config.c:348
+#: addressbook/gui/component/addressbook-config.c:353
 msgid "Bind DN:"
 msgstr "Bind-DN:"
 
-#: addressbook/gui/component/addressbook-config.c:349
+#: addressbook/gui/component/addressbook-config.c:354
 msgid "FIXME Bind DN Help text here"
 msgstr "FIXME Bind DN-hjälptext här"
 
-#: addressbook/gui/component/addressbook-config.c:351
+#: addressbook/gui/component/addressbook-config.c:356
+#: mail/mail-config.glade.h:50
 msgid "Remember this password"
 msgstr "Kom ihåg detta lösenord"
 
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:30
+#: addressbook/gui/component/addressbook-config.c:406
+#: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr "Värd:"
 
-#: addressbook/gui/component/addressbook-config.c:402
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "FIXME Host help text here."
 msgstr "FIXME Värd-hjälptext här."
 
-#: addressbook/gui/component/addressbook-config.c:404
+#: addressbook/gui/component/addressbook-config.c:409
 msgid "Port:"
 msgstr "Port:"
 
-#: addressbook/gui/component/addressbook-config.c:405
+#: 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:409
+#: addressbook/gui/component/addressbook-config.c:414
 msgid "Root DN:"
 msgstr "Rot-DN:"
 
-#: addressbook/gui/component/addressbook-config.c:410
+#: addressbook/gui/component/addressbook-config.c:415
 msgid "FIXME Root DN help text here."
 msgstr "FIXME Root DN-hjälptext här."
 
-#: addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.c:435
 msgid "Search Scope:"
 msgstr "Sökomfattning:"
 
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
+#: addressbook/gui/component/addressbook-config.c:489
 msgid "Authentication:"
 msgstr "Autentisering:"
 
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:51
+#: addressbook/gui/component/addressbook-config.c:507
+#: mail/mail-config.glade.h:44
 msgid "Path:"
 msgstr "Sökväg:"
 
-#: addressbook/gui/component/addressbook-config.c:503
+#: addressbook/gui/component/addressbook-config.c:508
 msgid "FIXME Path Help text here"
 msgstr "FIXME Sökvägshjälptext här"
 
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:513
 msgid "Create path if it doesn't exist."
 msgstr "Skapa sökvägen om den inte finns."
 
-#: addressbook/gui/component/addressbook-config.c:642
+#: addressbook/gui/component/addressbook-config.c:647
 msgid "Edit Addressbook"
 msgstr "Redigera adressbok"
 
-#: addressbook/gui/component/addressbook-config.c:644
+#: addressbook/gui/component/addressbook-config.c:649
 msgid "Add Addressbook"
 msgstr "Lägg till adressbok"
 
-#: addressbook/gui/component/addressbook-config.c:660
+#: addressbook/gui/component/addressbook-config.c:665
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -926,22 +921,22 @@ msgstr ""
 "Markera den typ av adressbok du har och ange den relevanta informationen om "
 "den."
 
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:43
+#: addressbook/gui/component/addressbook-config.c:671
+#: mail/mail-config.glade.h:35
 msgid "Name:"
 msgstr "Namn:"
 
-#: addressbook/gui/component/addressbook-config.c:667
+#: addressbook/gui/component/addressbook-config.c:672
 msgid "FIXME Name help text here"
 msgstr "FIXME Namnhjälptext här"
 
-#: addressbook/gui/component/addressbook-config.c:669
+#: addressbook/gui/component/addressbook-config.c:674
 #: 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:670
+#: addressbook/gui/component/addressbook-config.c:675
 msgid "FIXME Description help text here"
 msgstr "FIXME Beskrivningshjälptext här"
 
@@ -950,10 +945,12 @@ 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-minicard.c:673
 #: 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/folder-browser.c:574
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
+#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
+#: mail/mail-config.glade.h:19 mail/mail-view.c:156
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
 #: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
@@ -966,7 +963,6 @@ msgid "Edit"
 msgstr "Redigera"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Name"
 msgstr "Namn"
 
@@ -983,12 +979,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:200
+#: addressbook/gui/component/select-names/e-select-names-popup.c:210
 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:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:269
 msgid "Add to Contacts"
 msgstr "Lägg till i kontakter"
 
@@ -1044,13 +1040,14 @@ msgstr "Evolutions adressboks namnvalsgränssnitt."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Fabrik för adressbokens namnvalsgränssnitt"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:121
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+#: addressbook/gui/component/select-names/e-select-names-popup.c:131
+#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
+#: filter/filter-rule.c:547 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:136
+#: addressbook/gui/component/select-names/e-select-names-popup.c:146
 msgid "Remove All"
 msgstr "Ta bort alla"
 
@@ -1070,7 +1067,7 @@ msgstr "Markera namn"
 msgid "Select name from:"
 msgstr "Välj namn från:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
 msgid "Search"
 msgstr "Sök"
 
@@ -1182,72 +1179,157 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
-#: addressbook/gui/widgets/e-minicard.c:450
+#: addressbook/gui/widgets/e-addressbook-view.c:513
+#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/widgets/e-minicard.c:466
+#: addressbook/gui/widgets/e-minicard.c:668
 msgid "Save as VCard"
 msgstr "Spara som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+msgid "Send contact to other"
+msgstr "Skicka kontakt till annan"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+msgid "Send message to contact"
+msgstr "Skicka meddelande till kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
+#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
+#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:29
+#: ui/evolution-tasks.xml.h:4
+msgid "Print"
+msgstr "Skriv ut"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+msgid "Print Envelope"
+msgstr "Skriv ut kuvert"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:641
 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:606
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+msgid "File As"
+msgstr "Arkivera som"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:610
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+msgid "Primary Phone"
+msgstr "Primär telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+msgid "Assistant Phone"
+msgstr "Telefonväxel"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:647
+msgid "Business Phone"
+msgstr "Företagstelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+msgid "Callback Phone"
+msgstr "Tillbakaxringningstelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+msgid "Company Phone"
+msgstr "Företagets telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+msgid "Home Phone"
+msgstr "Hemtelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:622
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+msgid "Business Address"
+msgstr "Företagsadress"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+msgid "Home Address"
+msgstr "Hemadress"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr "Biltelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+msgid "Business Phone 2"
+msgstr "Företagstelefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:659
+msgid "Home Phone 2"
+msgstr "Hemtelefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+msgid "Other Phone"
+msgstr "Annan telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+msgid "TTY"
+msgstr "TTY"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+msgid "Other Address"
+msgstr "Annan adress"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Web Site"
 msgstr "Webbsida"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:623
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 msgid "Department"
 msgstr "Avdelning"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:625
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:626
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 msgid "Profession"
 msgstr "Yrke"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:627
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:629
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:630
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 msgid "Spouse"
 msgstr "Partner"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:631
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 msgid "Note"
 msgstr "Notering"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:632
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Free-busy URL"
 msgstr "Ledig/Upptagen-URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:633
-msgid "Click here to add a contact"
-msgstr "Klicka här för att lägga till en kontakt"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:282
 msgid "Save in addressbook"
 msgstr "Spara i adressboken"
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:166
 msgid ""
 "\n"
 "\n"
@@ -1261,7 +1343,7 @@ msgstr ""
 "\n"
 "Dubbelklicka här för att skapa en ny kontakt."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Visitkortsvy"
 
@@ -1445,126 +1527,127 @@ msgstr "Kunde inte läsa pilotens kalenderprogramblock"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunde inte läsa pilotens att-göra-programblock"
 
-#: calendar/gui/calendar-commands.c:258
+#: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr "Filen hittades inte"
 
-#: calendar/gui/calendar-commands.c:282
+#: calendar/gui/calendar-commands.c:290
 msgid "Open calendar"
 msgstr "Öppna kalender"
 
-#: calendar/gui/calendar-commands.c:324
+#: calendar/gui/calendar-commands.c:332
 msgid "Save calendar"
 msgstr "Spara kalender"
 
-#: calendar/gui/calendar-commands.c:478
+#: calendar/gui/calendar-commands.c:468
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunde inte skapa kalendervyn. Var vänlig och kontrollera din ORBit- och "
 "OAF-installation."
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
+#: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr "Publikt"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
-#: calendar/gui/e-calendar-table.c:333
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
-#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
-#: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
+#: calendar/gui/event-editor.c:1619
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Unknown"
 msgstr "Okänt"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "E"
 msgstr "Ö"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:626
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:627
 msgid "High"
 msgstr "Hög"
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
+#: calendar/gui/calendar-model.c:1569
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:626
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:355 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:625
 msgid "Low"
 msgstr "Låg"
 
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr "Genomskinlig"
 
-#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr "Ogenomskinlig"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "Not Started"
 msgstr "Inte startad"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "In Progress"
 msgstr "Pågår"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "Completed"
 msgstr "Färdigt"
 
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
+#: camel/camel-service.c:586
 msgid "Cancelled"
 msgstr "Avbruten"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:277
+#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y-%m-%d %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:286
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I.%M.%S %p"
 
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:799
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1575,7 +1658,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:879
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1583,19 +1666,17 @@ msgstr ""
 "eller \"Ingen\""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
-#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:330
-#: calendar/gui/e-calendar-table.c:405 mail/mail-account-editor.c:451
-#: mail/mail-account-editor.c:790 mail/mail-account-editor.c:792
-#: mail/mail-account-editor.c:883 mail/mail-accounts.c:115
-#: mail/mail-config-druid.c:1090 mail/mail-config.glade.h:45
-#: shell/e-shell-view.c:1119 widgets/misc/e-cell-date-edit.c:231
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
+#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
+#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
+#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:968
+#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
+#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1124
+#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
+#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:967
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1605,41 +1686,41 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1013
+#: calendar/gui/calendar-model.c:1007
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentvärdet måste vara mellan 0 och 100"
 
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1048
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Prioriteten måste vara \"Hög\", \"Normal\", \"Låg\" eller \"Odefinierad\"."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/calendar-model.c:1061
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
 msgstr "Odefinierad"
 
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1102
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 "Genomskinligheten måste vara \"Genomskinlig\", \"Ogenomskinlig\" eller "
 "\"Ingen\"."
 
-#: calendar/gui/calendar-model.c:1598
+#: calendar/gui/calendar-model.c:1571
 msgid "Recurring"
 msgstr "Återkommande"
 
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1573
 msgid "Assigned"
 msgstr "Tilldelad"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 msgid "No"
 msgstr "Nej"
 
@@ -1675,7 +1756,7 @@ msgstr "Visa uppgifter"
 msgid "Loading Calendar"
 msgstr "Läser in kalendern"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:126
 msgid "The URI that the calendar will display"
 msgstr "URI:n som kalendern kommer att visa"
 
@@ -1704,23 +1785,23 @@ msgstr "Alarmaviseringstjänst"
 msgid "Factory for the alarm notification service"
 msgstr "Fabrik för alarmavsieringstjänsten"
 
-#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
 msgid "Could not initialize GNOME"
 msgstr "Kunde inte initiera Gnome"
 
-#: calendar/gui/alarm-notify/notify-main.c:73
+#: calendar/gui/alarm-notify/notify-main.c:77
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunde inte skapa fabriken för alarmaviseringstjänsten"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+#: calendar/gui/dialogs/alarm-notify-dialog.c:189
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm på %A %d %b %Y %H.%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+#: calendar/gui/dialogs/alarm-notify-dialog.c:196
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "Avisering om ditt möte på %A %d %b %Y %H.%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+#: calendar/gui/dialogs/alarm-notify-dialog.c:207
 msgid "No summary available."
 msgstr "Ingen sammanfattning finns tillgänglig."
 
@@ -1809,7 +1890,7 @@ msgid "Display options"
 msgstr "Visningsalternativ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:162
 msgid "Due Date"
 msgstr "Förfallodatum"
 
@@ -1830,7 +1911,7 @@ msgid "Fri"
 msgstr "fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Friday"
 msgstr "fredag"
 
@@ -1859,7 +1940,7 @@ msgid "Mon"
 msgstr "mån"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Monday"
 msgstr "måndag"
 
@@ -1872,12 +1953,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:52
+#: mail/mail-config.glade.h:45
 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:166
+#: calendar/gui/e-calendar-table.c:165
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -1895,7 +1976,7 @@ msgid "Sat"
 msgstr "lör"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:482
 msgid "Saturday"
 msgstr "lördag"
 
@@ -1920,7 +2001,7 @@ msgid "Sun"
 msgstr "sön"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:483
 msgid "Sunday"
 msgstr "söndag"
 
@@ -1933,7 +2014,7 @@ msgid "Thu"
 msgstr "tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Thursday"
 msgstr "torsdag"
 
@@ -1954,7 +2035,7 @@ msgid "Tue"
 msgstr "tis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Tuesday"
 msgstr "tisdag"
 
@@ -1967,7 +2048,7 @@ msgid "Wed"
 msgstr "ons"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Wednesday"
 msgstr "onsdag"
 
@@ -1980,34 +2061,34 @@ msgid "minutes before they occur."
 msgstr "minuter innan de sker."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:78
 msgid "seconds."
 msgstr "sekunder."
 
-#: calendar/gui/dialogs/delete-comp.c:68
+#: calendar/gui/dialogs/delete-comp.c:70
 #, 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:71
+#: calendar/gui/dialogs/delete-comp.c:73
 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:77
+#: calendar/gui/dialogs/delete-comp.c:79
 #, 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:80
+#: calendar/gui/dialogs/delete-comp.c:82
 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:86
+#: calendar/gui/dialogs/delete-comp.c:88
 #, 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:89
+#: calendar/gui/dialogs/delete-comp.c:91
 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?"
 
@@ -2021,7 +2102,7 @@ msgid "% Comp_lete:"
 msgstr "% färdig_t:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:158
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Klassifikation"
@@ -2088,300 +2169,299 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:697
 msgid "Edit Task"
 msgstr "Redigera uppgift"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
+#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
+#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagbokspost - %s"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:157
 msgid "Categories"
 msgstr "Kategorier"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:159
 msgid "Completion Date"
 msgstr "Färdigdatum"
 
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:160
 msgid "End Date"
 msgstr "Slutdatum"
 
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:161
 msgid "Start Date"
 msgstr "Startdatum"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:163
 msgid "Geographical Position"
 msgstr "Geografisk position"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:164
 msgid "Percent complete"
 msgstr "Procent klar"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:166
 msgid "Summary"
 msgstr "Sammanfattning"
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:167
 msgid "Transparency"
 msgstr "Genomskinlighet"
 
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:168
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:170
+#: calendar/gui/e-calendar-table.c:169
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.c:171
+#: calendar/gui/e-calendar-table.c:170
 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:375
+#: calendar/gui/e-calendar-table.c:374
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:375
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:376
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:377
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:378
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:379
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:380
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:381
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:382
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:383
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:385
+#: calendar/gui/e-calendar-table.c:384
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:552
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark Complete"
 msgstr "Märk som färdig"
 
-#: calendar/gui/e-calendar-table.c:553
+#: calendar/gui/e-calendar-table.c:552
 msgid "Mark the task complete"
 msgstr "Märk uppgiften som färdig"
 
-#: calendar/gui/e-calendar-table.c:558
+#: calendar/gui/e-calendar-table.c:557
 msgid "Edit this task..."
 msgstr "Redigera denna uppgift..."
 
-#: calendar/gui/e-calendar-table.c:559
+#: calendar/gui/e-calendar-table.c:558
 msgid "Edit the task"
 msgstr "Redigera uppgiften"
 
-#: calendar/gui/e-calendar-table.c:561
+#: calendar/gui/e-calendar-table.c:560
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "Ta bort denna uppgift"
 
-#: calendar/gui/e-calendar-table.c:562
+#: calendar/gui/e-calendar-table.c:561
 msgid "Delete the task"
 msgstr "Ta bort uppgiften"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutdivisioner"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1281
-#: calendar/gui/e-week-view-main-item.c:321
+#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1290
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1295
-#: calendar/gui/e-week-view-main-item.c:330
+#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1304
+#: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:344
+#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1317
+#: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:563 calendar/gui/e-week-view.c:297
-#: calendar/gui/print.c:613
+#: calendar/gui/e-day-view.c:572 calendar/gui/e-week-view.c:302
+#: calendar/gui/print.c:617
 msgid "am"
 msgstr "fm"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:566 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:612
+#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:305
+#: calendar/gui/print.c:616
 msgid "pm"
 msgstr "em"
 
-#: calendar/gui/e-day-view.c:3027 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3036 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr "Nytt möte"
 
-#: calendar/gui/e-day-view.c:3029 calendar/gui/e-week-view.c:3237
+#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3242
 msgid "New All Day Event"
 msgstr "Nytt heldagsarrangemang"
 
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3242
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3247
 msgid "Go to Today"
 msgstr "Gå till idag"
 
-#: calendar/gui/e-day-view.c:3036 calendar/gui/e-week-view.c:3244
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3249
 msgid "Go to Date..."
 msgstr "Gå till datum..."
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3250
-#: mail/folder-browser.c:543 ui/evolution-calendar.xml.h:19
+#: calendar/gui/e-day-view.c:3052 calendar/gui/e-week-view.c:3255
+#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Öppna"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3252
+#: calendar/gui/e-day-view.c:3054 calendar/gui/e-week-view.c:3257
 msgid "Delete this Appointment"
 msgstr "Ta bort detta möte"
 
-#: calendar/gui/e-day-view.c:3047 calendar/gui/e-week-view.c:3254
+#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3259
 #: ui/evolution-event-editor.xml.h:45
 msgid "Schedule Meeting"
 msgstr "Boka möte"
 
-#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3267
+#: calendar/gui/e-day-view.c:3065 calendar/gui/e-week-view.c:3272
 msgid "Make this Occurrence Movable"
 msgstr "Gör denna förekomst flyttbar"
 
-#: calendar/gui/e-day-view.c:3058 calendar/gui/e-week-view.c:3269
+#: calendar/gui/e-day-view.c:3067 calendar/gui/e-week-view.c:3274
 msgid "Delete this Occurrence"
 msgstr "Ta bort denna förekomst"
 
-#: calendar/gui/e-day-view.c:3060
+#: calendar/gui/e-day-view.c:3069
 msgid "Delete all Occurrences"
 msgstr "Ta bort alla förekomster"
 
-#: calendar/gui/e-itip-control.c:153
+#: calendar/gui/e-itip-control.c:161
 msgid "I couldn't update your calendar file!\n"
 msgstr "Jag kunde inte uppdatera din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
 msgid "Component successfully updated."
 msgstr "Komponenten uppdaterades utan problem."
 
-#: calendar/gui/e-itip-control.c:165
+#: calendar/gui/e-itip-control.c:173
 msgid "There was an error loading the calendar file."
 msgstr "Ett fel uppstod när kalenderfilen lästes in."
 
-#: calendar/gui/e-itip-control.c:189
+#: calendar/gui/e-itip-control.c:197
 msgid "I couldn't open your calendar file!\n"
 msgstr "Jag kunde inte uppdatera din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
 msgid "I couldn't load your calendar file!\n"
 msgstr "Jag kunde inte läsa in din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:462
+#: calendar/gui/e-itip-control.c:470
 msgid "I couldn't read your calendar file!\n"
 msgstr "Jag kunde inte läsa din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:475
+#: calendar/gui/e-itip-control.c:483
 msgid "This is a reply from someone who was uninvited!"
 msgstr "Detta är ett svar från någon som inte var inbjuden!"
 
-#: calendar/gui/e-itip-control.c:491
+#: calendar/gui/e-itip-control.c:499
 msgid "I couldn't update your calendar store."
 msgstr "Jag kunde inte uppdatera ditt kalenderlagringsutrymme."
 
-#: calendar/gui/e-itip-control.c:532
+#: calendar/gui/e-itip-control.c:540
 msgid "I couldn't delete the calendar component!\n"
 msgstr "Jag kunde inte ta bort kalenderkomponenten!\n"
 
-#: calendar/gui/e-itip-control.c:542
+#: calendar/gui/e-itip-control.c:550
 msgid "Component successfully deleted."
 msgstr "Komponenten togs bort utan problem."
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:694
 msgid "I don't recognize this type of calendar component."
 msgstr "Jag känner inte igen denna typ av kalenderkomponent."
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:780
 msgid "Add to Calendar"
 msgstr "Lägg till i kalender"
 
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Acceptera"
+#: calendar/gui/e-itip-control.c:814
+msgid " Accept "
+msgstr " Acceptera "
 
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "Neka"
+#: calendar/gui/e-itip-control.c:815
+msgid " Decline "
+msgstr " Neka "
 
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Preliminär"
+#: calendar/gui/e-itip-control.c:816
+msgid " Tentative "
+msgstr " Preliminärt "
 
-#: calendar/gui/e-itip-control.c:852
+#: calendar/gui/e-itip-control.c:860
 msgid "Update Calendar"
 msgstr "Uppdatera kalender"
 
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:883
 msgid "Cancel Meeting"
 msgstr "Avboka möte"
 
@@ -2398,7 +2478,7 @@ msgstr "--till--"
 msgid "Calendar Message"
 msgstr "Kalendermeddelande"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:598
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:613
 msgid "Date:"
 msgstr "Datum:"
 
@@ -2410,9 +2490,9 @@ msgstr "Läser in kalendern..."
 msgid "Organizer:"
 msgstr "Organisatör:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:43
-msgid "Sender"
-msgstr "Avsändare"
+#: calendar/gui/e-itip-control.glade.h:10
+msgid "Server Message:"
+msgstr "Servermeddelande:"
 
 #: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
@@ -2502,8 +2582,8 @@ msgstr ""
 "Boka\n"
 "tid"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:48
-#: mail/message-list.c:1014
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:30
+#: mail/message-list.c:1019
 msgid "Status"
 msgstr "Status"
 
@@ -2529,15 +2609,15 @@ msgstr "Metoden som krävs för att läsa in \"%s\" stöds inte"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
+#: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3235 calendar/gui/e-week-view.c:3258
+#: calendar/gui/e-week-view.c:3240 calendar/gui/e-week-view.c:3263
 msgid "New Appointment..."
 msgstr "Nytt möte..."
 
-#: calendar/gui/e-week-view.c:3271
+#: calendar/gui/e-week-view.c:3276
 msgid "Delete All Occurrences"
 msgstr "Ta bort alla förekomster"
 
@@ -2574,7 +2654,7 @@ msgid "No recurrence"
 msgstr "Ingen upprepning"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
+#: calendar/gui/event-editor.c:1579
 msgid "Play a sound"
 msgstr "Spela ett ljud"
 
@@ -2595,12 +2675,12 @@ msgid "Reminder"
 msgstr "Påminnare"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
+#: calendar/gui/event-editor.c:1588
 msgid "Run a program"
 msgstr "Kör ett program"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
+#: calendar/gui/event-editor.c:1585
 msgid "Send an email"
 msgstr "Skicka ett brev"
 
@@ -2609,7 +2689,7 @@ msgid "Settings..."
 msgstr "Inställningar..."
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1580
+#: calendar/gui/event-editor.c:1582
 msgid "Show a dialog"
 msgstr "Visa ett dialogfönster"
 
@@ -2629,12 +2709,11 @@ msgstr "_Starttid:"
 msgid "_Starting date:"
 msgstr "_Startdatum:"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:33
 msgid "after"
 msgstr "efter"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:34
 msgid "before"
 msgstr "före"
 
@@ -2658,7 +2737,7 @@ msgstr "för alltid"
 msgid "hour(s)"
 msgstr "timme/timmar"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
 msgid "minute(s)"
 msgstr "minut(er)"
 
@@ -2682,97 +2761,97 @@ msgstr "vecka"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/event-editor.c:371
+#: calendar/gui/event-editor.c:373
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: calendar/gui/event-editor.c:449
+#: calendar/gui/event-editor.c:451
 msgid "on"
 msgstr "vid"
 
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/event-editor.c:601
+#: calendar/gui/event-editor.c:603
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/event-editor.c:608
+#: calendar/gui/event-editor.c:610
 msgid "th"
 msgstr ":e"
 
-#: calendar/gui/event-editor.c:754
+#: calendar/gui/event-editor.c:756
 msgid "occurrences"
 msgstr "förekomster"
 
-#: calendar/gui/event-editor.c:871
+#: calendar/gui/event-editor.c:873
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Detta möte har upprepningsregler som inte kan redigeras med Evolution."
 
-#: calendar/gui/event-editor.c:1532
+#: calendar/gui/event-editor.c:1534
 #, c-format
 msgid " %d days"
 msgstr " %d dagar"
 
-#: calendar/gui/event-editor.c:1534
+#: calendar/gui/event-editor.c:1536
 msgid " 1 day"
 msgstr " 1 dag"
 
-#: calendar/gui/event-editor.c:1537
+#: calendar/gui/event-editor.c:1539
 #, c-format
 msgid " %d weeks"
 msgstr " %d veckor"
 
-#: calendar/gui/event-editor.c:1539
+#: calendar/gui/event-editor.c:1541
 msgid " 1 week"
 msgstr " 1 vecka"
 
-#: calendar/gui/event-editor.c:1542
+#: calendar/gui/event-editor.c:1544
 #, c-format
 msgid " %d hours"
 msgstr " %d timmar"
 
-#: calendar/gui/event-editor.c:1544
+#: calendar/gui/event-editor.c:1546
 msgid " 1 hour"
 msgstr " 1 timme"
 
-#: calendar/gui/event-editor.c:1547
+#: calendar/gui/event-editor.c:1549
 #, c-format
 msgid " %d minutes"
 msgstr " %d minuter"
 
-#: calendar/gui/event-editor.c:1549
+#: calendar/gui/event-editor.c:1551
 msgid " 1 minute"
 msgstr " 1 minut"
 
-#: calendar/gui/event-editor.c:1552
+#: calendar/gui/event-editor.c:1554
 #, c-format
 msgid " %d seconds"
 msgstr " %d sekunder"
 
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/event-editor.c:1556
 msgid " 1 second"
 msgstr " 1 sekund"
 
-#: calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1603
 msgid " before start of appointment"
 msgstr " innan start på möte"
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/event-editor.c:1605
 msgid " after start of appointment"
 msgstr " efter start på möte"
 
-#: calendar/gui/event-editor.c:1611
+#: calendar/gui/event-editor.c:1613
 msgid " before end of appointment"
 msgstr " före slut på möte"
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/event-editor.c:1615
 msgid " after end of appointment"
 msgstr " efter slut på möte"
 
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
+#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
+#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
@@ -2808,12 +2887,12 @@ msgstr "Fabrik för kalenderns iTip-vykontroll"
 msgid "Factory for the sample Calendar control"
 msgstr "Fabrik för test-kalenderkontrollen"
 
-#: calendar/gui/gnome-cal.c:695
+#: calendar/gui/gnome-cal.c:700
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunde inte öppna mappen i \"%s\""
 
-#: calendar/gui/gnome-cal.c:706
+#: calendar/gui/gnome-cal.c:711
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som krävs för att öppna \"%s\" stöds inte"
@@ -2874,201 +2953,201 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "1st"
 msgstr "1:a"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "2nd"
 msgstr "2:a"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "3rd"
 msgstr "3:e"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "4th"
 msgstr "4:e"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "5th"
 msgstr "5:e"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "6th"
 msgstr "6:e"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "7th"
 msgstr "7:e"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "8th"
 msgstr "8:e"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "9th"
 msgstr "9:e"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "10th"
 msgstr "10:e"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "11th"
 msgstr "11:e"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "12th"
 msgstr "12:e"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "13th"
 msgstr "13:e"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "14th"
 msgstr "14:e"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "15th"
 msgstr "15:e"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "16th"
 msgstr "16:e"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "17th"
 msgstr "17:e"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "18th"
 msgstr "18:e"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "19th"
 msgstr "19:e"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "20th"
 msgstr "20:e"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "21st"
 msgstr "21:a"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "22nd"
 msgstr "22:a"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "23rd"
 msgstr "23:e"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "24th"
 msgstr "24:e"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "25th"
 msgstr "25:e"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "26th"
 msgstr "26:e"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "27th"
 msgstr "27:e"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "28th"
 msgstr "28:e"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "29th"
 msgstr "29:e"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "30th"
 msgstr "30:e"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:306
 msgid "31st"
 msgstr "31:a"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Su"
 msgstr "Sö"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Mo"
 msgstr "Må"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Tu"
 msgstr "Ti"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "We"
 msgstr "On"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Th"
 msgstr "To"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Sa"
 msgstr "Lö"
 
-#: calendar/gui/print.c:944
+#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Uppgifter"
 
 #. Day
-#: calendar/gui/print.c:1074
+#: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
 msgstr "Aktuell dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1093
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1104
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Aktuell vecka (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1108
+#: calendar/gui/print.c:1112
 msgid "Current month (%b %Y)"
 msgstr "Aktuell månad (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1115
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr "Aktuellt år (%Y)"
 
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:1156
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1333
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1341
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:30
 msgid "Print Preview"
 msgstr "Förhandsgranska"
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/tasks-control.c:108
 msgid "The URI of the tasks folder to display"
 msgstr "URI:t som uppgiftsmappen ska visa"
 
@@ -3110,26 +3189,69 @@ msgstr ""
 "Metoden som krävs för att läsa in \"%s\" stöds inte; inga objekt från "
 "kalendermappen kommer att flyttas till uppgiftsmappen."
 
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
+#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
-#: camel/camel-filter-driver.c:850
+#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+msgid "Syncing folders"
+msgstr "Synkroniserar mappar"
+
+#: camel/camel-filter-driver.c:643
+msgid "Unable to open spool folder"
+msgstr "Kan inte öppna spool-mappen"
+
+#: camel/camel-filter-driver.c:652
+msgid "Unable to process spool folder"
+msgstr "Kan inte bearbeta spool-mappen"
+
+#: camel/camel-filter-driver.c:666
+msgid "Getting message %d (%d%%)"
+msgstr "Hämtar meddelande %d (%d%%)"
+
+#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#, c-format
+msgid "Failed message %d"
+msgstr "Meddelande %d misslyckades"
+
+#: camel/camel-filter-driver.c:671
+msgid "Cannot open message"
+msgstr "Kan inte öppna meddelande"
+
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+msgid "Syncing folder"
+msgstr "Synkroniserar mapp"
+
+#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
+msgid "Complete"
+msgstr "Färdigt"
+
+#: camel/camel-filter-driver.c:748
+#, c-format
+msgid "Getting message %d of %d"
+msgstr "Hämtar meddelande %d av %d"
+
+#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#, c-format
+msgid "Failed at message %d of %d"
+msgstr "Misslyckades vid meddelande %d av %d"
+
+#: camel/camel-filter-driver.c:866
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fel vid tolkning av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:855
+#: camel/camel-filter-driver.c:871
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fel vid körning av filter: %s: %s"
 
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:431 camel/camel-filter-search.c:437
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fel vid körning av filtersökning: %s: %s"
 
-#: camel/camel-folder-search.c:323
+#: camel/camel-folder-search.c:328
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3138,7 +3260,7 @@ msgstr ""
 "Kan inte tolka sökuttrycket: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:338
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3147,144 +3269,163 @@ msgstr ""
 "Fel vid körning av sökuttrycket: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
+#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
 msgid "(match-all) requires a single bool result"
 msgstr "(matcha-alla) kräver ett ensamt booleskt resultat"
 
-#: camel/camel-folder-search.c:554
+#: camel/camel-folder-search.c:559
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Utför fråga på okänt huvud: %s"
 
-#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
+#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ogiltig typ i \"body-contains\", förväntar sträng"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Kunde inte skapa låsfil för %s: %s"
 
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151 camel/camel-movemail.c:219
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Gjorde time-out när låsfil skulle fås för %s. Försök igen senare."
 
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Misslyckades med att få lås med fcntl(2): %s"
 
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Misslyckades med att få lås med flock(2): %s"
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:101
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Kunde inte kontrollera brevlådefilen %s: %s"
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:148
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kunde inte öppna brevlådefilen %s: %s"
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Kunde inte öppna temporära brevlådefilen %s: %s"
 
-#: camel/camel-movemail.c:197
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr "Kunde inte testa låsfilen för %s: %s"
 
-#: camel/camel-movemail.c:243
+#: camel/camel-movemail.c:245
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Fel vid läsning av brevlådefil: %s"
 
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:256
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Fel vid skrivande av temporär brevlådefil: %s"
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:274
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Misslyckades med att lagra e-post i temporära filen %s: %s"
 
-#: camel/camel-movemail.c:304
+#: camel/camel-movemail.c:306
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kunde inte skapa rör: %s"
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Kunde inte grena: %s"
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Programmet movemail misslyckades: %s"
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
 msgid "(Unknown error)"
 msgstr "(Okänt fel)"
 
-#: camel/camel-provider.c:137
+#: camel/camel-movemail.c:587
+#, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "Fel vid kopierande av temporär brevfil: %s"
+
+#: camel/camel-provider.c:131
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr "Kunde inte läsa in %s: Modulinläsning stöds inte på detta system."
+
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunde inte läsa in %s: %s"
 
-#: camel/camel-provider.c:145
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunde inte läsa in %s: Ingen initieringskod i modulen."
 
-#: camel/camel-remote-store.c:170
+#: camel/camel-remote-store.c:189
 #, c-format
 msgid "%s server %s"
 msgstr "%s-server %s"
 
-#: camel/camel-remote-store.c:174
+#: camel/camel-remote-store.c:193
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-tjänst för %s på %s"
 
-#: camel/camel-remote-store.c:221
+#: camel/camel-remote-store.c:243
 msgid "Connection cancelled"
 msgstr "Anslutning avbruten"
 
-#: camel/camel-remote-store.c:224
-#: camel/providers/smtp/camel-smtp-transport.c:243
+#: camel/camel-remote-store.c:246
+#: camel/providers/smtp/camel-smtp-transport.c:261
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunde inte ansluta till %s (port %d): %s"
 
-#: camel/camel-remote-store.c:225
+#: camel/camel-remote-store.c:247
 msgid "(unknown host)"
 msgstr "(okänd värd)"
 
-#: camel/camel-remote-store.c:306 camel/camel-remote-store.c:368
-#: camel/camel-remote-store.c:439
-#: camel/providers/imap/camel-imap-command.c:259
+#: camel/camel-remote-store.c:328 camel/camel-remote-store.c:390
+#: camel/camel-remote-store.c:461
+#: camel/providers/imap/camel-imap-command.c:264
 msgid "Operation cancelled"
 msgstr "Operation avbruten"
 
-#: camel/camel-remote-store.c:445
+#: camel/camel-remote-store.c:467
 msgid "Server unexpectedly disconnected"
 msgstr "Servern kopplade ifrån oväntat"
 
-#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr "Anonym"
+
+#: camel/camel-sasl-anonymous.c:35
+msgid "This option will connect to the server using an anonymous login."
+msgstr ""
+"Detta alternativ ansluter till servern genom att använda anonym inloggning."
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: camel/camel-sasl-anonymous.c:106
+#: camel/camel-sasl-anonymous.c:119
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -3293,7 +3434,7 @@ msgstr ""
 "Spårningsinformation för ogiltig e-postadress:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:118
+#: camel/camel-sasl-anonymous.c:131
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -3302,7 +3443,7 @@ msgstr ""
 "Spårningsinformation för ogiltig ogenomskinlig:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -3311,11 +3452,11 @@ msgstr ""
 "Spårningsinformation för ogiltig:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:11
+#: camel/camel-sasl-cram-md5.c:35
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/camel-sasl-cram-md5.c:34
+#: camel/camel-sasl-cram-md5.c:37
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -3323,11 +3464,11 @@ msgstr ""
 "Detta alternativ kommer att ansluta till servern med ett säkert "
 "CRAM-MD5-lösenord, om servern stöder det."
 
-#: camel/camel-sasl-digest-md5.c:39 mail/mail-config.glade.h:19
+#: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:41
+#: camel/camel-sasl-digest-md5.c:45
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -3335,41 +3476,41 @@ msgstr ""
 "Detta alternativ kommer att ansluta till servern med ett "
 "DIGEST-MD5-lösenord, om servern stöder det."
 
-#: camel/camel-sasl-digest-md5.c:799
+#: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Serverutmaningen var för lång (>2048 oktetter)\n"
 
-#: camel/camel-sasl-digest-md5.c:808
+#: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
 msgstr "Serverutmaningen var ogiltig\n"
 
-#: camel/camel-sasl-digest-md5.c:814
+#: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr "Serverutmaningen innehöll ogiltig \"Quality of Protection\"-flagga\n"
 
-#: camel/camel-sasl-digest-md5.c:836
+#: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
 msgstr "Serversvaret innehöll inte autentiseringsdata\n"
 
-#: camel/camel-sasl-digest-md5.c:854
+#: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Serversvaret innehöll ofullständig autentiseringsdata\n"
 
-#: camel/camel-sasl-digest-md5.c:864
+#: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
 msgstr "Serversvaret stämmer inte överens\n"
 
-#: camel/camel-sasl-kerberos4.c:38
+#: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Detta alternativ kommer att ansluta till servern med Kerberos "
 "4-autentisering."
 
-#: camel/camel-sasl-kerberos4.c:158
+#: camel/camel-sasl-kerberos4.c:161
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -3378,67 +3519,70 @@ msgstr ""
 "Kunde inte få Kerberos-biljett:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:418
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:417
 msgid "Bad authentication response from server."
 msgstr "Felaktigt autentiseringssvar från servern."
 
-#: camel/camel-sasl-plain.c:29
-msgid "PLAIN"
-msgstr "VANLIG"
-
-#: camel/camel-sasl-plain.c:31
-msgid ""
-"This option will connect to the server using a the PLAIN SASL mechanism if "
-"the server supports it."
+#: camel/camel-sasl-plain.c:34
+msgid "This option will connect to the server using a simple password."
 msgstr ""
-"Detta alternativ kommer att ansluta till servern med en VANLIG SASL-mekanism "
-"om servern stöder det."
+"Detta alternativ ansluter till servern genom att använda ett enkelt lösenord."
 
-#: camel/camel-search-private.c:105
+#: camel/camel-search-private.c:110
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Misslyckades med kompilering av reguljärt uttryck: %s: %s"
 
-#: camel/camel-service.c:139
+#: camel/camel-service.c:152
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL:en \"%s\" behöver ett användarnamn"
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL:en \"%s\" behöver ett värdnamn"
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:168
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL:en \"%s\" behöver en sökväg"
 
-#: camel/camel-service.c:478
+#: camel/camel-service.c:554
+#, c-format
+msgid "Resolving: %s"
+msgstr "Slår upp: %s"
+
+#: camel/camel-service.c:581
 #, c-format
-msgid "No such host %s."
-msgstr "Det finns ingen värd med namnet %s."
+msgid "Failure in name lookup: %s"
+msgstr "Namnuppslagning misslyckades: %s"
 
-#: camel/camel-service.c:481
+#: camel/camel-service.c:606
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Kunde temporärt inte slå upp värdnamnet %s."
+msgid "Host lookup failed: %s: host not found"
+msgstr "Uppslagning av värdnamn misslyckades: %s: värden kunde inte hittas"
 
-#: camel/camel-session.c:54
+#: camel/camel-service.c:608
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr "Uppslagning av värdnamn misslyckades: %s: okänd orsak"
+
+#: camel/camel-session.c:57
 msgid "Virtual folder email provider"
 msgstr "E-postleverantör för virtuell mapp"
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:59
 msgid "For reading mail as a query of another set of folders"
 msgstr "För läsande av e-post som en fråga av en annan samling mappar"
 
-#: camel/camel-session.c:320
+#: camel/camel-session.c:274 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Det finns ingen leverantör för protokollet \"%s\""
 
-#: camel/camel-session.c:415
+#: camel/camel-session.c:462
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3448,122 +3592,139 @@ msgstr ""
 "%s"
 
 #. Fill in the new fields
-#: camel/camel-store.c:382 mail/mail-ops.c:947 mail/mail-ops.c:954
-#: mail/mail-ops.c:972 mail/mail-ops.c:973
+#: camel/camel-store.c:380 mail/mail-ops.c:995 mail/mail-ops.c:1002
+#: mail/mail-ops.c:1020 mail/mail-ops.c:1021
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: camel/camel-url.c:77
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "URL-strängen \"%s\" innehåller inget protokoll"
-
-#: camel/camel-url.c:92
+#: camel/camel-url.c:288
 #, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "URL-strängen \"%s\" innehåller ett ogiltigt protokoll"
+msgid "Could not parse URL `%s'"
+msgstr "Kunde inte tolka URL:en \"%s\""
 
-#: camel/camel-url.c:152
+#: camel/camel-vee-folder.c:451
 #, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "Portnumret i URL:en \"%s\" består inte av siffror"
+msgid "No such message %s in %s"
+msgstr "Det finns inget sådant meddelande %s i %s"
 
-#: camel/camel-vee-folder.c:962
+#: camel/camel-vee-folder.c:545
 #, c-format
 msgid "No such message: %s"
 msgstr "Det finns inget sådant meddelande: %s"
 
-#: camel/providers/imap/camel-imap-command.c:204
+#: camel/providers/imap/camel-imap-command.c:209
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Oväntat svar från IMAP-servern: %s"
 
-#: camel/providers/imap/camel-imap-command.c:212
+#: camel/providers/imap/camel-imap-command.c:217
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommandot misslyckades: %s"
 
-#: camel/providers/imap/camel-imap-command.c:213 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: camel/providers/imap/camel-imap-command.c:267
+#: camel/providers/imap/camel-imap-command.c:272
 msgid "Server response ended too soon."
 msgstr "Serversvaret tog slut för tidigt."
 
-#: camel/providers/imap/camel-imap-command.c:451
+#: camel/providers/imap/camel-imap-command.c:456
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP-serversvaret innehöll inte %s-information"
 
-#: camel/providers/imap/camel-imap-command.c:485
+#: camel/providers/imap/camel-imap-command.c:490
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Oväntat OK-svar från IMAP-servern: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:171
+#: camel/providers/imap/camel-imap-folder.c:172
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunde inte läsa in sammanfattning för %s"
 
-#: camel/providers/imap/camel-imap-folder.c:350
+#: camel/providers/imap/camel-imap-folder.c:351
 msgid "Scanning IMAP folder"
 msgstr "Genomsöker IMAP-mappen"
 
-#: camel/providers/imap/camel-imap-folder.c:951
-#: camel/providers/imap/camel-imap-folder.c:1155
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
 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:981
-#: camel/providers/imap/camel-imap-folder.c:1189
+#: camel/providers/imap/camel-imap-folder.c:1016
+#: camel/providers/imap/camel-imap-folder.c:1231
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
-#: camel/providers/imap/camel-imap-provider.c:40
+# Låter konstigt?
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+msgid "Checking for new mail"
+msgstr "Kontrollerar ny e-post"
+
+# Det här också
+#: camel/providers/imap/camel-imap-provider.c:45
+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:479
+msgid "Folders"
+msgstr "Mappar"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Show only subscribed folders"
+msgstr "Visa endast prenumererade mappar"
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
+msgstr "Åsidosätt mappnamnrymden som servern tillhandahåller"
+
+#: camel/providers/imap/camel-imap-provider.c:54
+msgid "Namespace"
+msgstr "Namnrymd"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Apply filters to new messages in INBOX on this server"
+msgstr "Verkställ filtren på nya meddelanden i INBOX på denna server"
+
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAPv4"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "För läsande och lagrande av e-post på IMAP-servrar."
 
-#: camel/providers/imap/camel-imap-provider.c:58
-msgid "Secure IMAPv4"
-msgstr "Säker IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:60
-msgid "For reading and storing mail on IMAP servers over an SSL connection."
-msgstr ""
-"För läsande och lagrande av e-post på IMAP-servrar över en SSL-anslutning."
-
-#: camel/providers/imap/camel-imap-provider.c:77
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Detta alternativ ansluter till IMAP-servern med ett lösenord i klartext."
 
-#: camel/providers/imap/camel-imap-store.c:441
+#: camel/providers/imap/camel-imap-store.c:440
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-servern %s stöder inte den begärda autentiseringstypen %s"
 
-#: camel/providers/imap/camel-imap-store.c:451
+#: camel/providers/imap/camel-imap-store.c:450
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Inget stöd för autentiseringstypen %s"
 
-#: camel/providers/imap/camel-imap-store.c:476
+#: camel/providers/imap/camel-imap-store.c:475
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVar vänlig och ange IMAP-lösenordet för %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:491
-#: camel/providers/smtp/camel-smtp-transport.c:374
+#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:403
 msgid "You didn't enter a password."
 msgstr "Du angav inte något lösenord."
 
-#: camel/providers/imap/camel-imap-store.c:519
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/smtp/camel-smtp-transport.c:411
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3574,93 +3735,98 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:871
+#: camel/providers/imap/camel-imap-store.c:858
+#, c-format
+msgid "%s is not a selectable folder"
+msgstr "%s är inte en mapp som kan väljas"
+
+#: camel/providers/imap/camel-imap-store.c:872
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kunde inte skapa katalogen %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1329
+#: camel/providers/imap/camel-imap-store.c:1373
 msgid "You must be working online to complete this operation"
 msgstr "Du måste vara ansluten för att kunna genomföra detta"
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/local/camel-local-provider.c:39
 msgid "MH-format mail directories"
 msgstr "Brevlådekataloger i MH-format"
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
 msgid "For storing local mail in MH-like mail directories"
 msgstr "För lagrande av e-post i MH-liknande brevlådekataloger"
 
-#: camel/providers/local/camel-local-provider.c:46
+#: camel/providers/local/camel-local-provider.c:49
 msgid "Standard Unix mailbox file"
 msgstr "Standard Unix-brevlådefil"
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in standard mbox format"
 msgstr "För lagrande av e-post i standard-mbox-format"
 
-#: camel/providers/local/camel-local-provider.c:56
+#: camel/providers/local/camel-local-provider.c:59
 msgid "Qmail maildir-format mail files"
 msgstr "Brevlådefiler i Qmail maildir-format"
 
-#: camel/providers/local/camel-local-provider.c:57
+#: camel/providers/local/camel-local-provider.c:60
 msgid "For storing local mail in qmail maildir directories"
 msgstr "För lagrande av e-post i qmail maildir-liknande kataloger"
 
-#: camel/providers/local/camel-local-store.c:128
+#: camel/providers/local/camel-local-store.c:129
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagringsroten %s är inte en absolut sökväg"
 
-#: camel/providers/local/camel-local-store.c:135
+#: camel/providers/local/camel-local-store.c:136
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Lagringsroten %s är ingen vanlig katalog"
 
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:144
+#: camel/providers/local/camel-local-store.c:160
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kan inte få mapp: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:175
 msgid "Local stores do not have an inbox"
 msgstr "Lokala lagringsutrymmen har ingen inkorg"
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal brevlådefil %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:241
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunde inte byta namn på mappen %s till %s: %s"
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:283
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kunde inte ta bort mappsammanfattningsfilen \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:293
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunde inte ta bort mappindexfilen \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
 #, 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:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: 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
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3669,19 +3835,19 @@ msgstr ""
 "Kan inte hämta meddelande: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
 msgid "No such message"
 msgstr "Det finns inget sådant meddelande"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:203
 msgid "Invalid message contents"
 msgstr "Ogiltigt meddelandeinnehåll"
 
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
+#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3690,15 +3856,15 @@ msgstr ""
 "Kunde inte öppna mappen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
+#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen \"%s\" finns inte."
 
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3707,35 +3873,40 @@ msgstr ""
 "Kunde inte skapa mappen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:122
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "\"%s\" är inte en brevlådekatalog."
 
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
+#: camel/providers/local/camel-maildir-store.c:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunde inte ta bort mappen \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:150
+#: camel/providers/local/camel-maildir-store.c:152
 msgid "not a maildir directory"
 msgstr "är inte en brevlådekatalog"
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:152
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Kan inte skapa mapplås på %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan inte öppna brevlåda: %s %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, c-format
 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:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3744,15 +3915,15 @@ msgstr ""
 "Kan inte hämta meddelande: %s från mappen %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:368
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen verkar vara obotligt skadad."
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:381
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Meddelandebyggande misslyckades: Trasig brevlåda?"
 
-#: camel/providers/local/camel-mbox-store.c:92
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -3761,7 +3932,7 @@ msgstr ""
 "Kan inte öppna filen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3770,14 +3941,14 @@ msgstr ""
 "Kunde inte skapa filen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" är ingen vanlig fil."
 
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3786,111 +3957,111 @@ msgstr ""
 "Kunde inte ta bort mappen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:151
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen \"%s\" är inte tom. Den togs inte bort."
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
+#: camel/providers/local/camel-mbox-summary.c:248
 msgid "Summarising folder"
 msgstr "Sammanfattar mapp"
 
-#: camel/providers/local/camel-mbox-summary.c:245
+#: camel/providers/local/camel-mbox-summary.c:253
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Kunde inte öppna mapp: %s: sammanfattar från position %ld: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:287
+#: camel/providers/local/camel-mbox-summary.c:295
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Ödesdigert e-posttolkningsfel nära position %ld i mappen %s"
 
-#: camel/providers/local/camel-mbox-summary.c:362
+#: camel/providers/local/camel-mbox-summary.c:370
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Kan inte sammanfatta mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1333
+#: camel/providers/local/camel-mbox-summary.c:501
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1383
 msgid "Synchronising folder"
 msgstr "Synkroniserar mapp"
 
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:506
+#: camel/providers/local/camel-mbox-summary.c:707
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Kunde inte öppna mapp för att sammanfatta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:523
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan inte öppna temporär brevlåda: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
 #: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:556
 #: camel/providers/local/camel-mbox-summary.c:745
+#: camel/providers/local/camel-mbox-summary.c:753
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Summeringen stämmer inte överens, avbryter synk"
 
-#: camel/providers/local/camel-mbox-summary.c:591
+#: camel/providers/local/camel-mbox-summary.c:599
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fel vid skrivning av temporär brevlåda: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:608
+#: camel/providers/local/camel-mbox-summary.c:616
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fel vid skrivning till temporär brevlåda: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
+#: camel/providers/local/camel-mbox-summary.c:634
+#: camel/providers/local/camel-mbox-summary.c:803
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunde inte stänga källmappen %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:643
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunde inte stänga temporära mapp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:646
+#: camel/providers/local/camel-mbox-summary.c:654
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunde inte byta namn på mapp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:870
+#: camel/providers/local/camel-mbox-summary.c:878
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Okänt fel: %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:149
+#: camel/providers/local/camel-mh-folder.c:157
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan inte lägga till meddelande i mh-mapp: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:108
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" är inte en katalog."
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Var vänlig och ange NNTP-lösenordet för %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:62
+#: camel/providers/nntp/camel-nntp-auth.c:66
 msgid "Server rejected username"
 msgstr "Servern avvisade användarnamnet"
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:72
 msgid "Failed to send username to server"
 msgstr "Misslyckades med att skicka användarnamnet till servern"
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:81
 msgid "Server rejected username/password"
 msgstr "Servern avvisade användarnamnet/lösenordet"
 
@@ -3914,11 +4085,11 @@ msgstr "Kan inte läsa in grupplistefilen för %s: %s"
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Kan inte spara grupplistefilen för %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr "USENET-diskussionsgrupper"
 
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Det här är en leverantör för läsning och postning till "
@@ -3956,26 +4127,39 @@ msgstr "Hämtar POP-sammanfattning"
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Kunde inte öppna mapp: meddelandelistningen var inte komplett."
 
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:285
 #, c-format
 msgid "No message with uid %s"
 msgstr "Inget meddelande med uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:290
+#: camel/providers/pop3/camel-pop3-folder.c:289
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Hämtar POP-meddelande %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:308
+#: camel/providers/pop3/camel-pop3-folder.c:307
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Kunde inte hämta meddelande från POP-servern %s: %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+msgid "Message storage"
+msgstr "Meddelandelager"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Leave messages on server"
+msgstr "Lämna meddelanden på servern"
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, c-format
+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
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
@@ -3983,21 +4167,7 @@ msgstr ""
 "För anslutning till POP-servrar. POP-protokollet kan även användas för att "
 "hämta e-post från vissa webb-epostleverantörer och slutna e-postsystem."
 
-#: camel/providers/pop3/camel-pop3-provider.c:52
-msgid "Secure POP"
-msgstr "Säker POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:54
-msgid ""
-"For connecting to POP servers over an SSL connection. The POP protocol can "
-"also be used to retrieve mail from certain web mail providers and "
-"proprietary email systems."
-msgstr ""
-"För anslutning till POP-servrar över en SSL-anslutning. POP-protokollet kan "
-"även användas för att hämta e-post från vissa webb-epostleverantörer och "
-"slutna e-postsystem."
-
-#: camel/providers/pop3/camel-pop3-provider.c:71
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4006,7 +4176,7 @@ msgstr ""
 "klartextlösenord. Det här är det enda alternativet som stöds hos många "
 "POP-servrar."
 
-#: camel/providers/pop3/camel-pop3-provider.c:81
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4016,29 +4186,29 @@ msgstr ""
 "krypterat lösenord via APOP-protokollet. Det här kanske inte fungerar för "
 "alla användare även med servrar som sägs stöda detta."
 
-#: camel/providers/pop3/camel-pop3-provider.c:93
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Det här kommer att ansluta till POP-servern och använda Kerberos 4 för att "
 "autentisera med den."
 
-#: camel/providers/pop3/camel-pop3-store.c:181
+#: camel/providers/pop3/camel-pop3-store.c:207
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kunde inte autentisera till KPOP-server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:298
+#: camel/providers/pop3/camel-pop3-store.c:319
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Kunde inte ansluta till POP-servern på %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:337
+#: camel/providers/pop3/camel-pop3-store.c:358
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVar vänlig och ange ett POP3-lösenord för %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:356
+#: camel/providers/pop3/camel-pop3-store.c:377
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4047,12 +4217,12 @@ msgstr ""
 "Kunde inte ansluta till POP-servern,\n"
 "Fel vid skickande av filnamn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:359
-#: camel/providers/pop3/camel-pop3-store.c:396
+#: camel/providers/pop3/camel-pop3-store.c:380
+#: camel/providers/pop3/camel-pop3-store.c:417
 msgid "(Unknown)"
 msgstr "(Okänd)"
 
-#: camel/providers/pop3/camel-pop3-store.c:386
+#: camel/providers/pop3/camel-pop3-store.c:407
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4060,7 +4230,7 @@ msgstr ""
 "Kan inte ansluta till POP-servern.\n"
 "Inget stöd för begärd autentiseringsmekanism."
 
-#: camel/providers/pop3/camel-pop3-store.c:394
+#: camel/providers/pop3/camel-pop3-store.c:415
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4069,17 +4239,17 @@ msgstr ""
 "Kan inte ansluta till POP-server.\n"
 "Fel vid skickande av lösenord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:503
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:64
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:57
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -4087,331 +4257,328 @@ msgstr ""
 "För leverans av e-post genom att skicka det till programmet \"sendmail\" på "
 "det lokala systemet."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Kunde inte skapa rör till sendmail: %s: brevet skickades inte"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kunde inte grena sendmail: %s: brevet skickades inte"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Kunde inte skicka meddelande: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail avslutade med signal %s: brevet skickades inte."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Kunde inte köra %s: brevet skickades inte."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail avslutade med status %d: brevet skickades inte."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
 msgid "Could not find 'From' address in message"
 msgstr "Kunde inte hitta \"Från\"-adress i meddelandet"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
 msgstr "E-postleverans via programmet sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:35 mail/mail-config.glade.h:58
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37
+#: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "För leverans av e-post genom anslutning till ett fjärr-epostnav som använder "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-provider.c:52
-msgid "Secure SMTP"
-msgstr "Säker SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:54
-msgid ""
-"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-"connection.\n"
-msgstr ""
-"För leverans av e-post genom anslutning till ett fjärr-epostnav som använder "
-"SMTP över en SSL-anslutning.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:146
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfel, okänt kommando"
 
-#: camel/providers/smtp/camel-smtp-transport.c:148
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfel i parametrar eller argument"
 
-#: camel/providers/smtp/camel-smtp-transport.c:150
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr "Kommandot inte implementerat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:152
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter inte implementerad"
 
-#: camel/providers/smtp/camel-smtp-transport.c:154
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar från systemhjälp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:156
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Help message"
 msgstr "Hjälpmeddelande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:158
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Service ready"
 msgstr "Tjänsten klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:160
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr "Tjänsten stänger överföringskanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service not available, closing transmission channel"
 msgstr "Tjänsten inte tillgänglig, stänger överföringskanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:164
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
 msgstr "Efterfrågad e-poståtgärd okej, färdig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:166
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "User not local; will forward to <forward-path>"
 msgstr "Användaren inte lokal; vidarebefordrar till <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Efterfrågad e-poståtgärd inte utförd: brevlådan inte tillgänglig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Efterfrågad åtgärd inte utförd: brevlådan inte tillgänglig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr "Efterfrågad åtgärd avbruten: fel i behandling"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr "Användaren inte lokal; försök med <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Efterfrågad åtgärd inte utförd: otillräckligt systemutrymme"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Efterfrågad åtgärd avbruten: överskriden utrymmesallokering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Efterfrågad åtgärd inte utförd: brevlådenamn inte tillåtet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Börja skriva in brevet, avsluta med <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr "Transaktionen misslyckades"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "A password transition is needed"
 msgstr "En lösenordsöverföring behövs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen är för svag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering behövs för begärd autentiseringsmekanism"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Temporary authentication failure"
 msgstr "Tillfälligt autentiseringsmisslyckande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication required"
 msgstr "Autentisering krävs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:305
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Fel på välkomstsvar: %s: möjligtvis inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:348
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
+msgstr "SMTP-servern %s stöder inte den begärda autentiseringstypen %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVar vänlig och ange SMTP-lösenordet för %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:494
+#: camel/providers/smtp/camel-smtp-transport.c:527
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:529
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-epostleverans via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:521
+#: camel/providers/smtp/camel-smtp-transport.c:554
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan inte skicka meddelande: avsändaradressen är inte angiven."
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:561
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan inte skicka meddelande: avsändaradressen är inte giltig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:542
+#: camel/providers/smtp/camel-smtp-transport.c:575
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan inte skicka meddelande: inga mottagare är angivna."
 
-#: camel/providers/smtp/camel-smtp-transport.c:636
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO-begäran gjorde time-out: %s: inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:655
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Fel i HELO-svar: %s: inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:702
+#: camel/providers/smtp/camel-smtp-transport.c:721
+msgid "Error creating SASL authentication object."
+msgstr "Fel vid skapande av SASL-autentiseringsobjekt."
+
+#: camel/providers/smtp/camel-smtp-transport.c:736
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:798
 msgid "Bad authentication response from server.\n"
 msgstr "Felaktigt autentiseringssvar från servern.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:785
+#: camel/providers/smtp/camel-smtp-transport.c:824
 #, 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:804
+#: camel/providers/smtp/camel-smtp-transport.c:843
 #, 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:829
+#: camel/providers/smtp/camel-smtp-transport.c:868
 #, 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:848
+#: camel/providers/smtp/camel-smtp-transport.c:887
 #, 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:879
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, 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:898
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, 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:913
-#: camel/providers/smtp/camel-smtp-transport.c:931
+#: camel/providers/smtp/camel-smtp-transport.c:952
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:950
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, 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:974
+#: camel/providers/smtp/camel-smtp-transport.c:1013
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:993
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1055
 #, 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:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1074
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Fel i QUIT-svar: %s: inte ödesdigert"
 
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:95
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:97
 #, c-format
 msgid "%u bytes"
 msgstr "%u byte"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fk"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:112
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:116
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
 msgid "attachment"
 msgstr "bilaga"
 
-#: composer/e-msg-composer-attachment-bar.c:413
+#: composer/e-msg-composer-attachment-bar.c:421
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:469
 msgid "Remove selected items from the attachment list"
 msgstr "Ta bort markerade objekt från bifogningslistan"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Add attachment..."
 msgstr "Lägg till bilaga..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:501
 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:1014
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1019
 msgid "Attachment"
 msgstr "Bilaga"
 
@@ -4435,52 +4602,52 @@ msgstr "MIME-typ:"
 msgid "Send as:"
 msgstr "Skicka som:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Click here for the address book"
 msgstr "Klicka här för att ta fram adressboken"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:694
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:709
 msgid "From:"
 msgstr "Från:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:696
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:711
 msgid "Reply-To:"
 msgstr "Svara-Till:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:618
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:633
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:698
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:713
 msgid "To:"
 msgstr "Till:"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:700
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:715
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:388
 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:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:392
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4488,7 +4655,7 @@ msgstr ""
 "Ange adresserna till de som ska ta emot en extra kopia av meddelandet utan "
 "att visas i mottagarlistan av meddelandet."
 
-#: composer/e-msg-composer.c:518
+#: composer/e-msg-composer.c:528
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4497,26 +4664,34 @@ msgstr ""
 "Kunde inte öppna signaturfilen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:706
+#: composer/e-msg-composer.c:716
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:727
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fel vid sparande av filen: %s"
 
-#: composer/e-msg-composer.c:737
+#: composer/e-msg-composer.c:747
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid inläsning av filen: %s"
 
-#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:193
+#: composer/e-msg-composer.c:819
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Kan inte öppna mallmappen för detta konto.\n"
+"Vill du använda standardmappen för mallar?"
+
+#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:206
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:824
+#: composer/e-msg-composer.c:883
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4526,27 +4701,27 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:908
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:975
+#: composer/e-msg-composer.c:1034
 msgid "That file does not exist."
 msgstr "Den filen finns inte."
 
-#: composer/e-msg-composer.c:985
+#: composer/e-msg-composer.c:1044
 msgid "That is not a regular file."
 msgstr "Det är ingen vanlig fil."
 
-#: composer/e-msg-composer.c:995
+#: composer/e-msg-composer.c:1054
 msgid "That file exists but is not readable."
 msgstr "Den filen finns, men är inte läsbar."
 
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1064
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Filen verkade åtkomlig, men open(2) misslyckades."
 
-#: composer/e-msg-composer.c:1027
+#: composer/e-msg-composer.c:1086
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4554,19 +4729,19 @@ 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:1048
+#: composer/e-msg-composer.c:1107
 msgid "An error occurred while reading the file."
 msgstr "Ett fel uppstod vid läsning av filen."
 
-#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
+#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:1765
+#: composer/e-msg-composer.c:1829
 msgid "Could not create composer window."
 msgstr "Kunde inte skapa fönster för meddelanderedigering."
 
-#: composer/evolution-composer.c:352
+#: composer/evolution-composer.c:355
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -4574,7 +4749,7 @@ msgstr ""
 "Kunde inte skapa redigerarfönstret, eftersom du inte har\n"
 "konfigurerat några identiter i e-postkomponenten."
 
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:370
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan inte initiera Evolutions e-postredigerare."
 
@@ -4591,74 +4766,74 @@ msgid "calendar information"
 msgstr "kalenderinformation"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
 msgid "%I:%M:%S %p%n"
 msgstr " "
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
 msgid "%H:%M:%S%n"
 msgstr "%H.%M.%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
 msgid "%I:%M %p%n"
 msgstr " "
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
 msgid "%H:%M%n"
 msgstr "%H.%M%n"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:268
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
+#: e-util/e-time-utils.c:269
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
 msgid "%a %m/%d/%Y"
 msgstr "%a %Y-%m-%d"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:273
+#: e-util/e-time-utils.c:274
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %Y-%m-%d %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:282
+#: e-util/e-time-utils.c:283
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %Y-%m-%d %I.%M %p"
 
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:311 widgets/misc/e-dateedit.c:1248
-#: widgets/misc/e-dateedit.c:1307 widgets/misc/e-dateedit.c:1486
+#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
+#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
 msgid "%H:%M"
 msgstr "%H.%M"
 
 #. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:314
+#: e-util/e-time-utils.c:315
 msgid "%H:%M:%S"
 msgstr "%H.%M.%S"
 
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:319 widgets/misc/e-dateedit.c:1251
-#: widgets/misc/e-dateedit.c:1310 widgets/misc/e-dateedit.c:1489
+#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
+#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
 msgid "%I:%M %p"
 msgstr "%I.%M %p"
 
 #. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:322
+#: e-util/e-time-utils.c:323
 msgid "%I:%M:%S %p"
 msgstr "%I.%M.%S %p"
 
@@ -4742,7 +4917,7 @@ msgstr "Flytta %s till nästa rad"
 msgid "Configure %s"
 msgstr "Konfigura %s"
 
-#: executive-summary/component/e-summary.c:918
+#: executive-summary/component/e-summary.c:924
 #, c-format
 msgid ""
 "Cannot open the HTML file:\n"
@@ -4751,7 +4926,7 @@ msgstr ""
 "Kunde inte öppna HTML-filen:\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:932
+#: executive-summary/component/e-summary.c:938
 #, c-format
 msgid ""
 "Error reading data:\n"
@@ -4760,7 +4935,7 @@ msgstr ""
 "Fel vid läsning av data:\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:950
+#: executive-summary/component/e-summary.c:956
 msgid "File does not have a place for the services.\n"
 msgstr "Filen har ingen plats för tjänsterna.\n"
 
@@ -4772,7 +4947,7 @@ msgstr "Utseende"
 msgid "Background:"
 msgstr "Bakgrund:"
 
-#: executive-summary/component/main.c:60
+#: executive-summary/component/main.c:62
 msgid ""
 "Executive summary component could not initialize Bonobo.\n"
 "If there was a warning message about the RootPOA, it probably means\n"
@@ -4806,87 +4981,87 @@ msgstr "Testa Bonobo-tjänsten"
 msgid "Test service"
 msgstr "Testa tjänsten"
 
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+#: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Fel"
 
-#: executive-summary/test-service/rdf-summary.c:765
+#: executive-summary/test-service/rdf-summary.c:768
 msgid "Update automatically"
 msgstr "Uppdatera automatiskt"
 
-#: executive-summary/test-service/rdf-summary.c:775
+#: executive-summary/test-service/rdf-summary.c:778
 msgid "Update now"
 msgstr "Uppdatera nu"
 
-#: executive-summary/test-service/rdf-summary.c:785
+#: executive-summary/test-service/rdf-summary.c:788
 msgid "Update every "
 msgstr "Uppdatera var "
 
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
+#: executive-summary/test-service/rdf-summary.c:796
+#: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr "minut"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "year"
 msgstr "år"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "years"
 msgstr "år"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "month"
 msgstr "månad"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "months"
 msgstr "månader"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "week"
 msgstr "vecka"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "weeks"
 msgstr "veckor"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:81
 msgid "days"
 msgstr "dagar"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hour"
 msgstr "timme"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hours"
 msgstr "timmar"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:83
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "second"
 msgstr "sekund"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "seconds"
 msgstr "sekunder"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:199
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Hoppsan. Du har glömt välja ett datum."
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:201
 msgid "Oops. You have chosen an invalid date."
 msgstr "Hoppsan. Du har valt ett ogiltigt datum."
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:275
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -4896,7 +5071,7 @@ msgstr ""
 "den tid då filtret körs eller en virtuell\n"
 "mapp öppnas."
 
-#: filter/filter-datespec.c:282
+#: filter/filter-datespec.c:298
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -4904,7 +5079,7 @@ msgstr ""
 "Meddelandedatumet kommer att jämföras med\n"
 "datumet som du anger här."
 
-#: filter/filter-datespec.c:322
+#: filter/filter-datespec.c:338
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -4915,49 +5090,45 @@ msgstr ""
 "körs; \"en vecka sen\" till exempel."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "the current time"
 msgstr "aktuell tid"
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "a time you specify"
 msgstr "en tid du anger"
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:374
 msgid "a time relative to the current time"
 msgstr "en tid som är relativ till aktuell tid"
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:432
 msgid "Compare against"
 msgstr "Jämför med"
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
 msgid "now"
 msgstr "nu"
 
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:706
 msgid "<click here to select a date>"
 msgstr "<klicka här för att välja ett datum>"
 
-#: filter/filter-editor.c:126 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "Filterregler"
 
 #. and now for the action area
-#: filter/filter-filter.c:424
+#: filter/filter-filter.c:453
 msgid "Then"
 msgstr "Då"
 
-#: filter/filter-filter.c:437
+#: filter/filter-filter.c:467
 msgid "Add action"
 msgstr "Lägg till åtgärd"
 
-#: filter/filter-filter.c:443
-msgid "Remove action"
-msgstr "Ta bort åtgärd"
-
-#: filter/filter-folder.c:143
+#: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -4966,19 +5137,20 @@ msgstr ""
 "Var vänlig och gå tillbaka och ange en giltig mapp som e-post kan levereras "
 "till."
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:678
 msgid "Select Folder"
 msgstr "Välj mapp"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:247
 msgid "Enter folder URI"
 msgstr "Ange mappens URI"
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:293
 msgid "<click here to select a folder>"
 msgstr "<klicka här för att välja en mapp>"
 
-#: filter/filter-input.c:189
+#: filter/filter-input.c:194
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -4987,42 +5159,38 @@ msgstr ""
 "Fel i reguljära uttrycket \"%s\":\n"
 "%s"
 
-#: filter/filter-part.c:467
+#: filter/filter-part.c:475
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:598
+#: filter/filter-rule.c:624
 msgid "Rule name: "
 msgstr "Regelnamn: "
 
-#: filter/filter-rule.c:602
+#: filter/filter-rule.c:628
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: filter/filter-rule.c:618
+#: filter/filter-rule.c:644
 msgid "If"
 msgstr "Om"
 
-#: filter/filter-rule.c:635
+#: filter/filter-rule.c:662
 msgid "Execute actions"
 msgstr "Utför åtgärder"
 
-#: filter/filter-rule.c:639
+#: filter/filter-rule.c:666
 msgid "if all criteria are met"
 msgstr "om alla villkor uppfylls"
 
-#: filter/filter-rule.c:644
+#: filter/filter-rule.c:671
 msgid "if any criteria are met"
 msgstr "om något villkor uppfylls"
 
-#: filter/filter-rule.c:655
+#: filter/filter-rule.c:682
 msgid "Add criterion"
 msgstr "Lägg till villkor"
 
-#: filter/filter-rule.c:661
-msgid "Remove criterion"
-msgstr "Ta bort villkor"
-
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Redigera filter"
@@ -5039,7 +5207,7 @@ msgstr "Inkommande"
 msgid "Outgoing"
 msgstr "Utgående"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtuella mappar"
 
@@ -5063,183 +5231,188 @@ msgstr "med alla lokala och aktiva fjärrmappar"
 msgid "with all local folders"
 msgstr "med alla lokala mappar"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Tilldela färg"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Tilldela poäng"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Bilagor"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "innehåller"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Kopiera till mapp"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Ankomstdatum"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Avsändningsdatum"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "innehåller inte"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "slutar inte med"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "finns inte"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not sound like"
-msgstr "låter inte som"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not start with"
-msgstr "börjar inte med"
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "Finns inte"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "Mall"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "slutar med"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "Finns"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "finns"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Uttryck"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Forward to Address"
 msgstr "Vidarebefordra till adress"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:15
 msgid "Important"
 msgstr "Viktigt"
 
-#: filter/libfilter-i18n.h:26
-msgid "is"
-msgstr "är"
-
-#: filter/libfilter-i18n.h:27
-msgid "is greater than"
-msgstr "är större än"
-
-#: filter/libfilter-i18n.h:28
-msgid "is less than"
-msgstr "är mindre än"
-
-#: filter/libfilter-i18n.h:29
-msgid "is not"
-msgstr "är inte"
-
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Mailing list"
 msgstr "Sändlista"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Body"
 msgstr "Meddelandetext"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message Header"
 msgstr "Meddelandehuvud"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was received"
 msgstr "Meddelandet mottogs"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Message was sent"
 msgstr "Meddelandet skickades"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:21
 msgid "Move to Folder"
 msgstr "Flytta till mapp"
 
-#: filter/libfilter-i18n.h:36
-msgid "on or after"
-msgstr "den eller efter"
-
-#: filter/libfilter-i18n.h:37
-msgid "on or before"
-msgstr "den eller innan"
-
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Read"
 msgstr "Läs"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Recipients"
 msgstr "Mottagare"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Regex Match"
 msgstr "Sökning med reguljärt uttryck"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:25
 msgid "Replied to"
 msgstr "Svarade till"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1014
+#: filter/libfilter-i18n.h:26 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1019
 msgid "Score"
 msgstr "Poäng"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
+msgid "Sender"
+msgstr "Avsändare"
+
+#: filter/libfilter-i18n.h:28
 msgid "Set Status"
 msgstr "Ställ in status"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "låter som"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 msgid "Specific header"
 msgstr "Specifikt huvud"
 
-#: filter/libfilter-i18n.h:47
-msgid "starts with"
-msgstr "börjar med"
-
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:31
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: filter/libfilter-i18n.h:50 mail/message-list.c:1015
+#: filter/libfilter-i18n.h:32 mail/message-list.c:1020
 msgid "Subject"
 msgstr "Ämne"
 
+#: filter/libfilter-i18n.h:35
+msgid "contains"
+msgstr "innehåller"
+
+#: filter/libfilter-i18n.h:36
+msgid "does not contain"
+msgstr "innehåller inte"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not end with"
+msgstr "slutar inte med"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not exist"
+msgstr "finns inte"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not sound like"
+msgstr "låter inte som"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not start with"
+msgstr "börjar inte med"
+
+#: filter/libfilter-i18n.h:41
+msgid "ends with"
+msgstr "slutar med"
+
+#: filter/libfilter-i18n.h:42
+msgid "exists"
+msgstr "finns"
+
+#: filter/libfilter-i18n.h:43
+msgid "is greater than"
+msgstr "är större än"
+
+#: filter/libfilter-i18n.h:44
+msgid "is less than"
+msgstr "är mindre än"
+
+#: filter/libfilter-i18n.h:45
+msgid "is not"
+msgstr "är inte"
+
+#: filter/libfilter-i18n.h:46
+msgid "is"
+msgstr "är"
+
+#: filter/libfilter-i18n.h:47
+msgid "on or after"
+msgstr "den eller efter"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or before"
+msgstr "den eller innan"
+
+#: filter/libfilter-i18n.h:49
+msgid "sounds like"
+msgstr "låter som"
+
+#: filter/libfilter-i18n.h:50
+msgid "starts with"
+msgstr "börjar med"
+
 #: filter/libfilter-i18n.h:51
 msgid "was after"
 msgstr "var efter"
@@ -5248,111 +5421,105 @@ msgstr "var efter"
 msgid "was before"
 msgstr "var före"
 
-#: filter/score-editor.c:126
+#: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr "Poängregler"
 
-#: mail/component-factory.c:319
+#: mail/component-factory.c:332
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan inte initiera Evolutions e-postkomponent."
 
-#: mail/component-factory.c:392
+#: mail/component-factory.c:405
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lager hos skal"
 
-#: mail/folder-browser-factory.c:244
+#: mail/folder-browser-factory.c:209
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper för \"%s\""
 
-#: mail/folder-browser-factory.c:246 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:219
+#: mail/folder-browser.c:225
 msgid "Store search as vFolder"
 msgstr "Lagra sökning som vMapp"
 
-#: mail/folder-browser.c:510
+#: mail/folder-browser.c:533
 msgid "VFolder on Subject"
 msgstr "Virtuell mapp på ämnesrad"
 
-#: mail/folder-browser.c:513
+#: mail/folder-browser.c:536
 msgid "VFolder on Sender"
 msgstr "Virtuell mapp på avsändare"
 
-#: mail/folder-browser.c:516
+#: mail/folder-browser.c:539
 msgid "VFolder on Recipients"
 msgstr "Virtuell mapp på mottagare"
 
-#: mail/folder-browser.c:519 mail/folder-browser.c:710
+#: mail/folder-browser.c:542 mail/folder-browser.c:733
 msgid "VFolder on Mailing List"
 msgstr "Virtuell mapp på sändlista"
 
-#: mail/folder-browser.c:525
+#: mail/folder-browser.c:548
 msgid "Filter on Subject"
 msgstr "Filtrera på ämnesrad"
 
-#: mail/folder-browser.c:528
+#: mail/folder-browser.c:551
 msgid "Filter on Sender"
 msgstr "Filtrera på avsändare"
 
-#: mail/folder-browser.c:531
+#: mail/folder-browser.c:554
 msgid "Filter on Recipients"
 msgstr "Filtrera på mottagare"
 
-#: mail/folder-browser.c:534 mail/folder-browser.c:709
+#: mail/folder-browser.c:557 mail/folder-browser.c:732
 msgid "Filter on Mailing List"
 msgstr "Filtrera på sändlista"
 
-#: mail/folder-browser.c:545
+#: mail/folder-browser.c:568
 msgid "Resend"
 msgstr "Skicka om"
 
-#: mail/folder-browser.c:547
+#: mail/folder-browser.c:570
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: mail/folder-browser.c:549 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:28 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Skriv ut"
-
-#: mail/folder-browser.c:554
+#: mail/folder-browser.c:577
 msgid "Reply to Sender"
 msgstr "Svara till avsändaren"
 
-#: mail/folder-browser.c:556 mail/mail-view.c:141 ui/evolution-mail.xml.h:35
+#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:36
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: mail/folder-browser.c:558 mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:14
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: mail/folder-browser.c:560
+#: mail/folder-browser.c:583
 msgid "Forward inline"
 msgstr "Vidarebefordra inuti"
 
-#: mail/folder-browser.c:563
+#: mail/folder-browser.c:586
 msgid "Mark as Read"
 msgstr "Märk som läst"
 
-#: mail/folder-browser.c:565
+#: mail/folder-browser.c:588
 msgid "Mark as Unread"
 msgstr "Märk som oläst"
 
-#: mail/folder-browser.c:570
+#: mail/folder-browser.c:593
 msgid "Move to Folder..."
 msgstr "Flytta till mapp..."
 
-#: mail/folder-browser.c:572
+#: mail/folder-browser.c:595
 msgid "Copy to Folder..."
 msgstr "Kopiera till mapp..."
 
-#: mail/folder-browser.c:576
+#: mail/folder-browser.c:599
 msgid "Undelete"
 msgstr "Ångra borttagning"
 
@@ -5360,20 +5527,20 @@ msgstr "Ångra borttagning"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:609
 msgid "Apply Filters"
 msgstr "Tillämpa filter"
 
-#: mail/folder-browser.c:590
+#: mail/folder-browser.c:613
 msgid "Create Rule From Message"
 msgstr "Skapa regel från meddelande"
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:735
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrera på sändlista (%s)"
 
-#: mail/folder-browser.c:713
+#: mail/folder-browser.c:736
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Virtuell mapp på sändlista (%s)"
@@ -5444,65 +5611,65 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-accounts.c:116
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 msgid " (default)"
 msgstr " (standard)"
 
-#: mail/mail-accounts.c:231 mail/mail-accounts.c:235
+#: mail/mail-accounts.c:197
+msgid "Disable"
+msgstr "Stäng av"
+
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+msgid "Enable"
+msgstr "Slå på"
+
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
 msgid "Are you sure you want to delete this account?"
 msgstr "Är du säker på att du vill ta bort detta konto?"
 
-#: mail/mail-accounts.c:341 mail/mail-accounts.c:345
+#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
 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:459
+#: mail/mail-accounts.c:536
 msgid "Evolution Account Manager"
 msgstr "Evolutions kontohanterare"
 
-#: mail/mail-account-editor.c:301
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"En eller flera av dina servrar är inte korrekt konfigurerade.\n"
-"Vill du spara i alla fall?"
+#: mail/mail-account-editor.c:105
+msgid "You have not filled in all of the required information."
+msgstr "Du har inte fyllt i all nödvändig information."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:740
+#: mail/mail-account-editor.c:173
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontoredigerare"
 
-#: mail/mail-account-editor.c:761
-msgid "Unspecified"
-msgstr "Odefinierad"
-
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Skicka e-post till %s"
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr "Ämnesraden är %s"
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "Hämta e-post från %s"
 
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr "Sändlistan %s"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
 msgid "Add Filter Rule"
 msgstr "Lägg till filterregel"
 
-#: mail/mail-callbacks.c:85
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5514,7 +5681,7 @@ msgstr ""
 "ta emot eller skriva nya brev.\n"
 "Vill du konfigurera det nu?"
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5522,7 +5689,7 @@ msgstr ""
 "Du måste konfigurera en identititet\n"
 "innan du kan skriva brev."
 
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5530,11 +5697,11 @@ msgstr ""
 "Du måste konfigurera en e-posttransport\n"
 "innan du kan skriva brev."
 
-#: mail/mail-callbacks.c:194
+#: 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:227
+#: mail/mail-callbacks.c:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5542,32 +5709,32 @@ msgstr ""
 "Detta meddelande har ingen ämnesrad.\n"
 "Vill du verkligen skicka?"
 
-#: mail/mail-callbacks.c:296
-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:318
+#: 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:583
+#: 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:591
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Den %s skrev %s:\n"
 
-#: mail/mail-callbacks.c:765
+#: mail/mail-callbacks.c:773
 msgid "Forwarded message:\n"
 msgstr "Vidarebefordrat meddelande:\n"
 
-#: mail/mail-callbacks.c:868
+#: mail/mail-callbacks.c:876
 msgid "Move message(s) to"
 msgstr "Flytta meddelande(n) till"
 
-#: mail/mail-callbacks.c:870
+#: mail/mail-callbacks.c:878
 msgid "Copy message(s) to"
 msgstr "Kopiera meddelande(n) till"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:1019
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5575,7 +5742,7 @@ msgstr ""
 "Du kan bara redigera meddelanden\n"
 "som du sparat i mappen Drafts."
 
-#: mail/mail-callbacks.c:1048
+#: mail/mail-callbacks.c:1056
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -5583,11 +5750,11 @@ msgstr ""
 "Du kan bara skicka om meddelanden\n"
 "som du sparat i mappen Sent."
 
-#: mail/mail-callbacks.c:1081 mail/mail-display.c:86
+#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: mail/mail-callbacks.c:1085 mail/mail-display.c:90
+#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5595,15 +5762,15 @@ msgstr ""
 "Det finns redan en fil med det namnet.\n"
 "Ska den skrivas över?"
 
-#: mail/mail-callbacks.c:1129
+#: mail/mail-callbacks.c:1137
 msgid "Save Message As..."
 msgstr "Spara meddelande som..."
 
-#: mail/mail-callbacks.c:1131
+#: mail/mail-callbacks.c:1139
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1252
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5612,51 +5779,56 @@ msgstr ""
 "Fel vid läsning av filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1293
+#: mail/mail-callbacks.c:1301
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/mail-callbacks.c:1340
+#: mail/mail-callbacks.c:1348
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
+#: mail/mail-config.c:1043 mail/mail-config.c:1046
+msgid "Connecting to server..."
+msgstr "Ansluter till server..."
+
 #: mail/mail-config.glade.h:1
+msgid " Check for supported types "
+msgstr " Kontrollera vilka typer som stöds "
+
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " färg"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Konto"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Kontoinformation"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Kontohantering"
 
 #: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "Avancerat"
+msgid "Accounts"
+msgstr "Konton"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "Autentiseringstyp:"
+#: mail/mail-config.glade.h:9
+msgid "Authentication Type: "
+msgstr "Autentiseringstyp: "
 
+# Låter konstigt
 #: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
-msgstr "Kontrollera e-post var"
+msgid "Automatically check for new mail every"
+msgstr "Kontrollera ny e-post var"
 
 #: mail/mail-config.glade.h:12
-msgid "Check settings"
-msgstr "Kontrollera inställningarna"
-
-#: mail/mail-config.glade.h:13
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5671,203 +5843,163 @@ msgstr ""
 "\n"
 "Klicka på \"Slutför\" för att spara dina inställningar."
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:18
 msgid "De_fault"
 msgstr "Sta_ndard"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:20
 msgid "Done"
 msgstr "Klar"
 
+#: mail/mail-config.glade.h:21
+msgid "Drafts"
+msgstr "Mallar"
+
+#: mail/mail-config.glade.h:22
+msgid "Drafts folder:"
+msgstr "Mallmapp:"
+
 #: mail/mail-config.glade.h:24
 msgid "Email Address:"
 msgstr "E-postadress:"
 
-#: mail/mail-config.glade.h:25
-msgid "Email address:"
-msgstr "E-postadress:"
-
 #: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "Evolutions e-postkonfiguration"
-
-#: mail/mail-config.glade.h:27
 msgid "Full Name:"
 msgstr "Fullständigt namn:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Highlight citations with "
 msgstr "Markera citat med "
 
-#: mail/mail-config.glade.h:31
-msgid "Hostname:"
-msgstr "Värd:"
-
-#: mail/mail-config.glade.h:32
-msgid "IMAP"
-msgstr "IMAP"
+#: mail/mail-config.glade.h:29
+msgid "IMAPv4 "
+msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:30
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:34
-msgid "Include this account when receiving mail"
-msgstr "Inkludera detta konto när det kommer e-post"
-
-#: mail/mail-config.glade.h:35
-msgid "Keep mail on server"
-msgstr "Spara meddelanden på servern"
-
-#: mail/mail-config.glade.h:36
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:37
-msgid "Mail"
-msgstr "E-post"
-
-#: mail/mail-config.glade.h:38
-msgid "Mail Account"
-msgstr "Epostkonton"
+#: mail/mail-config.glade.h:31
+msgid "Kerberos "
+msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:32
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: mail/mail-config.glade.h:40
-msgid "Mail Configuration Druid"
-msgstr "E-postkonfigurationsguide"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:33
 msgid "Make this my default account"
 msgstr "Gör detta till mitt standardkonto"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:34
 msgid "Mark messages as \"Read\" after:"
 msgstr "Märk meddelanden som \"Läst\" efter: "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:36
 msgid "News"
 msgstr "Diskussionsgrupper"
 
-#: mail/mail-config.glade.h:46
-msgid "Optional"
-msgstr "Valfri"
+#: mail/mail-config.glade.h:38
+msgid "Optional Information"
+msgstr "Valfri information"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:39
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:41
 msgid "PGP binary path:"
 msgstr "Sökväg till PGP-programmet:"
 
-#: mail/mail-config.glade.h:50
-msgid "Password:"
-msgstr "Lösenord:"
-
-#: mail/mail-config.glade.h:53
-msgid "Plain Text"
-msgstr "Vanlig text"
+#: mail/mail-config.glade.h:46
+msgid "Qmail maildir "
+msgstr "Qmail-epostkatalog "
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:47
 msgid "Receiving Email"
 msgstr "Tar emot e-post"
 
-#: mail/mail-config.glade.h:55
-msgid "Remember my password"
-msgstr "Kom ihåg mitt lösenord"
-
-#: mail/mail-config.glade.h:56
-msgid "Reply address:"
-msgstr "Svarsadress:"
+#: mail/mail-config.glade.h:48
+msgid "Receiving Mail"
+msgstr "Tar emot e-post"
 
-#: mail/mail-config.glade.h:57
-msgid "Required"
-msgstr "Krävs"
+#: mail/mail-config.glade.h:49
+msgid "Receiving Options"
+msgstr "Alternativ för mottagning"
 
-#: mail/mail-config.glade.h:59
-msgid "Save password"
-msgstr "Spara lösenord"
+#: mail/mail-config.glade.h:51
+msgid "Required Information"
+msgstr "Obligatorisk information"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:53
 msgid "Select PGP binary"
 msgstr "Välj PGP-program"
 
-#: mail/mail-config.glade.h:61
-msgid "Select signature file"
-msgstr "Välj signaturfil"
-
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:54
 msgid "Send mail in HTML format by default."
 msgstr "Skicka brev i HTML-format som standard."
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:55
 msgid "Sending Email"
 msgstr "Skickar e-post"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:56
+msgid "Sending Mail"
+msgstr "Skickar e-post"
+
+#: mail/mail-config.glade.h:58
+msgid "Sent"
+msgstr "Skickat"
+
+#: mail/mail-config.glade.h:59
+msgid "Sent and Draft Messages"
+msgstr "Skickade meddelanden och mallar"
+
+#: mail/mail-config.glade.h:60
+msgid "Sent messages folder:"
+msgstr "Mapp för skickade meddelanden:"
+
+#: mail/mail-config.glade.h:61
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:62
 msgid "Server Type: "
 msgstr "Servertyp: "
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:63
 msgid "Server requires authentication"
 msgstr "Servern kräver autentisering"
 
-#: mail/mail-config.glade.h:68
-msgid "Server type:"
-msgstr "Servertyp:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:64
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:70
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: mail/mail-config.glade.h:71
-msgid "Source"
-msgstr "Källa"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:65
 msgid "Sources"
 msgstr "Källor"
 
-#: mail/mail-config.glade.h:73
-msgid "Transport"
-msgstr "Transport"
+#: mail/mail-config.glade.h:66
+msgid "Special Folders"
+msgstr "Specialmappar"
 
-#: mail/mail-config.glade.h:74
-msgid "Transport Authentication"
-msgstr "Transportautentisering"
+#: mail/mail-config.glade.h:67
+msgid "Standard Unix mbox"
+msgstr "Standard Unix-brevlåda"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:68
 msgid "Type"
 msgstr "Typ"
 
-#: mail/mail-config.glade.h:76
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Skriv in namnet som du vill använda för att referera till dessa servrar, "
-"till exempel: \"Jobb\" eller \"Hemma\"."
-
-#: mail/mail-config.glade.h:77
-msgid "User Information"
-msgstr "Användarinformation"
+#: mail/mail-config.glade.h:69
+msgid "Use secure connection (SSL)"
+msgstr "Använd säker anslutning (SSL)"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:70
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:71
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -5877,185 +6009,206 @@ msgstr ""
 "\n"
 "Klicka på \"Nästa\" för att börja. "
 
-#: mail/mail-config.glade.h:84 ui/evolution-event-editor.xml.h:58
+#: 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:29
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: mail/mail-config.glade.h:85
-msgid "minutes."
-msgstr "minuter."
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Ange ditt namn och din e-postadress nedan. De \"valfria\" fälten nedan "
+"behöver du inte fylla i såvida du inte vill inkludera denna information i "
+"den e-post som du skickar."
 
-#: mail/mail-config-druid.c:421
-#, c-format
+#: mail/mail-config-druid.c:101
 msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
 msgstr ""
-"Misslyckades med att verifiera konfigurationen för inkommande post.\n"
-"Du kan komma att få problem med att hämta post från %s"
+"Ange information om din server för inkommande e-post nedan. Om du inte vet "
+"vad för server du använder kan du kontakta din systemadministratör eller din "
+"Internetleverantör."
 
-#: mail/mail-config-druid.c:515
-msgid "Namespace:"
-msgstr "Namnrymd:"
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+"Var vänlig och ange information om din server för utgående e-post nedan. Om "
+"du inte vet vad för protokoll du använder kan du kontakta din "
+"systemadministratör eller Internetleverantör."
 
-#: mail/mail-config-druid.c:708
-#, c-format
+#: mail/mail-config-druid.c:107
 msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
-"Misslyckades med att verifiera konfigurationen för utgående post.\n"
-"Du kan komma att få problem med att skicka post med %s"
+"Du är färdig med din e-postkonfiguration. Identiteten, den inkommande "
+"e-postservern och transportmetoden för utgående e-post som du angav kommer "
+"att sammanställas för att skapa ett Evolution-epostkonto. Ange ett namn för "
+"detta konto nedan. Detta namn kommer endast att användas för visning."
 
 #. set window title
-#: mail/mail-config-druid.c:1215
+#: mail/mail-config-druid.c:445
 msgid "Evolution Account Wizard"
 msgstr "Kontoguide för Evolution"
 
-#: mail/mail-display.c:192
+#: mail/mail-display.c:194
 msgid "Save Attachment"
 msgstr "Spara bilaga"
 
-#: mail/mail-display.c:232
+#: mail/mail-display.c:234
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunde inte skapa temporär katalog: %s"
 
-#: mail/mail-display.c:293
+#: mail/mail-display.c:295
 msgid "Save to Disk..."
 msgstr "Spara till disk..."
 
-#: mail/mail-display.c:295
+#: mail/mail-display.c:297
 #, c-format
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
 
-#: mail/mail-display.c:297
+#: mail/mail-display.c:299
 msgid "View Inline"
 msgstr "Visa inuti"
 
-#: mail/mail-display.c:326
+#: mail/mail-display.c:334
 msgid "External Viewer"
 msgstr "Externt visningsprogram"
 
-#: mail/mail-display.c:349
+#: mail/mail-display.c:357
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visa inuti (med %s)"
 
-#: mail/mail-display.c:353
+#: mail/mail-display.c:361
 msgid "Hide"
 msgstr "Göm"
 
-#: mail/mail-display.c:1062
-msgid "Open link in browser (FIXME)"
-msgstr "Öppna länk i webbläsare (FIXME)"
+#: mail/mail-display.c:1100
+msgid "Open link in browser"
+msgstr "Öppna länk i webbläsare"
 
-#: mail/mail-display.c:1064
+#: mail/mail-display.c:1102
 msgid "Save as (FIXME)"
 msgstr "Spara som (FIXME)"
 
-#: mail/mail-display.c:1066
+#: mail/mail-display.c:1104
 msgid "Copy location (FIXME)"
 msgstr "Kopiera plats (FIXME)"
 
-#: mail/mail-format.c:506
+#: mail/mail-format.c:512
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/mail-format.c:721
+#: mail/mail-format.c:554
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Kunde inte tolka MIME-meddelande. Visar som källa."
+
+#: mail/mail-format.c:736
 msgid "Loading message content"
 msgstr "Läser in meddelandeinnehåll"
 
-#: mail/mail-format.c:1010
+#: mail/mail-format.c:1025
 msgid "Encrypted message not displayed"
 msgstr "Krypterat meddelande visas inte"
 
-#: mail/mail-format.c:1016
+#: mail/mail-format.c:1031
 msgid "Encrypted message"
 msgstr "Krypterat meddelande"
 
-#: mail/mail-format.c:1017
+#: mail/mail-format.c:1032
 msgid "Click icon to decrypt."
 msgstr "Klicka på ikonen för att dekryptera."
 
-#: mail/mail-format.c:1086 mail/mail-format.c:1473
+#: mail/mail-format.c:1101 mail/mail-format.c:1488
 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:1094 mail/mail-format.c:1481
+#: mail/mail-format.c:1109 mail/mail-format.c:1496
 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:1694
+#: mail/mail-format.c:1709
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/mail-format.c:1706
+#: mail/mail-format.c:1721
 #, 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:1710
+#: mail/mail-format.c:1725
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/mail-format.c:1744
+#: mail/mail-format.c:1759
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okänd extern data (typen \"%s\")"
 
-#: mail/mail-format.c:1749
+#: mail/mail-format.c:1764
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
-#: mail/mail-local.c:335
+#: mail/mail-local.c:337
 #, c-format
 msgid "No such folder %s"
 msgstr "Det finns ingen mapp %s"
 
-#: mail/mail-local.c:508
+#: mail/mail-local.c:509
 #, c-format
 msgid "Opening '%s'"
 msgstr "Öppnar \"%s\""
 
-#: mail/mail-local.c:786
+#: mail/mail-local.c:787
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Byter format på mappen \"%s\" till \"%s\""
 
-#: mail/mail-local.c:790
+#: mail/mail-local.c:791
 #, 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:815
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerar mapp"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:844
 msgid "Closing current folder"
 msgstr "Stänger aktuell mapp"
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:876
 msgid "Renaming old folder and opening"
 msgstr "Byter namn på gammal mapp och öppnar"
 
-#: mail/mail-local.c:893
+#: mail/mail-local.c:894
 msgid "Creating new folder"
 msgstr "Skapar ny mapp"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:908
 msgid "Copying messages"
 msgstr "Kopierar meddelanden"
 
-#: mail/mail-local.c:928
+#: mail/mail-local.c:925
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6064,7 +6217,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:967
+#: mail/mail-local.c:964
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6072,7 +6225,7 @@ msgstr ""
 "Om du inte längre kan öppna denna brevlåda måste\n"
 "du kanske reparera den manuellt."
 
-#: mail/mail-mt.c:181
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6081,7 +6234,7 @@ msgstr ""
 "Fel vid \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:183
+#: mail/mail-mt.c:192
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6090,96 +6243,105 @@ msgstr ""
 "Fel vid utförande av operation:\n"
 "%s"
 
-#: mail/mail-mt.c:506 mail/mail-mt.c:535 mail/mail-mt.c:882
+#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
 msgid "Working"
 msgstr "Jobbar"
 
-#: mail/mail-mt.c:670 mail/session.c:91
+#: mail/mail-mt.c:679 mail/session.c:98
 msgid "Do you accept?"
 msgstr "Accepterar du?"
 
-#: mail/mail-mt.c:864
+#: mail/mail-mt.c:873
 msgid "Evolution progress"
 msgstr "Evolutionförlopp"
 
-#: mail/mail-ops.c:518
+#: mail/mail-ops.c:588
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Skickar \"%s\""
 
-#: mail/mail-ops.c:520
+#: mail/mail-ops.c:590
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:705
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "Skickar meddelande %d av %d"
+
+#: mail/mail-ops.c:724
+#, c-format
+msgid "Failed on message %d of %d"
+msgstr "Meddelande %d av %d misslyckades"
+
+#: mail/mail-ops.c:726 mail/mail-send-recv.c:475
+msgid "Complete."
+msgstr "Färdig."
+
+#: mail/mail-ops.c:812
 msgid "Saving message to folder"
 msgstr "Sparar meddelande till mappen"
 
-#: mail/mail-ops.c:830
+#: mail/mail-ops.c:885
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: mail/mail-ops.c:830
+#: mail/mail-ops.c:885
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: mail/mail-ops.c:847
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:850
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kopierar"
 
-#: mail/mail-ops.c:861
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s meddelande %d av %d (uid \"%s\")"
-
-#: mail/mail-ops.c:932
+#: mail/mail-ops.c:979
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
-#: mail/mail-ops.c:1090
+#: mail/mail-ops.c:1140
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1131 mail/mail-ops.c:1269
+#: mail/mail-ops.c:1181 mail/mail-ops.c:1319
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1198
+#: mail/mail-ops.c:1248
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagringsutrymmet %s"
 
-#: mail/mail-ops.c:1385
+#: mail/mail-ops.c:1435
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1484
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: mail/mail-ops.c:1501
+#: mail/mail-ops.c:1551
 msgid "Retrieving messages"
 msgstr "Hämtar meddelanden"
 
-#: mail/mail-ops.c:1511
+#: mail/mail-ops.c:1561
 #, 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:1585
+#: mail/mail-ops.c:1635
 msgid "Saving messages"
 msgstr "Sparar meddelanden"
 
-#: mail/mail-ops.c:1664
+#: mail/mail-ops.c:1714
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6188,12 +6350,12 @@ msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1677
+#: mail/mail-ops.c:1727
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Sparar meddelande %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1691
+#: mail/mail-ops.c:1741
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6202,11 +6364,11 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1765
+#: mail/mail-ops.c:1815
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: mail/mail-ops.c:1780
+#: mail/mail-ops.c:1830
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6215,75 +6377,71 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1858
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: mail/mail-search-dialogue.c:107
+#: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Sök"
 
-#: mail/mail-send-recv.c:136
+#: mail/mail-send-recv.c:138
 msgid "Cancelling ..."
 msgstr "Avbryter..."
 
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:233
 msgid "Send & Receive mail"
 msgstr "Skicka och ta emot e-post"
 
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:236
 msgid "Receiving"
 msgstr "Tar emot"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:285
 msgid "Updating ..."
 msgstr "Uppdaterar..."
 
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
 msgid "Waiting ..."
 msgstr "Väntar..."
 
-#: mail/mail-send-recv.c:304
+#: mail/mail-send-recv.c:306
 msgid "Sending"
 msgstr "Skickar"
 
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:471
 msgid "Cancelled."
 msgstr "Avbruten."
 
-#: mail/mail-send-recv.c:473
-msgid "Complete."
-msgstr "Färdig."
-
-#: mail/mail-summary.c:111
+#: mail/mail-summary.c:109
 msgid "Incomplete message written on pipe!"
 msgstr "Inkomplett meddelande skrevs på rör!"
 
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:141
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kunde inte skapa temporärt meddelandefält \"%s\": %s"
 
-#: mail/mail-tools.c:185
+#: mail/mail-tools.c:188
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (vidarebefordrat meddelande)"
 
-#: mail/mail-tools.c:195
+#: mail/mail-tools.c:198
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (inget ämne)"
 
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidarebefordrat meddelande - %s"
 
-#: mail/mail-tools.c:214
+#: mail/mail-tools.c:217
 msgid "Forwarded message (no subject)"
 msgstr "Vidarebefordrat meddelande (inget ämne)"
 
-#: mail/mail-tools.c:411
+#: mail/mail-tools.c:414
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
@@ -6292,186 +6450,191 @@ msgstr ""
 "-----Vidarebefordrat meddelande-----<br><b>Fr&aring;n:</b> "
 "%s<br><b>Till:</b> %s<br><b>&Auml;mne:</b> %s<br>"
 
-#: mail/mail-vfolder.c:248
+#: mail/mail-vfolder.c:249
 msgid "VFolders"
 msgstr "Virtuella mappar"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:427
 msgid "New VFolder"
 msgstr "Ny virtuell mapp"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:34
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:35
 msgid "Reply"
 msgstr "Svara"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:39
 msgid "Reply to the sender of this message"
 msgstr "Svara till avsändaren av det här meddelandet"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:38
 msgid "Reply to all recipients of this message"
 msgstr "Svara till alla mottagare av det här meddelandet"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:16
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:16
 msgid "Forward this message"
 msgstr "Vidarebefordra detta meddelande"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:31
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Skriv ut det markerade meddelandet"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:7
 msgid "Delete this message"
 msgstr "Ta bort detta meddelande"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:615
 msgid "Unseen"
 msgstr "Oläst"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:616
 msgid "Seen"
 msgstr "Läst"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:617
 msgid "Answered"
 msgstr "Besvarad"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:618
 msgid "Multiple Unseen Messages"
 msgstr "Flera olästa meddelanden"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:619
 msgid "Multiple Messages"
 msgstr "Flera meddelanden"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:623
 msgid "Lowest"
 msgstr "Lägsta"
 
-#: mail/message-list.c:623
+#: mail/message-list.c:624
 msgid "Lower"
 msgstr "Lägre"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:628
 msgid "Higher"
 msgstr "Högre"
 
-#: mail/message-list.c:628
+#: mail/message-list.c:629
 msgid "Highest"
 msgstr "Högsta"
 
-#: mail/message-list.c:878
+#: mail/message-list.c:879
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:885
+#: mail/message-list.c:886
 msgid "Today %l:%M %p"
 msgstr "Idag %I.%M"
 
-#: mail/message-list.c:894
+#: mail/message-list.c:895
 msgid "Yesterday %l:%M %p"
 msgstr "Igår %I.%M"
 
-#: mail/message-list.c:906
+#: mail/message-list.c:907
 msgid "%a %l:%M %p"
 msgstr "%a %I.%M"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:915
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %I:%M"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:917
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:1014
+#: mail/message-list.c:1019
 msgid "Flagged"
 msgstr "Flaggad"
 
-#: mail/message-list.c:1015
+#: mail/message-list.c:1020
 msgid "From"
 msgstr "Från"
 
-#: mail/message-list.c:1015
+#: mail/message-list.c:1020
 msgid "Date"
 msgstr "Datum"
 
-#: mail/message-list.c:1015
+#: mail/message-list.c:1020
 msgid "Received"
 msgstr "Mottaget"
 
-#: mail/message-list.c:1016
+#: mail/message-list.c:1021
 msgid "To"
 msgstr "Till"
 
-#: mail/message-list.c:1016
+#: mail/message-list.c:1021
 msgid "Size"
 msgstr "Storlek"
 
-#: mail/openpgp-utils.c:89
+#: mail/openpgp-utils.c:92
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Ange din %s-lösenordsfras för %s"
 
-#: mail/openpgp-utils.c:92
+#: mail/openpgp-utils.c:95
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Ange din %s-lösenordsfras"
 
-#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
-#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
+#: mail/openpgp-utils.c:455 mail/openpgp-utils.c:562 mail/openpgp-utils.c:766
+#: mail/openpgp-utils.c:920 mail/openpgp-utils.c:1079
 msgid "No GPG/PGP program available."
 msgstr "Inget GPG/PGP-program finns tillgängligt."
 
-#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
-#: mail/openpgp-utils.c:920
+#: mail/openpgp-utils.c:462 mail/openpgp-utils.c:571 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:927
 msgid "No password provided."
 msgstr "Inget lösenord angavs."
 
-#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
-#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
+#: mail/openpgp-utils.c:470 mail/openpgp-utils.c:578 mail/openpgp-utils.c:779
+#: mail/openpgp-utils.c:935 mail/openpgp-utils.c:1085
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunde inte skapa rör till GPG/PGP: %s"
 
-#: mail/openpgp-utils.c:588
+#: mail/openpgp-utils.c:592
 msgid "No recipients specified"
 msgstr "Inga avsändare är angivna"
 
-#: mail/openpgp-utils.c:1088
+#: mail/openpgp-utils.c:1096
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Kunde inte skapa temporär fil: %s"
 
-#: mail/subscribe-dialog.c:73 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
 msgid "Folder"
 msgstr "Mapp"
 
-#: mail/subscribe-dialog.c:74
+#: mail/subscribe-dialog.c:77
 msgid "Store"
 msgstr "Lagringsutrymme"
 
-#: mail/subscribe-dialog.c:156
+#: mail/subscribe-dialog.c:138
 msgid "Display folders starting with:"
 msgstr "Visa mappar som börjar med:"
 
-#: mail/subscribe-dialog.c:186
+#: mail/subscribe-dialog.c:168
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "Hämtar lagringsutrymme för \"%s\""
 
-#: mail/subscribe-dialog.c:289
+#: mail/subscribe-dialog.c:271
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Prenumerar på mappen \"%s\""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:273
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Säger upp prenumeration på mappen \"%s\""
 
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+msgid "Manage Subscriptions"
+msgstr "Hantera prenumerationer"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Mappnamn:"
@@ -6484,9 +6647,23 @@ msgstr "Mapptyp:"
 msgid "Specify where to create the folder:"
 msgstr "Ange var mappen ska skapas:"
 
+#: 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:167
+#: shell/importer/importer.c:182
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6497,7 +6674,7 @@ msgstr ""
 "Importören är inte redo.\n"
 "Väntar 5 sekunder med nytt försök."
 
-#: shell/importer/importer.c:187 shell/importer/importer.c:218
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6506,7 +6683,7 @@ msgstr ""
 "Importerar %s\n"
 "Importerar objekt %d."
 
-#: shell/importer/importer.c:326
+#: shell/importer/importer.c:341
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -6515,11 +6692,11 @@ msgstr ""
 "Det finns ingen importör som kan hantera\n"
 "%s"
 
-#: shell/importer/importer.c:336
+#: shell/importer/importer.c:351
 msgid "Importing"
 msgstr "Importerar"
 
-#: shell/importer/importer.c:344
+#: shell/importer/importer.c:359
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -6528,12 +6705,17 @@ msgstr ""
 "Importerar %s.\n"
 "Startar %s"
 
-#: shell/importer/importer.c:360
+#: 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:375
+#: shell/importer/importer.c:402
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6542,40 +6724,26 @@ msgstr ""
 "Importerar %s\n"
 "Importerar objekt 1."
 
-#: shell/importer/importer.c:446
+#: shell/importer/importer.c:473
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/importer/importer.c:496
+#: shell/importer/importer.c:523
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:501
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: shell/importer/importer.c:511
+#: shell/importer/importer.c:538
 msgid "File type:"
 msgstr "Filtyp:"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:592
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
 msgid "Import"
 msgstr "Importera"
 
-#: shell/importer/importer.c:627
-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."
-
 #: 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. "
@@ -6598,11 +6766,11 @@ msgstr ""
 "Denna guide kommer att hjälpa dig igenom processen med att\n"
 "importera externa filer till Evolution."
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr "Evolution-installation"
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:122
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6610,30 +6778,30 @@ msgstr ""
 "Denna nya version av Evolution måste installera ytterligare filer\n"
 "i din personliga Evolutionkatalog"
 
-#: shell/e-setup.c:117
+#: shell/e-setup.c:123
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Var vänlig och klicka på \"OK\" för att installera filerna, eller \"Avbryt\" "
 "för att avsluta."
 
-#: shell/e-setup.c:157
+#: shell/e-setup.c:163
 msgid "Could not update files correctly"
 msgstr "Kunde inte uppdatera filerna korrekt"
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
+#: shell/e-setup.c:166 shell/e-setup.c:234
 msgid "Evolution files successfully installed."
 msgstr "Evolutionfilerna installerades utan problem."
 
-#: shell/e-setup.c:189
+#: shell/e-setup.c:195
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Detta verkar vara första gången du kör Evolution."
 
-#: shell/e-setup.c:190
+#: shell/e-setup.c:196
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Var vänlig och klicka på \"OK\" för att installera Evolutions användarfiler i"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:215
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6644,7 +6812,7 @@ msgstr ""
 "%s\n"
 "Fel: %s"
 
-#: shell/e-setup.c:224
+#: shell/e-setup.c:230
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -6653,7 +6821,7 @@ msgstr ""
 "Kan inte kopiera filer till\n"
 "\"%s\"."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:255
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6664,7 +6832,7 @@ msgstr ""
 "Var vänlig och flytta den så att installationen\n"
 "av Evolutions användarfiler kan genomföras."
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6675,7 +6843,7 @@ msgstr ""
 "katalogen. Var vänlig och flytta den så att\n"
 "Evolutions användarfiler kan installeras."
 
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6684,11 +6852,11 @@ msgstr ""
 "Kan inte skapa den angivna katalogen:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:156
 msgid "The specified folder name is not valid."
 msgstr "Det angivna mappnamnet är inte giltigt."
 
-#: shell/e-shell-folder-creation-dialog.c:245
+#: shell/e-shell-folder-creation-dialog.c:248
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Skapa ny mapp"
 
@@ -6700,27 +6868,27 @@ msgstr ""
 "Den valda typen av mapp är inte giltig för\n"
 "den begärda åtgärden."
 
-#: shell/e-shell-folder-selection-dialog.c:318
+#: shell/e-shell-folder-selection-dialog.c:319
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr "(Namnlös)"
 
-#: shell/e-shell-view-menu.c:160
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy hittades inte i din $PATH."
 
-#: shell/e-shell-view-menu.c:166
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kunde inte köras."
 
-#: shell/e-shell-view-menu.c:195
+#: shell/e-shell-view-menu.c:208
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:197
+#: shell/e-shell-view-menu.c:210
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6730,34 +6898,30 @@ msgstr ""
 "för e-post, kalender- och kontakthantering\n"
 "inom Gnome-skrivbordsmiljön."
 
-#: shell/e-shell-view-menu.c:361
+#: shell/e-shell-view-menu.c:374
 msgid "Go to folder..."
 msgstr "Gå till mapp..."
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view.c:148
 msgid "(No folder displayed)"
 msgstr "(Ingen mapp visas)"
 
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Mappar"
-
-#: shell/e-shell-view.c:1124
+#: shell/e-shell-view.c:1129
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1126
+#: shell/e-shell-view.c:1131
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell.c:372
+#: shell/e-shell.c:378
 #, 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:1242
+#: shell/e-shell.c:1248
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6766,15 +6930,15 @@ msgstr ""
 "Hoppsan! Vyn för \"%s\" dog oväntat. :-(\n"
 "Det här betyder antagligen att komponenten %s har kraschat."
 
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:134
 msgid "Create new shortcut group"
 msgstr "Skapa en ny genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
 msgid "Group name:"
 msgstr "Gruppnamn:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6783,63 +6947,63 @@ msgstr ""
 "Vill du verkligen ta bort gruppen\n"
 "\"%s\" från genvägsraden?"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:265
 msgid "Don't remove"
 msgstr "Ta inte bort"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
 msgid "_Small Icons"
 msgstr "_Små ikoner"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
 msgid "Show the shortcuts as small icons"
 msgstr "Visa genvägarna som små ikoner"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
 msgid "_Large Icons"
 msgstr "S_tora ikoner"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
 msgid "Show the shortcuts as large icons"
 msgstr "Visa genvägarna som stora ikoner"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
 msgid "_New Group..."
 msgstr "_Ny grupp..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
 msgid "Create a new shortcut group"
 msgstr "Skapa en ny genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
 msgid "_Remove This Group..."
 msgstr "Ta bo_rt denna grupp..."
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
 msgid "Remove this shortcut group"
 msgstr "Ta bort denna genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
 msgid "_Hide the Shortcut Bar"
 msgstr "_Göm genvägsraden"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
 msgid "Hide the shortcut bar"
 msgstr "_Visa genvägsraden"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate"
 msgstr "Aktivera"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate this shortcut"
 msgstr "Aktivera denna genväg"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Ta bort denna genväg från genvägsraden"
 
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:379
 msgid "Error saving shortcuts."
 msgstr "Fel vid sparande av genvägar."
 
@@ -6905,7 +7069,7 @@ msgstr "Den angivna typen stöds inte i detta lager"
 msgid "The Evolution shell."
 msgstr "Evolutionskalet."
 
-#: shell/main.c:73
+#: shell/main.c:83
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -6944,7 +7108,7 @@ msgstr ""
 "Vi hoppas att du gläds åt resultatet av vårt hårda arbete, och vi\n"
 "inväntar med spänning dina bidrag!\n"
 
-#: shell/main.c:98
+#: shell/main.c:108
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6952,15 +7116,19 @@ msgstr ""
 "Tack\n"
 "Evolution-teamet\n"
 
-#: shell/main.c:129
+#: shell/main.c:139
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan inte initiera Evolutionskalet."
 
-#: shell/main.c:175
-msgid "Disable."
-msgstr "Stäng av."
+#: shell/main.c:185
+msgid "Disable splash screen"
+msgstr "Använd inte startbild"
+
+#: shell/main.c:186
+msgid "Send the debugging output of all components to a file."
+msgstr "Skicka felsökningsinformation från alla komponenter till en fil."
 
-#: shell/main.c:195
+#: shell/main.c:219
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet."
 
@@ -6984,8 +7152,7 @@ msgstr "Sök efter en kontakt"
 msgid "New contact"
 msgstr "Ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:22
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:28
 msgid "Previews the message to be printed"
 msgstr "Förhandsgranskar meddelandet som ska skrivas ut"
 
@@ -6993,7 +7160,7 @@ msgstr "Förhandsgranskar meddelandet som ska skrivas ut"
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:47
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:48
 msgid "Stop"
 msgstr "Stopp"
 
@@ -7027,7 +7194,7 @@ 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:77
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:78
 #: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
 msgid "_Tools"
 msgstr "_Verktyg"
@@ -7105,6 +7272,10 @@ msgstr "Öppna kalender"
 msgid "Prev"
 msgstr "Föreg"
 
+#: ui/evolution-calendar.xml.h:22
+msgid "Previews the calendar to be printed"
+msgstr "Förhandsgranskar kalendern som ska skrivas ut"
+
 #: ui/evolution-calendar.xml.h:25
 msgid "Print calendar"
 msgstr "Skriv ut kalender"
@@ -7137,8 +7308,8 @@ msgstr "Visa 1 vecka"
 msgid "Show the working week"
 msgstr "Visa arbetsveckan"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:223
-#: widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
+#: widgets/misc/e-dateedit.c:422
 msgid "Today"
 msgstr "Idag"
 
@@ -7171,7 +7342,7 @@ msgstr "_Ny"
 msgid "_Open Calendar"
 msgstr "_Öppna kalender"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:74
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:75
 #: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "_Spara som..."
@@ -7202,7 +7373,7 @@ 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:32 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:33 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Skriv ut..."
 
@@ -7379,7 +7550,7 @@ msgid "Print Setup"
 msgstr "Skrivarinställningar"
 
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:236
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Spara"
 
@@ -7478,7 +7649,7 @@ msgstr "Klistra _in"
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:70
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:71
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Egenskaper..."
@@ -7565,70 +7736,74 @@ msgid "Full _Headers"
 msgstr "Fullständiga _huvuden"
 
 #: ui/evolution-mail.xml.h:18
+msgid "Hide Deleted Messages"
+msgstr "Göm borttagna meddelanden"
+
+#: ui/evolution-mail.xml.h:19
 msgid "Hide S_elected Messages"
 msgstr "Göm _markerade meddelanden"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:20
 msgid "Hide _Deleted Messages"
 msgstr "Göm _borttagna meddelanden"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:21
 msgid "Hide _Read messages"
 msgstr "Göm _lästa meddelanden"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
 msgid "Manage _Subscriptions..."
 msgstr "Hantera _prenumerationer..."
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:23
 msgid "Mar_k as Read"
 msgstr "Mär_k som läst"
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:24
 msgid "Mark All as R_ead"
 msgstr "Märk alla som _lästa"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:25
 msgid "Mark as U_nread"
 msgstr "Märk som _oläst"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:26
 msgid "Move"
 msgstr "Flytta"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:27
 msgid "Move message to a new folder"
 msgstr "Flytta meddelandet till en ny mapp"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:31
 msgid "Print message to the printer"
 msgstr "Skriv ut meddelandet på skrivaren"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:34
 msgid "Redirect (FIXME: implement me)"
 msgstr "Omdirigera (FIXME: implementera mig)"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:37
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:40
 msgid "S_ource"
 msgstr "_Källa"
 
-#: ui/evolution-mail.xml.h:40 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:41 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Markera _alla"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:42
 msgid "Select _Thread"
 msgstr "Markera _tråd"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:43
 msgid "Send / Receive"
 msgstr "Skicka / Ta emot"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:44
 msgid ""
 "Send queued mail\n"
 "    and retrieve new mail"
@@ -7636,119 +7811,119 @@ msgstr ""
 "Skicka kölagd e-post\n"
 "    och hämta ny e-post"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:46
 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:46
+#: ui/evolution-mail.xml.h:47
 msgid "Show _All"
 msgstr "Visa _alla"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:49
 msgid "Threaded Message list"
 msgstr "Trådad meddelandelista"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:50
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på _avsändare"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:51
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på _mottagare"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:52
 msgid "VFolder on _Subject"
 msgstr "Virtuell mapp på _ämnesrad"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:53
 msgid "View Raw Message Source"
 msgstr "Visa rå meddelandekälla"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:54
 msgid "Virtual Folder _Editor..."
 msgstr "R_edigerare för virtuella mappar..."
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:55
 msgid "_Apply Filters"
 msgstr "Tillämp_a filter"
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:56
 msgid "_Attachment"
 msgstr "_Bilaga"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:57
 msgid "_Compose"
 msgstr "Skriv _nytt"
 
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:58
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:59
 msgid "_Create Filter From Message"
 msgstr "_Skapa filter från meddelande"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:61
 msgid "_Expunge"
 msgstr "T_öm"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:62
 msgid "_Filters..."
 msgstr "_Filter..."
 
-#: ui/evolution-mail.xml.h:62 ui/evolution.xml.h:31
+#: ui/evolution-mail.xml.h:63 ui/evolution.xml.h:31
 msgid "_Folder"
 msgstr "_Mapp"
 
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:64
 msgid "_Forward"
 msgstr "Vidarebe_fordra"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:65
 msgid "_Inline"
 msgstr "_Inuti"
 
-#: ui/evolution-mail.xml.h:65 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Om_vänd markering"
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:67
 msgid "_Mail Message"
 msgstr "_Posta meddelande"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:68
 msgid "_Mail Settings..."
 msgstr "_E-postinställningar..."
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:69
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp..."
 
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:70
 msgid "_Open Selected Items"
 msgstr "_Öppna markerade objekt"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:72
 msgid "_Quoted"
 msgstr "_Citerad"
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail.xml.h:73
 msgid "_Reply"
 msgstr "_Svara"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:74
 msgid "_Resend Messages"
 msgstr "Skicka _om meddelanden"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:76
 msgid "_Send / Receive"
 msgstr "_Skicka / Ta emot"
 
-#: ui/evolution-mail.xml.h:76
+#: ui/evolution-mail.xml.h:77
 msgid "_Threaded"
 msgstr "_Trådat"
 
-#: ui/evolution-mail.xml.h:78
+#: ui/evolution-mail.xml.h:79
 msgid "_Undelete"
 msgstr "_Ångra borttagning"
 
@@ -8151,87 +8326,95 @@ msgstr "_Genvägsraden"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+msgid "Tentative"
+msgstr "Preliminär"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Upptagen"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Inte inne"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Ingen information"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
 msgid "_Invite Others..."
 msgstr "Bjud _in andra..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
 msgid "_Options"
 msgstr "_Alternativ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
 msgid "Show _Only Working Hours"
 msgstr "Visa _endast arbetstimmar"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
 msgid "Show _Zoomed Out"
 msgstr "Visa ut_zoomade"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
 msgid "_Update Free/Busy"
 msgstr "_Uppdatera ledig/upptagen"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "_Autovälj"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
 msgid "_All People and Resources"
 msgstr "_Alla människor och resurser"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
 msgid "All _People and One Resource"
 msgstr "Alla _människor och en resurs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
 msgid "_Required People"
 msgstr "Folk som k_rävs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
 msgid "Required People and _One Resource"
 msgstr "Folk som krävs _och en resurs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
 msgid "Meeting _start time:"
 msgstr "Mötets _starttid:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
 msgid "Meeting _end time:"
 msgstr "Mötets slu_ttid:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
 msgid "All Attendees"
 msgstr "Alla deltagare"
 
-#: widgets/menus/gal-view-menus.c:171
+#: widgets/menus/gal-view-menus.c:178
 msgid "_Current View"
 msgstr "_Aktuell vy"
 
+#: widgets/menus/gal-view-menus.c:198
+msgid "Define Views"
+msgstr "Definiera vyer"
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:421
@@ -8243,15 +8426,15 @@ msgstr "MTOTFLS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
 msgid "Now"
 msgstr "Nu"
 
-#: widgets/misc/e-cell-date-edit.c:239
+#: widgets/misc/e-cell-date-edit.c:242
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:720
+#: widgets/misc/e-cell-date-edit.c:723
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Tiden måste anges i formatet: %s"
@@ -8260,43 +8443,75 @@ msgstr "Tiden måste anges i formatet: %s"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:163
+#: widgets/misc/e-filter-bar.c:166
 msgid "Save Search"
 msgstr "Spara sökning"
 
-#: widgets/misc/e-filter-bar.c:234
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
-#: widgets/misc/e-filter-bar.c:314
+#: widgets/misc/e-filter-bar.c:317
 msgid "Advanced ..."
 msgstr "Avancerat..."
 
-#: widgets/misc/e-messagebox.c:141
+#: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Information"
 
-#: widgets/misc/e-messagebox.c:148
+#: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varning"
 
-#: widgets/misc/e-messagebox.c:162
+#: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Fråga"
 
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
 msgid "Message"
 msgstr "Meddelande"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
+#: widgets/misc/e-messagebox.c:224
 msgid "Don't show this message again."
 msgstr "Visa inte detta meddelande igen."
 
-#: widgets/misc/e-search-bar.c:140
+#: widgets/misc/e-search-bar.c:148
 msgid "Sear_ch"
 msgstr "S_ök"
 
+#: views/addressbook/galview.xml.h:1
+msgid "Adress Cards"
+msgstr "Adresskort"
+
+#: views/addressbook/galview.xml.h:2
+msgid "By Company"
+msgstr "Efter företag"
+
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr "Telefonlista"
+
+#: views/mail/galview.xml.h:1
+msgid "By Sender"
+msgstr "Efter avsändare"
+
+#: views/mail/galview.xml.h:2
+msgid "By Status"
+msgstr "Efter status"
+
+#: views/mail/galview.xml.h:3
+msgid "By Subject"
+msgstr "Efter ämne"
+
+#: views/mail/galview.xml.h:4
+msgid "Messages"
+msgstr "Meddelanden"
+
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr "Med kategori"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "Server för personlig adressbok"
@@ -8305,18 +8520,193 @@ msgstr "Server för personlig adressbok"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Server för personlig kalender; kalenderfabrik"
 
-#: wombat/wombat.c:165
+#: wombat/wombat.c:173
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): kunde inte initiera GNOME-VFS"
 
-#: wombat/wombat.c:177
+#: wombat/wombat.c:185
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): kunde inte initiera GNOME"
 
-#: wombat/wombat.c:190
+#: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
+#~ msgid "Click here to add a contact"
+#~ msgstr "Klicka här för att lägga till en kontakt"
+
+#~ msgid "PLAIN"
+#~ msgstr "VANLIG"
+
+#~ msgid ""
+#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
+#~ "the server supports it."
+#~ msgstr ""
+#~ "Detta alternativ kommer att ansluta till servern med en VANLIG SASL-mekanism "
+#~ "om servern stöder det."
+
+#~ msgid "No such host %s."
+#~ msgstr "Det finns ingen värd med namnet %s."
+
+#~ msgid "Temporarily unable to look up hostname %s."
+#~ msgstr "Kunde temporärt inte slå upp värdnamnet %s."
+
+#~ msgid "URL string `%s' contains no protocol"
+#~ msgstr "URL-strängen \"%s\" innehåller inget protokoll"
+
+#~ msgid "URL string `%s' contains an invalid protocol"
+#~ msgstr "URL-strängen \"%s\" innehåller ett ogiltigt protokoll"
+
+#~ msgid "Port number in URL `%s' is non-numeric"
+#~ msgstr "Portnumret i URL:en \"%s\" består inte av siffror"
+
+#~ msgid "Secure IMAPv4"
+#~ msgstr "Säker IMAPv4"
+
+#~ msgid "For reading and storing mail on IMAP servers over an SSL connection."
+#~ msgstr ""
+#~ "För läsande och lagrande av e-post på IMAP-servrar över en SSL-anslutning."
+
+#~ msgid "Secure POP"
+#~ msgstr "Säker POP"
+
+#~ msgid ""
+#~ "For connecting to POP servers over an SSL connection. The POP protocol can "
+#~ "also be used to retrieve mail from certain web mail providers and "
+#~ "proprietary email systems."
+#~ msgstr ""
+#~ "För anslutning till POP-servrar över en SSL-anslutning. POP-protokollet kan "
+#~ "även användas för att hämta e-post från vissa webb-epostleverantörer och "
+#~ "slutna e-postsystem."
+
+#~ msgid "Secure SMTP"
+#~ msgstr "Säker SMTP"
+
+#~ msgid ""
+#~ "For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+#~ "connection.\n"
+#~ msgstr ""
+#~ "För leverans av e-post genom anslutning till ett fjärr-epostnav som använder "
+#~ "SMTP över en SSL-anslutning.\n"
+
+#~ msgid "Remove action"
+#~ msgstr "Ta bort åtgärd"
+
+#~ msgid "Remove criterion"
+#~ msgstr "Ta bort villkor"
+
+#~ msgid ""
+#~ "One or more of your servers are not configured correctly.\n"
+#~ "Do you wish to save anyway?"
+#~ msgstr ""
+#~ "En eller flera av dina servrar är inte korrekt konfigurerade.\n"
+#~ "Vill du spara i alla fall?"
+
+#~ msgid "Unspecified"
+#~ msgstr "Odefinierad"
+
+#~ msgid "Advanced"
+#~ msgstr "Avancerat"
+
+#~ msgid "Check settings"
+#~ msgstr "Kontrollera inställningarna"
+
+#~ msgid "Email address:"
+#~ msgstr "E-postadress:"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Evolutions e-postkonfiguration"
+
+#~ msgid "Hostname:"
+#~ msgstr "Värd:"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "Include this account when receiving mail"
+#~ msgstr "Inkludera detta konto när det kommer e-post"
+
+#~ msgid "Keep mail on server"
+#~ msgstr "Spara meddelanden på servern"
+
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos"
+
+#~ msgid "Mail"
+#~ msgstr "E-post"
+
+#~ msgid "Mail Account"
+#~ msgstr "Epostkonton"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "E-postkonfigurationsguide"
+
+#~ msgid "Optional"
+#~ msgstr "Valfri"
+
+#~ msgid "Password:"
+#~ msgstr "Lösenord:"
+
+#~ msgid "Plain Text"
+#~ msgstr "Vanlig text"
+
+#~ msgid "Remember my password"
+#~ msgstr "Kom ihåg mitt lösenord"
+
+#~ msgid "Reply address:"
+#~ msgstr "Svarsadress:"
+
+#~ 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:"
+
+#~ msgid "Signature:"
+#~ msgstr "Signatur:"
+
+#~ msgid "Source"
+#~ msgstr "Källa"
+
+#~ msgid "Transport"
+#~ msgstr "Transport"
+
+#~ msgid "Transport Authentication"
+#~ msgstr "Transportautentisering"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr ""
+#~ "Skriv in namnet som du vill använda för att referera till dessa servrar, "
+#~ "till exempel: \"Jobb\" eller \"Hemma\"."
+
+#~ msgid "minutes."
+#~ msgstr "minuter."
+
+#~ msgid ""
+#~ "Failed to verify the incoming mail configuration.\n"
+#~ "You may experience problems retrieving your mail from %s"
+#~ msgstr ""
+#~ "Misslyckades med att verifiera konfigurationen för inkommande post.\n"
+#~ "Du kan komma att få problem med att hämta post från %s"
+
+#~ msgid ""
+#~ "Failed to verify the outgoing mail configuration.\n"
+#~ "You may experience problems sending your mail using %s"
+#~ msgstr ""
+#~ "Misslyckades med att verifiera konfigurationen för utgående post.\n"
+#~ "Du kan komma att få problem med att skicka post med %s"
+
+#~ msgid "%s message %d of %d (uid \"%s\")"
+#~ msgstr "%s meddelande %d av %d (uid \"%s\")"
+
 #~ msgid "No authentication required"
 #~ msgstr "Ingen autentisering krävs"
 
@@ -8327,9 +8717,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ "Detta alternativ kommer att ansluta till SMTP-servern utan någon form av "
 #~ "autentisering. Detta bör fungera för anslutning till de flesta SMTP-servrar."
 
-#~ msgid "This server requires a secure connection (SSL)"
-#~ msgstr "Servern kräver en säker anslutning (SSL)"
-
 #~ msgid "[ %s ]"
 #~ msgstr "[ %s ]"
 
@@ -8533,9 +8920,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr ""
 #~ "Observera: Vid konvertering mellan brevlådeformat kommer ett misslyckande\n"
 
-#~ msgid "Connecting to server"
-#~ msgstr "Ansluter till server"
-
 #~ msgid "Connect to server"
 #~ msgstr "Anslut till server"
 
@@ -8563,13 +8947,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Registering local folder"
 #~ msgstr "Registrerar lokal mapp"
 
-#~ msgid ""
-#~ "Unable to register folder '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan inte registrera mappen \"%s\":\n"
-#~ "%s"
-
 #~ msgid "Appending \"%s\""
 #~ msgstr "Tillägger \"%s\""
 
@@ -8633,9 +9010,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Get store for \"%s\""
 #~ msgstr "Hämta lagringsutrymme för \"%s\""
 
-#~ msgid "Subscribe to folder \"%s\""
-#~ msgstr "Prenumerera på mappen \"%s\""
-
 #~ msgid "Unsubscribe from folder \"%s\""
 #~ msgstr "Säg upp prenumeration på mappen \"%s\""
 
@@ -8834,9 +9208,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Retrieving message %d of %d"
 #~ msgstr "Hämtar meddelande %d av %d"
 
-#~ msgid "Writing message %d of %d"
-#~ msgstr "Skriver meddelande %d av %d"
-
 #~ msgid "Saving changes to %s"
 #~ msgstr "Sparar ändringar i %s"
 
@@ -8930,12 +9301,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Server:"
 #~ msgstr "Server:"
 
-#~ msgid "Detect supported types..."
-#~ msgstr "Detektera vilka typer som stöds..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Ta inte bort meddelanden från servern"
-
 #~ msgid "Mail source type:"
 #~ msgstr "Typ av e-postkälla:"
 
@@ -8986,9 +9351,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Edit News Server"
 #~ msgstr "Redigera diskussionsgruppsserver"
 
-#~ msgid "Testing \"%s\""
-#~ msgstr "Testar \"%s\""
-
 #~ msgid "The connection was successful!"
 #~ msgstr "Anslutningen lyckades!"
 
@@ -9031,15 +9393,9 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Send a message without a subject"
 #~ msgstr "Skicka ett meddelande utan en ämnesrad"
 
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Märker meddelanden i mappen \"%s\""
-
 #~ msgid "Mark messages in folder \"%s\""
 #~ msgstr "Märk meddelanden i mappen \"%s\""
 
-#~ msgid "Marking message %d of %d"
-#~ msgstr "Märker meddelande %d av %d"
-
 #~ msgid "Scan folders in \"%s\""
 #~ msgstr "Genomsök mappar i \"%s\""
 
@@ -9289,9 +9645,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Could not create summary"
 #~ msgstr "Kunde inte skapa sammanfattning"
 
-#~ msgid "Cannot get message: %s"
-#~ msgstr "Kan inte hämta meddelande: %s"
-
 #~ msgid "Could not rename folder %s to %s: destination exists"
 #~ msgstr "Kunde inte byta namn på mappen %s till %s: målet existerar"
 
@@ -9370,33 +9723,9 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Edit Mail Configuration Settings"
 #~ msgstr "Redigera e-postkonfigurationsinställningar"
 
-#~ msgid ""
-#~ "Please enter information about your incoming mail server below. If you don't "
-#~ "know what"
-#~ msgstr ""
-#~ "Var vänlig och ange information om din server för inkommande e-post nedan. "
-#~ "Om du inte vet vad"
-
-#~ msgid ""
-#~ "Please enter information about your outgoing mail protocol below. If you "
-#~ "don't know "
-#~ msgstr ""
-#~ "Var vänlig och ange information om din server för utgående e-post nedan. Om "
-#~ "du inte vet "
-
-#~ msgid ""
-#~ "Please enter your name and email address below. The &quot;optional&quot; "
-#~ "fields below do not "
-#~ msgstr ""
-#~ "Var vänlig och ange ditt namn och din e-postadress nedan. Fälten "
-#~ "&quot;optional&quot; nedan "
-
 #~ msgid "Preferred type: "
 #~ msgstr "Typ som föredras: "
 
-#~ msgid "Sending Mail"
-#~ msgstr "Skickar e-post"
-
 #~ msgid ""
 #~ "You are almost done with the mail configuration process. The identity, "
 #~ "incoming"
@@ -9559,9 +9888,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Forward Message"
 #~ msgstr "Vidarebefordra meddelande"
 
-#~ msgid "Move Message"
-#~ msgstr "Flytta meddelande"
-
 #~ msgid "Copy Message"
 #~ msgstr "Kopiera meddelande"