Updated Swedish translation.

2001-10-31  Christian Rose  <menthos@menthos.com>

	* sv.po: Updated Swedish translation.

svn path=/trunk/; revision=14531

2 files changed, 1725 insertions, 1670 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index dad10722ad..330fe4dc8b 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-31  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
 2001-10-31  Zbigniew Chyla  <cyba@gnome.pl>
 
 	* pl.po: Updated Polish translation by
diff --git a/po/sv.po b/po/sv.po
index c45419913b..b601d34b95 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,13 +5,13 @@
 # Christian Rose <menthos@menthos.com>, 2000, 2001.
 # Martin Norbäck <d95mback@dtek.chalmers.se>, 2001.
 #
-# $Id: sv.po,v 1.128 2001/10/26 15:26:25 menthos Exp $
+# $Id: sv.po,v 1.129 2001/10/31 11:36:43 menthos Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-10-26 17:25+0200\n"
-"PO-Revision-Date: 2001-10-26 17:25+0200\n"
+"POT-Creation-Date: 2001-10-31 12:35+0100\n"
+"PO-Revision-Date: 2001-10-31 12:30+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -34,291 +34,296 @@ msgstr "Fabrik för import av VCard-filer till Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importerar VCard-filer till Evolution."
 
-#: addressbook/backend/ebook/e-card-simple.c:59
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Arkivera som"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Namn"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Primär"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr "Prim"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/contact-editor/e-contact-editor.c:1587
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1588
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "Företag"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "För"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1591
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Tillbakaringning"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1593
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Företag"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "För"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Hem"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1592
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1590
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Företagsfax"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "För.fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Fax hem"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1589
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "Företag 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "För 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "Hem 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
 #: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Annat"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Annan fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Personsökare"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Webbsida"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "Url"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Avdelning"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "Avd"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Kont"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Yrke"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "Yrke"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Man"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "Ass"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Smek"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "Partner"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Notering"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "Kalender-URI"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "KALUri"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "Ledig/Upptagen-URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr "LU-Url"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "Jubileum"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "Jubil"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "Födelsedatum"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategorier"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "Efternamn"
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr "%x"
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -326,7 +331,7 @@ msgstr ""
 "\n"
 "Namn: "
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -334,7 +339,7 @@ msgstr ""
 "\n"
 "  Prefix:     "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -342,7 +347,7 @@ msgstr ""
 "\n"
 "  Förnamn:    "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -350,7 +355,7 @@ msgstr ""
 "\n"
 "  Andranamn:  "
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -358,7 +363,7 @@ msgstr ""
 "\n"
 "  Efternamn:  "
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -366,7 +371,7 @@ msgstr ""
 "\n"
 "  Suffix:     "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -374,7 +379,7 @@ msgstr ""
 "\n"
 "Födelsedatum: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -382,7 +387,7 @@ msgstr ""
 "\n"
 "Adress:"
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -390,7 +395,7 @@ msgstr ""
 "\n"
 "  Box:           "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -398,7 +403,7 @@ msgstr ""
 "\n"
 "  Anknytning:    "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -406,7 +411,7 @@ msgstr ""
 "\n"
 "  Gatuadress:    "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -414,7 +419,7 @@ msgstr ""
 "\n"
 "  Ort:           "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -422,7 +427,7 @@ msgstr ""
 "\n"
 "  Region:        "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -430,7 +435,7 @@ msgstr ""
 "\n"
 "  Postnummer:    "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -438,7 +443,7 @@ msgstr ""
 "\n"
 "  Land:          "
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -446,7 +451,7 @@ msgstr ""
 "\n"
 "Leveransetikett: "
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -454,7 +459,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3781
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -462,7 +467,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3805
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -470,7 +475,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3808
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -478,7 +483,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3827
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -486,7 +491,7 @@ msgstr ""
 "\n"
 "E-postprogram: "
 
-#: addressbook/backend/ebook/e-card.c:3833
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -494,7 +499,7 @@ msgstr ""
 "\n"
 "Tidszon: "
 
-#: addressbook/backend/ebook/e-card.c:3841
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -502,7 +507,7 @@ msgstr ""
 "\n"
 "Geografisk plats: "
 
-#: addressbook/backend/ebook/e-card.c:3845
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -510,7 +515,7 @@ msgstr ""
 "\n"
 "Yrkesroll: "
 
-#: addressbook/backend/ebook/e-card.c:3857
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -518,7 +523,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3858
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -526,7 +531,7 @@ msgstr ""
 "\n"
 "  Namn:    "
 
-#: addressbook/backend/ebook/e-card.c:3859
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -534,7 +539,7 @@ msgstr ""
 "\n"
 "  Enhet:   "
 
-#: addressbook/backend/ebook/e-card.c:3860
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -542,7 +547,7 @@ msgstr ""
 "\n"
 "  Enhet 2: "
 
-#: addressbook/backend/ebook/e-card.c:3861
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -550,7 +555,7 @@ msgstr ""
 "\n"
 "  Enhet 3: "
 
-#: addressbook/backend/ebook/e-card.c:3862
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -558,7 +563,7 @@ msgstr ""
 "\n"
 "  Enhet 4: "
 
-#: addressbook/backend/ebook/e-card.c:3866
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -566,7 +571,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3867
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -584,7 +589,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3880
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -592,7 +597,7 @@ msgstr ""
 "\n"
 "Unik sträng: "
 
-#: addressbook/backend/ebook/e-card.c:3883
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -600,11 +605,11 @@ msgstr ""
 "\n"
 "Publik nyckel: "
 
-#: addressbook/backend/ebook/e-card.c:4236
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "Flera VCard"
 
-#: addressbook/backend/ebook/e-card.c:4244
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard för %s"
@@ -613,18 +618,18 @@ msgstr "VCard för %s"
 #: 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:1514
+#: addressbook/conduit/address-conduit.c:1537
 #: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1420
-#: calendar/conduits/todo/todo-conduit.c:1122
-#: calendar/gui/alarm-notify/notify-main.c:172 calendar/gui/main.c:63
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Kunde inte initiera Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2059
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "Söker..."
 
@@ -637,60 +642,60 @@ msgstr "Läser in..."
 msgid "Error in search expression."
 msgstr "Fel i sökuttryck."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "Ansluter till LDAP-servern..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "Kan inte ansluta till LDAP-servern."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "Väntar på anslutning till LDAP-servern..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "Lägger till kort till LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "Tar bort kort från LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1072
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr "Modifierar kort från LDAP-servern..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2004
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr "Mottar LDAP-sökresultat..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2009
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr "Startar om sökningen."
 
-#: addressbook/conduit/address-conduit.c:288
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "Markören kunde inte läsas in\n"
 
-#: addressbook/conduit/address-conduit.c:301
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "EBook inte inläst\n"
 
-#: addressbook/conduit/address-conduit.c:1075
-#: calendar/conduits/calendar/calendar-conduit.c:967
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
 #: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "Kunde inte starta wombat-server"
 
-#: addressbook/conduit/address-conduit.c:1076
-#: calendar/conduits/calendar/calendar-conduit.c:968
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
 #: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "Kunde inte starta wombat"
 
-#: addressbook/conduit/address-conduit.c:1106
-#: addressbook/conduit/address-conduit.c:1109
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte läsa pilotens adressprogramblock"
 
@@ -734,39 +739,39 @@ msgstr "Fabrik för adressbokens adress-popup"
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabrik för adressbokstestkontrollen"
 
-#: addressbook/gui/component/addressbook-component.c:72
-#: calendar/gui/dialogs/comp-editor-util.c:300
-#: calendar/gui/dialogs/comp-editor-util.c:356 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1062
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "Mapp som innehåller kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr "LDAP-server som innehåller kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr "Ny _kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:528
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "Ny kontaktlista"
 
-#: addressbook/gui/component/addressbook-component.c:528
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr "Ny kontakt_lista"
 
@@ -799,7 +804,7 @@ msgid "Base"
 msgstr "Bas"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:179
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "Grundläggande"
 
@@ -896,7 +901,7 @@ msgstr "_Lägg till"
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Redigera"
@@ -914,19 +919,19 @@ msgid "_Server name:"
 msgstr "_Servernamn:"
 
 #: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:175 calendar/gui/main.c:106
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunde inte initiera gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "Andra kontakter"
 
-#: addressbook/gui/component/addressbook.c:464
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Kan inte öppna adressboken"
 
-#: addressbook/gui/component/addressbook.c:473
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -936,7 +941,7 @@ msgstr ""
 "att du har angett en felaktig URI eller att LDAP-servern är\n"
 "onåbar"
 
-#: addressbook/gui/component/addressbook.c:478
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -948,7 +953,7 @@ msgstr ""
 "programmet från CVS-källkod efter det att du har hämtat\n"
 "OpenLDAP från länken nedan.\n"
 
-#: addressbook/gui/component/addressbook.c:486
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -956,42 +961,42 @@ msgstr ""
 "Vi kunde inte öppna denna adressbok. Kontrollera att sökvägen\n"
 "existerar och att du har rätt att komma åt den."
 
-#: addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ange lösenord för %s (användare %s)"
 
-#: addressbook/gui/component/addressbook.c:724
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Något fält innehåller"
 
-#: addressbook/gui/component/addressbook.c:725
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "Namnet innehåller"
 
-#: addressbook/gui/component/addressbook.c:726
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "E-postadressen innehåller"
 
-#: addressbook/gui/component/addressbook.c:727
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategori är"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:728 widgets/misc/e-filter-bar.h:98
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
 #: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Avancerat..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:959
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Alla kategorier"
 
-#: addressbook/gui/component/addressbook.c:999
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "URI:n som mappbläddraren kommer att visa"
 
@@ -1004,51 +1009,51 @@ msgstr "URI:n som mappbläddraren kommer att visa"
 msgid "(none)"
 msgstr "(ingen)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Primär e-post"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "Välj en åtgärd"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Skapa en ny kontakt \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Lägg till adress till befintliga kontakten \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:860
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "Undersöker adressboken..."
 
-#: addressbook/gui/component/e-address-popup.c:935
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Redigera kontaktinformation"
 
-#: addressbook/gui/component/e-address-popup.c:964
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Lägg till i kontakter"
 
-#: addressbook/gui/component/e-address-popup.c:1007
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "Slå samman e-postadress"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "Använd inte frågor"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Använd frågor (farligt!)"
 
@@ -1060,35 +1065,35 @@ msgstr "Evolutions adressboks namnvalsgränssnitt."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Fabrik för adressbokens namnvalsgränssnitt"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:766
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
 #: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Ta bort"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Ta bort alla"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "Skicka HTML-post?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr "Redigera kontaktlista"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr "Namnlös kontaktlista"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d visas inte)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "Namnlös kontakt:"
 
@@ -1108,7 +1113,18 @@ msgstr ""
 "detaljerad beskrivning av de omständigheter under vilket felet framträdde.\n"
 "Tack på förhand."
 
-#: addressbook/gui/component/select-names/e-select-names.c:602
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+"Evolution kan inte få tag på det lokala adressbokslagret.\n"
+"Normalt bör detta aldrig inträffa. Du kan behöva avsluta\n"
+"och starta om Evolution för att åtgärda detta problem."
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "Välj kontakter från adressboken"
 
@@ -1168,12 +1184,12 @@ msgstr "Samarbete"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1236
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Kontaktredigerare"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Detaljer"
 
@@ -1243,8 +1259,8 @@ msgstr "_Kontakter..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:702 filter/filter.glade.h:8
-#: mail/folder-browser.c:1465 mail/mail-config.glade.h:96
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -1314,46 +1330,46 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "Ta bort kontakten?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:754
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "Denna kontakt tillhör dessa kategorier:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2227
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunde inte hitta widget för fältet: \"%s\""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Snabbinläggning av kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "Redigera fullständigt namn"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Fullständigt namn"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "E-post"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:171
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:203
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2420,7 +2436,7 @@ msgid "contact-list-editor"
 msgstr "kontaktlisteredigerare"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigerare"
 
@@ -2469,13 +2485,13 @@ msgstr ""
 "Denna kontakts ändrade namn eller e-postadress finns\n"
 "redan i den här mappen. Vill du lägga till den ändå?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:235
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Sök"
 
@@ -2494,9 +2510,9 @@ msgstr "%d kort"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-#: addressbook/gui/widgets/e-addressbook-view.c:1407
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Spara som VCard"
@@ -2507,18 +2523,18 @@ msgid "Open"
 msgstr "Öppna"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Vidarebefordra kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr "Skicka meddelande till kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
@@ -2526,12 +2542,12 @@ msgid "Print"
 msgstr "Skriv ut"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Skriv ut kuvert"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:742 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:282 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
@@ -2539,81 +2555,86 @@ msgstr "Skriv ut kuvert"
 msgid "Delete"
 msgstr "Ta bort"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:476
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Fel vid ändring av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
-#: shell/evolution-shell-component.c:972
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "Lyckades"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1891
-#: shell/e-storage.c:529 shell/evolution-shell-component.c:1009
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "Lagret frånkopplat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:517
-#: shell/evolution-shell-component.c:1000
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Åtkomst nekas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "Kortet hittades inte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "Kort-ID finns redan"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "Protokollet stöds inte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1205
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:484 camel/camel-service.c:608
-#: camel/camel-service.c:644
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "Annat fel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Vill du spara ändringar?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "Fel vid tillägg av lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "Fel vid tillägg av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "Fel vid ändring av lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "Fel vid borttagning av lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "Fel vid borttagning av kort"
 
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,x,y,z,å,ä,ö"
 
