Updated Swedish translation.

svn path=/trunk/; revision=9554

2 files changed, 992 insertions, 767 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index f443d9ce6c..174d092538 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-25  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
 2001-04-24  Héctor García Álvarez <hector@scouts-es.org>
 
         * es.po: Updated Spanish translation.
diff --git a/po/sv.po b/po/sv.po
index 655dacc362..0152471345 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.67 2001/04/12 00:26:45 menthos Exp $
+# $Id: sv.po,v 1.68 2001/04/25 01:29:36 menthos Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-04-12 02:18+0200\n"
-"PO-Revision-Date: 2001-04-12 02:25+0200\n"
+"POT-Creation-Date: 2001-04-25 03:28+0200\n"
+"PO-Revision-Date: 2001-04-25 03: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:3269
+#: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3271
+#: addressbook/backend/ebook/e-card.c:3211
 msgid ""
 "\n"
 "Name: "
@@ -30,7 +30,7 @@ msgstr ""
 "\n"
 "Namn: "
 
-#: addressbook/backend/ebook/e-card.c:3272
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
@@ -38,7 +38,7 @@ msgstr ""
 "\n"
 "  Prefix:     "
 
-#: addressbook/backend/ebook/e-card.c:3273
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
@@ -46,7 +46,7 @@ msgstr ""
 "\n"
 "  Förnamn:    "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
@@ -54,7 +54,7 @@ msgstr ""
 "\n"
 "  Andranamn:  "
 
-#: addressbook/backend/ebook/e-card.c:3275
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
@@ -62,7 +62,7 @@ msgstr ""
 "\n"
 "  Efternamn:  "
 
-#: addressbook/backend/ebook/e-card.c:3276
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "  Suffix:     "
@@ -70,7 +70,7 @@ msgstr ""
 "\n"
 "  Suffix:     "
 
-#: addressbook/backend/ebook/e-card.c:3290
+#: addressbook/backend/ebook/e-card.c:3230
 msgid ""
 "\n"
 "Birth Date: "
@@ -78,7 +78,7 @@ msgstr ""
 "\n"
 "Födelsedatum: "
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3241
 msgid ""
 "\n"
 "Address:"
@@ -86,7 +86,7 @@ msgstr ""
 "\n"
 "Adress:"
 
-#: addressbook/backend/ebook/e-card.c:3303
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -94,7 +94,7 @@ msgstr ""
 "\n"
 "  Box:           "
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
@@ -102,7 +102,7 @@ msgstr ""
 "\n"
 "  Anknytning:    "
 
-#: addressbook/backend/ebook/e-card.c:3305
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
@@ -110,7 +110,7 @@ msgstr ""
 "\n"
 "  Gatuadress:    "
 
-#: addressbook/backend/ebook/e-card.c:3306
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
@@ -118,7 +118,7 @@ msgstr ""
 "\n"
 "  Ort:           "
 
-#: addressbook/backend/ebook/e-card.c:3307
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
@@ -126,7 +126,7 @@ msgstr ""
 "\n"
 "  Region:        "
 
-#: addressbook/backend/ebook/e-card.c:3308
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
@@ -134,7 +134,7 @@ msgstr ""
 "\n"
 "  Postnummer:    "
 
-#: addressbook/backend/ebook/e-card.c:3309
+#: addressbook/backend/ebook/e-card.c:3249
 msgid ""
 "\n"
 "  Country:     "
@@ -142,7 +142,7 @@ msgstr ""
 "\n"
 "  Land:          "
 
-#: addressbook/backend/ebook/e-card.c:3322
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
@@ -150,7 +150,7 @@ msgstr ""
 "\n"
 "Leveransetikett: "
 
-#: addressbook/backend/ebook/e-card.c:3334
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
@@ -158,7 +158,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
@@ -166,7 +166,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3361
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "E-mail:\n"
@@ -174,7 +174,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3364
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "E-mail:"
@@ -182,7 +182,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3383
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
@@ -190,7 +190,7 @@ msgstr ""
 "\n"
 "E-postprogram: "
 
-#: addressbook/backend/ebook/e-card.c:3389
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
@@ -198,7 +198,7 @@ msgstr ""
 "\n"
 "Tidszon: "
 
-#: addressbook/backend/ebook/e-card.c:3397
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
@@ -206,7 +206,7 @@ msgstr ""
 "\n"
 "Geografisk plats: "
 
-#: addressbook/backend/ebook/e-card.c:3401
+#: addressbook/backend/ebook/e-card.c:3341
 msgid ""
 "\n"
 "Business Role: "
@@ -214,7 +214,7 @@ msgstr ""
 "\n"
 "Yrkesroll: "
 
-#: addressbook/backend/ebook/e-card.c:3413
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
@@ -222,7 +222,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3414
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Name:  "
@@ -230,7 +230,7 @@ msgstr ""
 "\n"
 "  Namn:    "
 
-#: addressbook/backend/ebook/e-card.c:3415
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
@@ -238,7 +238,7 @@ msgstr ""
 "\n"
 "  Enhet:   "
 
-#: addressbook/backend/ebook/e-card.c:3416
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
@@ -246,7 +246,7 @@ msgstr ""
 "\n"
 "  Enhet 2: "
 
-#: addressbook/backend/ebook/e-card.c:3417
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
@@ -254,7 +254,7 @@ msgstr ""
 "\n"
 "  Enhet 3: "
 
-#: addressbook/backend/ebook/e-card.c:3418
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
@@ -262,7 +262,7 @@ msgstr ""
 "\n"
 "  Enhet 4: "
 
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "Categories: "
@@ -270,7 +270,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3423
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "Comment: "
@@ -288,7 +288,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3436
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
@@ -296,7 +296,7 @@ msgstr ""
 "\n"
 "Unik sträng: "
 
-#: addressbook/backend/ebook/e-card.c:3439
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Public Key: "
@@ -316,11 +316,11 @@ msgstr "Importerar GnomeCard-filer till Evolution."
 #: 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:1090
+#: addressbook/conduit/address-conduit.c:1092
 #: 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:72 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:99 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr "Kunde inte initiera Bonobo"
 
@@ -332,20 +332,20 @@ msgstr "Markören kunde inte läsas in\n"
 msgid "EBook not loaded\n"
 msgstr "EBook inte inläst\n"
 
-#: addressbook/conduit/address-conduit.c:652
+#: addressbook/conduit/address-conduit.c:654
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Kunde inte starta wombat-server"
 
-#: addressbook/conduit/address-conduit.c:653
+#: addressbook/conduit/address-conduit.c:655
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Kunde inte starta wombat"
 
-#: addressbook/conduit/address-conduit.c:685
-#: addressbook/conduit/address-conduit.c:688
+#: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
 msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte läsa pilotens adressprogramblock"
 
@@ -448,8 +448,9 @@ msgid "_Company:"
 msgstr "_Företag:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: 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
+#: mail/folder-browser.c:625 mail/mail-config.glade.h:75
+#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:93
+#: ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Ta bort"
 
@@ -603,20 +604,20 @@ msgstr "E-post 2"
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:223
+#: addressbook/contact-editor/e-contact-quick-add.c:233
 msgid "Contact Quick-Add"
 msgstr "Snabbinläggning av kontakt"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
+#: addressbook/contact-editor/e-contact-quick-add.c:235
 msgid "Edit Full"
 msgstr "Redigera fullständigt namn"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/contact-editor/e-contact-quick-add.c:276
 #: addressbook/gui/widgets/e-addressbook-view.c:643
 msgid "Full Name"
 msgstr "Fullständigt namn"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/contact-editor/e-contact-quick-add.c:282
 msgid "E-mail"
 msgstr "E-post"
 
@@ -779,7 +780,7 @@ msgstr "Visa alla"
 msgid "Advanced..."
 msgstr "Avancerat..."
 
-#: addressbook/gui/component/addressbook.c:587
+#: addressbook/gui/component/addressbook.c:587 calendar/gui/gnome-cal.c:236
 msgid "Any field contains"
 msgstr "Något fält innehåller"
 
@@ -817,7 +818,7 @@ msgstr "Ingen (anonymt läge)"
 
 #: addressbook/gui/component/addressbook-config.c:165
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:291
 #: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
 msgid "Password"
 msgstr "Lösenord"
@@ -949,10 +950,10 @@ msgstr "Adressbokskällor"
 #: 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: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
+#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
+#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
+#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -1041,8 +1042,8 @@ 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:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
-#: filter/filter-rule.c:547 filter/filter.glade.h:9
+#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
 #: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
 msgid "Remove"
 msgstr "Ta bort"
@@ -1197,10 +1198,9 @@ 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
+#: addressbook/gui/widgets/e-minicard.c:671 mail/message-browser.c:200
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:51 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Skriv ut"
 
@@ -1561,8 +1561,8 @@ msgstr "Privat"
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
-#: calendar/gui/event-editor.c:1619
+#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
+#: calendar/gui/event-editor.c:1633
 #: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Unknown"
 msgstr "Okänt"
@@ -1585,20 +1585,20 @@ msgstr "V"
 
 #: 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:352 mail/message-list.c:627
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:690
 msgid "High"
 msgstr "Hög"
 
 #: 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:353 mail/message-list.c:626
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:689
 msgid "Normal"
 msgstr "Normal"
 
 #: 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:354 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:688
 msgid "Low"
 msgstr "Låg"
 
@@ -1668,11 +1668,11 @@ msgstr ""
 #. An empty string is the same as 'None'.
 #: 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
+#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
 #: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
-#: 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
+#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1179
+#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
+#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
 msgid "None"
 msgstr "Ingen"
 
@@ -1724,35 +1724,48 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: calendar/gui/calendar-summary.c:196
+#: calendar/gui/calendar-summary.c:198
 msgid "%A, %e %B %Y"
 msgstr "%A %e %B %Y"
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
+#: calendar/gui/calendar-summary.c:207
+msgid "Appointments"
+msgstr "Möten"
+
+#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
 msgid "%I:%M%p"
 msgstr "%H.%M"
 
-#: calendar/gui/calendar-summary.c:437
+#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Uppgifter"
+
+#: calendar/gui/calendar-summary.c:443
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Fel vid inläsning av kalender</b>"
 