@@ -2621,84 +2642,84 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,x,y,z,å,ä,ö"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,x,y,z,å,ä,ö"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Klicka här för att lägga till en kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Primär telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Sekreterartelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Arbetstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "Tillbakaringningstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Företagets telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Hemtelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Företagsadress"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Hemadress"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "Företagstelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "Hemtelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Annan telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Annan adress"
 
-#: addressbook/gui/widgets/e-minicard-control.c:183
+#: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
 msgstr "och %d andra kort."
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:187
 msgid "and one other card."
 msgstr "och ett annat kort."
 
-#: addressbook/gui/widgets/e-minicard-control.c:307
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Spara i adressboken"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2884,58 +2905,58 @@ msgstr "Bredd:"
 msgid "_Font..."
 msgstr "_Typsnitt..."
 
-#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "Skriv ut kort"
 
-#: addressbook/printing/e-contact-print.c:1172
-#: addressbook/printing/e-contact-print.c:1194
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "Skriv ut kort"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "Skriv ut kuvert"
 
-#: calendar/cal-util/cal-util.c:425 calendar/cal-util/cal-util.c:447
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "Hög"
 
-#: calendar/cal-util/cal-util.c:427 calendar/cal-util/cal-util.c:449
-#: calendar/gui/calendar-model.c:1705
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:409 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:429 calendar/cal-util/cal-util.c:451
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:410 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "Låg"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:445
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "Odefinierad"
 
-#: calendar/conduits/calendar/calendar-conduit.c:923
+#: calendar/conduits/calendar/calendar-conduit.c:935
 #: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Fel vid kommunikation med kalenderserver"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1050
-#: calendar/conduits/calendar/calendar-conduit.c:1053
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunde inte läsa pilotens kalenderprogramblock"
 
-#: calendar/conduits/todo/todo-conduit.c:752
-#: calendar/conduits/todo/todo-conduit.c:755
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunde inte läsa pilotens att-göra-programblock"
 
@@ -2991,23 +3012,23 @@ msgstr "Alarmaviseringstjänst"
 msgid "Factory for the alarm notification service"
 msgstr "Fabrik för alarmavsieringstjänsten"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:217
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Starting:"
 msgstr "Startar:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:219
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
 msgid "Ending:"
 msgstr "Slutar:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:232
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "ogiltig tid"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
 msgid "Evolution Alarm"
 msgstr "Evolution-alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:372
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm den %s"
@@ -3029,11 +3050,11 @@ msgstr "Slumringstid (minuter)"
 msgid "_Edit appointment"
 msgstr "_Redigera möte"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:671
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "Ingen beskrivning finns tillgänglig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:731
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3045,7 +3066,7 @@ msgstr ""
 "konfigurerad att skicka e-post. Evolution kommer att\n"
 "visa en normal dialogruta istället."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:782
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3062,113 +3083,114 @@ msgstr ""
 "\n"
 "Är du säker på att du vill köra detta program?"
 
-#: calendar/gui/alarm-notify/notify-main.c:167 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "Kunde inte initiera GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:182
+#: calendar/gui/alarm-notify/notify-main.c:181
 msgid "Could not create the alarm notify service"
 msgstr "Kunde inte skapa fabriken för alarmnotifieringstjänsten"
 
-#: calendar/gui/alarm-notify/notify-main.c:187
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunde inte skapa fabriken för alarmaviseringstjänsten"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunde inte skapa kalendervyn. Kontrollera din ORBit- och OAF-installation."
 
-#: calendar/gui/calendar-model.c:417 calendar/gui/calendar-model.c:998
-#: calendar/gui/e-calendar-table.c:387
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:420 calendar/gui/calendar-model.c:1000
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
-#: calendar/gui/calendar-model.c:423 calendar/gui/e-calendar-table.c:386
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "Publikt"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "Ö"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:596 calendar/gui/calendar-model.c:1151
-#: calendar/gui/e-calendar-table.c:460
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/calendar-model.c:598 calendar/gui/e-calendar-table.c:461
-#: calendar/gui/e-meeting-time-sel.c:410 shell/evolution-shell-component.c:994
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Upptagen"
 
-#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:481
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Inte startad"
 
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:482
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "Pågår"
 
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1203
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:483 calendar/gui/e-meeting-model.c:316
-#: calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "Färdigt"
 
-#: calendar/gui/calendar-model.c:1056
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3179,54 +3201,54 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1197 calendar/gui/dialogs/meeting-page.c:313
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1460
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:391
 #: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:453
-#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "Återkommande"
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Tilldelad"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:298 calendar/gui/e-meeting-model.c:524
-#: calendar/gui/e-meeting-model.c:720
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:300
-#: calendar/gui/e-meeting-model.c:721
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Nej"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:2014 calendar/gui/e-day-view.c:1675
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
 #: calendar/gui/e-week-view.c:1182
 msgid "Searching"
 msgstr "Söker"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Dagsvy"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Arbetsveckovy"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "Veckovy"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "Månadsvy"
 
@@ -3242,68 +3264,68 @@ msgstr "Beskrivningen innehåller"
 msgid "Comment contains"
 msgstr "Kommentaren innehåller"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1077
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr "Omatchade"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:7
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "Mapp som innehåller möten och evenemang"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:246 my-evolution/e-summary-tasks.c:262
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "Mapp som innehåller att-göra-objekt"
 
-#: calendar/gui/component-factory.c:643 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt möte"
 
-#: calendar/gui/component-factory.c:644 calendar/gui/e-day-view.c:3441
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "Nytt m_öte"
 
-#: calendar/gui/component-factory.c:649 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Skapa en ny uppgift"
 
-#: calendar/gui/component-factory.c:650
+#: calendar/gui/component-factory.c:649
 msgid "New _Task"
 msgstr "Ny _uppgift"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URI:n som kalendern kommer att visa"
 
-#: calendar/gui/dialogs/alarm-options.c:359
+#: calendar/gui/dialogs/alarm-options.c:358
 msgid "Audio Alarm Options"
 msgstr "Alternativ för ljudalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:367
 msgid "Message Alarm Options"
 msgstr "Alternativ för meddelandealarm"
 
-#: calendar/gui/dialogs/alarm-options.c:377
+#: calendar/gui/dialogs/alarm-options.c:376
 msgid "Mail Alarm Options"
 msgstr "Alternativ för e-postalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:385
 msgid "Program Alarm Options"
 msgstr "Alternativ för programalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:394
 msgid "Unknown Alarm Options"
 msgstr "Alternativ för okända alarm"
 
@@ -3356,110 +3378,110 @@ msgstr "timme"
 msgid "minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d dagar"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 dag"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d veckor"
 
-#: calendar/gui/dialogs/alarm-page.c:321
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 vecka"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d timmar"
 
-#: calendar/gui/dialogs/alarm-page.c:329
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 timme"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuter"
 
-#: calendar/gui/dialogs/alarm-page.c:337
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 minut"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
 
-#: calendar/gui/dialogs/alarm-page.c:345
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Spela ett ljud"
 
-#: calendar/gui/dialogs/alarm-page.c:378
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Visa ett meddelande"
 
-#: calendar/gui/dialogs/alarm-page.c:382
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Skicka ett brev"
 
-#: calendar/gui/dialogs/alarm-page.c:386
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Kör ett program"
 
-#: calendar/gui/dialogs/alarm-page.c:392
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Unknown action to be performed"
 msgstr "Okänd åtgärd att utföra"
 
-#: calendar/gui/dialogs/alarm-page.c:404
+#: calendar/gui/dialogs/alarm-page.c:403
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s innan starten på mötet"
 
-#: calendar/gui/dialogs/alarm-page.c:407
+#: calendar/gui/dialogs/alarm-page.c:406
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s innan starten på mötet"
 
-#: calendar/gui/dialogs/alarm-page.c:412
+#: calendar/gui/dialogs/alarm-page.c:411
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s innan starten på mötet"
 
-#: calendar/gui/dialogs/alarm-page.c:421
+#: calendar/gui/dialogs/alarm-page.c:420
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s innan starten på mötet"
 
-#: calendar/gui/dialogs/alarm-page.c:424
+#: calendar/gui/dialogs/alarm-page.c:423
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s efter slut på möte"
 
-#: calendar/gui/dialogs/alarm-page.c:429
+#: calendar/gui/dialogs/alarm-page.c:428
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s efter slut på möte"
 
-#: calendar/gui/dialogs/alarm-page.c:454
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr "%s vid %s"
 
-#: calendar/gui/dialogs/alarm-page.c:460
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s för en okänd triggertyp"
@@ -3480,7 +3502,7 @@ msgstr "Påminnelser"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:687 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammanfattning:"
 
@@ -3563,7 +3585,7 @@ msgid "First day of wee_k:"
 msgstr "F_örsta dagen i veckan:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:962
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "fredag"
 
@@ -3576,7 +3598,7 @@ msgid "Minutes"
 msgstr "minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "måndag"
 
@@ -3585,7 +3607,7 @@ msgid "O_verdue tasks:"
 msgstr "Uppgi_fter som skulle ha utförts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "lördag"
 
@@ -3606,7 +3628,7 @@ msgid "Su_n"
 msgstr "_sön"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "söndag"
 
@@ -3623,7 +3645,7 @@ msgid "Tas_ks due today:"
 msgstr "U_ppgifter som ska ha utförts idag:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "torsdag"
 
@@ -3644,12 +3666,12 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "tisdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:960
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "onsdag"
 
@@ -3718,121 +3740,121 @@ msgstr "_ons"
 msgid "before the start of the appointment"
 msgstr "innan starten på mötet"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr "Mötestatusen har ändrats. Skicka en uppdaterad version?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Är du säker på att du vill avboka och ta bort detta möte?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Är du säker på att du vill avbryta och ta bort denna uppgift?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Är du säker på att du vill avbryta ta bort denna dagbokspost?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Detta evenemang har tagits bort."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Denna uppgift har tagits bort."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Denna dagbokspost har tagits bort."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har gjort ändringar. Glöm dessa ändringar och stäng redigeraren?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Du har inte gjort några ändringar, stäng redigeraren?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Detta evenemang har ändrats."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Denna uppgift har ändrats."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Denna dagbokspost har ändrats."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Du har gjort ändringar. Glöm dessa ändringar och uppdatera redigeraren?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har inte gjort några ändringar, uppdatera redigeraren?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " till "
 
-#: calendar/gui/dialogs/comp-editor-util.c:182 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (Färdigt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:184 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "Färdigt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:189 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr " (Ska utföras "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "Ska utföras "
 
-#: calendar/gui/dialogs/comp-editor.c:304
+#: calendar/gui/dialogs/comp-editor.c:303
 msgid "Could not update object!"
 msgstr "Kunde inte uppdatera objekt!"
 
-#: calendar/gui/dialogs/comp-editor.c:672
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: calendar/gui/dialogs/comp-editor.c:677
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:680
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagbokspost - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: calendar/gui/dialogs/comp-editor.c:1047 mail/mail-callbacks.c:1846
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
 #: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: calendar/gui/dialogs/comp-editor.c:1051 mail/mail-callbacks.c:1853
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
 #: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
@@ -3841,53 +3863,53 @@ msgstr ""
 "Det finns redan en fil med det namnet.\n"
 "Ska den skrivas över?"
 
-#: calendar/gui/dialogs/comp-editor.c:1095 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1250
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "Kunde inte få tag i aktuell version!"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Är du säker på att du vill ta bort mötet \"%s\""
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Är du säker på att du vill ta bort detta namnlösa möte?"
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Är du säker på att du vill ta bort uppgiften \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Är du säker på att du vill ta bort denna namnlösa uppgift?"
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Är du säker på att du vill ta bort dagboksposten \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Är du säker på att du vill ta bort denna namnlösa dagbokspost?"
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Är du säker på att du vill ta bort %d möten?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Är du säker på att du vill ta bort %d uppgifter?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Är du säker på att du vill ta bort %d dagboksposter?"
@@ -3904,25 +3926,25 @@ msgstr "Delegera till:"
 msgid "Enter Delegate"
 msgstr "Ange delegerad person"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Möte"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "Påminnelse"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Upprepning"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:355
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr "Schemaläggning"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:358
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "Möte"
 
@@ -3982,15 +4004,19 @@ msgstr "Slutti_d:"
 msgid "_Start time:"
 msgstr "_Starttid:"
 
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "En organisatör krävs."
 
-#: calendar/gui/dialogs/meeting-page.c:624
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
+msgstr "Det måste finnas åtminstone en närvarande person."
+
+#: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr "Personen är redan närvarande på mötet!"
 
-#: calendar/gui/dialogs/meeting-page.c:697
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "_Delegera till..."
 
@@ -4030,7 +4056,7 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "OSA"
@@ -4064,34 +4090,35 @@ msgid "_Change Organizer"
 msgstr "_Ändra organisatör"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "_Bjud in andra"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
+msgstr "Bjud _in andra..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr "_Annan organisatör"
 
-#: calendar/gui/dialogs/recurrence-page.c:572
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Detta möte har upprepningsregler som inte kan redigeras med Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:931
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "vid"
 
-#: calendar/gui/dialogs/recurrence-page.c:957 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1087
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1095
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr ":e"
 
-#: calendar/gui/dialogs/recurrence-page.c:1268
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "förekomster"
 
@@ -4155,19 +4182,15 @@ msgstr "veckor"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Vill du spara ändringar?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Mötesinformationen har ändrats. Skicka en uppdaterad version?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr "Uppgiftsinformationen har ändrats. Skicka en uppdaterad version?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr "Dagboksposten har ändrats. Skicka en uppdaterad version?"
 
@@ -4186,7 +4209,7 @@ msgid "Progress"
 msgstr "Förlopp"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:951
+#: my-evolution/e-summary-preferences.c:945
 msgid "URL:"
 msgstr "URL:"
 
@@ -4198,12 +4221,13 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:191
-#: calendar/gui/dialogs/task-editor.c:320
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "Tilldelning"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:696
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
@@ -4217,122 +4241,132 @@ msgstr "Sta_rtdatum:"
 msgid "_Due Date:"
 msgstr "Förfallo_datum:"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:436
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:439
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:937 calendar/gui/e-day-view.c:3462
-#: calendar/gui/e-week-view.c:3320 mail/folder-browser.c:1444
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+msgid "Deleting selected objects"
+msgstr "Tar bort markerade objekt"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "_Öppna"
 
-#: calendar/gui/e-calendar-table.c:941 calendar/gui/e-day-view.c:3471
-#: calendar/gui/e-week-view.c:3329 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3473
-#: calendar/gui/e-week-view.c:3331 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3448
-#: calendar/gui/e-day-view.c:3475 calendar/gui/e-week-view.c:3307
-#: calendar/gui/e-week-view.c:3333 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: calendar/gui/e-calendar-table.c:950
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "_Markera som färdig"
 
-#: calendar/gui/e-calendar-table.c:952
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr "_Ta bort denna uppgift"
 
-#: calendar/gui/e-calendar-table.c:955
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr "_Markera uppgifterna som färdiga"
 
-#: calendar/gui/e-calendar-table.c:957
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "_Ta bort markerade uppgifter"
 
-#: calendar/gui/e-calendar-table.c:1217
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr "Uppdaterar objekt"
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klicka för att lägga till en uppgift"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y-%m-%d %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:123 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %H.%M.%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:128
+#: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4348,7 +4382,7 @@ msgid "Alarms"
 msgstr "Alarm"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
-#: camel/camel-filter-driver.c:837
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "Färdigt"
 
@@ -4379,8 +4413,8 @@ msgstr "Startdatum"
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1461 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1460 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Sammanfattning"
 
@@ -4392,383 +4426,383 @@ msgstr "Sortera efter uppgift"
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutdivisioner"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1387
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 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:293 calendar/gui/e-day-view.c:1414
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 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:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:769
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "fm"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
-#: calendar/gui/print.c:771
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "em"
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3302
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsarrangemang"
 
-#: calendar/gui/e-day-view.c:3453 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Gå till _idag"
 
-#: calendar/gui/e-day-view.c:3455 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "_Gå till datum..."
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3322
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "_Ta bort detta möte"
 
-#: calendar/gui/e-day-view.c:3483 calendar/gui/e-week-view.c:3347
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "Gör denna förekomst _flyttbar"
 
-#: calendar/gui/e-day-view.c:3485 calendar/gui/e-week-view.c:3349
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: calendar/gui/e-day-view.c:3487 calendar/gui/e-week-view.c:3351
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
-#: calendar/gui/e-itip-control.c:475
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr "Mötet börjar: <b>"
 
-#: calendar/gui/e-itip-control.c:480
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr "Uppgiften börjar: <b>"
 
-#: calendar/gui/e-itip-control.c:485
+#: calendar/gui/e-itip-control.c:534
 msgid "Free/Busy info begins: <b>"
 msgstr "Ledig-/upptageninformation börjar: <b>"
 
-#: calendar/gui/e-itip-control.c:489
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr "Börjar: <b>"
 
-#: calendar/gui/e-itip-control.c:502
+#: calendar/gui/e-itip-control.c:550
 msgid "Meeting ends: <b>"
 msgstr "Mötet slutar: <b>"
 
-#: calendar/gui/e-itip-control.c:505
+#: calendar/gui/e-itip-control.c:553
 msgid "Free/Busy info ends: <b>"
 msgstr "Ledig-/upptageninformation slutar: <b>"
 
-#: calendar/gui/e-itip-control.c:509
+#: calendar/gui/e-itip-control.c:557
 msgid "Ends: <b>"
 msgstr "Slutar: <b>"
 
-#: calendar/gui/e-itip-control.c:521
+#: calendar/gui/e-itip-control.c:571
 msgid "Task Completed: <b>"
 msgstr "Uppgiften färdig: <b>"
 
-#: calendar/gui/e-itip-control.c:531
+#: calendar/gui/e-itip-control.c:581
 msgid "Task Due: <b>"
 msgstr "Uppgiften ska vara utförd: <b>"
 
-#: calendar/gui/e-itip-control.c:568 calendar/gui/e-itip-control.c:617
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:633
 msgid "iCalendar Error"
 msgstr "iCalendar-fel"
 
-#: calendar/gui/e-itip-control.c:648 calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
 msgid "An unknown person"
 msgstr "En okänd person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:671
+#: calendar/gui/e-itip-control.c:721
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Granska följande information, och välj sedan en åtgärd från menyn nedan."
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:737
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:728 calendar/gui/e-itip-control.c:744
-#: calendar/gui/e-itip-control.c:760 calendar/gui/e-itip-control.c:773
-#: calendar/gui/e-itip-control.c:787 calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
 msgid "Choose an action:"
 msgstr "Välj en åtgärd:"
 
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:779
 msgid "Update"
 msgstr "Uppdatera"
 
-#: calendar/gui/e-itip-control.c:730 calendar/gui/e-itip-control.c:749
-#: calendar/gui/e-itip-control.c:762 calendar/gui/e-itip-control.c:775
-#: calendar/gui/e-itip-control.c:789 calendar/gui/e-itip-control.c:803
-#: shell/e-shell.c:1881 widgets/misc/e-cell-date-edit.c:249
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:745
+#: calendar/gui/e-itip-control.c:795
 msgid "Accept"
 msgstr "Acceptera"
 
-#: calendar/gui/e-itip-control.c:746
+#: calendar/gui/e-itip-control.c:796
 msgid "Tentatively accept"
 msgstr "Acceptera preliminärt"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:797
 msgid "Decline"
 msgstr "Neka"
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:811
 msgid "Send Free/Busy Information"
 msgstr "Skicka ledig-/upptageninformation"
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:824
 msgid "Update respondent status"
 msgstr "Uppdatera svarandestatus"
 
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:838
 msgid "Send Latest Information"
 msgstr "Skicka senaste information"
 
-#: calendar/gui/e-itip-control.c:802 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publicerat mötesinformation."
 
-#: calendar/gui/e-itip-control.c:818
+#: calendar/gui/e-itip-control.c:868
 msgid "Meeting Information"
 msgstr "Mötesinformation"
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> begär din närvaro vid ett möte."
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:873
 msgid "Meeting Proposal"
 msgstr "Mötesförslag"
 
-#: calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> vill lägga till i ett befintligt möte."
 
-#: calendar/gui/e-itip-control.c:828
+#: calendar/gui/e-itip-control.c:878
 msgid "Meeting Update"
 msgstr "Mötesuppdatering"
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> vill få den senaste mötesinformationen."
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr "Begäran av mötesuppdatering"
 
-#: calendar/gui/e-itip-control.c:837
+#: calendar/gui/e-itip-control.c:887
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svarat på en mötesbegäran."
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:888
 msgid "Meeting Reply"
 msgstr "Mötessvar"
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har avbokat ett möte."
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:893
 msgid "Meeting Cancellation"
 msgstr "Mötesavbokning"
 
-#: calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:897
-#: calendar/gui/e-itip-control.c:932
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har skickat ett obegripligt meddelande."
 
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:898
 msgid "Bad Meeting Message"
 msgstr "Felaktigt mötesmeddelande"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publicerat mötesinformation."
 
-#: calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:918
 msgid "Task Information"
 msgstr "Uppgiftsinformation"
 
-#: calendar/gui/e-itip-control.c:872
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> begär att du utför en uppgift."
 
-#: calendar/gui/e-itip-control.c:873
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr "Uppgiftsförslag"
 
-#: calendar/gui/e-itip-control.c:877
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> vill lägga till i en befintlig uppgift."
 
-#: calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:928
 msgid "Task Update"
 msgstr "Uppgiftsuppdatering"
 
-#: calendar/gui/e-itip-control.c:882
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> vill få den senaste uppgiftsinformationen."
 
-#: calendar/gui/e-itip-control.c:883
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr "Begäran om uppgiftsuppdatering"
 
-#: calendar/gui/e-itip-control.c:887
+#: calendar/gui/e-itip-control.c:937
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svarat på en uppgiftstilldelning."
 
-#: calendar/gui/e-itip-control.c:888
+#: calendar/gui/e-itip-control.c:938
 msgid "Task Reply"
 msgstr "Uppgiftssvar"
 
-#: calendar/gui/e-itip-control.c:892
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har avbokat en uppgift."
 
-#: calendar/gui/e-itip-control.c:893
+#: calendar/gui/e-itip-control.c:943
 msgid "Task Cancellation"
 msgstr "Uppgiftsavbokning"
 
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:948
 msgid "Bad Task Message"
 msgstr "Felaktigt uppgiftsmeddelande"
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:967
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publicerat ledig-/upptageninformation."
 
-#: calendar/gui/e-itip-control.c:918
+#: calendar/gui/e-itip-control.c:968
 msgid "Free/Busy Information"
 msgstr "Ledig-/upptageninformation"
 
-#: calendar/gui/e-itip-control.c:922
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> begär din ledig-/upptageninformation."
 
-#: calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr "Ledig-/Upptagenbegäran"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:977
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> har svarat på en ledig-/upptagenbegäran."
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr "Ledig-/Upptagensvar"
 
-#: calendar/gui/e-itip-control.c:933
+#: calendar/gui/e-itip-control.c:983
 msgid "Bad Free/Busy Message"
 msgstr "Felaktigt ledig-/upptagenmeddelande"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr "Meddelandet verkar inte vara korrekt utformat"
 
-#: calendar/gui/e-itip-control.c:1021
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr "Meddelandet innehåller typer av begäran som inte stöds."
 
-#: calendar/gui/e-itip-control.c:1049 calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilagan innehåller inte ett giltigt kalendermeddelande"
 
-#: calendar/gui/e-itip-control.c:1080
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilagan har inga visningsbara kalenderobjekt"
 
-#: calendar/gui/e-itip-control.c:1179
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunde inte uppdateras!\n"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "Uppdateringen färdig\n"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Närvarandestatus kunde inte uppdateras på grund av ogiltig status!\n"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr "Närvarandestatus kunde inte uppdateras!\n"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr "Närvarandestatus är uppdaterad\n"
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Närvarandestatusen kan inte uppdateras eftersom objektet inte längre finns"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Jag kunde inte ta bort objektet från din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "Borttagning färdig"
 
-#: calendar/gui/e-itip-control.c:1300 calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "Objektet skickat!\n"
 
-#: calendar/gui/e-itip-control.c:1302 calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr "Objektet kunde inte skickas!\n"
 
-#: calendar/gui/e-itip-control.c:1502
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr "Kan inte hitta någon av dina identiteter i närvarandelistan!\n"
 
@@ -4809,216 +4843,211 @@ msgstr "slutdatum"
 msgid "date-start"
 msgstr "startdatum"
 
-#: calendar/gui/e-meeting-model.c:219 calendar/gui/e-meeting-model.c:236
-#: calendar/gui/e-meeting-model.c:520 calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr "Ordförandepersoner"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "Nödvändiga deltagare"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "Valfria deltagare"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "Icke-deltagare"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "Person"
 
-#: calendar/gui/e-meeting-model.c:221 calendar/gui/e-meeting-model.c:238
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "Grupp"
 
-#: calendar/gui/e-meeting-model.c:223 calendar/gui/e-meeting-model.c:240
-#: calendar/gui/e-meeting-model.c:690
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "Resurs"
 
-#: calendar/gui/e-meeting-model.c:225 calendar/gui/e-meeting-model.c:242
-#: calendar/gui/e-meeting-model.c:691
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "Rum"
 
-#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:279
-#: calendar/gui/e-meeting-model.c:344 calendar/gui/e-meeting-model.c:692
-#: calendar/gui/e-meeting-model.c:708
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "Okänd"
 
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:271
-#: calendar/gui/e-meeting-model.c:704
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "Mötesordförande"
 
-#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:273
-#: calendar/gui/e-meeting-model.c:522 calendar/gui/e-meeting-model.c:705
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "Nödvändig deltagare"
 
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:275
-#: calendar/gui/e-meeting-model.c:706
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Valfri deltagare"
 
-#: calendar/gui/e-meeting-model.c:260 calendar/gui/e-meeting-model.c:277
-#: calendar/gui/e-meeting-model.c:707
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "Icke-deltagare"
 
-#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:733
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "Behöver åtgärd"
 
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:331
-#: calendar/gui/e-meeting-model.c:734
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "Godtaget"
 
-#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:333
-#: calendar/gui/e-meeting-model.c:735
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "Avböjt"
 
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:335
-#: calendar/gui/e-meeting-model.c:736 calendar/gui/e-meeting-time-sel.c:409
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Preliminärt"
 
-#: calendar/gui/e-meeting-model.c:314 calendar/gui/e-meeting-model.c:337
-#: calendar/gui/e-meeting-model.c:737
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "Delegerat"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "Pågår"
 
-#: calendar/gui/e-meeting-model.c:1350 calendar/gui/e-meeting-model.c:1463
-msgid "Chair Persons"
-msgstr "Ordförandepersoner"
-
-#: calendar/gui/e-meeting-model.c:1351 calendar/gui/e-meeting-model.c:1418
-#: calendar/gui/e-meeting-model.c:1465
-msgid "Required Participants"
-msgstr "Nödvändiga deltagare"
-
-#: calendar/gui/e-meeting-model.c:1352 calendar/gui/e-meeting-model.c:1467
-msgid "Optional Participants"
-msgstr "Valfria deltagare"
-
-#: calendar/gui/e-meeting-model.c:1353 calendar/gui/e-meeting-model.c:1469
-msgid "Non-Participants"
-msgstr "Icke-deltagare"
-
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:473
-#: calendar/gui/e-meeting-time-sel.c:2024
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:2023
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:477
-#: calendar/gui/e-meeting-time-sel.c:2052 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %Y-%m-%d"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:481 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "Inte inne"
 