-#: calendar/gui/calendar-summary.c:449
+#: calendar/gui/calendar-summary.c:455
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Fel vid inläsning av kalender:<br>Stödjer inte metoden."
 
-#: calendar/gui/calendar-summary.c:616
+#: calendar/gui/calendar-summary.c:622
 msgid "Display"
 msgstr "Visa"
 
-#: calendar/gui/calendar-summary.c:621
+#: calendar/gui/calendar-summary.c:627
 msgid "Show appointments"
 msgstr "Visa möten"
 
-#: calendar/gui/calendar-summary.c:629
+#: calendar/gui/calendar-summary.c:635
 msgid "Show tasks"
 msgstr "Visa uppgifter"
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
+#: calendar/gui/calendar-summary.c:690
+msgid "Things to do"
+msgstr "Saker att göra"
+
+#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Läser in kalendern"
 
@@ -1785,11 +1798,18 @@ msgstr "Alarmaviseringstjänst"
 msgid "Factory for the alarm notification service"
 msgstr "Fabrik för alarmavsieringstjänsten"
 
-#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:56
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr "Det är %s. Unix-tiden är %ld just nu. Vi ville bara låta dig veta det."
+
+#: calendar/gui/alarm-notify/notify-main.c:94 calendar/gui/main.c:52
 msgid "Could not initialize GNOME"
 msgstr "Kunde inte initiera Gnome"
 
-#: calendar/gui/alarm-notify/notify-main.c:77
+#: calendar/gui/alarm-notify/notify-main.c:109
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunde inte skapa fabriken för alarmaviseringstjänsten"
 
@@ -1911,7 +1931,7 @@ msgid "Fri"
 msgstr "fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:484
 msgid "Friday"
 msgstr "fredag"
 
@@ -1940,7 +1960,7 @@ msgid "Mon"
 msgstr "mån"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:480
 msgid "Monday"
 msgstr "måndag"
 
@@ -1976,7 +1996,7 @@ msgid "Sat"
 msgstr "lör"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/event-editor.c:485
 msgid "Saturday"
 msgstr "lördag"
 
@@ -2001,7 +2021,7 @@ msgid "Sun"
 msgstr "sön"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/event-editor.c:486
 msgid "Sunday"
 msgstr "söndag"
 
@@ -2014,7 +2034,7 @@ msgid "Thu"
 msgstr "tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:483
 msgid "Thursday"
 msgstr "torsdag"
 
@@ -2035,7 +2055,7 @@ msgid "Tue"
 msgstr "tis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:481
 msgid "Tuesday"
 msgstr "tisdag"
 
@@ -2048,7 +2068,7 @@ msgid "Wed"
 msgstr "ons"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:482
 msgid "Wednesday"
 msgstr "onsdag"
 
@@ -2169,25 +2189,25 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:697
+#: calendar/gui/dialogs/task-editor.c:707
 msgid "Edit Task"
 msgstr "Redigera uppgift"
 
-#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
+#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
+#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
+#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
+#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagbokspost - %s"
@@ -2323,77 +2343,76 @@ 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:274 calendar/gui/e-day-view.c:1290
+#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
 #: 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:278 calendar/gui/e-day-view.c:1304
+#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
 #: 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:282 calendar/gui/e-day-view.c:1317
+#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
 #: 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:572 calendar/gui/e-week-view.c:302
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
 #: 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:575 calendar/gui/e-week-view.c:305
+#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
 #: calendar/gui/print.c:616
 msgid "pm"
 msgstr "em"
 
-#: calendar/gui/e-day-view.c:3036 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr "Nytt möte"
 
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3242
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
 msgid "New All Day Event"
 msgstr "Nytt heldagsarrangemang"
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3247
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
 msgid "Go to Today"
 msgstr "Gå till idag"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3249
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
 msgid "Go to Date..."
 msgstr "Gå till datum..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
+#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Öppna"
 
-#: calendar/gui/e-day-view.c:3054 calendar/gui/e-week-view.c:3257
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
 msgid "Delete this Appointment"
 msgstr "Ta bort detta möte"
 
-#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3259
+#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
 #: ui/evolution-event-editor.xml.h:45
 msgid "Schedule Meeting"
 msgstr "Boka möte"
 
-#: calendar/gui/e-day-view.c:3065 calendar/gui/e-week-view.c:3272
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
 msgid "Make this Occurrence Movable"
 msgstr "Gör denna förekomst flyttbar"
 
-#: calendar/gui/e-day-view.c:3067 calendar/gui/e-week-view.c:3274
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
 msgid "Delete this Occurrence"
 msgstr "Ta bort denna förekomst"
 
-#: calendar/gui/e-day-view.c:3069
+#: calendar/gui/e-day-view.c:3179
 msgid "Delete all Occurrences"
 msgstr "Ta bort alla förekomster"
 
@@ -2478,7 +2497,7 @@ msgstr "--till--"
 msgid "Calendar Message"
 msgstr "Kalendermeddelande"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:613
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
 msgid "Date:"
 msgstr "Datum:"
 
@@ -2582,8 +2601,8 @@ msgstr ""
 "Boka\n"
 "tid"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:30
-#: mail/message-list.c:1019
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:49
+#: mail/message-list.c:1082
 msgid "Status"
 msgstr "Status"
 
@@ -2613,11 +2632,11 @@ msgstr "Metoden som krävs för att läsa in \"%s\" stöds inte"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3240 calendar/gui/e-week-view.c:3263
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
 msgid "New Appointment..."
 msgstr "Nytt möte..."
 
-#: calendar/gui/e-week-view.c:3276
+#: calendar/gui/e-week-view.c:3314
 msgid "Delete All Occurrences"
 msgstr "Ta bort alla förekomster"
 
@@ -2654,7 +2673,7 @@ msgid "No recurrence"
 msgstr "Ingen upprepning"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1579
+#: calendar/gui/event-editor.c:1593
 msgid "Play a sound"
 msgstr "Spela ett ljud"
 
@@ -2675,12 +2694,12 @@ msgid "Reminder"
 msgstr "Påminnare"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1588
+#: calendar/gui/event-editor.c:1602
 msgid "Run a program"
 msgstr "Kör ett program"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1585
+#: calendar/gui/event-editor.c:1599
 msgid "Send an email"
 msgstr "Skicka ett brev"
 
@@ -2689,7 +2708,7 @@ msgid "Settings..."
 msgstr "Inställningar..."
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1582
+#: calendar/gui/event-editor.c:1596
 msgid "Show a dialog"
 msgstr "Visa ett dialogfönster"
 
@@ -2709,11 +2728,12 @@ msgstr "_Starttid:"
 msgid "_Starting date:"
 msgstr "_Startdatum:"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:33
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "efter"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "före"
 
@@ -2761,96 +2781,96 @@ msgstr "vecka"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/event-editor.c:373
+#: calendar/gui/event-editor.c:376
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: calendar/gui/event-editor.c:451
+#: calendar/gui/event-editor.c:454
 msgid "on"
 msgstr "vid"
 
-#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
+#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/event-editor.c:603
+#: calendar/gui/event-editor.c:606
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/event-editor.c:610
+#: calendar/gui/event-editor.c:613
 msgid "th"
 msgstr ":e"
 
-#: calendar/gui/event-editor.c:756
+#: calendar/gui/event-editor.c:759
 msgid "occurrences"
 msgstr "förekomster"
 
-#: calendar/gui/event-editor.c:873
+#: calendar/gui/event-editor.c:876
 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:1534
+#: calendar/gui/event-editor.c:1548
 #, c-format
 msgid " %d days"
 msgstr " %d dagar"
 
-#: calendar/gui/event-editor.c:1536
+#: calendar/gui/event-editor.c:1550
 msgid " 1 day"
 msgstr " 1 dag"
 
-#: calendar/gui/event-editor.c:1539
+#: calendar/gui/event-editor.c:1553
 #, c-format
 msgid " %d weeks"
 msgstr " %d veckor"
 
-#: calendar/gui/event-editor.c:1541
+#: calendar/gui/event-editor.c:1555
 msgid " 1 week"
 msgstr " 1 vecka"
 
-#: calendar/gui/event-editor.c:1544
+#: calendar/gui/event-editor.c:1558
 #, c-format
 msgid " %d hours"
 msgstr " %d timmar"
 
-#: calendar/gui/event-editor.c:1546
+#: calendar/gui/event-editor.c:1560
 msgid " 1 hour"
 msgstr " 1 timme"
 
-#: calendar/gui/event-editor.c:1549
+#: calendar/gui/event-editor.c:1563
 #, c-format
 msgid " %d minutes"
 msgstr " %d minuter"
 
-#: calendar/gui/event-editor.c:1551
+#: calendar/gui/event-editor.c:1565
 msgid " 1 minute"
 msgstr " 1 minut"
 
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/event-editor.c:1568
 #, c-format
 msgid " %d seconds"
 msgstr " %d sekunder"
 
-#: calendar/gui/event-editor.c:1556
+#: calendar/gui/event-editor.c:1570
 msgid " 1 second"
 msgstr " 1 sekund"
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/event-editor.c:1617
 msgid " before start of appointment"
 msgstr " innan start på möte"
 
-#: calendar/gui/event-editor.c:1605
+#: calendar/gui/event-editor.c:1619
 msgid " after start of appointment"
 msgstr " efter start på möte"
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/event-editor.c:1627
 msgid " before end of appointment"
 msgstr " före slut på möte"
 
-#: calendar/gui/event-editor.c:1615
+#: calendar/gui/event-editor.c:1629
 msgid " after end of appointment"
 msgstr " efter slut på möte"
 
-#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
+#: calendar/gui/event-editor.c:3137 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"
@@ -2887,12 +2907,32 @@ 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:700
+#: calendar/gui/gnome-cal.c:223
+msgid "Show all "
+msgstr "Visa alla "
+
+#: calendar/gui/gnome-cal.c:237
+msgid "Summary contains"
+msgstr "Sammanfattningen innehåller"
+
+#: calendar/gui/gnome-cal.c:238
+msgid "Description contains"
+msgstr "Beskrivningen innehåller"
+
+#: calendar/gui/gnome-cal.c:239
+msgid "Comment contains"
+msgstr "Kommentaren innehåller"
+
+#: calendar/gui/gnome-cal.c:240
+msgid "Has category"
+msgstr "Har kategorin"
+
+#: calendar/gui/gnome-cal.c:843
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunde inte öppna mappen i \"%s\""
 