-#: calendar/gui/e-meeting-time-sel.c:412
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "Ingen information"
 
-#: calendar/gui/e-meeting-time-sel.c:428
-msgid "_Invite Others..."
-msgstr "Bjud _in andra..."
-
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Alternativ"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Visa _endast arbetstimmar"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "Visa ut_zoomade"
 
-#: calendar/gui/e-meeting-time-sel.c:496
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "_Uppdatera ledig/upptagen"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "_Autovälj"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "_Alla människor och resurser"
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "Alla _människor och en resurs"
 
-#: calendar/gui/e-meeting-time-sel.c:588
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "Folk som k_rävs"
 
-#: calendar/gui/e-meeting-time-sel.c:601
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "Folk som krävs _och en resurs"
 
-#: calendar/gui/e-meeting-time-sel.c:624
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "Mötets _starttid:"
 
-#: calendar/gui/e-meeting-time-sel.c:643
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "Mötets slu_ttid:"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:328
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Öppnar uppgifter i %s"
 
-#: calendar/gui/e-tasks.c:356
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunde inte läsa in uppgifterna i \"%s\""
 
-#: calendar/gui/e-tasks.c:368
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som krävs för att läsa in \"%s\" stöds inte"
 
-#: calendar/gui/e-week-view.c:3300 calendar/gui/e-week-view.c:3338
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1489
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunde inte öppna mappen i \"%s\""
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1500
 #, 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"
 
-#: calendar/gui/gnome-cal.c:1684
+#: calendar/gui/gnome-cal.c:1855
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Öppnar kalender i %s"
@@ -5079,236 +5108,269 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:244
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr "Det måste finnas åtminstone en närvarande person"
 
-#: calendar/gui/itip-utils.c:275
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "En organisatör måste vara angiven."
 
-#: calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:570
 msgid "You must be an attendee of the event."
 msgstr "Du måste vara närvarande på detta evenemang."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:91
 msgid "Could not create the component editor factory"
 msgstr "Kunde inte skapa komponentredigerarfabriken"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1:a"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2:a"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3:e"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4:e"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5:e"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6:e"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7:e"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8:e"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9:e"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10:e"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11:e"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12:e"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13:e"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14:e"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15:e"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16:e"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17:e"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18:e"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19:e"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20:e"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21:a"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22:a"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23:e"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24:e"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25:e"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26:e"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27:e"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28:e"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29:e"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30:e"
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31:a"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "Sö"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Må"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Ti"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "On"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "To"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "Lö"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Markerad dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Markerad vecka (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "Markerad månad (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "Markerat år (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr "Uppgift"
+
+#: calendar/gui/print.c:2262
+#, c-format
+msgid "Status: %s"
+msgstr "Status: %s"
+
+#: calendar/gui/print.c:2280
+#, c-format
+msgid "Priority: %s"
+msgstr "Prioritet: %s"
+
+#: calendar/gui/print.c:2294
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Procent klar: %i"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2320
+#, c-format
+msgid "Categories: %s"
+msgstr "Kategorier: %s"
+
+#: calendar/gui/print.c:2331
+msgid "Contacts: "
+msgstr "Kontakter: "
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2307 my-evolution/e-summary.c:607
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Förhandsgranska"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Skriv ut objekt"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Skrivarinställningar"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URI:t som uppgiftsmappen ska visa"
 
-#: calendar/gui/tasks-control-factory.c:76
+#: calendar/gui/tasks-control-factory.c:75
 msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunde inte skapa uppgiftsvyn. Kontrollera din ORBit- och OAF-installation."
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
@@ -5316,7 +5378,7 @@ msgstr ""
 "Evolution har tagit de uppgifter som var i din kalendermapp och automatiskt "
 "flyttat dem till den nya uppgiftsmappen."
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5328,7 +5390,7 @@ msgstr ""
 "En del av dessa uppgifter kunde inte flyttas, så detta förfarande kan "
 "försökas igen i framtiden."
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5337,7 +5399,7 @@ msgstr ""
 "Kunde inte öppna \"%s\"; inga objekt från kalendermappen kommer att flyttas "
 "till uppgiftsmappen."
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -5346,84 +5408,84 @@ msgstr ""
 "Metoden som krävs för att läsa in \"%s\" stöds inte; inga objekt från "
 "kalendermappen kommer att flyttas till uppgiftsmappen."
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
-#: calendar/pcs/query.c:235
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr "time-now förväntar sig 0 argument"
 
-#: calendar/pcs/query.c:259
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr "make-time förväntar sig 1 argument"
 
-#: calendar/pcs/query.c:264
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time förväntar sig att argument 1 är en sträng"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "argument 1 till make-time måste vara en datum-/tidssträng enligt ISO 8601"
 
-#: calendar/pcs/query.c:301
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day förväntar sig 2 argument"
 
-#: calendar/pcs/query.c:306
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day förväntar sig att argument 1 är en time_t"
 
-#: calendar/pcs/query.c:313
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day förväntar sig att argument 2 är ett heltal"
 
-#: calendar/pcs/query.c:340
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin förväntar sig 1 argument"
 
-#: calendar/pcs/query.c:345
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin förväntar sig att argument 1 är en time_t"
 
-#: calendar/pcs/query.c:372
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end förväntar sig 1 argument"
 
-#: calendar/pcs/query.c:377
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end förväntar sig att argument 1 är en time_t"
 
-#: calendar/pcs/query.c:413
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype förväntar sig 0 argument"
 
-#: calendar/pcs/query.c:509
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? förväntar sig 2 argument"
 
-#: calendar/pcs/query.c:514
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? förväntar sig att argument 1 är en time_t"
 
-#: calendar/pcs/query.c:521
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? förväntar sig att argument 2 är en time_t"
 
-#: calendar/pcs/query.c:651
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr "contains? förväntar sig 2 argument"
 
-#: calendar/pcs/query.c:656
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? förväntar sig att argument 1 är en sträng"
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? förväntar sig att argument 2 är en sträng"
 
-#: calendar/pcs/query.c:680
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -5431,11 +5493,11 @@ msgstr ""
 "contains? förväntar sig att argument 1 är ett av \"any\", \"summary\", eller "
 "\"description\""
 
-#: calendar/pcs/query.c:722
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? förväntar sig minst 1 argument"
 
-#: calendar/pcs/query.c:734
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -5443,19 +5505,19 @@ msgstr ""
 "has-categories? förväntar sig att alla argument är strängar eller att ett "
 "och endast ett argument är booleskt falsk (#f)"
 
-#: calendar/pcs/query.c:822
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? förväntar sig 0 argument"
 
-#: calendar/pcs/query.c:867
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? förväntar sig 1 argument"
 
-#: calendar/pcs/query.c:872
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? förväntar sig att argument 1 är en time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Evaluering av sökuttrycket gav inget booleskt värde"
 
@@ -5479,7 +5541,7 @@ msgstr "Kryptering stöds inte av detta chiffer"
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering stöds inte av detta chiffer"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5490,7 +5552,7 @@ msgstr ""
 "Ytterligare åtgärder på denna server kommer inte att spelas tillbaka\n"
 "då du återansluter till nätverket."
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5501,15 +5563,15 @@ msgstr ""
 "%s\n"
 "Ändringar i denna mapp kommer inte att återsynkroniseras."
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr "Återsynkroniserar med servern"
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr "Du måste vara ansluten för att kunna genomföra denna åtgärd"
 
-#: camel/camel-filter-driver.c:552 camel/camel-filter-driver.c:561
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Synkroniserar mappar"
 
@@ -5535,26 +5597,26 @@ msgstr "Misslyckades med meddelande %d"
 msgid "Cannot open message"
 msgstr "Kan inte öppna meddelande"
 
-#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Synkroniserar mapp"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Hämtar meddelande %d av %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Misslyckades vid meddelande %d av %d"
 
-#: camel/camel-filter-driver.c:921
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fel vid tolkning av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:927
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fel vid körning av filter: %s: %s"
@@ -5564,26 +5626,26 @@ msgstr "Fel vid körning av filter: %s: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fel vid körning av filtersökning: %s: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Åtgärden stöds inte: lägg till meddelande: för %s"
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Åtgärden stöds inte: sökning med uttryck: för %s"
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Åtgärden stöds inte: sökning med uid: för %s"
 
-#: camel/camel-folder.c:1269
+#: camel/camel-folder.c:1262
 msgid "Moving messages"
 msgstr "Flyttar meddelanden"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5592,7 +5654,7 @@ msgstr ""
 "Kan inte tolka sökuttrycket: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5601,110 +5663,110 @@ msgstr ""
 "Fel vid körning av sökuttrycket: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(matcha-alla) kräver ett ensamt booleskt resultat"
 
-#: camel/camel-folder-search.c:639
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Utför fråga på okänt huvud: %s"
 
-#: camel/camel-folder-search.c:749 camel/camel-folder-search.c:793
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ogiltig typ i \"body-contains\", förväntar sträng"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Kunde inte skapa låsande hjälpprogramsrör: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Kan inte grena låsande hjälpprogram: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Kunde inte låsa \"%s\": protokollfel med låshjälpprogram"
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Kunde inte låsa \"%s\""
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Kunde inte skapa låsfil för %s: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Gjorde time-out när låsfil skulle fås för %s. Försök igen senare."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Misslyckades med att få lås med fcntl(2): %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Misslyckades med att få lås med flock(2): %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Kunde inte kontrollera brevlådefilen %s: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kunde inte öppna brevlådefilen %s: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Kunde inte öppna temporära brevlådefilen %s: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Misslyckades med att lagra e-post i temporära filen %s: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kunde inte skapa rör: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Kunde inte grena: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Programmet movemail misslyckades: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Okänt fel)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Fel vid läsning av brevlådefil: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Fel vid skrivande av temporär brevlådefil: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Fel vid kopierande av temporär brevfil: %s"
@@ -5719,82 +5781,82 @@ msgstr "Ange din %s-lösenordsfras för %s"
 msgid "Please enter your %s passphrase"
 msgstr "Ange din %s-lösenordsfras"
 
-#: camel/camel-pgp-context.c:554
+#: camel/camel-pgp-context.c:561
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Kan inte signera detta meddelande: ingen klartext att signera"
 
-#: camel/camel-pgp-context.c:561 camel/camel-pgp-context.c:735
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr "Kan inte signera detta meddelande: inget lösenord angavs"
 
-#: camel/camel-pgp-context.c:567 camel/camel-pgp-context.c:741
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kan inte signera detta meddelande: kunde inte skapa rör till GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:728
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Kan inte signera detta meddelande: ingen klartext att klartextsignera"
 
-#: camel/camel-pgp-context.c:920
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Kan inte veridiera detta meddelande: ingen klartext att verifiera"
 
-#: camel/camel-pgp-context.c:926
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kan inte verifiera detta meddelande: kunde inte skapa rör till GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:937
+#: camel/camel-pgp-context.c:956
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Kan inte verifiera detta meddelande: kunde inte skapa temporär fil: %s"
 
-#: camel/camel-pgp-context.c:1104
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Kan inte kryptera detta meddelande: ingen klartext att kryptera"
 
-#: camel/camel-pgp-context.c:1114
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Kan inte kryptera detta meddelande: inget lösenord angavs"
 
-#: camel/camel-pgp-context.c:1121
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kan inte kryptera detta meddelande: kunde inte skapa rör till GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1130
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Kan inte kryptera detta meddelande: inga mottagare är angivna"
 
-#: camel/camel-pgp-context.c:1292
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Kan inte dekryptera detta meddelande: ingen klartext att dekryptera"
 
-#: camel/camel-pgp-context.c:1300
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Kan inte dekryptera detta meddelande: inget lösenord angavs"
 
-#: camel/camel-pgp-context.c:1307
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kan inte dekryptera detta meddelande: kunde inte skapa rör till GPG/PGP: %s"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Kunde inte läsa in %s: Modulinläsning stöds inte på detta system."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunde inte läsa in %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunde inte läsa in %s: Ingen initieringskod i modulen."
@@ -5814,7 +5876,7 @@ msgid "Connection cancelled"
 msgstr "Anslutning avbruten"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunde inte ansluta till %s (port %d): %s"
@@ -5824,12 +5886,12 @@ msgid "(unknown host)"
 msgstr "(okänd värd)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Åtgärden avbruten"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Servern kopplade ifrån oväntat: %s"
@@ -5942,7 +6004,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Felaktigt autentiseringssvar från servern."
 
@@ -5960,8 +6022,8 @@ msgid "Unknown authentication state."
 msgstr "Okänt autentiseringstillstånd."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:52
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Lösenord"
 
@@ -5992,55 +6054,55 @@ msgstr "POP innan SMTP-auktorisering med en källa som inte är POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Misslyckades med kompilering av reguljärt uttryck: %s: %s"
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL:en \"%s\" behöver ett användarnamn"
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL:en \"%s\" behöver ett värdnamn"
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL:en \"%s\" behöver en sökväg"
 
-#: camel/camel-service.c:612
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "Slår upp: %s"
 
-#: camel/camel-service.c:639
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Namnuppslagning misslyckades: %s"
 
-#: camel/camel-service.c:664
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Uppslagning av värdnamn misslyckades: %s: värden kunde inte hittas"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Uppslagning av värdnamn misslyckades: %s: okänd orsak"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "E-postleverantör för virtuell mapp"
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 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:347 camel/camel-session.c:416
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Det finns ingen leverantör för protokollet \"%s\""
 
-#: camel/camel-session.c:533
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6087,15 +6149,15 @@ msgstr "Misslyckades med att avkoda meddelandet."
 msgid "Failed to verify certificates."
 msgstr "Misslyckades med att verifiera certifikat."
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan inte få tag i mapp: Ogiltig åtgärd på detta lager"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan inte skapa mapp: Ogiltig åtgärd på detta lager"
 
-#: camel/camel-tcp-stream-openssl.c:541
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6105,7 +6167,7 @@ msgstr ""
 "Ämne: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:546 camel/camel-tcp-stream-ssl.c:421
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6120,7 +6182,7 @@ msgstr ""
 "\n"
 "Vill du acceptera ändå?"
 
-#: camel/camel-tcp-stream-ssl.c:405
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6139,37 +6201,37 @@ msgstr ""
 "Stat: %s\n"
 "Land: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Kunde inte tolka URL:en \"%s\""
 
-#: camel/camel-vee-folder.c:586
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Det finns inget sådant meddelande %s i %s"
 
-#: camel/camel-vee-folder.c:747
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "Det finns inget sådant meddelande: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan inte ta bort mapp: %s: Ogiltig åtgärd"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan inte ta bort mapp: %s: Det finns ingen sådan mapp"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan inte byta namn på mapp: %s: Ogiltig åtgärd"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan inte byta namn på mapp: %s: Det finns ingen sådan mapp"
@@ -6202,52 +6264,52 @@ 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:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kunde inte skapa katalogen %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, 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:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen förstördes och återskapades på servern."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "Letar efter ändrade meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 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:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr "Hämtar meddelandeinformation för nya meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "Letar efter nya meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Kunde inte öppna cachekatalogen: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:243
-#: camel/providers/imap/camel-imap-message-cache.c:300
-#: camel/providers/imap/camel-imap-message-cache.c:331
-#: camel/providers/imap/camel-imap-message-cache.c:363
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Misslyckades med att cacha meddelande %s: %s"
@@ -6260,7 +6322,7 @@ msgstr "Kontroll av ny e-post"
 msgid "Check for new messages in all folders"
 msgstr "Kontrollera nya meddelanden i alla mappar"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:840
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Mappar"
 
@@ -6293,28 +6355,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:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:527
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Inget stöd för autentiseringstypen %s"
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sAnge IMAP-lösenordet för %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Du angav inte något lösenord."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6325,88 +6387,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "Det finns ingen mapp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Föräldermappen får inte innehålla undermappar"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "Brevlådekataloger i MH-format"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr "För lagrande av lokal e-post i MH-liknande brevlådekataloger."
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr "Lokal leverans"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "För hämtande av lokal e-post i mbox-standardformaterade brevlådor."
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 msgid "Apply filters to new messages in INBOX"
 msgstr "Tillämpa filtren på nya meddelanden i INBOX"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:68
 msgid "Maildir-format mail directories"
 msgstr "Brevlådekataloger i maildir-format"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 msgid "For storing local mail in maildir directories."
 msgstr "För lagrande av lokal e-post i maildir-kataloger."
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr "Unix mbox-standardbrevlåda"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "För läsande och lagrande av lokal e-post i mbox-standardspoolfiler."
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagringsroten %s är inte en absolut sökväg"
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Lagringsroten %s är ingen vanlig katalog"
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kan inte få mapp: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "Lokala lager har ingen inkorg"
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal brevlådefil %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunde inte byta namn på mappen %s till %s: %s"
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kunde inte ta bort mappsammanfattningsfilen \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunde inte ta bort mappindexfilen \"%s\": %s"
@@ -6417,27 +6481,27 @@ msgid "Could not save summary: %s: %s"
 msgstr "Kunde inte spara sammanfattningen: %s: %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunde inte lägga till meddelandet i sammanfattningen: okänd orsak"
 
-#: camel/providers/local/camel-maildir-folder.c:182
+#: camel/providers/local/camel-maildir-folder.c:181
 msgid "Maildir append message cancelled"
 msgstr "Tillägg av meddelande i brevlådekatalog avbröts"
 
-#: camel/providers/local/camel-maildir-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan inte lägga till meddelande i mapp för brevlådekatalog: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-maildir-folder.c:222
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-mh-folder.c:208
-#: camel/providers/local/camel-mh-folder.c:216
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6446,20 +6510,20 @@ msgstr ""
 "Kan inte hämta meddelande: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "Det finns inget sådant meddelande"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "Ogiltigt meddelandeinnehåll"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6468,15 +6532,15 @@ msgstr ""
 "Kunde inte öppna mappen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen \"%s\" finns inte."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6485,19 +6549,19 @@ msgstr ""
 "Kunde inte skapa mappen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "\"%s\" är inte en brevlådekatalog."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunde inte ta bort mappen \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "är inte en brevlådekatalog"
 
@@ -6512,33 +6576,33 @@ msgstr "Kunde inte genomsöka mappen \"%s\": %s"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kan inte öppna sökvägen till brevlådekatalogen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan inte skapa mapplås på %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan inte öppna brevlåda: %s %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:265
 msgid "Mail append cancelled"
 msgstr "E-posttillägg avbrutet"
 
-#: camel/providers/local/camel-mbox-folder.c:269
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan inte lägga till meddelande till mbox-fil: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:348
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-mbox-folder.c:393
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6547,17 +6611,17 @@ msgstr ""
 "Kan inte hämta meddelande: %s från mappen %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:381
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen verkar vara obotligt skadad."
 
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Meddelandebyggande misslyckades: Trasig brevlåda?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6566,7 +6630,7 @@ msgstr ""
 "Kan inte öppna filen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6575,14 +6639,14 @@ msgstr ""
 "Kunde inte skapa filen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" är ingen vanlig fil."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6591,110 +6655,110 @@ msgstr ""
 "Kunde inte ta bort mappen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen \"%s\" är inte tom. Den togs inte bort."
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:249
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#: camel/providers/local/camel-spool-summary.c:379
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 msgid "Storing folder"
 msgstr "Lagrar mapp"
 
-#: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunde inte öppna mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Ödesdigert e-posttolkningsfel nära position %ld i mappen %s"
 
-#: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan inte kontrollera mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:503
-#: camel/providers/local/camel-mbox-summary.c:704
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunde inte öppna fil: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan inte öppna temporär brevlåda: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:545
-#: camel/providers/local/camel-mbox-summary.c:553
-#: camel/providers/local/camel-mbox-summary.c:742
-#: camel/providers/local/camel-mbox-summary.c:750
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Summeringen stämmer inte överens, även efter en synk"
 
-#: camel/providers/local/camel-mbox-summary.c:596
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fel vid skrivning av temporär brevlåda: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:613
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fel vid skrivning till temporär brevlåda: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
-#: camel/providers/local/camel-mbox-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunde inte stänga källmappen %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:640
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunde inte stänga temporära mapp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunde inte byta namn på mapp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:874
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Okänt fel: %s"
 
-#: camel/providers/local/camel-mh-folder.c:173
+#: camel/providers/local/camel-mh-folder.c:172
 msgid "MH append message cancelled"
 msgstr "MH-meddelandetillägg avbrutet"
 
-#: camel/providers/local/camel-mh-folder.c:176
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan inte lägga till meddelande i mh-mapp: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" är inte en katalog."
@@ -6704,49 +6768,49 @@ msgstr "\"%s\" är inte en katalog."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan inte öppna sökvägen till MH-katalogen: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Kan inte lägga till meddelande till spool-filen %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "Spool-filen \"%s\" finns inte eller är ingen vanlig fil"
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen \"%s/%s\" finns inte."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool-brevlådefil %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mappar kan inte bytas namn på"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-mappar kan inte tas bort"
 
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Kunde inte synkronisera temporära mappen %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Kunde inte synkronisera spool-mappen %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6755,69 +6819,69 @@ msgstr ""
 "Kunde inte synkronisera spool-mappen %s: %s\n"
 "Mappen kan vara skadad, kopia sparad i \"%s\""
 
-#: camel/providers/local/camel-spool-summary.c:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "Kunde inte arkivera: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Ange NNTP-lösenordet för %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "Servern avvisade användarnamnet"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "Misslyckades med att skicka användarnamnet till servern"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "Servern avvisade användarnamnet/lösenordet"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Meddelandet %s hittades inte."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Kunde inte hämta grupplista från servern."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Kan inte läsa in grupplistefilen för %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Kan inte spara grupplistefilen för %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET-diskussionsgrupper"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Det här är en leverantör för läsning och postning till USENET-"
 "diskussionsgrupper."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, 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:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-diskussionsgrupper via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -6825,71 +6889,71 @@ msgstr ""
 "Detta alternativ kommer att autentisera med NNTP-servern genom att använda "
 "ett klartextlösenord."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, 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"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "Hämtar POP-sammanfattning"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, 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:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 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:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 msgid "Expunging deleted messages"
 msgstr "Tömmer borttagna meddelanden"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Kunde inte hämta meddelande: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Kunde inte hämta meddelande från POP-servern %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Inget meddelande med uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Hämtar POP-meddelande %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "Meddelandelager"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "Lämna meddelanden på servern"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Ta bort efter %s dag(ar)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "För anslutning till och hämtande av e-post från POP-servrar."
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6898,7 +6962,7 @@ msgstr ""
 "klartextlösenord. Det här är det enda alternativet som stöds hos många POP-"
 "servrar."
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -6908,34 +6972,34 @@ msgstr ""
 "krypterat lösenord via APOP-protokollet. Det här kanske inte fungerar för "
 "alla användare även med servrar som sägs stöda detta."
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Det här kommer att ansluta till POP-servern och använda Kerberos 4 för att "
 "autentisera med den."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, 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:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Kunde inte ansluta till server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, 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:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sAnge ett POP3-lösenord för %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6944,12 +7008,12 @@ msgstr ""
 "Kunde inte ansluta till POP-servern,\n"
 "Fel vid skickande av filnamn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Okänd)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -6957,7 +7021,7 @@ msgstr ""
 "Kan inte ansluta till POP-servern.\n"
 "Inget stöd för begärd autentiseringsmekanism."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6966,22 +7030,22 @@ msgstr ""
 "Kan inte ansluta till POP-server.\n"
 "Fel vid skickande av lösenord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "Oväntat svar från POP-servern: %s"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
 #: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -6989,174 +7053,174 @@ msgstr ""
 "För leverans av e-post genom att skicka det till programmet \"sendmail\" på "
 "det lokala systemet."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Kunde inte skapa rör till sendmail: %s: brevet skickades inte"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kunde inte grena sendmail: %s: brevet skickades inte"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Kunde inte skicka meddelande: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail avslutade med signal %s: brevet skickades inte."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Kunde inte köra %s: brevet skickades inte."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail avslutade med status %d: brevet skickades inte."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "Kunde inte hitta \"Från\"-adress i meddelandet"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr "E-postleverans via programmet sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "För leverans av e-post genom anslutning till ett fjärr-epostnav som använder "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfel, okänt kommando"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfel i parametrar eller argument"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Kommandot inte implementerat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter inte implementerad"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar från systemhjälp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Hjälpmeddelande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Tjänsten klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Tjänsten stänger överföringskanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Tjänsten inte tillgänglig, stänger överföringskanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Efterfrågad e-poståtgärd okej, färdig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "Användaren inte lokal; vidarebefordrar till <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Efterfrågad e-poståtgärd inte utförd: brevlådan inte tillgänglig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Efterfrågad åtgärd inte utförd: brevlådan inte tillgänglig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Efterfrågad åtgärd avbruten: fel i behandling"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Användaren inte lokal; försök med <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Efterfrågad åtgärd inte utförd: otillräckligt systemutrymme"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Efterfrågad åtgärd avbruten: överskriden utrymmesallokering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Efterfrågad åtgärd inte utförd: brevlådenamn inte tillåtet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Börja skriva in brevet, avsluta med <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Transaktionen misslyckades"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "En lösenordsöverföring behövs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen är för svag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering behövs för begärd autentiseringsmekanism"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Tillfälligt autentiseringsmisslyckande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Autentisering krävs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Fel på välkomstsvar: %s: möjligtvis inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP-servern %s stöder inte den begärda autentiseringstypen %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sAnge SMTP-lösenordet för %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7167,126 +7231,126 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-epostleverans via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan inte skicka meddelande: avsändaradressen är inte angiven."
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan inte skicka meddelande: avsändaradressen är inte giltig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan inte skicka meddelande: inga mottagare är angivna."
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr "SMTP-hälsning"
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO-begäran gjorde time-out: %s: inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Fel i HELO-svar: %s: inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "Fel vid skapande av SASL-autentiseringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "AUTH-begäran misslyckades."
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "Felaktigt autentiseringssvar från servern.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM-begäran gjorde time-out: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Fel i MAIL FROM-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO-begäran gjorde time-out: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Fel i RCPT TO-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA-begäran gjorde time-out: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Fel i DATA-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA-skickande gjorde time-out: meddelandeslut: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1068
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Fel i DATA-svar: meddelandeslut: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1092
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1134
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT-begäran gjorde time-out: %s: inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Fel i QUIT-svar: %s: inte ödesdigert"
@@ -7418,7 +7482,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: composer/e-msg-composer.c:664
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7427,29 +7491,29 @@ msgstr ""
 "Fel vid läsning av filen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:847
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: composer/e-msg-composer.c:856
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Varning!"
 
-#: composer/e-msg-composer.c:860
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "Filen finns, skriv över?"
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fel vid sparande av filen: %s"
 
-#: composer/e-msg-composer.c:901
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid inläsning av filen: %s"
 
-#: composer/e-msg-composer.c:972
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7457,16 +7521,16 @@ msgstr ""
 "Kan inte öppna utkastmappen för detta konto.\n"
 "Vill du använda standardmappen för utkast?"
 
-#: composer/e-msg-composer.c:1025
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fel vid åtkomst av filen: %s"
 
-#: composer/e-msg-composer.c:1033
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "Kunde inte hämta meddelande från redigeraren"
 
-#: composer/e-msg-composer.c:1040
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7475,7 +7539,7 @@ msgstr ""
 "Kan inte spola filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7484,7 +7548,7 @@ msgstr ""
 "Kan inte trunkera filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7493,7 +7557,7 @@ msgstr ""
 "Fel vid automatiskt sparande av meddelande: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1158
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7501,7 +7565,7 @@ msgstr ""
 "Ximian Evolution har hittat osparade filer från en tidigare session.\n"
 "Vill du försöka återställa dem?"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7511,23 +7575,23 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Varning: Ändrat meddelande"
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:1488
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Infoga fil"
 
-#: composer/e-msg-composer.c:1863 composer/e-msg-composer.c:2303
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:2320
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -7535,7 +7599,7 @@ msgstr ""
 "Kan inte skapa redigerarfönstret:\n"
 "Kan inte aktivera adressväljarkontrollen."
 
-#: composer/e-msg-composer.c:2343
+#: composer/e-msg-composer.c:2369
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7543,7 +7607,7 @@ msgstr ""
 "Kunde inte skapa redigerarfönstret:\n"
 "Kan inte aktivera HTML-redigerarkomponenten."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7551,11 +7615,11 @@ msgstr ""
 "Kunde inte skapa redigerarfönstret, eftersom du inte har\n"
 "konfigurerat några identiter i e-postkomponenten."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan inte initiera Evolutions e-postredigerare."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:84
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7604,23 +7668,23 @@ msgid "Subject does not contain"
 msgstr "Ämnet innehåller inte"
 
 #. Remember the password?
-#: e-util/e-passwords.c:348 mail/mail-session.c:258
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
 msgid "Remember this password"
 msgstr "Kom ihåg detta lösenord"
 
-#: e-util/e-passwords.c:350 mail/mail-session.c:259
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
 msgid "Remember this password for the remainder of this session"
 msgstr "Kom ihåg detta lösenord för resten av denna session"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:359
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %Y-%m-%d %H.%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %Y-%m-%d %H.%M"
 
@@ -7671,30 +7735,30 @@ msgid "%m/%d/%Y %H"
 msgstr "%Y-%m-%d %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%H.%M.%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 msgstr "%H.%M.%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 msgid "%I:%M %p"
 msgstr "%H.%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H.%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -7830,7 +7894,7 @@ msgstr "Då"
 msgid "Add action"
 msgstr "Lägg till åtgärd"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -7838,16 +7902,16 @@ msgstr ""
 "Du glömde välja en mapp.\n"
 "Gå tillbaka och ange en giltig mapp som e-post kan levereras till."
 
-#: filter/filter-folder.c:233 filter/vfolder-rule.c:357
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
 #: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "Välj mapp"
 
-#: filter/filter-folder.c:258
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Ange mappens URI"
 
-#: filter/filter-folder.c:305
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<klicka här för att välja en mapp>"
 
@@ -7864,39 +7928,39 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Regelnamn: "
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Om"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Utför åtgärder"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "om alla villkor uppfylls"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "om något villkor uppfylls"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Lägg till villkor"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "inkommande"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "utgående"
 
@@ -8090,7 +8154,7 @@ msgstr "besvarad"
 msgid "Score"
 msgstr "Poäng"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1353
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Avsändare"
 
@@ -8122,7 +8186,7 @@ msgstr "börjar med"
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Ämne"
@@ -8135,15 +8199,15 @@ msgstr "var efter"
 msgid "was before"
 msgstr "var före"
 
-#: filter/rule-editor.c:161
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Regler"
 
-#: filter/rule-editor.c:257
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Lägg till regel"
 
-#: filter/rule-editor.c:322
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Redigera regel"
 
@@ -8151,42 +8215,42 @@ msgstr "Redigera regel"
 msgid "Score Rules"
 msgstr "Poängregler"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du måste ange minst en mapp som källa."
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerar din gamla Elm-epost"
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importerar..."
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Var vänlig vänta"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importerar %s som %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr "Genomsöker %s"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:97
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "E-post"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -8194,19 +8258,15 @@ msgstr ""
 "Evolution har hittat e-postfiler från Elm.\n"
 "Vill du importera dem till Evolution?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:230
-msgid "GnomeCard:"
-msgstr "GnomeCard:"
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Adressbok"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8214,23 +8274,23 @@ msgstr ""
 "Evolution har hittat GnomeCard-filer.\n"
 "Vill du importera dem till Evolution?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerar din gamla Netscape-data"
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Genomsöker katalog"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "Startar import"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Inställningar"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8238,11 +8298,11 @@ msgstr ""
 "Evolution har hittat Netscape-epostfiler.\n"
 "Vill du importera dem till Evolution?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importerar din gamla Pine-data"
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -8250,7 +8310,7 @@ msgstr ""
 "Evolution har hittat Pine-epostfiler.\n"
 "Vill du importera dem till Evolution?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr "Pine"
 
@@ -8286,40 +8346,40 @@ msgstr "Fabrik för e-postsammanfattningskomponenten."
 msgid "Mail configuration interface"
 msgstr "Gränssnitt för e-postkonfiguration"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "Mapp som innehåller e-post"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr "E-postlagringsmapp (intern)"
 
-#: mail/component-factory.c:99
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Virtuell papperskorg"
 
-#: mail/component-factory.c:99
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "Virtuell papperskorgsmapp"
 
-#: mail/component-factory.c:126
+#: mail/component-factory.c:129
 #, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Kunde inte ansluta till lager: %s"
 
-#: mail/component-factory.c:144
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Denna mapp kan inte innehålla meddelanden."
 
-#: mail/component-factory.c:376
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "Egenskaper..."
 
-#: mail/component-factory.c:376
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "Ändra egenskaperna för denna mapp"
 
-#: mail/component-factory.c:750
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -8327,27 +8387,27 @@ msgstr ""
 "En del av dina e-postinställningar verkar felaktiga, kontrollera att allt är "
 "som det ska vara."
 
-#: mail/component-factory.c:918
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: mail/component-factory.c:918
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr "Nytt e-_postmeddelande"
 
-#: mail/component-factory.c:942
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan inte initiera Evolutions e-postkomponent."
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:1006
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan inte initiera Evolutions e-postkonfigurationskomponent."
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:1012
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan inte initiera Evolutions mappinformationskomponent."
 
-#: mail/component-factory.c:1122
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lager hos skal"
 
@@ -8360,164 +8420,164 @@ msgstr "Egenskaper för \"%s\""
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:292 mail/mail-display.c:298
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunde inte skapa temporär katalog: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "%d nya"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:772
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "%d gömda"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "%d markerade"
 
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d oskickade"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d sent"
 msgstr "%d skickade"
 
-#: mail/folder-browser.c:800
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1046
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr "Skapa virtuell mapp från sökning"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "Virtuell mapp på _ämne"
 
-#: mail/folder-browser.c:1428
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på _avsändare"
 
-#: mail/folder-browser.c:1429
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på _mottagare"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "Virtuell mapp på sänd_lista"
 
-#: mail/folder-browser.c:1434
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Filtrera på _ämne"
 
-#: mail/folder-browser.c:1435
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Filtrera på _avsändare"
 
-#: mail/folder-browser.c:1436
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "Filtrera på _mottagare"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "Filtrera på sä_ndlista"
 
-#: mail/folder-browser.c:1445 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
 
-#: mail/folder-browser.c:1446 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: mail/folder-browser.c:1451 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsändaren"
 
-#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: mail/folder-browser.c:1453 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "_Markera som läst"
 
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Markera som _oläst"
 
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: mail/folder-browser.c:1459
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "Markera som ovikti_gt"
 
-#: mail/folder-browser.c:1463
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp..."
 
-#: mail/folder-browser.c:1464
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "_Ångra borttagning"
 
-#: mail/folder-browser.c:1470
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "Lägg till avsändaren i adressboken"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "Tillämpa filter"
 
-#: mail/folder-browser.c:1475
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "Skapa rege_l från meddelande"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Filtrera på sändlista"
 
-#: mail/folder-browser.c:1626
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "Virtuell mapp på sändlista"
 
-#: mail/folder-browser.c:1628
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrera på sändlista (%s)"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Virtuell mapp på sändlista (%s)"
@@ -8620,7 +8680,7 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: mail/mail-account-gui.c:1629
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan inte skapa två konton med samma namn."
 
@@ -8657,31 +8717,31 @@ msgstr "Är du säker på att du vill ta bort detta diskussionsgruppskonto?"
 msgid "Mail Settings"
 msgstr "E-postinställningar"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "E-post till %s"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Ämnet är %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post från %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "Sändlistan %s"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Lägg till filterregel"
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8693,7 +8753,7 @@ msgstr ""
 "ta emot eller skriva nya brev.\n"
 "Vill du konfigurera den nu?"
 
-#: mail/mail-callbacks.c:187
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8701,7 +8761,7 @@ msgstr ""
 "Du måste konfigurera en identititet\n"
 "innan du kan skriva brev."
 
-#: mail/mail-callbacks.c:201
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8709,12 +8769,12 @@ msgstr ""
 "Du måste konfigurera en e-posttransport\n"
 "innan du kan skriva brev."
 
-#: mail/mail-callbacks.c:231
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "Du har inte angivit någon e-posttransportmetod"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:266
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -8722,11 +8782,11 @@ msgstr ""
 "Du skickar ett HTML-formaterat brev, men följande mottagare vill inte ha "
 "HTML-formaterad e-post:\n"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:280
 msgid "Send anyway?"
 msgstr "Skicka ändå?"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8734,7 +8794,7 @@ msgstr ""
 "Detta meddelande har inget ämne.\n"
 "Vill du verkligen skicka?"
 
-#: mail/mail-callbacks.c:367
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8742,11 +8802,11 @@ msgstr ""
 "Eftersom kontaktlistan som du skickar är konfigurerad att gömma listans "
 "adresser kommer detta meddelande endast att innehålla blindkopiemottagare."
 
-#: mail/mail-callbacks.c:371
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr "Detta meddelande innehåller endast blindkopiemottagare."
 
-#: mail/mail-callbacks.c:375
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -8756,40 +8816,40 @@ msgstr ""
 "till ett Apparently-To-huvud.\n"
 "Skicka ändå?"
 
-#: mail/mail-callbacks.c:469
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr "Detta meddelande innehåller ogiltiga mottagare:"
 
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:503
 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:600
+#: mail/mail-callbacks.c:599
 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:837
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr "en okänd avsändare"
 
-#: mail/mail-callbacks.c:842
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a %Y-%m-%d klockan %H.%M skrev %%s:"
 
-#: mail/mail-callbacks.c:1240
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "Flytta meddelande(n) till"
 
-#: mail/mail-callbacks.c:1242
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Kopiera meddelande(n) till"
 
-#: mail/mail-callbacks.c:1702
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Är du säker på att du vill redigera alla %d meddelanden?"
 
-#: mail/mail-callbacks.c:1727
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8797,7 +8857,7 @@ msgstr ""
 "Du kan bara redigera meddelanden\n"
 "som du sparat i mappen Utkast."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8805,28 +8865,28 @@ msgstr ""
 "Du kan bara skicka om meddelanden\n"
 "som du sparat i mappen Skickat."
 
-#: mail/mail-callbacks.c:1780
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Är du säker på att du vill skicka om alla %d meddelanden?"
 
-#: mail/mail-callbacks.c:1806
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Inget meddelande markerat"
 
-#: mail/mail-callbacks.c:1900
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "Spara meddelande som..."
 
-#: mail/mail-callbacks.c:1902
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:2071 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varning"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8839,11 +8899,11 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa meddelanden?"
 
-#: mail/mail-callbacks.c:2085
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr "Fråga mig inte igen."
 
-#: mail/mail-callbacks.c:2193
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8852,19 +8912,19 @@ msgstr ""
 "Fel vid läsning av filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2205
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2268
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/mail-callbacks.c:2314
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
-#: mail/mail-callbacks.c:2416
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8922,7 +8982,7 @@ msgstr ""
 "Detta namn kommer endast att användas för visning."
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoassistent"
 
@@ -9061,7 +9121,7 @@ msgstr "Visa"
 msgid "Done"
 msgstr "Klar"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Utkast"
 
@@ -9207,7 +9267,7 @@ msgid "Sending Mail"
 msgstr "Skickande av post"
 
 #: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Skickat"
 
@@ -9456,23 +9516,23 @@ msgstr "Göm"
 msgid "External Viewer"
 msgstr "Externt visningsprogram"
 
-#: mail/mail-display.c:1132
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "Läser in meddelandeinnehåll"
 
-#: mail/mail-display.c:1614
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "Öppna länk i webbläsare"
 
-#: mail/mail-display.c:1616
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Kopiera länkplats"
 
-#: mail/mail-display.c:1619
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "Spara länk som (FIXME)"
 
-#: mail/mail-display.c:1622
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "Spara bild som..."
 
@@ -9489,83 +9549,83 @@ msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Felaktig adress"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Från"
 
-#: mail/mail-format.c:907
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Till"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Kopia"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr "Blindkopia"
 
-#: mail/mail-format.c:1799
+#: mail/mail-format.c:1800
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Detta meddelande är digitalt signerat. Klicka på låsikonen för mer "
 "information."
 
-#: mail/mail-format.c:1822
+#: mail/mail-format.c:1823
 msgid "Evolution does not recognize this type of signed message."
 msgstr "Evolution känner inte igen denna typ av signerat meddelande."
 
-#: mail/mail-format.c:1830
+#: mail/mail-format.c:1831
 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:1838
+#: mail/mail-format.c:1839
 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:2054
+#: mail/mail-format.c:2055
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/mail-format.c:2068
+#: mail/mail-format.c:2069
 #, 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:2073
+#: mail/mail-format.c:2074
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2103
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pekare till fjärrdata (%s)"
 
-#: mail/mail-format.c:2110
+#: mail/mail-format.c:2111
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okänd extern data (typen \"%s\")"
 
-#: mail/mail-format.c:2115
+#: mail/mail-format.c:2116
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
-#: mail/mail-local.c:589
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerar mapp"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:707
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9574,27 +9634,27 @@ msgstr ""
 "Kan inte spara metainformation; du kommer antagligen att\n"
 "upptäcka att du inte kan öppna denna mapp längre: %s: %s"
 
-#: mail/mail-local.c:723
+#: mail/mail-local.c:763
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan inte spara metainformation för mapp på %s: %s"
 
-#: mail/mail-local.c:769
+#: mail/mail-local.c:815
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan inte ta bort metainformation för mapp %s: %s"
 
-#: mail/mail-local.c:1136
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Byter format på mappen \"%s\" till \"%s\""
 
-#: mail/mail-local.c:1151
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s kan inte konfigureras om eftersom den inte är en lokal mapp"
 
-#: mail/mail-local.c:1173
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9602,16 +9662,16 @@ msgstr ""
 "Om du inte längre kan öppna denna brevlåda måste\n"
 "du kanske reparera den manuellt."
 
-#: mail/mail-local.c:1262
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr "Du kan inte ändra formatet på en ickelokal mapp."
 
-#: mail/mail-local.c:1271
+#: mail/mail-local.c:1416
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigura om /%s"
 
-#: mail/mail-mt.c:251
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9620,7 +9680,7 @@ msgstr ""
 "Fel vid \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9629,7 +9689,7 @@ msgstr ""
 "Fel vid utförande av åtgärd:\n"
 "%s"
 
-#: mail/mail-mt.c:893
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "Arbetar"
 
@@ -9678,77 +9738,72 @@ msgstr "Flyttar meddelanden till %s"
 msgid "Copying messages to %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: mail/mail-ops.c:893
-#, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Kan inte kopiera en mapp \"%s\" till sig själv"
-
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "Kopierar"
 
-#: mail/mail-ops.c:1013
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1063 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: mail/mail-ops.c:1196
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1239
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1311
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagret %s"
 
-#: mail/mail-ops.c:1380
+#: mail/mail-ops.c:1378
 #, c-format
 msgid "Removing folder %s"
 msgstr "Byter namn på mappen %s"
 
-#: mail/mail-ops.c:1474
+#: mail/mail-ops.c:1472
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/mail-ops.c:1525
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Uppdaterar mapp"
 
-#: mail/mail-ops.c:1561
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: mail/mail-ops.c:1610
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: mail/mail-ops.c:1677
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Hämtar %d meddelande(n)"
 
-#: mail/mail-ops.c:1763
+#: mail/mail-ops.c:1761
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Sparar %d meddelande(n)"
 
-#: mail/mail-ops.c:1875
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9757,7 +9812,7 @@ msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1903
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9766,11 +9821,11 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: mail/mail-ops.c:1993
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9779,17 +9834,17 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: mail/mail-ops.c:2093
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar från %s"
 
-#: mail/mail-ops.c:2094
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ansluter igen till %s"
@@ -9798,35 +9853,35 @@ msgstr "Ansluter igen till %s"
 msgid "_Search"
 msgstr "_Sök"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(Namnlöst meddelande)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "Namnlöst meddelande"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "Tomt meddelande"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "Sök i meddelande"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Gör skillnad på gemener/VERSALER"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "Sök vidare"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Sök:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Träffar:"
 
@@ -9882,30 +9937,30 @@ msgstr "Ange lösenord för %s"
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
-#: mail/mail-tools.c:249
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidarebefordrat meddelande - %s"
 
-#: mail/mail-tools.c:253
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr "Vidarebefordrat meddelande"
 
-#: mail/mail-tools.c:387
+#: mail/mail-tools.c:386
 msgid "Forwarded Message"
 msgstr "Vidarebefordrat meddelande"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ställer in virtuell mapp: %s"
 
-#: mail/mail-vfolder.c:204
+#: mail/mail-vfolder.c:203
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Uppdaterar virtuella mappar för uri: %s"
 
-#: mail/mail-vfolder.c:415
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9918,20 +9973,20 @@ msgstr ""
 "    \"%s\"\n"
 "och har uppdaterats."
 
-#: mail/mail-vfolder.c:637
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr "Virtuella mappar"
 
-#: mail/mail-vfolder.c:735
+#: mail/mail-vfolder.c:816
 msgid "Edit VFolder"
 msgstr "Redigera virtuell mapp"
 
-#: mail/mail-vfolder.c:750
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Försöker redigera en virtuell mapp \"%s\" som inte finns."
 
-#: mail/mail-vfolder.c:804
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Ny virtuell mapp"
 
@@ -10000,7 +10055,7 @@ msgstr "%a %H.%M"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2327
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
@@ -10036,16 +10091,16 @@ msgstr "Prenumererar på mappen \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Säger upp prenumeration på mappen \"%s\""
 
-#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mapp"
 
-#: mail/subscribe-dialog.c:1519
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "Ingen server har valts"
 
-#: mail/subscribe-dialog.c:1580
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "Välj en server."
 
@@ -10085,90 +10140,82 @@ msgstr "_Säg upp prenumeration"
 msgid "Evolution component for the executive summary."
 msgstr "Evolutionkomponent för sammanfattningen."
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr "Mapp som innehåller Evolution-sammanfattningen"
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 msgid "Cannot initialize Evolution's Summary component."
 msgstr "Kan inte initiera Evolutions sammanfattningskomponent."
 
-#: my-evolution/e-summary-calendar.c:341 my-evolution/e-summary-calendar.c:359
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "Möten"
 
-#: my-evolution/e-summary-calendar.c:342
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "Inga möten"
 
-#: my-evolution/e-summary-calendar.c:378
+#: my-evolution/e-summary-calendar.c:377
 msgid "%k:%M %d %B"
 msgstr "%k.%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:380
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr "%l.%M %d %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "E-postsammanfattning"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
-msgstr "ESGG:ESMS:ESSA:ESNU"
-
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:423
 msgid "Dictionary.com Word of the Day"
 msgstr "Dagens ord från dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:465
+#: my-evolution/e-summary-preferences.c:446
 msgid "Quotes of the Day"
 msgstr "Dagens citat"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:931
+#: my-evolution/e-summary-preferences.c:925
 msgid "Add a news feed"
 msgstr "Lägg till en nyhetskälla"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:939
+#: my-evolution/e-summary-preferences.c:933
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Ange URL:en till den nyhetskälla som du vill lägga till"
 
-#: my-evolution/e-summary-preferences.c:943
+#: my-evolution/e-summary-preferences.c:937
 msgid "Name:"
 msgstr "Namn:"
 
-#: my-evolution/e-summary-preferences.c:1489
+#: my-evolution/e-summary-preferences.c:1483
 msgid "Summary Settings"
 msgstr "Sammanfattningsinställningar"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr "Fel vid hämtning av RDF"
 
-#: my-evolution/e-summary-rdf.c:527
+#: my-evolution/e-summary-rdf.c:528
 msgid "News Feed"
 msgstr "Nyhetskälla"
 
-#: my-evolution/e-summary-tasks.c:247
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "Inga uppgifter"
 
-#: my-evolution/e-summary-tasks.c:286
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr "(Ingen beskrivning)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Mitt väder"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Väderservern kunde inte kontaktas</b></dd>"
 
@@ -10180,27 +10227,27 @@ msgstr "Väder"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:650
-msgid "KBOS:EGAA:RJTT"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr "ESGG:ESMS:ESSA:ESNU"
 
-#: my-evolution/e-summary-weather.c:711
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Regioner"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A %e %B %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Skriv ut sammanfattning"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "Utskrift av sammanfattning misslyckades"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Sammanfattningskomponenten kunde inte initiera Bonobo.\n"
 
@@ -11504,31 +11551,31 @@ msgstr "_Väder"
 msgid "The Evolution shell."
 msgstr "Evolutionskalet."
 
-#: shell/e-activity-handler.c:201
+#: shell/e-activity-handler.c:200
 msgid "Show Details"
 msgstr "Visa detaljer"
 
-#: shell/e-activity-handler.c:203
+#: shell/e-activity-handler.c:202
 msgid "Cancel Operation"
 msgstr "Avbryt åtgärd"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 msgid "Outbox"
 msgstr "Utkorg"
 
-#: shell/e-local-storage.c:637
+#: shell/e-local-storage.c:636
 msgid "Local Folders"
 msgstr "Lokala mappar"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Evolution-installation"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11536,17 +11583,17 @@ msgstr ""
 "Denna nya version av Evolution måste installera ytterligare filer\n"
 "i din personliga Evolutionkatalog"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Klicka på \"OK\" för att installera filerna, eller \"Avbryt\" för att "
 "avsluta."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Kunde inte uppdatera filerna korrekt"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11557,7 +11604,7 @@ msgstr ""
 "%s\n"
 "Fel: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11566,7 +11613,7 @@ msgstr ""
 "Ett fel inträffade vid kopiering av filer till\n"
 "\"%s\"."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11577,7 +11624,7 @@ msgstr ""
 "Var vänlig och flytta den så att installationen\n"
 "av Evolutions användarfiler kan genomföras."
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11591,7 +11638,7 @@ msgstr ""
 "starta.\n"
 "Vill du att jag ska ta bort katalogen?"
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11602,15 +11649,15 @@ msgstr ""
 "katalogen. Var vänlig och flytta den så att\n"
 "Evolutions användarfiler kan installeras."
 
-#: shell/e-shell-about-box.c:41
+#: shell/e-shell-about-box.c:40
 msgid "Evolution "
 msgstr "Evolution "
 
-#: shell/e-shell-about-box.c:42
+#: shell/e-shell-about-box.c:41
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-about-box.c:44
+#: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Presenterades av"
 
@@ -11678,10 +11725,16 @@ msgstr ""
 msgid "Rename the \"%s\" folder to:"
 msgstr "Byt namn på mappen \"%s\" till:"
 
-#: shell/e-shell-folder-commands.c:539
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Det angivna mappnamnet är inte giltigt: %s"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11691,32 +11744,11 @@ msgstr ""
 "Kan inte skapa den angivna katalogen:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr "Inget mappnamn är angivet."
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr "Mappnamnet kan inte innehålla Retur-tecknet."
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder cannot contain the directory separator."
-msgstr "Mappen kan inte innehålla katalogavskiljaren."
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr "\".\" och \"..\" är reserverade mappnamn."
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Det angivna mappnamnet är inte giltigt: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Skapa ny mapp"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11724,19 +11756,19 @@ msgstr ""
 "Den markerade typen av mapp är inte giltig för\n"
 "den begärda åtgärden."
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Namnlös)"
 
-#: shell/e-shell-importer.c:143
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr "Välj den typ av importör som ska köras"
 
-#: shell/e-shell-importer.c:146
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11750,13 +11782,13 @@ msgstr ""
 "Du kan välja \"Automatisk\" om du inte vet, så kommer Evolution att försöka "
 "reda ut det."
 
-#: shell/e-shell-importer.c:152
+#: shell/e-shell-importer.c:151
 msgid "Please select the information that you would like to import"
 msgstr "Välj den information som du vill importera"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:244
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11767,7 +11799,7 @@ msgstr ""
 "Importören är inte redo.\n"
 "Väntar 5 sekunder med nytt försök."
 
-#: shell/e-shell-importer.c:264 shell/e-shell-importer.c:295
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11776,16 +11808,16 @@ msgstr ""
 "Importerar %s\n"
 "Importerar objekt %d."
 
-#: shell/e-shell-importer.c:398
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s finns inte"
 
-#: shell/e-shell-importer.c:410
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr "Du kan endast importera till lokala mappar"
 
-#: shell/e-shell-importer.c:425
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11794,11 +11826,11 @@ msgstr ""
 "Det finns ingen importör som kan hantera\n"
 "%s"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Importerar"
 
-#: shell/e-shell-importer.c:443
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11807,17 +11839,17 @@ msgstr ""
 "Importerar %s.\n"
 "Startar %s"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "Fel vid start av %s"
 
-#: shell/e-shell-importer.c:475
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "Fel vid inläsning av %s"
 
-#: shell/e-shell-importer.c:492
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11826,31 +11858,31 @@ msgstr ""
 "Importerar %s\n"
 "Importerar objekt 1."
 
-#: shell/e-shell-importer.c:562
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:618
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Filtyp:"
 
-#: shell/e-shell-importer.c:653
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr "Importera data och inställningar från äldre program"
 
-#: shell/e-shell-importer.c:657
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr "Importera en ensam fil"
 
-#: shell/e-shell-importer.c:722 shell/e-shell-startup-wizard.c:577
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11858,11 +11890,11 @@ msgstr ""
 "Var god vänta...\n"
 "Letar efter befintliga konfigurationer"
 
-#: shell/e-shell-importer.c:725 shell/e-shell-startup-wizard.c:580
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr "Startar intelligenta importörer"
 
-#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:701
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "Från %s:"
@@ -11875,15 +11907,15 @@ msgstr "Välj mapp"
 msgid "Select a destination folder for importing this data"
 msgstr "Välj en destinationsmapp för importen av denna data"
 
-#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importera"
 
-#: shell/e-shell-offline-handler.c:560
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "Kopplar från anslutningar..."
 
-#: shell/e-shell-startup-wizard.c:160
+#: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
 "Could not start the Evolution Mailer Assistant interface\n"
@@ -11892,11 +11924,11 @@ msgstr ""
 "Kunde inte starta gränssnittet för Evolution-epostguiden\n"
 "(%s)"
 
-#: shell/e-shell-startup-wizard.c:170
+#: shell/e-shell-startup-wizard.c:169
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Kunde inte starta gränssnittet för Evolution-epostguiden\n"
 
-#: shell/e-shell-startup-wizard.c:743
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
@@ -11904,11 +11936,11 @@ msgstr ""
 "Välj den information som\n"
 "du vill importera"
 
-#: shell/e-shell-view-menu.c:166
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy hittades inte i din $PATH."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kunde inte köras."
 
@@ -11957,39 +11989,39 @@ msgstr "Arbeta frånkopplad"
 msgid "(No folder displayed)"
 msgstr "(Ingen mapp visas)"
 
-#: shell/e-shell-view.c:1588
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1590
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: shell/e-shell-view.c:1637
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution är just nu ansluten. Klicka på denna knapp för att koppla "
 "från."
 
-#: shell/e-shell-view.c:1644
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution håller på att koppla från."
 
-#: shell/e-shell-view.c:1650
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution är just nu frånkopplad. Klicka på denna knapp för att "
 "ansluta."
 
-#: shell/e-shell.c:654
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan inte lägga upp lokal plats för sparande -- %s"
 
-#: shell/e-shell.c:1658
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12000,31 +12032,31 @@ msgstr ""
 "oväntat avslutats. Du måste avsluta Evolution och starta om det\n"
 "för att komma åt den datan igen."
 
-#: shell/e-shell.c:1883
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: shell/e-shell.c:1885
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera på OAF"
 
-#: shell/e-shell.c:1887
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
-#: shell/e-shell.c:1889 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Allmänt fel"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Skapa en ny genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Gruppnamn:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -12033,111 +12065,111 @@ msgstr ""
 "Vill du verkligen ta bort gruppen\n"
 "\"%s\" från genvägsraden?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Ta inte bort"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Byt namn på genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Byt namn på den markerade genvägsgruppen till:"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "_Små ikoner"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Visa genvägarna som små ikoner"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "S_tora ikoner"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Visa genvägarna som stora ikoner"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "_Ny grupp..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Skapa en ny genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "_Ta bort denna grupp..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Ta bort denna genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "_Byt namn på denna grupp..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "Byt namn på denna genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "_Göm genvägsraden"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "_Visa genvägsraden"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "Byt namn på genväg"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "Byt namn på den markerade genvägen till:"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "Öppna mappen som är länkad till denna genväg"
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "_Öppna i nytt fönster"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Öppna mappen som är länkad till denna genväg i ett nytt fönster"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "_Rename"
 msgstr "_Byt namn"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "Byt namn på denna genväg"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Re_move"
 msgstr "_Ta bort"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Ta bort denna genväg från genvägsraden"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Fel vid sparande av genvägar."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "Genvägar"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -12146,133 +12178,133 @@ msgstr ""
 "Kan inte för över mapp:\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(Inget namn)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "Inga fel"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "En mapp med samma namn finns redan"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "Den angivna mapptypen är inte giltig"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "I/O-fel"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Inte tillräckligt med utrymme för att skapa mapp"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
 msgid "The folder is not empty"
 msgstr "Mappen är inte tom"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "Den angivna mappen hittades inte"
 
-#: shell/e-storage.c:515
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "Funktionen är ännu inte implementerad i detta lager"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "Åtgärden stöds inte"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "Den angivna typen stöds inte i detta lager"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr "Den angivna mappen kan inte ändras eller tas bort"
 
-#: shell/e-storage.c:525
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan inte göra en mapp till barn av dess undermappar"
 
-#: shell/e-storage.c:527
+#: shell/e-storage.c:526
 msgid "Cannot create a folder with that name"
 msgstr "Kan inte skapa en mapp med det namnet"
 
-#: shell/e-task-widget.c:192
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% färdigt)"
 