-#: calendar/gui/gnome-cal.c:711
+#: calendar/gui/gnome-cal.c:854
 #, 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"
@@ -3105,10 +3145,6 @@ msgstr "Fr"
 msgid "Sa"
 msgstr "Lö"
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Uppgifter"
-
 #. Day
 #: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
@@ -3141,9 +3177,9 @@ msgstr "Aktuellt år (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1467
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:53
 msgid "Print Preview"
 msgstr "Förhandsgranska"
 
@@ -3193,6 +3229,26 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
+#: camel/camel-cipher-context.c:169
+msgid "Signing is not supported by this cipher"
+msgstr "Signering stöds inte av detta chiffer"
+
+#: camel/camel-cipher-context.c:209
+msgid "Clearsigning is not supported by this cipher"
+msgstr "Klarsignering stöds inte av detta chiffer"
+
+#: camel/camel-cipher-context.c:249
+msgid "Verifying is not supported by this cipher"
+msgstr "Verifiering stöds inte av detta chiffer"
+
+#: camel/camel-cipher-context.c:292
+msgid "Encryption is not supported by this cipher"
+msgstr "Kryptering stöds inte av detta chiffer"
+
+#: camel/camel-cipher-context.c:334
+msgid "Decryption is not supported by this cipher"
+msgstr "Dekryptering stöds inte av detta chiffer"
+
 #: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
 msgid "Syncing folders"
 msgstr "Synkroniserar mappar"
@@ -3246,7 +3302,7 @@ msgstr "Fel vid tolkning av filter: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Fel vid körning av filter: %s: %s"
 
-#: camel/camel-filter-search.c:431 camel/camel-filter-search.c:437
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fel vid körning av filtersökning: %s: %s"
@@ -3363,6 +3419,57 @@ msgstr "(Okänt fel)"
 msgid "Error copying mail temp file: %s"
 msgstr "Fel vid kopierande av temporär brevfil: %s"
 
+#: camel/camel-pgp-context.c:190
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Ange din %s-lösenordsfras för %s"
+
+#: camel/camel-pgp-context.c:193
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Ange din %s-lösenordsfras"
+
+#: camel/camel-pgp-context.c:513
+msgid "No plaintext to sign."
+msgstr "Ingen klartext att signera."
+
+#: camel/camel-pgp-context.c:520 camel/camel-pgp-context.c:692
+#: camel/camel-pgp-context.c:1060 camel/camel-pgp-context.c:1272
+msgid "No password provided."
+msgstr "Inget lösenord angavs."
+
+#: camel/camel-pgp-context.c:526 camel/camel-pgp-context.c:698
+#: camel/camel-pgp-context.c:881 camel/camel-pgp-context.c:1067
+#: camel/camel-pgp-context.c:1279
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Kunde inte skapa rör till GPG/PGP: %s"
+
+#: camel/camel-pgp-context.c:685
+msgid "No plaintext to clearsign."
+msgstr "Ingen klartext att klarsignera."
+
+#: camel/camel-pgp-context.c:875
+msgid "No plaintext to verify."
+msgstr "Ingen klartext att verifiera."
+
+#: camel/camel-pgp-context.c:892
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Kunde inte skapa temporär fil: %s"
+
+#: camel/camel-pgp-context.c:1050
+msgid "No plaintext to encrypt."
+msgstr "Ingen klartext att kryptera."
+
+#: camel/camel-pgp-context.c:1076
+msgid "No recipients specified"
+msgstr "Inga avsändare är angivna"
+
+#: camel/camel-pgp-context.c:1264
+msgid "No ciphertext to decrypt."
+msgstr "Ingen kryptotext att dekryptera."
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -3378,37 +3485,37 @@ msgstr "Kunde inte läsa in %s: %s"
 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:189
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s server %s"
 msgstr "%s-server %s"
 
-#: camel/camel-remote-store.c:193
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-tjänst för %s på %s"
 
-#: camel/camel-remote-store.c:243
+#: camel/camel-remote-store.c:240
 msgid "Connection cancelled"
 msgstr "Anslutning avbruten"
 
-#: camel/camel-remote-store.c:246
+#: camel/camel-remote-store.c:243
 #: 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:247
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(okänd värd)"
 
-#: camel/camel-remote-store.c:328 camel/camel-remote-store.c:390
-#: camel/camel-remote-store.c:461
+#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
+#: camel/camel-remote-store.c:458
 #: camel/providers/imap/camel-imap-command.c:264
 msgid "Operation cancelled"
 msgstr "Operation avbruten"
 
-#: camel/camel-remote-store.c:467
+#: camel/camel-remote-store.c:464
 msgid "Server unexpectedly disconnected"
 msgstr "Servern kopplade ifrån oväntat"
 
@@ -3520,7 +3627,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:417
+#: camel/providers/imap/camel-imap-store.c:420
 msgid "Bad authentication response from server."
 msgstr "Felaktigt autentiseringssvar från servern."
 
@@ -3569,15 +3676,15 @@ msgstr "Uppslagning av värdnamn misslyckades: %s: värden kunde inte hittas"
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Uppslagning av värdnamn misslyckades: %s: okänd orsak"
 
-#: camel/camel-session.c:57
+#: camel/camel-session.c:56
 msgid "Virtual folder email provider"
 msgstr "E-postleverantör för virtuell mapp"
 
-#: camel/camel-session.c:59
+#: camel/camel-session.c:58
 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:274 camel/camel-session.c:364
+#: camel/camel-session.c:273 camel/camel-session.c:363
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Det finns ingen leverantör för protokollet \"%s\""
@@ -3592,12 +3699,12 @@ msgstr ""
 "%s"
 
 #. Fill in the new fields
-#: 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
+#: camel/camel-store.c:380 mail/mail-ops.c:1007 mail/mail-ops.c:1014
+#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Kunde inte tolka URL:en \"%s\""
@@ -3640,22 +3747,22 @@ msgstr "IMAP-serversvaret innehöll inte %s-information"
 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:172
+#: camel/providers/imap/camel-imap-folder.c:170
 #, 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:351
+#: camel/providers/imap/camel-imap-folder.c:349
 msgid "Scanning IMAP folder"
 msgstr "Genomsöker IMAP-mappen"
 
-#: camel/providers/imap/camel-imap-folder.c:986
-#: camel/providers/imap/camel-imap-folder.c:1197
+#: camel/providers/imap/camel-imap-folder.c:984
+#: camel/providers/imap/camel-imap-folder.c:1195
 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:1016
-#: camel/providers/imap/camel-imap-folder.c:1231
+#: camel/providers/imap/camel-imap-folder.c:1014
+#: camel/providers/imap/camel-imap-folder.c:1229
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
@@ -3669,7 +3776,7 @@ msgstr "Kontrollerar ny e-post"
 msgid "Check for new messages in all folders"
 msgstr "Kontrollerar nya meddelanden i alla mappar"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:534
 msgid "Folders"
 msgstr "Mappar"
 
@@ -3702,29 +3809,28 @@ 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:440
+#: camel/providers/imap/camel-imap-store.c:443
 #, 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:450
+#: camel/providers/imap/camel-imap-store.c:453
 #: 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:475
+#: camel/providers/imap/camel-imap-store.c:478
 #, 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:490
+#: camel/providers/imap/camel-imap-store.c:493
 #: 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:518
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/imap/camel-imap-store.c:521
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3735,17 +3841,17 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:858
+#: camel/providers/imap/camel-imap-store.c:868
 #, 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
+#: camel/providers/imap/camel-imap-store.c:882
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kunde inte skapa katalogen %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1373
+#: camel/providers/imap/camel-imap-store.c:1385
 msgid "You must be working online to complete this operation"
 msgstr "Du måste vara ansluten för att kunna genomföra detta"
 
@@ -3984,7 +4090,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "Kan inte sammanfatta mapp: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1383
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1395
 msgid "Synchronising folder"
 msgstr "Synkroniserar mapp"
 
@@ -4095,17 +4201,17 @@ msgstr ""
 "Det här är en leverantör för läsning och postning till "
 "USENET-diskussionsgrupper."
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:224
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Kunde inte öppna katalog för diskussionsgruppsserver: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:286
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-diskussionsgrupper via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:293
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4113,8 +4219,8 @@ msgstr ""
 "Detta alternativ kommer att autentisera med NNTP-servern genom att använda "
 "ett klartextlösenord."
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:325
+#: camel/providers/nntp/camel-nntp-store.c:488
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Kan inte öppna eller skapa .newsrc-fil för %s: %s"
@@ -4123,21 +4229,31 @@ msgstr "Kan inte öppna eller skapa .newsrc-fil för %s: %s"
 msgid "Retrieving POP summary"
 msgstr "Hämtar POP-sammanfattning"
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr "Kunde inte kontrollera nya meddelanden på POP-servern: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 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:285
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr "Inget meddelande med uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:289
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Hämtar POP-meddelande %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:307
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, c-format
+msgid "Could not fetch message: %s"
+msgstr "Kunde inte hämta meddelande: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Kunde inte hämta meddelande från POP-servern %s: %s"
@@ -4193,22 +4309,27 @@ 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:207
+#: camel/providers/pop3/camel-pop3-store.c:209
 #, 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:319
+#: camel/providers/pop3/camel-pop3-store.c:225
+#, c-format
+msgid "Could not connect to server: %s"
+msgstr "Kunde inte ansluta till server: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:329
 #, 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:358
+#: camel/providers/pop3/camel-pop3-store.c:368
 #, 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:377
+#: camel/providers/pop3/camel-pop3-store.c:387
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4217,12 +4338,12 @@ msgstr ""
 "Kunde inte ansluta till POP-servern,\n"
 "Fel vid skickande av filnamn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:390