-#: shell/evolution-shell-component.c:974
+#: shell/evolution-shell-component.c:1009
 msgid "CORBA error"
 msgstr "CORBA-fel"
 
-#: shell/evolution-shell-component.c:976
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr "Avbruten"
 
-#: shell/evolution-shell-component.c:978
+#: shell/evolution-shell-component.c:1013
 msgid "Invalid argument"
 msgstr "Ogiltigt argument"
 
-#: shell/evolution-shell-component.c:980
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr "Har redan en ägare"
 
-#: shell/evolution-shell-component.c:982
+#: shell/evolution-shell-component.c:1017
 msgid "No owner"
 msgstr "Ingen ägare"
 
-#: shell/evolution-shell-component.c:984
+#: shell/evolution-shell-component.c:1019
 msgid "Not found"
 msgstr "Hittades inte"
 
-#: shell/evolution-shell-component.c:986
+#: shell/evolution-shell-component.c:1021
 msgid "Unsupported type"
 msgstr "Typen stöds inte"
 
-#: shell/evolution-shell-component.c:988
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr "Schemat stöds inte"
 
-#: shell/evolution-shell-component.c:990
+#: shell/evolution-shell-component.c:1025
 msgid "Unsupported operation"
 msgstr "Åtgärden stöds inte"
 