+#: camel/providers/pop3/camel-pop3-store.c:427
 msgid "(Unknown)"
 msgstr "(Okänd)"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:417
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4230,7 +4351,7 @@ msgstr ""
 "Kan inte ansluta till POP-servern.\n"
 "Inget stöd för begärd autentiseringsmekanism."
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:425
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4239,7 +4360,7 @@ msgstr ""
 "Kan inte ansluta till POP-server.\n"
 "Fel vid skickande av lösenord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:493
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
@@ -4424,6 +4545,17 @@ msgstr "SMTP-servern %s stöder inte den begärda autentiseringstypen %s"
 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:411
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"Kunde inte autentisera till SMTP-servern.\n"
+"%s\n"
+"\n"
+
 #: camel/providers/smtp/camel-smtp-transport.c:527
 #, c-format
 msgid "SMTP server %s"
@@ -4578,7 +4710,7 @@ msgstr "Lägg till bilaga..."
 msgid "Attach a file to the message"
 msgstr "Bifoga en fil till meddelandet"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1019
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1082
 msgid "Attachment"
 msgstr "Bilaga"
 
@@ -4609,25 +4741,25 @@ msgstr "Klicka här för att ta fram adressboken"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:709
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:745
 msgid "From:"
 msgstr "Från:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:711
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:747
 msgid "Reply-To:"
 msgstr "Svara-Till:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:643
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:713
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:749
 msgid "To:"
 msgstr "Till:"
 
@@ -4635,7 +4767,7 @@ msgstr "Till:"
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:751
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -4655,7 +4787,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:528
+#: composer/e-msg-composer.c:529
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4664,21 +4796,21 @@ msgstr ""
 "Kunde inte öppna signaturfilen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:717
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:728
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fel vid sparande av filen: %s"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:748
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid inläsning av filen: %s"
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:820
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -4686,12 +4818,12 @@ 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
+#: composer/e-msg-composer.c:878 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:206
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:884
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4701,27 +4833,27 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:909
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:1034
+#: composer/e-msg-composer.c:1035
 msgid "That file does not exist."
 msgstr "Den filen finns inte."
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1045
 msgid "That is not a regular file."
 msgstr "Det är ingen vanlig fil."
 
-#: composer/e-msg-composer.c:1054
+#: composer/e-msg-composer.c:1055
 msgid "That file exists but is not readable."
 msgstr "Den filen finns, men är inte läsbar."
 
-#: composer/e-msg-composer.c:1064
+#: composer/e-msg-composer.c:1065
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Filen verkade åtkomlig, men open(2) misslyckades."
 
-#: composer/e-msg-composer.c:1086
+#: composer/e-msg-composer.c:1087
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4729,15 +4861,15 @@ 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:1107
+#: composer/e-msg-composer.c:1108
 msgid "An error occurred while reading the file."
 msgstr "Ett fel uppstod vid läsning av filen."
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1409 composer/e-msg-composer.c:1741
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:1830
 msgid "Could not create composer window."
 msgstr "Kunde inte skapa fönster för meddelanderedigering."
 
@@ -4768,7 +4900,7 @@ msgstr "kalenderinformation"
 #. strptime format for a date.
 #: 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
+#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
@@ -4797,7 +4929,7 @@ msgstr "%H.%M%n"
 #. strftime format of a weekday and a date.
 #: 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
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr "%a %Y-%m-%d"
 
@@ -4815,8 +4947,8 @@ 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:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
+#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
+#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
 msgid "%H:%M"
 msgstr "%H.%M"
 
@@ -4827,8 +4959,8 @@ msgstr "%H.%M.%S"
 
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: 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
+#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
+#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
 msgid "%I:%M %p"
 msgstr "%I.%M %p"
 
@@ -5061,7 +5193,7 @@ msgstr "Hoppsan. Du har glömt välja ett datum."
 msgid "Oops. You have chosen an invalid date."
 msgstr "Hoppsan. Du har valt ett ogiltigt datum."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:276
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5071,7 +5203,7 @@ msgstr ""
 "den tid då filtret körs eller en virtuell\n"
 "mapp öppnas."
 
-#: filter/filter-datespec.c:298
+#: filter/filter-datespec.c:299
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5079,7 +5211,7 @@ msgstr ""
 "Meddelandedatumet kommer att jämföras med\n"
 "datumet som du anger här."
 
-#: filter/filter-datespec.c:338
+#: filter/filter-datespec.c:339
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5090,28 +5222,28 @@ msgstr ""
 "körs; \"en vecka sen\" till exempel."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:374
 msgid "the current time"
 msgstr "aktuell tid"
 
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:374
 msgid "a time you specify"
 msgstr "en tid du anger"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:375
 msgid "a time relative to the current time"
 msgstr "en tid som är relativ till aktuell tid"
 
 #. The label
-#: filter/filter-datespec.c:432
+#: filter/filter-datespec.c:433
 msgid "Compare against"
 msgstr "Jämför med"
 
-#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
+#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
 msgid "now"
 msgstr "nu"
 
-#: filter/filter-datespec.c:706
+#: filter/filter-datespec.c:707
 msgid "<click here to select a date>"
 msgstr "<klicka här för att välja ett datum>"
 
@@ -5120,11 +5252,11 @@ msgid "Filter Rules"
 msgstr "Filterregler"
 
 #. and now for the action area
-#: filter/filter-filter.c:453
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr "Då"
 
-#: filter/filter-filter.c:467
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr "Lägg till åtgärd"
 
@@ -5137,20 +5269,20 @@ msgstr ""
 "Var vänlig och gå tillbaka och ange en giltig mapp som e-post kan levereras "
 "till."
 
-#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:678
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr "Välj mapp"
 
-#: filter/filter-folder.c:247
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr "Ange mappens URI"
 
-#: filter/filter-folder.c:293
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr "<klicka här för att välja en mapp>"
 
-#: filter/filter-input.c:194
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5159,38 +5291,46 @@ msgstr ""
 "Fel i reguljära uttrycket \"%s\":\n"
 "%s"
 
-#: filter/filter-part.c:475
+#: filter/filter-part.c:474
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:624
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Regelnamn: "
 
-#: filter/filter-rule.c:628
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: filter/filter-rule.c:644
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr "Om"
 
-#: filter/filter-rule.c:662
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr "Utför åtgärder"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr "om alla villkor uppfylls"
 
-#: filter/filter-rule.c:671
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr "om något villkor uppfylls"
 
-#: filter/filter-rule.c:682
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr "Lägg till villkor"
 
+#: filter/filter-rule.c:770
+msgid "incoming"
+msgstr "inkommande"
+
+#: filter/filter-rule.c:770
+msgid "outgoing"
+msgstr "utgående"
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Redigera filter"
@@ -5231,193 +5371,196 @@ msgstr "med alla lokala och aktiva fjärrmappar"
 msgid "with all local folders"
 msgstr "med alla lokala mappar"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Tilldela färg"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Tilldela poäng"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Bilagor"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "innehåller"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiera till mapp"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Ankomstdatum"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Avsändningsdatum"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: filter/libfilter-i18n.h:10
+#: 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
 msgid "Do Not Exist"
 msgstr "Finns inte"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Mall"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "slutar med"
+
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr "Finns"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "finns"
+
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "Uttryck"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:24
 msgid "Forward to Address"
 msgstr "Vidarebefordra till adress"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Viktigt"
 
-#: filter/libfilter-i18n.h:16
+#: 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
 msgid "Mailing list"
 msgstr "Sändlista"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:31
 msgid "Message Body"
 msgstr "Meddelandetext"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:32
 msgid "Message Header"
 msgstr "Meddelandehuvud"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:33
 msgid "Message was received"
 msgstr "Meddelandet mottogs"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:34
 msgid "Message was sent"
 msgstr "Meddelandet skickades"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:35
 msgid "Move to Folder"
 msgstr "Flytta till mapp"
 
-#: filter/libfilter-i18n.h:22
+#: 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
 msgid "Read"
 msgstr "Läs"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:39
 msgid "Recipients"
 msgstr "Mottagare"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:40
 msgid "Regex Match"
 msgstr "Sökning med reguljärt uttryck"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:41
 msgid "Replied to"
 msgstr "Svarade till"
 
-#: filter/libfilter-i18n.h:26 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1019
+#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.c:1082
 msgid "Score"
 msgstr "Poäng"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:43
 msgid "Sender"
 msgstr "Avsändare"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:44
 msgid "Set Status"
 msgstr "Ställ in status"
 
-#: filter/libfilter-i18n.h:29
-msgid "Specific header"
-msgstr "Specifikt huvud"
-
-#: filter/libfilter-i18n.h:31
-msgid "Stop Processing"
-msgstr "Stoppa behandling"
-
-#: 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"
+msgid "sounds like"
+msgstr "låter som"
 
 #: filter/libfilter-i18n.h:46
-msgid "is"
-msgstr "är"
+msgid "Source Account"
+msgstr "Källkonto"
 
 #: filter/libfilter-i18n.h:47
-msgid "on or after"
-msgstr "den eller efter"
+msgid "Specific header"
+msgstr "Specifikt huvud"
 
 #: 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
+#: filter/libfilter-i18n.h:50
+msgid "Stop Processing"
+msgstr "Stoppa behandling"
+
+#: filter/libfilter-i18n.h:51 mail/message-list.c:1083
+msgid "Subject"
+msgstr "Ämne"
+
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "var efter"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "var före"
 
@@ -5425,122 +5568,140 @@ msgstr "var före"
 msgid "Score Rules"
 msgstr "Poängregler"
 
-#: mail/component-factory.c:332
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan inte initiera Evolutions e-postkomponent."
 
-#: mail/component-factory.c:405
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lager hos skal"
 
-#: mail/folder-browser-factory.c:209
+#: mail/folder-browser-factory.c:211
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper för \"%s\""
 
-#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:213 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:253
 msgid "Store search as vFolder"
 msgstr "Lagra sökning som vMapp"
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
-msgstr "Virtuell mapp på ämnesrad"
+#: mail/folder-browser.c:561 ui/evolution-mail.xml.h:86
+msgid "VFolder on _Subject"
+msgstr "Virtuell mapp på _ämnesrad"
+
+#: mail/folder-browser.c:564 ui/evolution-mail.xml.h:84
+msgid "VFolder on Se_nder"
+msgstr "Virtuell mapp på _avsändare"
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
-msgstr "Virtuell mapp på avsändare"
+#: mail/folder-browser.c:567 ui/evolution-mail.xml.h:85
+msgid "VFolder on _Recipients"
+msgstr "Virtuell mapp på _mottagare"
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
-msgstr "Virtuell mapp på mottagare"
+#: mail/folder-browser.c:570 ui/evolution-mail.xml.h:83
+msgid "VFolder on Mailing _List"
+msgstr "Virtuell mapp på sänd_lista"
 