-#: shell/evolution-shell-component.c:992
+#: shell/evolution-shell-component.c:1027
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: shell/evolution-shell-component.c:996
+#: shell/evolution-shell-component.c:1031
 msgid "Exists"
 msgstr "Existerar"
 
-#: shell/evolution-shell-component.c:998
+#: shell/evolution-shell-component.c:1033
 msgid "Invalid URI"
 msgstr "Ogiltig URI"
 
-#: shell/evolution-shell-component.c:1002
+#: shell/evolution-shell-component.c:1037
 msgid "Has subfolders"
 msgstr "Har undermappar"
 
-#: shell/evolution-shell-component.c:1004
+#: shell/evolution-shell-component.c:1039
 msgid "No space left"
 msgstr "Inget utrymme kvar"
 
-#: shell/evolution-shell-component.c:1006
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr "Gamla ägaren har dött"
 
-#: shell/evolution-shell-component-utils.c:125
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -12283,7 +12315,7 @@ msgstr ""
 "\n"
 "Okänt fel."
 
-#: shell/evolution-shell-component-utils.c:128
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -12296,7 +12328,7 @@ msgstr ""
 "Felet från komponentsystemet är:\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:135
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -12405,83 +12437,44 @@ msgstr ""
 "Denna assistent kommer att hjälpa dig med att\n"
 "importera externa filer till Evolution."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Importörer"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Importera inte"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Fråga mig inte igen"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importera data från följande filer:"
 