-#: 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:576
+msgid "Filter on Sub_ject"
+msgstr "Filtrera på _ämnesrad"
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
-msgstr "Filtrera på ämnesrad"
+#: mail/folder-browser.c:579
+msgid "Filter on Sen_der"
+msgstr "Filtrera på _avsändare"
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
-msgstr "Filtrera på avsändare"
+#: mail/folder-browser.c:582
+msgid "Filter on Re_cipients"
+msgstr "Filtrera på _mottagare"
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
-msgstr "Filtrera på mottagare"
+#: mail/folder-browser.c:585
+msgid "Filter on _Mailing List"
+msgstr "Filtrera på sä_ndlista"
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
-msgstr "Filtrera på sändlista"
+#: mail/folder-browser.c:594
+msgid "_Open"
+msgstr "_Öppna"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:596
 msgid "Resend"
 msgstr "Skicka om"
 
-#: mail/folder-browser.c:570
-msgid "Save As..."
-msgstr "Spara som..."
+#: mail/folder-browser.c:598 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail.xml.h:108 ui/evolution-tasks.xml.h:8
+msgid "_Save As..."
+msgstr "_Spara som..."
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
-msgstr "Svara till avsändaren"
+#: mail/folder-browser.c:600 ui/evolution-event-editor.xml.h:69
+#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+msgid "_Print"
+msgstr "Skriv _ut"
 
-#: 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:605
+msgid "_Reply to Sender"
+msgstr "Sva_ra till avsändaren"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:14
-msgid "Forward"
-msgstr "Vidarebefordra"
+#: mail/folder-browser.c:607 ui/evolution-mail.xml.h:62
+msgid "Reply to _All"
+msgstr "Svara till _alla"
 
-#: mail/folder-browser.c:583
-msgid "Forward inline"
-msgstr "Vidarebefordra inuti"
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:97
+msgid "_Forward"
+msgstr "_Vidarebefordra"
 
-#: mail/folder-browser.c:586
-msgid "Mark as Read"
-msgstr "Märk som läst"
+#: mail/folder-browser.c:611
+msgid "Forward _inline"
+msgstr "Vidarebefordra _inuti"
 
-#: mail/folder-browser.c:588
-msgid "Mark as Unread"
-msgstr "Märk som oläst"
+#: mail/folder-browser.c:614 ui/evolution-mail.xml.h:38
+msgid "Mar_k as Read"
+msgstr "Mär_k som läst"
 
-#: mail/folder-browser.c:593
-msgid "Move to Folder..."
-msgstr "Flytta till mapp..."
+#: mail/folder-browser.c:616 ui/evolution-mail.xml.h:42
+msgid "Mark as U_nread"
+msgstr "Märk som _oläst"
 
-#: mail/folder-browser.c:595
-msgid "Copy to Folder..."
-msgstr "Kopiera till mapp..."
+#: mail/folder-browser.c:621 ui/evolution-mail.xml.h:102
+msgid "_Move to Folder..."
+msgstr "_Flytta till mapp..."
 
-#: mail/folder-browser.c:599
-msgid "Undelete"
-msgstr "Ångra borttagning"
+#: mail/folder-browser.c:623 ui/evolution-mail.xml.h:91
+msgid "_Copy to Folder..."
+msgstr "_Kopiera till mapp..."
+
+#: mail/folder-browser.c:627 ui/evolution-mail.xml.h:113
+msgid "_Undelete"
+msgstr "_Ångra borttagning"
 
 #. { _("Add Sender to Address Book"),  NULL,
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609
+#: mail/folder-browser.c:637 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr "Tillämpa filter"
 
-#: mail/folder-browser.c:613
-msgid "Create Rule From Message"
-msgstr "Skapa regel från meddelande"
+#: mail/folder-browser.c:641
+msgid "Create Ru_le From Message"
+msgstr "Skapa rege_l från meddelande"
+
+#: mail/folder-browser.c:780
+msgid "Filter on Mailing List"
+msgstr "Filtrera på sändlista"
+
+#: mail/folder-browser.c:781
+msgid "VFolder on Mailing List"
+msgstr "Virtuell mapp på sändlista"
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:783
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrera på sändlista (%s)"
 
-#: mail/folder-browser.c:736
+#: mail/folder-browser.c:784
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Virtuell mapp på sändlista (%s)"
@@ -5665,11 +5826,11 @@ msgstr "Hämta e-post från %s"
 msgid "%s mailing list"
 msgstr "Sändlistan %s"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "Lägg till filterregel"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5681,7 +5842,7 @@ msgstr ""
 "ta emot eller skriva nya brev.\n"
 "Vill du konfigurera det nu?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5689,7 +5850,7 @@ msgstr ""
 "Du måste konfigurera en identititet\n"
 "innan du kan skriva brev."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:160
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5697,11 +5858,11 @@ msgstr ""
 "Du måste konfigurera en e-posttransport\n"
 "innan du kan skriva brev."
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:204
 msgid "You have not set a mail transport method"
 msgstr "Du har inte angivit någon e-posttransportmetod"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:237
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5709,32 +5870,32 @@ msgstr ""
 "Detta meddelande har ingen ämnesrad.\n"
 "Vill du verkligen skicka?"
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:310
 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:351
+#: mail/mail-callbacks.c:353
 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
+#: mail/mail-callbacks.c:593
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Den %s skrev %s:\n"
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:775
 msgid "Forwarded message:\n"
 msgstr "Vidarebefordrat meddelande:\n"
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:878
 msgid "Move message(s) to"
 msgstr "Flytta meddelande(n) till"
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:880
 msgid "Copy message(s) to"
 msgstr "Kopiera meddelande(n) till"
 
-#: mail/mail-callbacks.c:1019
+#: mail/mail-callbacks.c:1148
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5742,7 +5903,7 @@ msgstr ""
 "Du kan bara redigera meddelanden\n"
 "som du sparat i mappen Drafts."
 
-#: mail/mail-callbacks.c:1056
+#: mail/mail-callbacks.c:1180
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -5750,11 +5911,11 @@ msgstr ""
 "Du kan bara skicka om meddelanden\n"
 "som du sparat i mappen Sent."
 
-#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
+#: mail/mail-callbacks.c:1213 mail/mail-display.c:90
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
+#: mail/mail-callbacks.c:1217 mail/mail-display.c:94
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5762,15 +5923,15 @@ msgstr ""
 "Det finns redan en fil med det namnet.\n"
 "Ska den skrivas över?"
 
-#: mail/mail-callbacks.c:1137
+#: mail/mail-callbacks.c:1261
 msgid "Save Message As..."
 msgstr "Spara meddelande som..."
 
-#: mail/mail-callbacks.c:1139
+#: mail/mail-callbacks.c:1263
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1378
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5779,15 +5940,15 @@ msgstr ""
 "Fel vid läsning av filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1302
+#: mail/mail-callbacks.c:1427 ui/evolution-mail.xml.h:52
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/mail-callbacks.c:1349
+#: mail/mail-callbacks.c:1474
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-config.c:1121 mail/mail-config.c:1124
 msgid "Connecting to server..."
 msgstr "Ansluter till server..."
 
@@ -6011,7 +6172,7 @@ msgstr ""
 
 #: 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
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
 msgid "_Edit"
 msgstr "R_edigera"
 
@@ -6098,72 +6259,76 @@ msgstr "Visa inuti (med %s)"
 msgid "Hide"
 msgstr "Göm"
 
-#: mail/mail-display.c:1100
+#: mail/mail-display.c:1107
 msgid "Open link in browser"
 msgstr "Öppna länk i webbläsare"
 
-#: mail/mail-display.c:1102
+#: mail/mail-display.c:1109
 msgid "Save as (FIXME)"
 msgstr "Spara som (FIXME)"
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1111
 msgid "Copy location (FIXME)"
 msgstr "Kopiera plats (FIXME)"
 
-#: mail/mail-format.c:512
+#: mail/mail-format.c:522
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/mail-format.c:554
+#: mail/mail-format.c:564
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunde inte tolka MIME-meddelande. Visar som källa."
 
-#: mail/mail-format.c:736
+#: mail/mail-format.c:772
 msgid "Loading message content"
 msgstr "Läser in meddelandeinnehåll"
 
-#: mail/mail-format.c:1033
+#: mail/mail-format.c:1066
+msgid "No GPG/PGP program configured."
+msgstr "Inget GPG/PGP-program är konfigurerat."
+
+#: mail/mail-format.c:1081
 msgid "Encrypted message not displayed"
 msgstr "Krypterat meddelande visas inte"
 
-#: mail/mail-format.c:1039
+#: mail/mail-format.c:1087
 msgid "Encrypted message"
 msgstr "Krypterat meddelande"
 
-#: mail/mail-format.c:1040
+#: mail/mail-format.c:1088
 msgid "Click icon to decrypt."
 msgstr "Klicka på ikonen för att dekryptera."
 
-#: mail/mail-format.c:1109 mail/mail-format.c:1496
+#: mail/mail-format.c:1178 mail/mail-format.c:1566
 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:1117 mail/mail-format.c:1504
+#: mail/mail-format.c:1186 mail/mail-format.c:1574
 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:1717
+#: mail/mail-format.c:1787
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/mail-format.c:1729
+#: mail/mail-format.c:1799
 #, 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:1733