-#: shell/main.c:90
+#: shell/main.c:89
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avslutar nu..."
 
-#: shell/main.c:194
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\n"
-"Ximian Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. \n"
-"\n"
-"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Hej. Tack för att du tog dig tiden att hämta denna förhandsversion\n"
-"av grupprogramsviten Ximian Evolution.\n"
-"\n"
-"Ximian Evolution är inte färdigt än. Det börjar närma sig, men det\n"
-"finns platser där funktioner antingen saknas eller endast fungerar\n"
-"delvis.\n"
-"\n"
-"Om du hittar fel i programmet ber vi att du rapporterar dem till\n"
-"oss på bugzilla.ximian.com.\n"
-"Denna produkt kommer utan garanti och är inte lämpad för\n"
-"våldsbenägna personer.\n"
-"\n"
-"Vi hoppas att du gläds åt resultatet av vårt hårda arbete, och vi\n"
-"inväntar med spänning dina bidrag!\n"
-
-#: shell/main.c:215
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Tack\n"
-"Ximian Evolution-teamet\n"
-
-#: shell/main.c:269
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan inte komma åt Ximian Evolution-skalet."
 
-#: shell/main.c:278
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan inte initiera Ximian Evolution-skalet: %s"
 
-#: shell/main.c:348
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "Använd inte startbild"
 
-#: shell/main.c:349
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "Skicka felsökningsinformation från alla komponenter till en fil."
 
-#: shell/main.c:391
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet."
 
@@ -12781,11 +12774,12 @@ msgstr "Skriv ut..."
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:237
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Spara"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Spara och stäng"
 
@@ -12801,7 +12795,7 @@ msgstr "Spara detta objekt till disk"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Arkiv"
@@ -12823,7 +12817,7 @@ msgstr "Spara kontakten och stäng dialogrutan"
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Spara"
 
@@ -13449,7 +13443,7 @@ msgstr "Stäng detta fönster"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "S_täng"
@@ -13480,8 +13474,8 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Kryptera detta meddelande med ditt S/MIME-krypteringscertifikat"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "F_ormat"
+msgid "For_mat"
+msgstr "For_mat"
 
 #: ui/evolution-message-composer.xml.h:9
 msgid "H_TML"
@@ -13532,7 +13526,7 @@ msgid "Save in folder..."
 msgstr "Spara i mapp..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Spara aktuell fil"
 
@@ -13625,7 +13619,7 @@ msgid "_From Field"
 msgstr "_Frånfältet"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -13641,7 +13635,7 @@ msgstr "_Svara till-fältet"
 msgid "_Security"
 msgstr "_Säkerhet"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Hjälp"
 
@@ -13961,114 +13955,114 @@ 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:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:225 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Nu"
 
-#: widgets/misc/e-cell-date-edit.c:233 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Idag"
 
-#: widgets/misc/e-cell-date-edit.c:742
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Tiden måste anges i formatet: %s"
 
-#: widgets/misc/e-cell-percent.c:78
+#: widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentvärdet måste vara mellan 0 och 100"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Centraleuropeisk"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Grekisk"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japansk"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Koreansk"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "Turkisk"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "Västeuropeisk"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "Traditionell"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "FÖrenklad"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Ny"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Okänd teckentabell: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "Ange teckentabellen att använda"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "Annan..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "Teckenkodning"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:150
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "Sökredigerare"
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Spara sökning"
 
@@ -14105,11 +14099,11 @@ msgstr "Meddelande"
 msgid "Don't show this message again."
 msgstr "Visa inte detta meddelande igen."
 
-#: widgets/misc/e-search-bar.c:335
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "S_ök"
 
-#: widgets/misc/e-search-bar.c:461
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "Sök nu"
 
@@ -14123,18 +14117,84 @@ msgstr "Server för personlig adressbok"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Server för personlig kalender; kalenderfabrik"
 
-#: wombat/wombat.c:193
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): kunde inte initiera GNOME-VFS"
 
-#: wombat/wombat.c:205
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): kunde inte initiera GNOME"
 
-#: wombat/wombat.c:218
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
+#~ msgid "_Invite Others"
+#~ msgstr "_Bjud in andra"
+
+#~ msgid "GnomeCard:"
+#~ msgstr "GnomeCard:"
+
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Kan inte kopiera en mapp \"%s\" till sig själv"
+
+#~ msgid "KBOS:ZSAM:EGAA"
+#~ msgstr "ESGG:ESMS:ESSA:ESNU"
+
+#~ msgid "KBOS:EGAA:RJTT"
+#~ msgstr "ESGG:ESMS:ESSA:ESNU"
+
+#~ msgid "No folder name specified."
+#~ msgstr "Inget mappnamn är angivet."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "Mappnamnet kan inte innehålla Retur-tecknet."
+
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr "Mappen kan inte innehålla katalogavskiljaren."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "\".\" och \"..\" är reserverade mappnamn."
+
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\n"
+#~ "Ximian Evolution is not yet complete. It's getting close, but there are\n"
+#~ "places where features are either missing or only half working. \n"
+#~ "\n"
+#~ "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Hej. Tack för att du tog dig tiden att hämta denna förhandsversion\n"
+#~ "av grupprogramsviten Ximian Evolution.\n"
+#~ "\n"
+#~ "Ximian Evolution är inte färdigt än. Det börjar närma sig, men det\n"
+#~ "finns platser där funktioner antingen saknas eller endast fungerar\n"
+#~ "delvis.\n"
+#~ "\n"
+#~ "Om du hittar fel i programmet ber vi att du rapporterar dem till\n"
+#~ "oss på bugzilla.ximian.com.\n"
+#~ "Denna produkt kommer utan garanti och är inte lämpad för\n"
+#~ "våldsbenägna personer.\n"
+#~ "\n"
+#~ "Vi hoppas att du gläds åt resultatet av vårt hårda arbete, och vi\n"
+#~ "inväntar med spänning dina bidrag!\n"
+
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Tack\n"
+#~ "Ximian Evolution-teamet\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "F_ormat"
+
 #~ msgid "Alarm on %A %b %d %Y %H:%M"
 #~ msgstr "Alarm på %A %d %b %Y %H.%M"
 
@@ -14351,9 +14411,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%Y-%m-%d"
 
-#~ msgid "%x"
-#~ msgstr "%x"
-
 # Detta är inte diskussionsgrupper utan nyheter
 #~ msgid "There was an error downloading news feed"
 #~ msgstr "Ett fel uppstod när nyhetskällan hämtades"
@@ -14730,9 +14787,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Delegated From:"
 #~ msgstr "Delegerad från:"
 
-#~ msgid "Task"
-#~ msgstr "Uppgift"
-
 #~ msgid "% Comp_lete:"
 #~ msgstr "% färdig_t:"
 
@@ -15098,9 +15152,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Show a dialog"
 #~ msgstr "Visa ett dialogfönster"
 
-#~ msgid "Percent complete"
-#~ msgstr "Procent klar"
-
 #~ msgid "Elm Aliases"
 #~ msgstr "Elm-alias"