+#: mail/mail-format.c:1803
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/mail-format.c:1767
+#: mail/mail-format.c:1837
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okänd extern data (typen \"%s\")"
 
-#: mail/mail-format.c:1772
+#: mail/mail-format.c:1842
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
@@ -6187,28 +6352,28 @@ msgstr "Byter format på mappen \"%s\" till \"%s\""
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Byt format på mappen \"%s\" till \"%s\""
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerar mapp"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:844
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr "Stänger aktuell mapp"
 
-#: mail/mail-local.c:876
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr "Byter namn på gammal mapp och öppnar"
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr "Skapar ny mapp"
 
-#: mail/mail-local.c:908
+#: mail/mail-local.c:907
 msgid "Copying messages"
 msgstr "Kopierar meddelanden"
 
-#: mail/mail-local.c:925
+#: mail/mail-local.c:924
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6217,7 +6382,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:964
+#: mail/mail-local.c:963
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6234,7 +6399,7 @@ msgstr ""
 "Fel vid \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:192
+#: mail/mail-mt.c:193
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6243,105 +6408,105 @@ msgstr ""
 "Fel vid utförande av operation:\n"
 "%s"
 
-#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
+#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:892
 msgid "Working"
 msgstr "Jobbar"
 
-#: mail/mail-mt.c:679 mail/session.c:98
+#: mail/mail-mt.c:680 mail/session.c:98
 msgid "Do you accept?"
 msgstr "Accepterar du?"
 
-#: mail/mail-mt.c:873
+#: mail/mail-mt.c:874
 msgid "Evolution progress"
 msgstr "Evolutionförlopp"
 
-#: mail/mail-ops.c:588
+#: mail/mail-ops.c:599
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Skickar \"%s\""
 
-#: mail/mail-ops.c:590
+#: mail/mail-ops.c:603
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: mail/mail-ops.c:705
+#: mail/mail-ops.c:718
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Skickar meddelande %d av %d"
 
-#: mail/mail-ops.c:724
+#: mail/mail-ops.c:737
 #, 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
+#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
 msgid "Complete."
 msgstr "Färdig."
 
-#: mail/mail-ops.c:812
+#: mail/mail-ops.c:825
 msgid "Saving message to folder"
 msgstr "Sparar meddelande till mappen"
 
-#: mail/mail-ops.c:885
+#: mail/mail-ops.c:898
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: mail/mail-ops.c:885
+#: mail/mail-ops.c:898
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:914
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:917
 msgid "Copying"
 msgstr "Kopierar"
 
-#: mail/mail-ops.c:979
+#: mail/mail-ops.c:992
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
-#: mail/mail-ops.c:1140
+#: mail/mail-ops.c:1152
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1181 mail/mail-ops.c:1319
+#: mail/mail-ops.c:1193 mail/mail-ops.c:1331
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagringsutrymmet %s"
 
-#: mail/mail-ops.c:1435
+#: mail/mail-ops.c:1447
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: mail/mail-ops.c:1484
+#: mail/mail-ops.c:1496
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: mail/mail-ops.c:1551
+#: mail/mail-ops.c:1563
 msgid "Retrieving messages"
 msgstr "Hämtar meddelanden"
 
-#: mail/mail-ops.c:1561
+#: mail/mail-ops.c:1573
 #, 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:1635
+#: mail/mail-ops.c:1647
 msgid "Saving messages"
 msgstr "Sparar meddelanden"
 
-#: mail/mail-ops.c:1714
+#: mail/mail-ops.c:1726
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6350,12 +6515,12 @@ msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1727
+#: mail/mail-ops.c:1739
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Sparar meddelande %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1741
+#: mail/mail-ops.c:1753
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6364,11 +6529,11 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1815
+#: mail/mail-ops.c:1827
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: mail/mail-ops.c:1830
+#: mail/mail-ops.c:1842
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6377,7 +6542,7 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1858
+#: mail/mail-ops.c:1870
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
@@ -6414,10 +6579,14 @@ msgstr "Skickar"
 msgid "Cancelled."
 msgstr "Avbruten."
 
-#: mail/mail-summary.c:109
+#: mail/mail-summary.c:110
 msgid "Incomplete message written on pipe!"
 msgstr "Inkomplett meddelande skrevs på rör!"
 
+#: mail/mail-summary.c:468
+msgid "Mail Summary"
+msgstr "E-postsammanfattning"
+
 #: mail/mail-tools.c:141
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
@@ -6454,155 +6623,146 @@ msgstr ""
 msgid "VFolders"
 msgstr "Virtuella mappar"
 
-#: mail/mail-vfolder.c:427
+#: mail/mail-vfolder.c:426
 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:144 ui/evolution-mail.xml.h:35
+#: mail/message-browser.c:189 ui/evolution-mail.xml.h:60
 msgid "Reply"
 msgstr "Svara"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:39
+#: mail/message-browser.c:189 ui/evolution-mail.xml.h:66
 msgid "Reply to the sender of this message"
 msgstr "Svara till avsändaren av det här meddelandet"
 
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:38
+#: mail/message-browser.c:192 ui/evolution-mail.xml.h:61
+msgid "Reply to All"
+msgstr "Svara till alla"
+
+#: mail/message-browser.c:192 ui/evolution-mail.xml.h:64
 msgid "Reply to all recipients of this message"
 msgstr "Svara till alla mottagare av det här meddelandet"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:16
+#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
+msgid "Forward"
+msgstr "Vidarebefordra"
+
+#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
 msgid "Forward this message"
 msgstr "Vidarebefordra detta meddelande"
 
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:32
+#: mail/message-browser.c:200 ui/evolution-mail.xml.h:57
 msgid "Print the selected message"
 msgstr "Skriv ut det markerade meddelandet"
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:7
+#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Ta bort detta meddelande"
 
-#: mail/message-list.c:615
+#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
+#: ui/evolution-task-editor-dialog.xml.h:36
+msgid "Previous"
+msgstr "Föregående"
+
+#: mail/message-browser.c:208
+msgid "Previous message"
+msgstr "Föregående meddelande"
+
+#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
+#: ui/evolution-event-editor.xml.h:29 ui/evolution-task-editor-dialog.xml.h:32
+msgid "Next"
+msgstr "Nästa"
+
+#: mail/message-browser.c:211
+msgid "Next message"
+msgstr "Nästa meddelande"
+
+#: mail/message-list.c:678
 msgid "Unseen"
 msgstr "Oläst"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:679
 msgid "Seen"
 msgstr "Läst"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:680
 msgid "Answered"
 msgstr "Besvarad"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:681
 msgid "Multiple Unseen Messages"
 msgstr "Flera olästa meddelanden"
 
-#: mail/message-list.c:619
+#: mail/message-list.c:682
 msgid "Multiple Messages"
 msgstr "Flera meddelanden"
 
-#: mail/message-list.c:623
+#: mail/message-list.c:686
 msgid "Lowest"
 msgstr "Lägsta"
 
-#: mail/message-list.c:624
+#: mail/message-list.c:687
 msgid "Lower"
 msgstr "Lägre"
 
-#: mail/message-list.c:628
+#: mail/message-list.c:691
 msgid "Higher"
 msgstr "Högre"
 
-#: mail/message-list.c:629
+#: mail/message-list.c:692
 msgid "Highest"
 msgstr "Högsta"
 
-#: mail/message-list.c:879
+#: mail/message-list.c:942
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:886
+#: mail/message-list.c:949
 msgid "Today %l:%M %p"
 msgstr "Idag %I.%M"
 
-#: mail/message-list.c:895
+#: mail/message-list.c:958
 msgid "Yesterday %l:%M %p"
 msgstr "Igår %I.%M"
 
-#: mail/message-list.c:907
+#: mail/message-list.c:970
 msgid "%a %l:%M %p"
 msgstr "%a %I.%M"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:978
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %I:%M"
 
-#: mail/message-list.c:917
+#: mail/message-list.c:980
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1082
 msgid "Flagged"
 msgstr "Flaggad"
 
-#: mail/message-list.c:1020
+#: mail/message-list.c:1083
 msgid "From"
 msgstr "Från"
 
-#: mail/message-list.c:1020
+#: mail/message-list.c:1083
 msgid "Date"
 msgstr "Datum"
 
-#: mail/message-list.c:1020
+#: mail/message-list.c:1083
 msgid "Received"
 msgstr "Mottaget"
 
-#: mail/message-list.c:1021
+#: mail/message-list.c:1084
 msgid "To"
 msgstr "Till"
 
-#: mail/message-list.c:1021
+#: mail/message-list.c:1084
 msgid "Size"
 msgstr "Storlek"
 
-#: 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:95
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Ange din %s-lösenordsfras"
-
-#: mail/openpgp-utils.c:455 mail/openpgp-utils.c:562 mail/openpgp-utils.c:763
-#: mail/openpgp-utils.c:917 mail/openpgp-utils.c:1076
-msgid "No GPG/PGP program available."
-msgstr "Inget GPG/PGP-program finns tillgängligt."
-
-#: mail/openpgp-utils.c:462 mail/openpgp-utils.c:571 mail/openpgp-utils.c:770
-#: mail/openpgp-utils.c:924
-msgid "No password provided."
-msgstr "Inget lösenord angavs."
-
-#: mail/openpgp-utils.c:470 mail/openpgp-utils.c:578 mail/openpgp-utils.c:776
-#: mail/openpgp-utils.c:932 mail/openpgp-utils.c:1082
-#, 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:592
-msgid "No recipients specified"
-msgstr "Inga avsändare är angivna"
-
-#: mail/openpgp-utils.c:1093
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Kunde inte skapa temporär fil: %s"
-
 #: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
 msgid "Folder"
 msgstr "Mapp"
@@ -6856,7 +7016,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr "Det angivna mappnamnet är inte giltigt."
 
-#: shell/e-shell-folder-creation-dialog.c:248
+#: shell/e-shell-folder-creation-dialog.c:263
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Skapa ny mapp"
 
@@ -6868,7 +7028,7 @@ msgstr ""
 "Den valda typen av mapp är inte giltig för\n"
 "den begärda åtgärden."
 
-#: shell/e-shell-folder-selection-dialog.c:319
+#: shell/e-shell-folder-selection-dialog.c:321
 msgid "New..."
 msgstr "Ny..."
 
@@ -6906,12 +7066,12 @@ msgstr "Gå till mapp..."
 msgid "(No folder displayed)"
 msgstr "(Ingen mapp visas)"
 
-#: shell/e-shell-view.c:1134
+#: shell/e-shell-view.c:1184
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1136
+#: shell/e-shell-view.c:1186
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
@@ -7009,7 +7169,7 @@ msgstr "Fel vid sparande av genvägar."
 
 #: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
 msgid "_View"
 msgstr "_Visa"
 
@@ -7152,7 +7312,7 @@ msgstr "Sök efter en kontakt"
 msgid "New contact"
 msgstr "Ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:28
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:50
 msgid "Previews the message to be printed"
 msgstr "Förhandsgranskar meddelandet som ska skrivas ut"
 
@@ -7160,7 +7320,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:48
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:79
 msgid "Stop"
 msgstr "Stopp"
 
@@ -7194,8 +7354,8 @@ 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:78
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:112
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
 msgid "_Tools"
 msgstr "_Verktyg"
 
@@ -7259,11 +7419,6 @@ msgstr "Månad"
 msgid "New _Event"
 msgstr "Nytt _evenemang"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Nästa"
-
 #: ui/evolution-calendar.xml.h:20
 msgid "Open Calendar"
 msgstr "Öppna kalender"
@@ -7308,8 +7463,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:226
-#: widgets/misc/e-dateedit.c:422
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
+#: widgets/misc/e-dateedit.c:424
 msgid "Today"
 msgstr "Idag"
 
@@ -7334,7 +7489,7 @@ msgid "_Month"
 msgstr "_Månad"
 
 #: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
 msgid "_New"
 msgstr "_Ny"
 
@@ -7342,11 +7497,6 @@ msgstr "_Ny"
 msgid "_Open Calendar"
 msgstr "_Öppna kalender"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:75
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "_Spara som..."
-
 #: ui/evolution-calendar.xml.h:45
 msgid "_Week"
 msgstr "_Vecka"
@@ -7373,7 +7523,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:33 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:58 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Skriv ut..."
 
@@ -7406,7 +7556,7 @@ msgstr "Skicka _meddelande till kontakt..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
 #: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
 msgid "_File"
 msgstr "_Arkiv"
 
@@ -7460,7 +7610,7 @@ msgstr "Stäng detta möte"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "K_opiera till mapp... (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Kopiera"
@@ -7533,10 +7683,6 @@ msgstr "Klistra in från urklipp"
 msgid "Pre_vious"
 msgstr "Före_gående"
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Föregående"
-
 #: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
 msgid "Print Pre_view"
 msgstr "Förhands_granska"
@@ -7571,7 +7717,8 @@ msgstr "Boka _möte"
 msgid "Schedule some sort of a meeting"
 msgstr "Boka någon typ av möte"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:69
+#: ui/evolution-task-editor-dialog.xml.h:57
 msgid "Select All"
 msgstr "Markera allt"
 
@@ -7593,12 +7740,12 @@ msgid "_About..."
 msgstr "_Om..."
 
 #: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "S_täng"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:29
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
@@ -7612,7 +7759,7 @@ msgid "_Debug"
 msgstr "Fels_ök"
 
 #: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
 msgid "_Help"
 msgstr "_Hjälp"
 
@@ -7644,12 +7791,7 @@ msgstr "_Anteckna (FIXME)"
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "Skriv _ut"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:71
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:104
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Egenskaper..."
@@ -7659,7 +7801,7 @@ msgid "_Select All"
 msgstr "_Markera allt"
 
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:42
 msgid "_Task (FIXME)"
 msgstr "_Uppgift (FIXME)"
 
@@ -7687,123 +7829,224 @@ msgstr "Inställningar för sammanfattningen..."
 msgid "New Mail"
 msgstr "Ny post"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail.xml.h:2
+msgid "Apply any new filters to the mail in this box"
+msgstr "Verkställ alla nya filter på e-posten i denna brevlåda"
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr "Ändra egenskaperna för denna mapp"
+
+#: ui/evolution-mail.xml.h:4
 msgid "Compose"
 msgstr "Skriv"
 
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail.xml.h:5
 msgid "Compose a new message"
 msgstr "Skriv ett nytt meddelande"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:6
+msgid "Configure Folder..."
+msgstr "Konfigura mapp..."
+
+#: ui/evolution-mail.xml.h:8
 msgid "Copy message to a new folder"
 msgstr "Kopiera meddelandet till en ny mapp"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:9
+msgid "Copy selected messages to another folder"
+msgstr "Kopiera markerade meddelanden till en annan mapp"
+
+#: ui/evolution-mail.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Skapa _virtuell mapp från meddelande"
 
-#: ui/evolution-mail.xml.h:8
+#: ui/evolution-mail.xml.h:12
+msgid "Delete the selected messages"
+msgstr "Ta bort det markerade meddelandet"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Display all of the message headers"
 msgstr "Visa alla meddelandehuvuden"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:15
+msgid "Edit Message"
+msgstr "Redigera meddelande"
+
+#: ui/evolution-mail.xml.h:16
+msgid "Edit the current message"
+msgstr "Redigera det aktuella meddelandet"
+
+#: ui/evolution-mail.xml.h:17
 msgid "Empty _Trash"
 msgstr "Töm _papperskorgen"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:18
+msgid "Expunge"
+msgstr "Töm"
+
+#: ui/evolution-mail.xml.h:19
+msgid "Filter on Mailing _List"
+msgstr "Filtrera på sänd_lista"
+
+#: ui/evolution-mail.xml.h:20
 msgid "Filter on Se_nder"
 msgstr "Filtrera på _avsändare"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:21
 msgid "Filter on _Recipients"
 msgstr "Filtrera på _mottagare"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:22
 msgid "Filter on _Subject"
 msgstr "Filtrera på _ämnesrad"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:23
+msgid "Finaly remove all mails tagged for deletion"
+msgstr "Ta bort alla brev som är märkta för borttagning för gott"
+
+#: ui/evolution-mail.xml.h:24
 msgid "Forget _Passwords"
 msgstr "Glöm _lösenord"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:26
 msgid "Forward As"
 msgstr "Vidarebefordra som"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail.xml.h:27
+msgid "Forward inline"
+msgstr "Vidarebefordra inuti"
+
+#: ui/evolution-mail.xml.h:28
+msgid "Forward the selected mail to someone"
+msgstr "Vidarebefordra det markerade brevet till någon"
+
+#: ui/evolution-mail.xml.h:30
+msgid "Forward this message in-line with your mail, so you can edit it"
+msgstr ""
+"Vidarebefordra detta meddelande inuti ditt brev, så att du kan redigera det"
+
+#: ui/evolution-mail.xml.h:31
 msgid "Full _Headers"
 msgstr "Fullständiga _huvuden"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:32
 msgid "Hide Deleted Messages"
 msgstr "Göm borttagna meddelanden"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:33
 msgid "Hide S_elected Messages"
 msgstr "Göm _markerade meddelanden"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:34
 msgid "Hide _Deleted Messages"
 msgstr "Göm _borttagna meddelanden"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:35
 msgid "Hide _Read messages"
 msgstr "Göm _lästa meddelanden"
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:36
+msgid "Invert Selection"
+msgstr "Omvänd markering"
+
+#: ui/evolution-mail.xml.h:37
 msgid "Manage _Subscriptions..."
 msgstr "Hantera _prenumerationer..."
 
-#: ui/evolution-mail.xml.h:23
-msgid "Mar_k as Read"
-msgstr "Mär_k som läst"
-
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:39
 msgid "Mark All as R_ead"
 msgstr "Märk alla som _lästa"
 
-#: ui/evolution-mail.xml.h:25
-msgid "Mark as U_nread"
+#: ui/evolution-mail.xml.h:40
+msgid "Mark As Read"
+msgstr "Märk som läst"
+
+#: ui/evolution-mail.xml.h:41
+msgid "Mark As U_nread"
 msgstr "Märk som _oläst"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:43
+msgid "Mark the selected messages as having been read"
+msgstr "Märk de markerade meddelandena som lästa"
+
+#: ui/evolution-mail.xml.h:44
+msgid "Mark the selected messages as not having been read"
+msgstr "Märk de markerade meddelandena som olästa"
+
+#: ui/evolution-mail.xml.h:45
 msgid "Move"
 msgstr "Flytta"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:46
 msgid "Move message to a new folder"
 msgstr "Flytta meddelandet till en ny mapp"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:47
+msgid "Move selected messages to another folder"
+msgstr "Flytta markerade meddelanden till en annan mapp"
+
+#: ui/evolution-mail.xml.h:48
+msgid "Open in New Window"
+msgstr "Öppna i nytt fönster"
+
+#: ui/evolution-mail.xml.h:49
+msgid "Open the current message in a new window"
+msgstr "Öppna det aktuella meddelandet i ett nytt fönster"
+
+#: ui/evolution-mail.xml.h:54
+msgid "Print Preview of message..."
+msgstr "Förhandsgranska meddelande..."
+
+#: ui/evolution-mail.xml.h:55
 msgid "Print message to the printer"
 msgstr "Skriv ut meddelandet på skrivaren"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:56
+msgid "Print message..."
+msgstr "Skriv ut meddelande..."
+
+#: ui/evolution-mail.xml.h:59
 msgid "Redirect (FIXME: implement me)"
 msgstr "Omdirigera (FIXME: implementera mig)"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Reply to _All"
-msgstr "Svara till _alla"
+#: ui/evolution-mail.xml.h:63
+msgid "Reply to all"
+msgstr "Svara till alla"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:65
+msgid "Reply to sender"
+msgstr "Svara till avsändaren"
+
+#: ui/evolution-mail.xml.h:67
 msgid "S_ource"
 msgstr "_Källa"
 
-#: ui/evolution-mail.xml.h:41 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:68
+msgid "Save the message into a new file"
+msgstr "Spara meddelandet i en ny fil"
+
+#: ui/evolution-mail.xml.h:70 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Markera _alla"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:71
 msgid "Select _Thread"
 msgstr "Markera _tråd"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:72
 msgid "Send / Receive"
 msgstr "Skicka / Ta emot"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:73
+msgid "Send a reply to the person who sent you this mail"
+msgstr "Skicka ett svar till personen som skickade dig detta brev"
+
+#: ui/evolution-mail.xml.h:74
+msgid "Send a single mail in reply to all the selected mail"
+msgstr "Skicka ett enda brev som svar på alla de markerade breven"
+
+#: ui/evolution-mail.xml.h:75
 msgid ""
 "Send queued mail\n"
 "    and retrieve new mail"
@@ -7811,122 +8054,102 @@ msgstr ""
 "Skicka kölagd e-post\n"
 "    och hämta ny e-post"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:77
 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:47
+#: ui/evolution-mail.xml.h:78
 msgid "Show _All"
 msgstr "Visa _alla"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:80
 msgid "Threaded Message list"
 msgstr "Trådad meddelandelista"
 
-#: ui/evolution-mail.xml.h:50
-msgid "VFolder on Se_nder"
-msgstr "Virtuell mapp på _avsändare"
-
-#: ui/evolution-mail.xml.h:51
-msgid "VFolder on _Recipients"
-msgstr "Virtuell mapp på _mottagare"
+#: ui/evolution-mail.xml.h:81
+msgid "Un-delete the selected messages"
+msgstr "Ångra borttagning av de markerade meddelandena"
 
-#: ui/evolution-mail.xml.h:52
-msgid "VFolder on _Subject"
-msgstr "Virtuell mapp på _ämnesrad"
+#: ui/evolution-mail.xml.h:82
+msgid "Undelete"
+msgstr "Ångra borttagning"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:87
 msgid "View Raw Message Source"
 msgstr "Visa rå meddelandekälla"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:88
 msgid "Virtual Folder _Editor..."
 msgstr "R_edigerare för virtuella mappar..."
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:89
 msgid "_Apply Filters"
 msgstr "Tillämp_a filter"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:90
 msgid "_Attachment"
 msgstr "_Bilaga"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Compose"
-msgstr "Skriv _nytt"
-
-#: ui/evolution-mail.xml.h:58
-msgid "_Copy to Folder..."
-msgstr "_Kopiera till mapp..."
-
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:92
 msgid "_Create Filter From Message"
 msgstr "_Skapa filter från meddelande"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:94
 msgid "_Expunge"
 msgstr "T_öm"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:95
 msgid "_Filters..."
 msgstr "_Filter..."
 
-#: ui/evolution-mail.xml.h:63 ui/evolution.xml.h:31
+#: ui/evolution-mail.xml.h:96 ui/evolution.xml.h:32
 msgid "_Folder"
 msgstr "_Mapp"
 
-#: ui/evolution-mail.xml.h:64
-msgid "_Forward"
-msgstr "Vidarebe_fordra"
-
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:98
 msgid "_Inline"
 msgstr "_Inuti"
 
-#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:99 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Om_vänd markering"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:100
 msgid "_Mail Message"
 msgstr "_Posta meddelande"
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:101
 msgid "_Mail Settings..."
 msgstr "_E-postinställningar..."
 
-#: ui/evolution-mail.xml.h:69
-msgid "_Move to Folder..."
-msgstr "_Flytta till mapp..."
-
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:103
 msgid "_Open Selected Items"
 msgstr "_Öppna markerade objekt"
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail.xml.h:105
 msgid "_Quoted"
 msgstr "_Citerad"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:106
 msgid "_Reply"
 msgstr "_Svara"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:107
 msgid "_Resend Messages"
 msgstr "Skicka _om meddelanden"
 
-#: ui/evolution-mail.xml.h:76
+#: ui/evolution-mail.xml.h:109
+msgid "_Save Message As..."
+msgstr "Spara meddelande so_m..."
+
+#: ui/evolution-mail.xml.h:110
 msgid "_Send / Receive"
 msgstr "_Skicka / Ta emot"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:111
 msgid "_Threaded"
 msgstr "_Trådat"
 
-#: ui/evolution-mail.xml.h:79
-msgid "_Undelete"
-msgstr "_Ångra borttagning"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Bifoga"
@@ -8168,7 +8391,7 @@ msgstr "Ångra"
 msgid "Undo the last action"
 msgstr "Ångra den senaste åtgärden"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
 msgid "_Appointment (FIXME)"
 msgstr "_Möte (FIXME)"
 
@@ -8229,217 +8452,221 @@ msgid "E_xit"
 msgstr "_Avsluta"
 
 #: ui/evolution.xml.h:9
+msgid "Evolution _Window"
+msgstr "Evolution_fönster"
+
+#: ui/evolution.xml.h:10
 msgid "Evolution bar _shortcut"
 msgstr "Evolutiongenväg för _rader"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Avlsuta programmet"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:12
 msgid "Getting _Started"
 msgstr "Komma i _gång"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:13
 msgid "Import an external file format"
 msgstr "Importera ett externt filformat"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:14
 msgid "Main toolbar"
 msgstr "Huvudverktygsrad"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:15
 msgid "Show information about Evolution"
 msgstr "Visa information om Evolution"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Skicka felrapport"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Skicka _felrapport"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:18
 msgid "Submit bug report using Bug Buddy."
 msgstr "Skicka felrapport med Bug-Buddy."
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the folder bar"
 msgstr "Växla om mappraden ska visas"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:20
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Växla om genvägsraden ska visas"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Using the C_ontact Manager"
 msgstr "Använda k_ontakthanteraren"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "Using the _Calendar"
 msgstr "Använda _kalendern"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:23
 msgid "Using the _Mailer"
 msgstr "Använda _e-postdelen"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:24
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Actions"
 msgstr "_Åtgärder"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
 msgid "_Folder Bar"
 msgstr "_Mapprad"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:34
 msgid "_Go to Folder..."
 msgstr "_Gå till mapp..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
 msgid "_Import file..."
 msgstr "_Infoga fil..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:38
 msgid "_Mail message"
 msgstr "_Posta meddelande"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
 msgid "_New Folder"
 msgstr "_Ny mapp"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:41
 msgid "_Shortcut Bar"
 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:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Preliminär"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Upptagen"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Inte inne"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Ingen information"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "Bjud _in andra..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_Alternativ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "Visa _endast arbetstimmar"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Visa ut_zoomade"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr "_Uppdatera ledig/upptagen"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr "_Autovälj"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "_Alla människor och resurser"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Alla _människor och en resurs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "Folk som k_rävs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "Folk som krävs _och en resurs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "Mötets _starttid:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "Mötets slu_ttid:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "Alla deltagare"
 
-#: widgets/menus/gal-view-menus.c:178
+#: widgets/menus/gal-view-menus.c:177
 msgid "_Current View"
 msgstr "_Aktuell vy"
 
-#: widgets/menus/gal-view-menus.c:198
+#: widgets/menus/gal-view-menus.c:196
 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
+#: widgets/misc/e-calendar-item.c:422
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
+#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
+#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
 msgid "Now"
 msgstr "Nu"
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:245
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:726
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Tiden måste anges i formatet: %s"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
@@ -8532,6 +8759,33 @@ msgstr "init_corba(): kunde inte initiera GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
+#~ msgid "VFolder on Subject"
+#~ msgstr "Virtuell mapp på ämnesrad"
+
+#~ msgid "VFolder on Sender"
+#~ msgstr "Virtuell mapp på avsändare"
+
+#~ msgid "VFolder on Recipients"
+#~ msgstr "Virtuell mapp på mottagare"
+
+#~ msgid "Save As..."
+#~ msgstr "Spara som..."
+
+#~ msgid "Mark as Read"
+#~ msgstr "Märk som läst"
+
+#~ msgid "Mark as Unread"
+#~ msgstr "Märk som oläst"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "Flytta till mapp..."
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "Kopiera till mapp..."
+
+#~ msgid "_Compose"
+#~ msgstr "Skriv _nytt"
+
 #~ msgid "Click here to add a contact"
 #~ msgstr "Klicka här för att lägga till en kontakt"
 
@@ -8892,12 +9146,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Error saving composition to 'Drafts': %s"
 #~ msgstr "Fel vid sparande av alster i \"Drafts\": %s"
 
-#~ msgid "incoming"
-#~ msgstr "inkommande"
-
-#~ msgid "outgoing"
-#~ msgstr "utgående"
-
 #~ msgid "Body or subject contains"
 #~ msgstr "Meddelandetexten eller ämnet innehåller"
 
@@ -9040,27 +9288,12 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Get Mail"
 #~ msgstr "Hämta e-post"
 
-#~ msgid "Mar_k As Read"
-#~ msgstr "Mar_kera som läst"
-
-#~ msgid "Mark As U_nread"
-#~ msgstr "Märk som _oläst"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "Förhandsgranska meddelande..."
-
-#~ msgid "Print message..."
-#~ msgstr "Skriv ut meddelande..."
-
 #~ msgid "Reply to _Sender"
 #~ msgstr "Svara till av_sändaren"
 
 #~ msgid "Show _All Messages"
 #~ msgstr "Visa _alla meddelanden"
 
-#~ msgid "_Configure Folder..."
-#~ msgstr "_Konfigura mapp..."
-
 #~ msgid "_Filter on Subject"
 #~ msgstr "_Filtrera på ämne"
 
@@ -9073,9 +9306,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_Print Message"
 #~ msgstr "Skriv _ut meddelande"
 
-#~ msgid "_Save Message As..."
-#~ msgstr "Spara meddelande so_m..."
-
 #~ msgid "_VFolder on Subject"
 #~ msgstr "_Virtuell mapp på ämne"
 
@@ -9465,9 +9695,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Forward message \"%s\""
 #~ msgstr "Vidarebefordra meddelande \"%s\""
 
-#~ msgid "Forward a message without a subject"
-#~ msgstr "Vidarebefordra ett meddelande utan en ämnesrad"
-
 #~ msgid ""
 #~ "Failed to generate mime part from message while generating forwarded message."
 #~ msgstr ""
@@ -9739,9 +9966,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_New appointment..."
 #~ msgstr "_Nytt möte..."
 
-#~ msgid "_Open"
-#~ msgstr "_Öppna"
-
 #~ msgid "_Create New Folder..."
 #~ msgstr "_Skapa ny mapp..."
 
@@ -9882,9 +10106,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_Move to Folder"
 #~ msgstr "_Flytta till mapp"
 
-#~ msgid "Open in New Window"
-#~ msgstr "Öppna i nytt fönster"
-
 #~ msgid "Forward Message"
 #~ msgstr "Vidarebefordra meddelande"