Added missing file. Updated Swedish translation some.

2002-04-01  Christian Rose  <menthos@menthos.com>

	* POTFILES.in: Added missing file.
	* sv.po: Updated Swedish translation some.

svn path=/trunk/; revision=16301

3 files changed, 3480 insertions, 2400 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index c1f0a581fe..fa739fab34 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-01  Christian Rose  <menthos@menthos.com>
+
+	* POTFILES.in: Added missing file.
+	* sv.po: Updated Swedish translation some.
+
 2002-03-30  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* no.po: Updated Norwegian (bokmćl) translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fb7e3f5d11..7c8fc21236 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -204,6 +204,7 @@ data/evolution.desktop.in
 data/evolution.keys.in
 default_user/searches.xml
 e-util/e-categories-config.c
+e-util/e-dialog-utils.c
 e-util/e-passwords.c
 e-util/e-pilot-settings.c
 e-util/e-time-utils.c
@@ -251,8 +252,8 @@ mail/local-config.glade
 mail/mail-account-editor-news.c
 mail/mail-account-editor.c
 mail/mail-account-gui.c
-mail/mail-accounts.etspec
 mail/mail-accounts.c
+mail/mail-accounts.etspec
 mail/mail-autofilter.c
 mail/mail-callbacks.c
 mail/mail-config-druid.c
diff --git a/po/sv.po b/po/sv.po
index fa31c6d596..8c50870f96 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,13 +6,13 @@
 # Martin NorbÀck <d95mback@dtek.chalmers.se>, 2001.
 # Johan Dahlin <zilch.am@home.se>, 2001.
 #
-# $Id: sv.po,v 1.149 2002/01/28 03:38:06 menthos Exp $
+# $Id: sv.po,v 1.150 2002/03/31 23:19:10 menthos Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-01-28 04:34+0100\n"
-"PO-Revision-Date: 2002-01-28 04:35+0100\n"
+"POT-Creation-Date: 2002-04-01 00:08+0200\n"
+"PO-Revision-Date: 2002-04-01 01:16+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -36,21 +36,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importerar VCard-filer till Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:960
+#: addressbook/gui/widgets/e-addressbook-view.c:332
 msgid "File As"
 msgstr "Arkivera som"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Namn"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:962
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "Email"
 msgstr "E-post"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Primary"
 msgstr "PrimÀr"
 
@@ -60,16 +61,16 @@ msgstr "Prim"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1644
-#: addressbook/gui/widgets/e-addressbook-view.c:994
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:366
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
 msgid "Business"
 msgstr "Företag"
 
@@ -79,12 +80,12 @@ msgid "Bus"
 msgstr "För"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1648
+#: addressbook/gui/contact-editor/e-contact-editor.c:1720
 msgid "Callback"
 msgstr "Tillbakaringning"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1650
+#: addressbook/gui/contact-editor/e-contact-editor.c:1722
 msgid "Company"
 msgstr "Företag"
 
@@ -95,13 +96,13 @@ msgstr "För"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
 msgid "Home"
 msgstr "Hem"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:969
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Organization"
 msgstr "Organisation"
 
@@ -111,19 +112,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1649
+#: addressbook/gui/contact-editor/e-contact-editor.c:1721
 msgid "Car"
 msgstr "Bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: addressbook/gui/widgets/e-addressbook-view.c:974
+#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Business Fax"
 msgstr "Företagsfax"
 
@@ -132,13 +133,13 @@ msgid "Bus Fax"
 msgstr "För.fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1653
-#: addressbook/gui/widgets/e-addressbook-view.c:975
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Home Fax"
 msgstr "Fax hem"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "Företag 2"
 
@@ -147,69 +148,69 @@ msgid "Bus 2"
 msgstr "För 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1652
+#: addressbook/gui/contact-editor/e-contact-editor.c:1724
 msgid "Home 2"
 msgstr "Hem 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1654
-#: addressbook/gui/widgets/e-addressbook-view.c:978
+#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
-#: addressbook/gui/contact-editor/e-contact-editor.c:1714
-#: mail/mail-config.glade.h:57
+#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: mail/mail-config.glade.h:112
 msgid "Other"
 msgstr "Annat"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
-#: addressbook/gui/widgets/e-addressbook-view.c:980
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Other Fax"
 msgstr "Annan fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:981
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "Pager"
 msgstr "Personsökare"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1660
-#: addressbook/gui/widgets/e-addressbook-view.c:982
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:983
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:984
+#: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1687
-#: addressbook/gui/widgets/e-addressbook-view.c:986
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:987
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:359
 msgid "Email 3"
 msgstr "E-post 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:988
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 msgid "Web Site"
 msgstr "Webbsida"
 
@@ -218,7 +219,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:989
+#: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Department"
 msgstr "Avdelning"
 
@@ -227,7 +228,7 @@ msgid "Dep"
 msgstr "Avd"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:990
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Office"
 msgstr "Kontor"
 
@@ -236,12 +237,12 @@ msgid "Off"
 msgstr "Kont"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:991
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 msgid "Title"
 msgstr "Titel"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:992
+#: addressbook/gui/widgets/e-addressbook-view.c:364
 msgid "Profession"
 msgstr "Yrke"
 
@@ -250,7 +251,7 @@ msgid "Prof"
 msgstr "Yrke"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:993
+#: addressbook/gui/widgets/e-addressbook-view.c:365
 msgid "Manager"
 msgstr "Manager"
 
@@ -263,7 +264,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:995
+#: addressbook/gui/widgets/e-addressbook-view.c:367
 msgid "Nickname"
 msgstr "Smeknamn"
 
@@ -272,12 +273,12 @@ msgid "Nick"
 msgstr "Smek"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:996
+#: addressbook/gui/widgets/e-addressbook-view.c:368
 msgid "Spouse"
 msgstr "Partner"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:997
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Note"
 msgstr "Notering"
 
@@ -290,7 +291,7 @@ msgid "CALUri"
 msgstr "KALUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:998
+#: addressbook/gui/widgets/e-addressbook-view.c:370
 msgid "Free-busy URL"
 msgstr "Ledig/Upptagen-URL"
 
@@ -319,302 +320,16 @@ msgstr "Kategorier"
 msgid "Family Name"
 msgstr "Efternamn"
 
-#: addressbook/backend/ebook/e-card-simple.c:788
+#: addressbook/backend/ebook/e-card-simple.c:792
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:3712
-msgid "Card: "
-msgstr "Kort: "
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Namn: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Prefix:     "
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Förnamn:    "
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Andranamn:  "
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Efternamn:  "
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Suffix:     "
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Födelsedatum: "
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adress:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Box:           "
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Anknytning:    "
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Gatuadress:    "
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Ort:           "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Region:        "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Postnummer:    "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Land:          "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Leveransetikett: "
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefoner:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-post:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-post:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"E-postprogram: "
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Tidszon: "
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Geografisk plats: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Yrkesroll: "
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Org: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Namn:    "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Enhet:   "
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Enhet 2: "
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Enhet 3: "
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Enhet 4: "
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategorier: "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Kommentar: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3879
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Unik strÀng: "
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Publik nyckel: "
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2677
 msgid "Multiple VCards"
 msgstr "Flera VCard"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2685
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard för %s"
@@ -622,86 +337,86 @@ msgstr "VCard för %s"
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1721
+#: addressbook/backend/ebook/test-client.c:34
+#: addressbook/conduit/address-conduit.c:1860
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
-#: calendar/conduits/todo/todo-conduit.c:1316
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/conduits/todo/todo-conduit.c:1385
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
 #: tools/evolution-addressbook-abuse.c:132
 #: 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:2272
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2738
 msgid "Searching..."
 msgstr "Söker..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "LĂ€ser in..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:270
+#: addressbook/backend/pas/pas-backend-file.c:272
 msgid "Error in search expression."
 msgstr "Fel i sökuttryck."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:486
-msgid "Connecting to LDAP server..."
-msgstr "Ansluter till LDAP-servern..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:496
-msgid "Unable to connect to LDAP server."
-msgstr "Kan inte ansluta till LDAP-servern."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:512
-msgid "Waiting for connection to LDAP server..."
-msgstr "VÀntar pÄ anslutning till LDAP-servern..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:915
+#: addressbook/backend/pas/pas-backend-ldap.c:1129
 msgid "Adding card to LDAP server..."
 msgstr "LĂ€gger till kort till LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1016
+#: addressbook/backend/pas/pas-backend-ldap.c:1232
 msgid "Removing card from LDAP server..."
 msgstr "Tar bort kort frÄn LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1468
 msgid "Modifying card from LDAP server..."
 msgstr "Modifierar kort frÄn LDAP-servern..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2217
+#: addressbook/backend/pas/pas-backend-ldap.c:2592
+msgid "Restarting search."
+msgstr "Startar om sökningen."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2684
 msgid "Receiving LDAP search results..."
 msgstr "Mottar LDAP-sökresultat..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2222
-msgid "Restarting search."
-msgstr "Startar om sökningen."
+#: addressbook/backend/pas/pas-backend-ldap.c:2765
+msgid "Error performing search"
+msgstr "Fel vid sökning"
 
-#: addressbook/conduit/address-conduit.c:426
+#: addressbook/backend/pas/pas-backend-ldap.c:2789
+msgid "Could not parse query string"
+msgstr "Kunde inte tolka frÄgestrÀng"
+
+#: addressbook/conduit/address-conduit.c:293
+msgid "Default Sync Address:"
+msgstr "Sstandardsynkroniseringsadress:"
+
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "Markören kunde inte lÀsas in\n"
 
-#: addressbook/conduit/address-conduit.c:439
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "EBook inte inlÀst\n"
 
-#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1354
 #: calendar/conduits/calendar/calendar-conduit.c:1203
-#: calendar/conduits/todo/todo-conduit.c:824
+#: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr "Kunde inte starta wombat-server"
 
-#: addressbook/conduit/address-conduit.c:1221
+#: addressbook/conduit/address-conduit.c:1355
 #: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:825
+#: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "Kunde inte starta wombat"
 
-#: addressbook/conduit/address-conduit.c:1251
-#: addressbook/conduit/address-conduit.c:1254
+#: addressbook/conduit/address-conduit.c:1385
+#: addressbook/conduit/address-conduit.c:1388
 msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte lÀsa pilotens adressprogramblock"
 
@@ -719,37 +434,57 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr "En Bonobo-testkontroll som visar en adressbok."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Configuration control for the Evolution Addressbook."
+msgstr "Konfigurationsverktyg för Evolution-adressboken."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Kontroll som visar ett Evolution-adressboksvisitkort."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Directory Servers"
+msgstr "Katalogservrar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Visare för Evolution-adressboksvisitkort"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Evolutionkomponent för att hantera kontakter."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Fabrik för kontrollen för adressboksvisitkort"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Fabrik för adressbokens adressvisare"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Fabrik för adressbokens adress-popup"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+msgid "Factory for the configuration control for the Evolution Addressbook."
+msgstr "Fabrik för konfigurationskontrollen för Evolution-adressboken."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabrik för adressbokstestkontrollen"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid ""
+"This page can be used to configure access to directory servers using the "
+"LDAP protocol"
+msgstr ""
+"Denna sida kan anvÀndas för att konfigurera Ätkomst till katalogservrar "
+"genom anvÀndning av LDAP-protokollet"
+
 #: 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
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -765,24 +500,24 @@ msgstr "LDAP-server"
 msgid "LDAP server containing contact information"
 msgstr "LDAP-server som innehÄller kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:527
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New _Contact"
-msgstr "Ny _kontakt"
+#: addressbook/gui/component/addressbook-component.c:560
+#: ui/evolution-addressbook.xml.h:33
+msgid "_Contact"
+msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "New Contact List"
 msgstr "Ny kontaktlista"
 
-#: addressbook/gui/component/addressbook-component.c:530
-msgid "New Contact _List"
-msgstr "Ny kontakt_lista"
+#: addressbook/gui/component/addressbook-component.c:563
+msgid "Contact _List"
+msgstr "Kontakt_lista"
 
-#: addressbook/gui/component/addressbook-config.c:223
+#: addressbook/gui/component/addressbook-config.c:238
 msgid "Edit Addressbook"
 msgstr "Redigera adressbok"
 
@@ -941,7 +676,7 @@ msgstr "_Kontonamn:"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:179
 msgid "_Add"
 msgstr "_LĂ€gg till"
 
@@ -954,12 +689,12 @@ msgid "_Download Limit"
 msgstr "_HÀmtningsgrÀns"
 
 #: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:107
-#: ui/evolution-addressbook.xml.h:35 ui/evolution-calendar.xml.h:39
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:189
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:28
 #: 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:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Redigera"
 
@@ -976,7 +711,7 @@ msgid "_Server name:"
 msgstr "_Servernamn:"
 
 #: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunde inte initiera gnome-vfs"
 
@@ -984,11 +719,11 @@ msgstr "Kunde inte initiera gnome-vfs"
 msgid "Other Contacts"
 msgstr "Andra kontakter"
 
-#: addressbook/gui/component/addressbook.c:499
+#: addressbook/gui/component/addressbook.c:519
 msgid "Unable to open addressbook"
 msgstr "Kan inte öppna adressboken"
 
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:528
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -998,7 +733,7 @@ msgstr ""
 "att du har angett en felaktig URI eller att LDAP-servern Àr\n"
 "onÄbar"
 
-#: addressbook/gui/component/addressbook.c:513
+#: addressbook/gui/component/addressbook.c:533
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -1010,7 +745,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:521
+#: addressbook/gui/component/addressbook.c:541
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -1018,43 +753,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:655
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:649
+#: addressbook/gui/component/addressbook.c:652
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ange lösenord för %s (anvÀndare %s)"
 
-#: addressbook/gui/component/addressbook.c:836
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "NÄgot fÀlt innehÄller"
-
-#: addressbook/gui/component/addressbook.c:837
-msgid "Name contains"
-msgstr "Namnet innehÄller"
+#: addressbook/gui/component/addressbook.c:825
+msgid "Name begins with"
+msgstr "Namn börjar med"
 
-#: addressbook/gui/component/addressbook.c:838
-msgid "Email contains"
-msgstr "E-postadressen innehÄller"
+#: addressbook/gui/component/addressbook.c:826
+msgid "Email is"
+msgstr "E-post Àr"
 
-#: addressbook/gui/component/addressbook.c:839
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:827
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori Àr"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:828
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "NÄgot fÀlt innehÄller"
+
+#: addressbook/gui/component/addressbook.c:829 widgets/misc/e-filter-bar.h:99
 msgid "Advanced..."
 msgstr "Avancerat..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1067
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1057
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Alla kategorier"
 
-#: addressbook/gui/component/addressbook.c:1150
+#: addressbook/gui/component/addressbook.c:1139
 msgid "The URI that the Folder Browser will display"
 msgstr "URI:n som mappblÀddraren kommer att visa"
 
@@ -1069,7 +803,7 @@ msgstr "(ingen)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1686
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
 msgid "Primary Email"
 msgstr "PrimÀr e-post"
 
@@ -1124,9 +858,9 @@ 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:163
-#: addressbook/gui/component/select-names/e-select-names.c:830
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
-#: filter/filter-rule.c:637 shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:852
+#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
+#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -1155,7 +889,7 @@ msgstr "(%d visas inte)"
 msgid "Unnamed Contact"
 msgstr "Namnlös kontakt:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:581
+#: addressbook/gui/component/select-names/e-select-names.c:603
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "This may have been caused by the evolution-addressbook component crashing.\n"
@@ -1171,7 +905,7 @@ 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:589
+#: addressbook/gui/component/select-names/e-select-names.c:611
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "Under normal circumstances, this should never happen.\n"
@@ -1182,7 +916,7 @@ msgstr ""
 "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:671
+#: addressbook/gui/component/select-names/e-select-names.c:693
 msgid "Select Contacts from Addressbook"
 msgstr "VÀlj kontakter frÄn adressboken"
 
@@ -1242,7 +976,7 @@ msgstr "Samarbete"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr "Kontaktredigerare"
 
@@ -1268,6 +1002,7 @@ msgid "Full _Name..."
 msgstr "FullstÀndigt _namn..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: mail/mail-config.glade.h:74
 msgid "General"
 msgstr "AllmÀnt"
 
@@ -1315,10 +1050,12 @@ msgstr "Vill ha _HTML-post"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1478 mail/mail-config.glade.h:105
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
+#: calendar/gui/dialogs/meeting-page.c:707
+#: calendar/gui/e-calendar-table.c:1001 calendar/gui/e-day-view.c:3609
+#: filter/filter.glade.h:8 mail/folder-browser.c:1629
+#: mail/mail-config.glade.h:187 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:39
 msgid "_Delete"
 msgstr "_Ta bort"
 
@@ -2380,23 +2117,23 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "Ta bort kontakten?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:757
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
 msgid "Category editor not available."
 msgstr "Kategoriredigeraren Àr inte tillgÀnglig."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:764
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
 msgid "This contact belongs to these categories:"
 msgstr "Denna kontakt tillhör dessa kategorier:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:978
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
 msgid "Save Contact as VCard"
 msgstr "Spara kontakt som VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2309
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunde inte hitta widget för fÀltet: \"%s\""
@@ -2410,7 +2147,7 @@ msgid "Edit Full"
 msgstr "Redigera fullstÀndigt namn"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:961
+#: addressbook/gui/widgets/e-addressbook-view.c:333
 msgid "Full Name"
 msgstr "FullstÀndigt namn"
 
@@ -2550,7 +2287,7 @@ msgstr "Ange en e-postadress eller dra en kontakt till listan nedan:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_Hide addresses when sending mail to this list"
-msgstr "_Göm adresser dÄ e-post skickas till denna lista"
+msgstr "_Dölj adresser dÄ e-post skickas till denna lista"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
@@ -2616,7 +2353,7 @@ msgstr ""
 "redan i den hÀr mappen. Vill du lÀgga till den ÀndÄ?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:238
+#: widgets/misc/e-filter-bar.c:231
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
@@ -2625,170 +2362,187 @@ msgstr "Avancerad sökning"
 msgid "Search"
 msgstr "Sök"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:136
 msgid "No cards"
 msgstr "Inga kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:139
 msgid "1 card"
 msgstr "1 kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:142
 #, c-format
 msgid "%d cards"
 msgstr "%d kort"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:141
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:278
-#: addressbook/gui/widgets/e-addressbook-view.c:734
-#: addressbook/gui/widgets/e-addressbook-view.c:834
-#: addressbook/gui/widgets/e-addressbook-view.c:1516
-#: ui/evolution-addressbook.xml.h:19
+#: addressbook/gui/widgets/e-addressbook-model.c:369
+msgid "Error getting book view"
+msgstr "Fel vid hÀmtande av bokvy"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:145
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:1016
+#: addressbook/gui/widgets/e-addressbook-view.c:1638
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save as VCard"
 msgstr "Spara som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:313
 #: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Öppna"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: ui/evolution-addressbook.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
+#: addressbook/gui/widgets/e-addressbook-view.c:1017
+#: ui/evolution-addressbook.xml.h:13
 msgid "Forward Contact"
 msgstr "Vidarebefordra kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
-#: addressbook/gui/widgets/e-addressbook-view.c:836
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
+#: addressbook/gui/widgets/e-addressbook-view.c:1018
 msgid "Send Message to Contact"
 msgstr "Skicka meddelande till kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:281
-#: addressbook/gui/widgets/e-addressbook-view.c:837
-#: 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:67
-#: ui/my-evolution.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:317
+#: addressbook/gui/widgets/e-addressbook-view.c:1019
+#: ui/evolution-addressbook.xml.h:19 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
-#: addressbook/gui/widgets/e-addressbook-view.c:839
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:319
+#: addressbook/gui/widgets/e-addressbook-view.c:1021
 msgid "Print Envelope"
 msgstr "Skriv ut kuvert"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
-#: addressbook/gui/widgets/e-addressbook-view.c:841
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:323
+#: addressbook/gui/widgets/e-addressbook-view.c:1025
+msgid "Copy to folder..."
+msgstr "Kopiera till mapp..."
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:324
+#: addressbook/gui/widgets/e-addressbook-view.c:1026
+msgid "Move to folder..."
+msgstr "Flytta till mapp..."
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:327
+#: addressbook/gui/widgets/e-addressbook-view.c:1029
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:286
-#: addressbook/gui/widgets/e-addressbook-view.c:842
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
-#: ui/evolution-tasks.xml.h:3
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
+#: addressbook/gui/widgets/e-addressbook-view.c:1030
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiera"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
-#: addressbook/gui/widgets/e-addressbook-view.c:843
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
+#: addressbook/gui/widgets/e-addressbook-view.c:1031
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Klistra in"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:844 filter/libfilter-i18n.h:9
-#: mail/mail-accounts.c:296 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:18
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:330
+#: addressbook/gui/widgets/e-addressbook-view.c:1032
+#: filter/libfilter-i18n.h:10 mail/mail-accounts.c:213
+#: ui/evolution-addressbook.xml.h:10 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:20
 msgid "Delete"
 msgstr "Ta bort"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Fel vid Àndring av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:33
-#: shell/evolution-shell-component.c:1020
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: shell/evolution-shell-component.c:1042
 msgid "Success"
 msgstr "Lyckades"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1895
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1990
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1079
 msgid "Unknown error"
 msgstr "OkÀnt fel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "Lagret frÄnkopplat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
-#: shell/evolution-shell-component.c:1048
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
+#: shell/evolution-shell-component.c:1070
 msgid "Permission denied"
 msgstr "Åtkomst nekas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Kortet hittades inte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "Kort-ID finns redan"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Protokollet stöds inte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2276
 #: camel/camel-service.c:610 camel/camel-service.c:646
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Annat fel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: 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
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "Fel vid tillÀgg av lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "Fel vid tillÀgg av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "Fel vid Àndring av lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "Fel vid borttagning av lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1389
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1436
 msgid "Error removing card"
 msgstr "Fel vid borttagning av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:202
+#: addressbook/gui/widgets/e-addressbook-util.c:204
 msgid "Display Cards?"
 msgstr "Visa kort?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:203
+#: addressbook/gui/widgets/e-addressbook-util.c:205
 msgid "Display Cards"
 msgstr "Visa kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2798,81 +2552,97 @@ msgstr ""
 "Du har begÀrt att %d kort ska vara kort. Detta kommer att orsaka att %d nya "
 "fönster visas pÄ din skÀrm. Vill du verkligen visa alla dessa 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:404
-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,Ä,À,ö"
+#: addressbook/gui/widgets/e-addressbook-util.c:342
+msgid "Move card to"
+msgstr "Flytta kort till"
 
-#. Translators: put here a list of characters that correspond to buttons
-#. 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:409
-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-util.c:344
+msgid "Copy card to"
+msgstr "Kopiera kort till"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:347
+msgid "Move cards to"
+msgstr "Flytta kort till"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:959
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+msgid "Copy cards to"
+msgstr "Kopiera kort till"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:331
 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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:335
 msgid "Primary Phone"
 msgstr "PrimÀr telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:964
+#: addressbook/gui/widgets/e-addressbook-view.c:336
 msgid "Assistant Phone"
 msgstr "Sekreterartelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:965
+#: addressbook/gui/widgets/e-addressbook-view.c:337
 msgid "Business Phone"
 msgstr "Arbetstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:966
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Callback Phone"
 msgstr "Tillbakaringningstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:967
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Company Phone"
 msgstr "Företagets telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:968
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Home Phone"
 msgstr "Hemtelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:970
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Business Address"
 msgstr "Företagsadress"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:971
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Address"
 msgstr "Hemadress"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:972
+#: addressbook/gui/widgets/e-addressbook-view.c:344
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:973
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:976
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Business Phone 2"
 msgstr "Företagstelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:977
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Home Phone 2"
 msgstr "Hemtelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:979
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Other Phone"
 msgstr "Annan telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:985
+#: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Other Address"
 msgstr "Annan adress"
 
+#. 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:580
+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,Ä,À,ö"
+
+#. Translators: put here a list of characters that correspond to buttons
+#. 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:585
+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-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -2886,20 +2656,30 @@ msgstr "och ett annat kort."
 msgid "Save in addressbook"
 msgstr "Spara i adressboken"
 
-#: addressbook/gui/widgets/e-minicard-view.c:150
+#: addressbook/gui/widgets/e-minicard-view.c:158
 msgid ""
 "\n"
 "\n"
-"There are no items to show in this view\n"
+"There are no items to show in this view.\n"
 "\n"
 "Double-click here to create a new Contact."
 msgstr ""
 "\n"
 "\n"
-"Det finns inga objekt att visa i denna vy\n"
+"Det finns inga objekt att visa i denna vy.\n"
 "\n"
 "Dubbelklicka hÀr för att skapa en ny kontakt."
 
+#: addressbook/gui/widgets/e-minicard-view.c:161
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Det finns inga objekt att visa i denna vy."
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Kortvy"
@@ -2987,6 +2767,7 @@ msgid "Include:"
 msgstr "Inkludera:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Liggande"
 
@@ -3011,6 +2792,7 @@ msgid "Options"
 msgstr "Alternativ"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Orientering"
 
@@ -3031,7 +2813,9 @@ msgstr "Papper"
 msgid "Paper source:"
 msgstr "PapperskÀlla:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "StÄende"
 
@@ -3093,32 +2877,32 @@ msgstr "Namnlöst möte"
 
 #: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:679
+#: calendar/gui/e-calendar-table.c:416 mail/message-list.c:684
 msgid "High"
 msgstr "Hög"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/calendar-model.c:1711
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:678
+#: calendar/gui/e-calendar-table.c:417 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:677
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:682
 msgid "Low"
 msgstr "LĂ„g"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:518
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:419
 msgid "Undefined"
 msgstr "Odefinierad"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:770
+#: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Fel vid kommunikation med kalenderserver"
 
@@ -3127,8 +2911,12 @@ msgstr "Fel vid kommunikation med kalenderserver"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunde inte lÀsa pilotens kalenderprogramblock"
 
-#: calendar/conduits/todo/todo-conduit.c:886
-#: calendar/conduits/todo/todo-conduit.c:889
+#: calendar/conduits/todo/todo-conduit.c:206
+msgid "Default Priority:"
+msgstr "Standardprioritet:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunde inte lÀsa pilotens att-göra-programblock"
 
@@ -3141,41 +2929,53 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "En Bonobo-testkontroll som visar en kalender."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalender och uppgifter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Configuration control for the Evolution Calendar."
+msgstr "Konfigurationsverktyg för Evolution-kalendern."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution calendar executive summary component."
 msgstr "Evolutions kalendersammanfattningskomponent."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolutionkalenderns visare för iTip/iMip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Evolutionkomponent för hantering av kalendern."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the Calendar Summary component."
 msgstr "Fabrik för kalendersammanfattningskomponenten."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr "Fabrik för Evolutions uppgiftskomponent."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr "Fabrik för kalenderns iTip-vykontroll"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "Fabrik för test-kalenderkontrollen"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Fabrik för att centralisera kalenderkomponentens redigerardialoger"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr "Fabrik för att skapa en komponentredigerarfabrik"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+msgid "This page can be used to configure Calendar and Task preferences"
+msgstr ""
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr "AlarmaviseringstjÀnst"
@@ -3239,7 +3039,7 @@ msgstr ""
 "visa en normal dialogruta istÀllet."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2235
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2583
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varning"
@@ -3265,7 +3065,7 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "FrÄga mig inte om detta program igen."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Kunde inte initiera GNOME"
 
@@ -3277,68 +3077,68 @@ msgstr "Kunde inte skapa fabriken för alarmnotifieringstjÀnsten"
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunde inte skapa fabriken för alarmaviseringstjÀnsten"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Sammanfattningen innehÄller"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Beskrivningen innehÄller"
 
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Kommentaren innehÄller"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1081
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1118
 msgid "Unmatched"
 msgstr "Omatchade"
 
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/calendar-commands.c:405
 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:449 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1421 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
-#: calendar/gui/calendar-commands.c:458
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
-#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
+#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
 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:474
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
+#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1468
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:820
+#: calendar/gui/calendar-commands.c:775
 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:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:385
+#: calendar/gui/e-calendar-table.c:395
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
+#: calendar/gui/e-calendar-table.c:396
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:394
 msgid "Public"
 msgstr "Publikt"
 
@@ -3359,32 +3159,32 @@ msgid "W"
 msgstr "V"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:468
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
-#: calendar/gui/e-meeting-time-sel.c:432
-#: shell/evolution-shell-component.c:1042
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:469
+#: calendar/gui/e-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1064
 msgid "Busy"
 msgstr "Upptagen"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
+#: calendar/gui/e-calendar-table.c:489 calendar/gui/print.c:2267
 msgid "Not Started"
 msgstr "Inte startad"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
+#: calendar/gui/e-calendar-table.c:490 calendar/gui/print.c:2270
 msgid "In Progress"
 msgstr "PÄgÄr"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
-#: calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/e-meeting-model.c:326
+#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2273
 msgid "Completed"
 msgstr "FĂ€rdigt"
 
@@ -3400,9 +3200,11 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1496
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:405
-#: mail/mail-config.glade.h:55
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1591
+#: mail/mail-account-gui.c:1035 mail/mail-account-gui.c:1036
+#: mail/mail-account-gui.c:1621 mail/mail-accounts.c:426
+#: mail/mail-accounts.c:435 mail/mail-config.glade.h:110
+#: mail/message-tag-followup.c:62
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3417,20 +3219,20 @@ msgstr "Återkommande"
 msgid "Assigned"
 msgstr "Tilldelad"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
-#: calendar/gui/e-meeting-model.c:810
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/e-meeting-model.c:821
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:811
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/e-meeting-model.c:822
 msgid "No"
 msgstr "Nej"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-#: calendar/gui/e-week-view.c:1188
+#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1695
+#: calendar/gui/e-week-view.c:1206
 msgid "Searching"
 msgstr "Söker"
 
@@ -3450,44 +3252,66 @@ msgstr "Veckovy"
 msgid "Month View"
 msgstr "MĂ„nadsvy"
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:67 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Mapp som innehÄller möten och evenemang"
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
-#: my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+#: calendar/gui/component-factory.c:72 calendar/gui/print.c:1754
+#: calendar/gui/tasks-control.c:502
+#: calendar/importers/icalendar-importer.c:645
+#: my-evolution/e-summary-tasks.c:250 my-evolution/e-summary-tasks.c:267
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1039
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Mapp som innehÄller att-göra-objekt"
 
-#: 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:690
+msgid "New meeting"
+msgstr "Nytt möte"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-msgid "New _Appointment"
-msgstr "Nytt m_öte"
+#: calendar/gui/component-factory.c:690
+msgid "_Meeting"
+msgstr "_Möte"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr "Skapa en ny uppgift"
+#: calendar/gui/component-factory.c:694
+msgid "New task"
+msgstr "Ny uppgift"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "Ny _uppgift"
+#: calendar/gui/component-factory.c:694
+msgid "_Task"
+msgstr "_Uppgift"
+
+#: calendar/gui/component-factory.c:698
+msgid "New All Day Appointment"
+msgstr "Nytt heldagsmöte"
+
+#: calendar/gui/component-factory.c:698
+msgid "All _Day Appointment"
+msgstr "Hel_dagsmöte"
+
+#: calendar/gui/component-factory.c:702
+msgid "New appointment"
+msgstr "Nytt möte"
+
+#: calendar/gui/component-factory.c:702
+msgid "_Appointment"
+msgstr "_Möte"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:103
+#, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Kunde inte öppna mappen i \"%s\""
+
+#: calendar/gui/control-factory.c:130
 msgid "The URI that the calendar will display"
 msgstr "URI:n som kalendern kommer att visa"
 
@@ -3686,7 +3510,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:748 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:758 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammanfattning:"
 
@@ -3715,7 +3539,7 @@ msgstr "slut pÄ möte"
 msgid "hour(s)"
 msgstr "timme/timmar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:129
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:221
 msgid "minute(s)"
 msgstr "minut(er)"
 
@@ -3859,7 +3683,7 @@ msgid "Wednesday"
 msgstr "onsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Arbetsvecka"
 
@@ -3897,7 +3721,7 @@ msgstr "Allm_Ă€nt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Hide completed tasks after"
-msgstr "_Göm fÀrdiga uppgifter efter"
+msgstr "_Dölj fÀrdiga uppgifter efter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Mon"
@@ -3985,73 +3809,60 @@ msgstr ""
 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:188 calendar/gui/print.c:2164
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2185
 msgid " to "
 msgstr " till "
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2189
 msgid " (Completed "
 msgstr " (FĂ€rdigt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2191
 msgid "Completed "
 msgstr "FĂ€rdigt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2196
 msgid " (Due "
 msgstr " (Ska utföras "
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2198
 msgid "Due "
 msgstr "Ska utföras "
 
-#: calendar/gui/dialogs/comp-editor.c:321
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "Kunde inte uppdatera objekt!"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagbokspost - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2015
-#: mail/mail-display.c:101
-msgid "Overwrite file?"
-msgstr "Skriv över fil?"
-
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2022
-#: mail/mail-display.c:105
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Det finns redan en fil med det namnet.\n"
-"Ska den skrivas över?"
-
-#: calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: calendar/gui/dialogs/comp-editor.c:1074
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3801
+#: calendar/gui/e-week-view.c:3707 composer/e-msg-composer.c:956
+msgid "Save as..."
 msgstr "Spara som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "Kunde inte fÄ tag i aktuell version!"
 
@@ -4109,7 +3920,7 @@ msgstr "Delegera till:"
 msgid "Enter Delegate"
 msgstr "Ange delegerad person"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2224
 msgid "Appointment"
 msgstr "Möte"
 
@@ -4123,13 +3934,13 @@ msgstr "Upprepning"
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:363
+#: calendar/gui/dialogs/event-editor.c:365
 msgid "Scheduling"
 msgstr "SchemalÀggning"
 
 #: calendar/gui/dialogs/event-editor.c:207
 #: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:366
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr "Möte"
 
@@ -4250,7 +4061,7 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:809
+#: calendar/gui/e-itip-control.c:853
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "OSA"
@@ -4262,14 +4073,14 @@ msgstr "Roll"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:47
-#: mail/message-list.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:51
+#: mail/message-list.etspec.h:11
 msgid "Status"
 msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:94
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:168
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -4284,7 +4095,7 @@ msgid "_Change Organizer"
 msgstr "_Ändra organisatör"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "Bjud _in andra..."
 
@@ -4407,7 +4218,7 @@ msgid "Progress"
 msgstr "Förlopp"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:966
+#: my-evolution/e-summary-preferences.c:766
 msgid "URL:"
 msgstr "URL:"
 
@@ -4421,13 +4232,13 @@ msgstr "_Status:"
 
 #: calendar/gui/dialogs/task-editor.c:190
 #: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:322
+#: calendar/gui/dialogs/task-editor.c:324
 msgid "Assignment"
 msgstr "Tilldelning"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:757
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:801
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:55
 msgid "Description:"
 msgstr "Beskrivning:"
 
@@ -4439,115 +4250,131 @@ msgstr "Sta_rtdatum:"
 msgid "_Due Date:"
 msgstr "Förfallo_datum:"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:438
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:439
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:440
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:441
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:442
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:443
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:444
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:445
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:436
+#: calendar/gui/e-calendar-table.c:446
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/e-calendar-table.c:447
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-calendar-table.c:448
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
-#: calendar/gui/e-week-view.c:1828
+#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2744
+#: calendar/gui/e-week-view.c:1846
 msgid "Deleting selected objects"
 msgstr "Tar bort markerade objekt"
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
-#: calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1455
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3583
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1602
+#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:40
 msgid "_Open"
 msgstr "_Öppna"
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:974
+msgid "_Save as..."
+msgstr "_Spara som..."
+
+#: calendar/gui/e-calendar-table.c:976 calendar/gui/e-day-view.c:3587
+#: calendar/gui/e-week-view.c:3442 calendar/gui/e-week-view.c:3475
+#: ui/evolution-addressbook.xml.h:42 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+msgid "_Print..."
+msgstr "Skriv _ut..."
+
+#: calendar/gui/e-calendar-table.c:981 calendar/gui/e-day-view.c:3593
+#: calendar/gui/e-week-view.c:3481 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:966 calendar/gui/e-day-view.c:3557
-#: calendar/gui/e-week-view.c:3443 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:983 calendar/gui/e-day-view.c:3595
+#: calendar/gui/e-week-view.c:3483 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: calendar/gui/e-calendar-table.c:968 calendar/gui/e-day-view.c:3532
-#: calendar/gui/e-day-view.c:3559 calendar/gui/e-week-view.c:3419
-#: calendar/gui/e-week-view.c:3445 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:21
+#: calendar/gui/e-calendar-table.c:985 calendar/gui/e-day-view.c:3559
+#: calendar/gui/e-day-view.c:3597 calendar/gui/e-week-view.c:3447
+#: calendar/gui/e-week-view.c:3485 ui/evolution-addressbook.xml.h:41
+#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:990
+msgid "_Assign Task"
+msgstr "_Tilldela uppgift"
+
+#: calendar/gui/e-calendar-table.c:992
+msgid "_Forward as iCalendar"
+msgstr "_Vidarebefordra som iCalendar"
+
+#: calendar/gui/e-calendar-table.c:994
 msgid "_Mark as Complete"
 msgstr "_Markera som fÀrdig"
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "_Ta bort denna uppgift"
+#: calendar/gui/e-calendar-table.c:996
+msgid "_Mark Selected Tasks as Complete"
+msgstr "_Markera markerade uppgifter som fÀrdiga"
 
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
-msgstr "_Markera uppgifterna som fÀrdiga"
-
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Delete Selected Tasks"
 msgstr "_Ta bort markerade uppgifter"
 
-#: calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
-#: calendar/gui/e-week-view.c:3928
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7366
+#: calendar/gui/e-week-view.c:4155
 msgid "Updating objects"
 msgstr "Uppdaterar objekt"
 
-#: calendar/gui/e-calendar-table.c:1247
+#: calendar/gui/e-calendar-table.c:1354
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klicka för att lÀgga till en uppgift"
@@ -4556,8 +4383,8 @@ msgstr "Klicka för att lÀgga till en uppgift"
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
-#: camel/camel-filter-driver.c:1026
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1055
 msgid "Complete"
 msgstr "FĂ€rdigt"
 
@@ -4588,8 +4415,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:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
+#: my-evolution/component-factory.c:48 shell/e-shell.c:661
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Sammanfattning"
 
@@ -4631,385 +4458,442 @@ 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:284 calendar/gui/e-day-view.c:1389
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1407
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1484
 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:292 calendar/gui/e-day-view.c:1416
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1434
 #: 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:614 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:768
+#: calendar/gui/e-day-view.c:632 calendar/gui/e-week-view.c:368
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "fm"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:770
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:371
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "em"
 
-#: calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
+#: calendar/gui/e-day-view.c:3543
+msgid "New _Appointment"
+msgstr "Nytt m_öte"
+
+#: calendar/gui/e-day-view.c:3545 calendar/gui/e-week-view.c:3433
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsarrangemang"
 
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
-#: ui/evolution-calendar.xml.h:17
+#: calendar/gui/e-day-view.c:3547 calendar/gui/e-week-view.c:3435
+msgid "New Meeting"
+msgstr "Nytt möte"
+
+#: calendar/gui/e-day-view.c:3549 calendar/gui/e-week-view.c:3437
+msgid "New Task"
+msgstr "Ny uppgift"
+
+#: calendar/gui/e-day-view.c:3554 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Skriv ut..."
+
+#: calendar/gui/e-day-view.c:3564 calendar/gui/e-week-view.c:3452
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "GĂ„ till _idag"
 
-#: calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
+#: calendar/gui/e-day-view.c:3566 calendar/gui/e-week-view.c:3454
 msgid "_Go to Date..."
 msgstr "_GĂ„ till datum..."
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
-msgid "_Delete this Appointment"
-msgstr "_Ta bort detta möte"
+#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3459
+#: ui/evolution-calendar.xml.h:31
+msgid "_Publish Free/Busy Information"
+msgstr "_Publicera ledig-/upptageninformation"
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
+#: calendar/gui/e-day-view.c:3576 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
+msgid "_Configure..."
+msgstr "_Konfigurera..."
+
+#: calendar/gui/e-day-view.c:3585 calendar/gui/e-week-view.c:3473
+#: mail/folder-browser.c:1604 ui/evolution-mail-message.xml.h:110
+msgid "_Save As..."
+msgstr "_Spara som..."
+
+#: calendar/gui/e-day-view.c:3602 calendar/gui/e-week-view.c:3490
+msgid "_Schedule Meeting..."
+msgstr "_Boka möte..."
+
+#: calendar/gui/e-day-view.c:3604 calendar/gui/e-week-view.c:3492
+msgid "_Forward as iCalendar..."
+msgstr "_Vidarebefordra som iCalendar..."
+
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3499
 msgid "Make this Occurrence _Movable"
 msgstr "Gör denna förekomst _flyttbar"
 
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3461
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3501
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3463
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3503
 msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
-#: calendar/gui/e-itip-control.c:535
+#: calendar/gui/e-itip-control.c:545
 msgid "Meeting begins: <b>"
 msgstr "Mötet börjar: <b>"
 
-#: calendar/gui/e-itip-control.c:540
+#: calendar/gui/e-itip-control.c:550
 msgid "Task begins: <b>"
 msgstr "Uppgiften börjar: <b>"
 
-#: calendar/gui/e-itip-control.c:545
+#: calendar/gui/e-itip-control.c:555
 msgid "Free/Busy info begins: <b>"
 msgstr "Ledig-/upptageninformation börjar: <b>"
 
-#: calendar/gui/e-itip-control.c:549
+#: calendar/gui/e-itip-control.c:559
 msgid "Begins: <b>"
 msgstr "Börjar: <b>"
 
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:571
 msgid "Meeting ends: <b>"
 msgstr "Mötet slutar: <b>"
 
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:574
 msgid "Free/Busy info ends: <b>"
 msgstr "Ledig-/upptageninformation slutar: <b>"
 
-#: calendar/gui/e-itip-control.c:568
+#: calendar/gui/e-itip-control.c:578
 msgid "Ends: <b>"
 msgstr "Slutar: <b>"
 
-#: calendar/gui/e-itip-control.c:582
+#: calendar/gui/e-itip-control.c:592
 msgid "Task Completed: <b>"
 msgstr "Uppgiften fÀrdig: <b>"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:602
 msgid "Task Due: <b>"
 msgstr "Uppgiften ska vara utförd: <b>"
 
-#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:639 calendar/gui/e-itip-control.c:688
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:654
 msgid "iCalendar Error"
 msgstr "iCalendar-fel"
 
-#: calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:719 calendar/gui/e-itip-control.c:735
 msgid "An unknown person"
 msgstr "En okÀnd person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:742
 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:748
+#: calendar/gui/e-itip-control.c:758
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:789 calendar/gui/e-itip-control.c:805
-#: calendar/gui/e-itip-control.c:821 calendar/gui/e-itip-control.c:834
-#: calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:860
+#: calendar/gui/e-itip-control.c:770
+msgid "Status:"
+msgstr "Status:"
+
+#: calendar/gui/e-itip-control.c:775 calendar/gui/e-meeting-model.c:318
+#: calendar/gui/e-meeting-model.c:341 calendar/gui/e-meeting-model.c:835
+#: calendar/gui/itip-utils.c:323
+msgid "Accepted"
+msgstr "Godtaget"
+
+#: calendar/gui/e-itip-control.c:779 calendar/gui/itip-utils.c:326
+msgid "Tentatively Accepted"
+msgstr "PreliminÀrt godtaget"
+
+#: calendar/gui/e-itip-control.c:783 calendar/gui/e-meeting-model.c:320
+#: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/itip-utils.c:329 calendar/gui/itip-utils.c:355
+msgid "Declined"
+msgstr "Avböjt"
+
+#: calendar/gui/e-itip-control.c:787 calendar/gui/e-itip-control.c:986
+#: calendar/gui/e-itip-control.c:1057 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:289 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:793 calendar/gui/e-meeting-model.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:318
+#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:444
+msgid "Unknown"
+msgstr "OkÀnd"
+
+#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:865 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.c:904
 msgid "Choose an action:"
 msgstr "VÀlj en ÄtgÀrd:"
 
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:834
 msgid "Update"
 msgstr "Uppdatera"
 
-#: calendar/gui/e-itip-control.c:791 calendar/gui/e-itip-control.c:810
-#: calendar/gui/e-itip-control.c:823 calendar/gui/e-itip-control.c:836
-#: calendar/gui/e-itip-control.c:849 calendar/gui/e-itip-control.c:862
-#: shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:835 calendar/gui/e-itip-control.c:854
+#: calendar/gui/e-itip-control.c:867 calendar/gui/e-itip-control.c:880
+#: calendar/gui/e-itip-control.c:893 calendar/gui/e-itip-control.c:906
+#: shell/e-shell.c:1980 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:850
 msgid "Accept"
 msgstr "Acceptera"
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:851
 msgid "Tentatively accept"
 msgstr "Acceptera preliminÀrt"
 
-#: calendar/gui/e-itip-control.c:808
+#: calendar/gui/e-itip-control.c:852
 msgid "Decline"
 msgstr "Neka"
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:866
 msgid "Send Free/Busy Information"
 msgstr "Skicka ledig-/upptageninformation"
 
-#: calendar/gui/e-itip-control.c:835
+#: calendar/gui/e-itip-control.c:879
 msgid "Update respondent status"
 msgstr "Uppdatera svarandestatus"
 
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:892
 msgid "Send Latest Information"
 msgstr "Skicka senaste information"
 
-#: calendar/gui/e-itip-control.c:861 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:905 calendar/gui/itip-utils.c:343
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:909
+#: calendar/gui/e-itip-control.c:953
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publicerat mötesinformation."
 
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:954
 msgid "Meeting Information"
 msgstr "Mötesinformation"
 
-#: calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:958
 #, 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:915
+#: calendar/gui/e-itip-control.c:959
 msgid "Meeting Proposal"
 msgstr "Mötesförslag"
 
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:963
 #, 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:920
+#: calendar/gui/e-itip-control.c:964
 msgid "Meeting Update"
 msgstr "Mötesuppdatering"
 
-#: calendar/gui/e-itip-control.c:924
+#: calendar/gui/e-itip-control.c:968
 #, 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:925
+#: calendar/gui/e-itip-control.c:969
 msgid "Meeting Update Request"
 msgstr "BegÀran av mötesuppdatering"
 
-#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:1013
-#: calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:292
-#: calendar/gui/e-meeting-model.c:357 calendar/gui/e-meeting-model.c:782
-#: calendar/gui/e-meeting-model.c:798
-#: camel/providers/smtp/camel-smtp-transport.c:171
-#: camel/providers/smtp/camel-smtp-transport.c:226
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:442
-msgid "Unknown"
-msgstr "OkÀnd"
-
-#: calendar/gui/e-itip-control.c:948
+#: calendar/gui/e-itip-control.c:992
 #, 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:949
+#: calendar/gui/e-itip-control.c:993
 msgid "Meeting Reply"
 msgstr "Mötessvar"
 
-#: calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:997
 #, 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:954
+#: calendar/gui/e-itip-control.c:998
 msgid "Meeting Cancellation"
 msgstr "Mötesavbokning"
 
-#: calendar/gui/e-itip-control.c:958 calendar/gui/e-itip-control.c:1029
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1002 calendar/gui/e-itip-control.c:1073
+#: calendar/gui/e-itip-control.c:1108
 #, 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:959
+#: calendar/gui/e-itip-control.c:1003
 msgid "Bad Meeting Message"
 msgstr "Felaktigt mötesmeddelande"
 
-#: calendar/gui/e-itip-control.c:979
+#: calendar/gui/e-itip-control.c:1023
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publicerat mötesinformation."
 
-#: calendar/gui/e-itip-control.c:980
+#: calendar/gui/e-itip-control.c:1024
 msgid "Task Information"
 msgstr "Uppgiftsinformation"
 
-#: calendar/gui/e-itip-control.c:984
+#: calendar/gui/e-itip-control.c:1028
 #, 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:985
+#: calendar/gui/e-itip-control.c:1029
 msgid "Task Proposal"
 msgstr "Uppgiftsförslag"
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:1033
 #, 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:990
+#: calendar/gui/e-itip-control.c:1034
 msgid "Task Update"
 msgstr "Uppgiftsuppdatering"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:1038
 #, 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:995
+#: calendar/gui/e-itip-control.c:1039
 msgid "Task Update Request"
 msgstr "BegÀran om uppgiftsuppdatering"
 
-#: calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:1063
 #, 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:1020
+#: calendar/gui/e-itip-control.c:1064
 msgid "Task Reply"
 msgstr "Uppgiftssvar"
 
-#: calendar/gui/e-itip-control.c:1024
+#: calendar/gui/e-itip-control.c:1068
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har avbokat en uppgift."
 
-#: calendar/gui/e-itip-control.c:1025
+#: calendar/gui/e-itip-control.c:1069
 msgid "Task Cancellation"
 msgstr "Uppgiftsavbokning"
 
-#: calendar/gui/e-itip-control.c:1030
+#: calendar/gui/e-itip-control.c:1074
 msgid "Bad Task Message"
 msgstr "Felaktigt uppgiftsmeddelande"
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1093
 #, 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:1050
+#: calendar/gui/e-itip-control.c:1094
 msgid "Free/Busy Information"
 msgstr "Ledig-/upptageninformation"
 
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1098
 #, 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:1055
+#: calendar/gui/e-itip-control.c:1099
 msgid "Free/Busy Request"
 msgstr "Ledig-/UpptagenbegÀran"
 
-#: calendar/gui/e-itip-control.c:1059
+#: calendar/gui/e-itip-control.c:1103
 #, 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:1060
+#: calendar/gui/e-itip-control.c:1104
 msgid "Free/Busy Reply"
 msgstr "Ledig-/Upptagensvar"
 
-#: calendar/gui/e-itip-control.c:1065
+#: calendar/gui/e-itip-control.c:1109
 msgid "Bad Free/Busy Message"
 msgstr "Felaktigt ledig-/upptagenmeddelande"
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1182
 msgid "The message does not appear to be properly formed"
 msgstr "Meddelandet verkar inte vara korrekt utformat"
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1201
 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:1185 calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1235
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilagan innehÄller inte ett giltigt kalendermeddelande"
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1260
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilagan har inga visningsbara kalenderobjekt"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1338
+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"
+
+#: calendar/gui/e-itip-control.c:1369
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunde inte uppdateras!\n"
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1371
 msgid "Update complete\n"
 msgstr "Uppdateringen fÀrdig\n"
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1416
 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:1370
+#: calendar/gui/e-itip-control.c:1424
 msgid "Attendee status could not be updated!\n"
 msgstr "NĂ€rvarandestatus kunde inte uppdateras!\n"
 
-#: calendar/gui/e-itip-control.c:1372
+#: calendar/gui/e-itip-control.c:1426
 msgid "Attendee status updated\n"
 msgstr "NÀrvarandestatus Àr uppdaterad\n"
 
-#: calendar/gui/e-itip-control.c:1374
+#: calendar/gui/e-itip-control.c:1428
 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:1402
+#: calendar/gui/e-itip-control.c:1456
 msgid "Removal Complete"
 msgstr "Borttagning fÀrdig"
 
-#: calendar/gui/e-itip-control.c:1421 calendar/gui/e-itip-control.c:1471
+#: calendar/gui/e-itip-control.c:1486 calendar/gui/e-itip-control.c:1536
 msgid "Item sent!\n"
 msgstr "Objektet skickat!\n"
 
-#: calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
+#: calendar/gui/e-itip-control.c:1488 calendar/gui/e-itip-control.c:1540
 msgid "The item could not be sent!\n"
 msgstr "Objektet kunde inte skickas!\n"
 
-#: calendar/gui/e-itip-control.c:1648
-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"
-
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -5047,207 +4931,201 @@ msgstr "slutdatum"
 msgid "date-start"
 msgstr "startdatum"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "Ordförandepersoner"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "NödvÀndiga deltagare"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "Valfria deltagare"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "Icke-deltagare"
 
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533 calendar/gui/e-meeting-model.c:789
 msgid "Individual"
 msgstr "Person"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:779
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:790
 msgid "Group"
 msgstr "Grupp"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:780
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:791
 msgid "Resource"
 msgstr "Resurs"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:781
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:792
 msgid "Room"
 msgstr "Rum"
 
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:794
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:805
 msgid "Chair"
 msgstr "Mötesordförande"
 
-#: calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535 calendar/gui/e-meeting-model.c:806
 msgid "Required Participant"
 msgstr "NödvÀndig deltagare"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:796
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:807
 msgid "Optional Participant"
 msgstr "Valfri deltagare"
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:797
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:808
 msgid "Non-Participant"
 msgstr "Icke-deltagare"
 
-#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543 calendar/gui/e-meeting-model.c:834
 msgid "Needs Action"
 msgstr "Behöver ÄtgÀrd"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:824
-msgid "Accepted"
-msgstr "Godtaget"
-
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:825
-msgid "Declined"
-msgstr "Avböjt"
-
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:837 calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "PreliminÀrt"
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:838
 msgid "Delegated"
 msgstr "Delegerat"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 msgid "In Process"
 msgstr "PÄgÄr"
 
 #. 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:471
-#: calendar/gui/e-meeting-time-sel.c:2102
+#: calendar/gui/e-meeting-time-sel-item.c:475
+#: calendar/gui/e-meeting-time-sel.c:2088
 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:475
-#: calendar/gui/e-meeting-time-sel.c:2132 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel-item.c:479
+#: calendar/gui/e-meeting-time-sel.c:2118 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:479 e-util/e-time-utils.c:221
+#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:221
 #: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: calendar/gui/e-meeting-time-sel.c:433
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "Inte inne"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Ingen information"
 
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Alternativ"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "Visa _endast arbetstimmar"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "Visa ut_zoomade"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "_Uppdatera ledig/upptagen"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_AutovÀlj"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "_Alla mÀnniskor och resurser"
 
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "Alla _mÀnniskor och en resurs"
 
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "Folk som k_rÀvs"
 
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "Folk som krÀvs _och en resurs"
 
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "Mötets _starttid:"
 
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "Mötets slu_ttid:"
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Öppnar uppgifter i %s"
 
-#: calendar/gui/e-tasks.c:367
+#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunde inte lÀsa in uppgifterna i \"%s\""
 
-#: calendar/gui/e-tasks.c:379
+#: calendar/gui/e-tasks.c:404
 #, 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-tasks.c:629
+#: calendar/gui/e-tasks.c:654
 msgid "Expunging"
 msgstr "UtplÄnar"
 
-#: calendar/gui/e-week-view.c:3412 calendar/gui/e-week-view.c:3450
+#: calendar/gui/e-week-view.c:3431
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
-#: calendar/gui/gnome-cal.c:1493
+#: calendar/gui/e-week-view.c:3497
+msgid "_Delete this Appointment"
+msgstr "_Ta bort detta möte"
+
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunde inte öppna mappen i \"%s\""
 
-#: calendar/gui/gnome-cal.c:1504
+#: calendar/gui/gnome-cal.c:1510
 #, 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:1859
+#: calendar/gui/gnome-cal.c:1879
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Öppnar kalender i %s"
@@ -5308,284 +5186,288 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr "Åtminstone en nĂ€rvarande person krĂ€vs"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "En organisatör mÄste vara angiven."
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
+#: calendar/gui/itip-utils.c:295
 msgid "Event information"
 msgstr "Evenemangsinformation"
 
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
+#: calendar/gui/itip-utils.c:297
 msgid "Task information"
 msgstr "Uppgiftsinformation"
 
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
+#: calendar/gui/itip-utils.c:299
 msgid "Journal information"
 msgstr "Journalinformation"
 
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
+#: calendar/gui/itip-utils.c:301
 msgid "Free/Busy information"
 msgstr "Ledig-/upptageninformation"
 
-#: calendar/gui/itip-utils.c:321
+#: calendar/gui/itip-utils.c:303
 msgid "Calendar information"
 msgstr "Kalenderinformation"
 
-#: calendar/gui/itip-utils.c:370
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Ledig-/upptageninformation (%s till %s)"
+#: calendar/gui/itip-utils.c:339
+msgid "Updated"
+msgstr "Uppdaterat"
 
-#: calendar/gui/itip-utils.c:382
-msgid "iCalendar information"
-msgstr "iCalendar-information"
+#: calendar/gui/itip-utils.c:347
+msgid "Refresh"
+msgstr "Uppdatera"
 
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:351
+msgid "Counter-proposal"
+msgstr "Motförslag"
+
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Du mÄste vara nÀrvarande pÄ detta evenemang."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
 msgstr "Kunde inte skapa komponentredigerarfabriken"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "1st"
 msgstr "1:a"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "2nd"
 msgstr "2:a"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "3rd"
 msgstr "3:e"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "4th"
 msgstr "4:e"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "5th"
 msgstr "5:e"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "6th"
 msgstr "6:e"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "7th"
 msgstr "7:e"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "8th"
 msgstr "8:e"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "9th"
 msgstr "9:e"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "10th"
 msgstr "10:e"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "11th"
 msgstr "11:e"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "12th"
 msgstr "12:e"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "13th"
 msgstr "13:e"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "14th"
 msgstr "14:e"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "15th"
 msgstr "15:e"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "16th"
 msgstr "16:e"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "17th"
 msgstr "17:e"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "18th"
 msgstr "18:e"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "19th"
 msgstr "19:e"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "20th"
 msgstr "20:e"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "21st"
 msgstr "21:a"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "22nd"
 msgstr "22:a"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "23rd"
 msgstr "23:e"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "24th"
 msgstr "24:e"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "25th"
 msgstr "25:e"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "26th"
 msgstr "26:e"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "27th"
 msgstr "27:e"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "28th"
 msgstr "28:e"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "29th"
 msgstr "29:e"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "30th"
 msgstr "30:e"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:462
 msgid "31st"
 msgstr "31:a"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Su"
 msgstr "Sö"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "MĂ„"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Ti"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "On"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "To"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Lö"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1840
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Markerad dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
+#: calendar/gui/print.c:1865 calendar/gui/print.c:1869
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1866
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1852
+#: calendar/gui/print.c:1870 calendar/gui/print.c:1872
+#: calendar/gui/print.c:1873
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1877
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Markerad vecka (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1885
 msgid "Selected month (%b %Y)"
 msgstr "Markerad mÄnad (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1892
 msgid "Selected year (%Y)"
 msgstr "Markerat Ă„r (%Y)"
 
-#: calendar/gui/print.c:2205
+#: calendar/gui/print.c:2226
 msgid "Task"
 msgstr "Uppgift"
 
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2283
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2280
+#: calendar/gui/print.c:2301
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2294
+#: calendar/gui/print.c:2315
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent klar: %i"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2320
+#: calendar/gui/print.c:2341
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2352
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2407
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2512 my-evolution/e-summary.c:605
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
+#: calendar/gui/print.c:2498 calendar/gui/print.c:2590
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2862
+#: my-evolution/e-summary.c:604 ui/evolution-addressbook.xml.h:20
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Förhandsgranska"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2527
 msgid "Print Item"
 msgstr "Skriv ut objekt"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2608
 msgid "Print Setup"
 msgstr "SkrivarinstÀllningar"
 
@@ -5595,11 +5477,11 @@ msgid ""
 msgstr ""
 "Kunde inte skapa uppgiftsvyn. Kontrollera din ORBit- och OAF-installation."
 
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr "URI:t som uppgiftsmappen ska visa"
 
-#: calendar/gui/tasks-control.c:434
+#: calendar/gui/tasks-control.c:456
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -5612,10 +5494,15 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa uppgifter?"
 
-#: calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2249
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2358
+#: mail/mail-callbacks.c:2597
 msgid "Do not ask me again."
 msgstr "FrÄga mig inte igen."
 
+#: calendar/gui/tasks-control.c:612
+msgid "Print Tasks"
+msgstr "Skriv ut uppgifter"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5666,6 +5553,30 @@ msgstr "Fabrik för import av iCalendar-filer till Evolution"
 msgid "Imports iCalendar files into Evolution"
 msgstr "Importerar iCalendar-filer till Evolution"
 
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+msgid "Imports vCalendar files into Evolution"
+msgstr "Importerar vCalendar-filer till Evolution"
+
+#: calendar/importers/icalendar-importer.c:424
+msgid "Reminder!!"
+msgstr "PĂ„minnelse!!"
+
+#: calendar/importers/icalendar-importer.c:638
+msgid "Calendar Events"
+msgstr "KalenderhÀndelser"
+
+#: calendar/importers/icalendar-importer.c:663
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution har hittat Gnome-kalenderfiler.\n"
+"Vill du importera dem till Evolution?"
+
+#: calendar/importers/icalendar-importer.c:670
+msgid "Gnome Calendar"
+msgstr "Gnome-kalendern"
+
 #: calendar/pcs/query.c:246
 msgid "time-now expects 0 arguments"
 msgstr "time-now förvÀntar sig 0 argument"
@@ -7308,11 +7219,11 @@ 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-data-cache.c:159
+#: camel/camel-data-cache.c:166
 msgid "Unable to create cache path"
 msgstr "Kan inte skapa cachesökvÀg"
 
-#: camel/camel-data-cache.c:426
+#: camel/camel-data-cache.c:438
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kunde inte ta bort cacheposten: %s: %s"
@@ -7347,52 +7258,52 @@ msgstr "Återsynkroniserar med servern"
 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:689 camel/camel-filter-driver.c:698
+#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
 msgid "Syncing folders"
 msgstr "Synkroniserar mappar"
 
-#: camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1198
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fel vid tolkning av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1204
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fel vid körning av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "Kan inte öppna spool-mappen"
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "Kan inte bearbeta spool-mappen"
 
-#: camel/camel-filter-driver.c:889
+#: camel/camel-filter-driver.c:911
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "HĂ€mtar meddelande %d (%d%%)"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Kan inte öppna meddelande"
 
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "Misslyckades med meddelande %d"
 
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1050
 msgid "Syncing folder"
 msgstr "Synkroniserar mapp"
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1017
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "HĂ€mtar meddelande %d av %d"
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1032
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Misslyckades vid meddelande %d av %d"
@@ -7406,7 +7317,7 @@ msgstr "Misslyckades med att hÀmta meddelande"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fel vid körning av filtersökning: %s: %s"
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -7415,7 +7326,7 @@ msgstr ""
 "Kan inte tolka sökuttrycket: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -7424,19 +7335,15 @@ msgstr ""
 "Fel vid körning av sökuttrycket: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
+#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
 msgstr "(matcha-alla) krÀver ett ensamt booleskt resultat"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:649
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Utför frÄga pÄ okÀnt huvud: %s"
 
-#: 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-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -7561,72 +7468,72 @@ 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:575
+#: camel/camel-pgp-context.c:622
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Kan inte signera detta meddelande: ingen klartext att signera"
 
-#: camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
+#: camel/camel-pgp-context.c:629 camel/camel-pgp-context.c:803
 msgid "Cannot sign this message: no password provided"
 msgstr "Kan inte signera detta meddelande: inget lösenord angavs"
 
-#: camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
+#: camel/camel-pgp-context.c:635 camel/camel-pgp-context.c:809
 #, 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:755
+#: camel/camel-pgp-context.c:796
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Kan inte signera detta meddelande: ingen klartext att klartextsignera"
 
-#: camel/camel-pgp-context.c:953
+#: camel/camel-pgp-context.c:988
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Kan inte veridiera detta meddelande: ingen klartext att verifiera"
 
-#: camel/camel-pgp-context.c:959
+#: camel/camel-pgp-context.c:994
 #, 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:970
+#: camel/camel-pgp-context.c:1005
 #, 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:1143
+#: camel/camel-pgp-context.c:1178
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Kan inte kryptera detta meddelande: ingen klartext att kryptera"
 
-#: camel/camel-pgp-context.c:1153
+#: camel/camel-pgp-context.c:1188
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Kan inte kryptera detta meddelande: inget lösenord angavs"
 
-#: camel/camel-pgp-context.c:1160
+#: camel/camel-pgp-context.c:1195
 #, 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:1169
+#: camel/camel-pgp-context.c:1204
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Kan inte kryptera detta meddelande: inga mottagare Àr angivna"
 
-#: camel/camel-pgp-context.c:1337
+#: camel/camel-pgp-context.c:1373
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Kan inte dekryptera detta meddelande: ingen klartext att dekryptera"
 
-#: camel/camel-pgp-context.c:1345
+#: camel/camel-pgp-context.c:1381
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Kan inte dekryptera detta meddelande: inget lösenord angavs"
 
-#: camel/camel-pgp-context.c:1352
+#: camel/camel-pgp-context.c:1388
 #, 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-pgp-mime.c:310
+#: camel/camel-pgp-mime.c:332
 msgid "This is a digitally signed message part"
 msgstr "Detta Àr en digitalt signerad meddelandedel"
 
@@ -7689,38 +7596,38 @@ msgstr "Kunde inte lÀsa in %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunde inte lÀsa in %s: Ingen initieringskod i modulen."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s-server %s"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-tjÀnst för %s pÄ %s"
 
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Anslutning avbruten"
 
-#: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:274
+#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunde inte ansluta till %s (port %d): %s"
 
-#: camel/camel-remote-store.c:268
+#: camel/camel-remote-store.c:258
 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:481
+#: camel/camel-remote-store.c:348 camel/camel-remote-store.c:410
+#: camel/camel-remote-store.c:471
 #: camel/providers/imap/camel-imap-command.c:228
 #: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr "ÅtgĂ€rden avbruten"
 
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:474
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7839,8 +7746,8 @@ msgid "Bad authentication response from server."
 msgstr "Felaktigt autentiseringssvar frÄn servern."
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
-msgstr "NT-inloggning"
+msgid "Login"
+msgstr "Inloggning"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
@@ -7851,9 +7758,21 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "OkÀnt autentiseringstillstÄnd."
 
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr "NTLM / SPA"
+
+#: camel/camel-sasl-ntlm.c:33
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"Detta alternativ kommer att ansluta till med NTLM / sÀker "
+"lösenordsautentisering (SPA)."
+
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:149
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:60
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:115
 msgid "Password"
 msgstr "Lösenord"
 
@@ -7982,7 +7901,7 @@ msgstr "Kan inte fÄ tag i mapp: Ogiltig ÄtgÀrd pÄ detta lager"
 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:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -7991,7 +7910,7 @@ msgstr ""
 "UtstÀllare: %s\n"
 "Ämne: %s"
 
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8008,7 +7927,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:438
+#: camel/camel-tcp-stream-ssl.c:467
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8021,16 +7940,16 @@ msgstr ""
 "Fingeravtryck:     %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:473
 msgid "GOOD"
 msgstr "BRA"
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:473
 msgid "BAD"
 msgstr "DÅLIG"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:476
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8128,7 +8047,7 @@ msgid "Scanning for changed messages"
 msgstr "Letar efter Àndrade meddelanden"
 
 #: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2104
+#: camel/providers/imap/camel-imap-folder.c:2108
 msgid "This message is not currently available"
 msgstr "Detta meddelande Àr inte tillgÀngligt för tillfÀllet"
 
@@ -8141,7 +8060,7 @@ msgstr "HÀmtar meddelandeinformation för nya meddelanden"
 msgid "Scanning for new messages"
 msgstr "Letar efter nya meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:2141
+#: camel/providers/imap/camel-imap-folder.c:2145
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
@@ -8166,7 +8085,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:832
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
 msgid "Folders"
 msgstr "Mappar"
 
@@ -8205,7 +8124,7 @@ 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:390
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Inget stöd för autentiseringstypen %s"
@@ -8216,7 +8135,7 @@ 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Du angav inte nÄgot lösenord."
 
@@ -8240,31 +8159,31 @@ msgstr "Det finns ingen mapp %s"
 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:42
+#: camel/providers/local/camel-local-provider.c:43
 msgid "MH-format mail directories"
 msgstr "BrevlÄdekataloger i MH-format"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:44
 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:52
+#: camel/providers/local/camel-local-provider.c:53
 msgid "Local delivery"
 msgstr "Lokal leverans"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:54
 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:62
+#: camel/providers/local/camel-local-provider.c:63
 msgid "Apply filters to new messages in INBOX"
 msgstr "TillÀmpa filtren pÄ nya meddelanden i INBOX"
 
-#: camel/providers/local/camel-local-provider.c:68
+#: camel/providers/local/camel-local-provider.c:69
 msgid "Maildir-format mail directories"
 msgstr "BrevlÄdekataloger i maildir-format"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:70
 msgid "For storing local mail in maildir directories."
 msgstr "För lagrande av lokal e-post i maildir-kataloger."
 
@@ -8276,56 +8195,69 @@ msgstr "Unix mbox-standardbrevlÄda"
 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:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:91
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:92
+msgid ""
+"For accessing mail storedin an external tree of mbox files.\n"
+"This will allow you to directly access pine and elm folders.\n"
+"NOTE: This provider is still experimental so ensure you backup any mail "
+"folders first."
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:109
+#: camel/providers/local/camel-spoold-store.c:110
 #, 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:145
+#: camel/providers/local/camel-local-store.c:146
 #, 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:153
-#: camel/providers/local/camel-local-store.c:169
-#: camel/providers/local/camel-local-store.c:235
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:236
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kan inte fÄ mapp: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 msgid "Local stores do not have an inbox"
 msgstr "Lokala lager har ingen inkorg"
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal brevlÄdefil %s"
 
-#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
+#: camel/providers/local/camel-local-store.c:301 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:374
+#: camel/providers/local/camel-local-store.c:375
 #, 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:384
+#: camel/providers/local/camel-local-store.c:385
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunde inte ta bort mappindexfilen \"%s\": %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 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:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1160
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunde inte lÀgga till meddelandet i sammanfattningen: okÀnd orsak"
 
@@ -8345,7 +8277,7 @@ msgstr "Kan inte lÀgga till meddelande i mapp för brevlÄdekatalog: %s: %s"
 #: 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
+#: camel/providers/local/camel-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8357,7 +8289,7 @@ msgstr ""
 #: 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
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "Det finns inget sÄdant meddelande"
 
@@ -8377,7 +8309,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -8410,24 +8342,45 @@ msgid "not a maildir directory"
 msgstr "Àr inte en brevlÄdekatalog"
 
 #: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-spoold-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunde inte genomsöka mappen \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-summary.c:405
-#: camel/providers/local/camel-maildir-summary.c:526
+#: camel/providers/local/camel-maildir-summary.c:408
+#: camel/providers/local/camel-maildir-summary.c:531
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kan inte öppna sökvÀgen till brevlÄdekatalogen: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+msgid "Checking folder consistency"
+msgstr "Kontrollerar mappkonsekvens"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+msgid "Checking for new messages"
+msgstr "Kontrollerar nya meddelanden"
+
+#. 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-maildir-summary.c:718
+#: camel/providers/local/camel-mbox-summary.c:250
+#: camel/providers/local/camel-mbox-summary.c:499
+#: camel/providers/local/camel-mbox-summary.c:700
+#: camel/providers/local/camel-spool-summary.c:381
+#: camel/providers/local/camel-spool-summary.c:646
+#: camel/providers/local/camel-spool-summary.c:938
+msgid "Storing folder"
+msgstr "Lagrar mapp"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:208
-#: camel/providers/local/camel-spool-folder.c:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan inte öppna brevlÄda: %s %s\n"
@@ -8444,9 +8397,9 @@ msgstr "Kan inte lÀgga till meddelande till mbox-fil: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mbox-folder.c:379
 #: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8456,16 +8409,16 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen verkar vara obotligt skadad."
 
 #: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Meddelandebyggande misslyckades: Trasig brevlÄda?"
 
-#: camel/providers/local/camel-mbox-store.c:93
+#: camel/providers/local/camel-mbox-store.c:95
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -8474,7 +8427,7 @@ msgstr ""
 "Kan inte öppna filen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:109
+#: camel/providers/local/camel-mbox-store.c:111
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -8483,14 +8436,14 @@ msgstr ""
 "Kunde inte skapa filen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:118
-#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:120
+#: camel/providers/local/camel-mbox-store.c:147
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" Àr ingen vanlig fil."
 
-#: camel/providers/local/camel-mbox-store.c:137
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:139
+#: camel/providers/local/camel-mbox-store.c:162
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -8499,96 +8452,85 @@ msgstr ""
 "Kunde inte ta bort mappen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:152
+#: camel/providers/local/camel-mbox-store.c:154
 #, 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: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:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunde inte öppna mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan inte kontrollera mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:648
+#: camel/providers/local/camel-mbox-summary.c:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunde inte öppna fil: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan inte öppna temporÀr brevlÄda: %s"
 
-#: 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
+#: camel/providers/local/camel-mbox-summary.c:546
+#: camel/providers/local/camel-mbox-summary.c:554
+#: camel/providers/local/camel-mbox-summary.c:743
+#: camel/providers/local/camel-mbox-summary.c:751
+#: camel/providers/local/camel-spool-summary.c:700
+#: camel/providers/local/camel-spool-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:981
+#: camel/providers/local/camel-spool-summary.c:989
 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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: camel/providers/local/camel-mbox-summary.c:597
+#: camel/providers/local/camel-spool-summary.c:752
 #, 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: camel/providers/local/camel-mbox-summary.c:614
+#: camel/providers/local/camel-spool-summary.c:774
 #, 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:801
+#: camel/providers/local/camel-spool-summary.c:1039
 #, 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:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, 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:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunde inte byta namn pÄ mapp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:873
-#: camel/providers/local/camel-spool-summary.c:544
-#: camel/providers/local/camel-spool-summary.c:1110
+#: camel/providers/local/camel-mbox-summary.c:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1113
 #, c-format
 msgid "Unknown error: %s"
 msgstr "OkÀnt fel: %s"
@@ -8607,12 +8549,12 @@ msgstr "Kan inte lÀgga till meddelande i mh-mapp: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "\"%s\" Àr inte en katalog."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, c-format
 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:512
+#: camel/providers/local/camel-spool-folder.c:515
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Kan inte lÀgga till meddelande till spool-filen %s: %s"
@@ -8623,6 +8565,7 @@ 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:141
+#: camel/providers/local/camel-spoold-store.c:147
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen \"%s/%s\" finns inte."
@@ -8633,28 +8576,30 @@ msgid "Spool mail file %s"
 msgstr "Spool-brevlÄdefil %s"
 
 #: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spoold-store.c:192
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mappar kan inte bytas namn pÄ"
 
 #: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spoold-store.c:200
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-mappar kan inte tas bort"
 
-#: camel/providers/local/camel-spool-summary.c:788
-#: camel/providers/local/camel-spool-summary.c:797
-#: camel/providers/local/camel-spool-summary.c:806
+#: camel/providers/local/camel-spool-summary.c:791
+#: camel/providers/local/camel-spool-summary.c:800
+#: camel/providers/local/camel-spool-summary.c:809
 #, 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:821
+#: camel/providers/local/camel-spool-summary.c:824
 #, 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:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:854
+#: camel/providers/local/camel-spool-summary.c:872
+#: camel/providers/local/camel-spool-summary.c:884
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8663,11 +8608,25 @@ msgstr ""
 "Kunde inte synkronisera spool-mappen %s: %s\n"
 "Mappen kan vara skadad, kopia sparad i \"%s\""
 
-#: camel/providers/local/camel-spool-summary.c:940
+#: camel/providers/local/camel-spool-summary.c:943
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "Kunde inte arkivera: %s: %s"
 
+#: camel/providers/local/camel-spoold-store.c:116
+#, c-format
+msgid "Store `%s' does not exist or is not a directory"
+msgstr "Lagret \"%s\" finns inte eller Àr ingen katalog"
+
+#: camel/providers/local/camel-spoold-store.c:161
+msgid "Store does not support an INBOX"
+msgstr "Lagret stöder inte en INKORG"
+
+#: camel/providers/local/camel-spoold-store.c:172
+#, c-format
+msgid "Mail tree %s"
+msgstr "E-posttrÀd %s"
+
 #: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -8692,11 +8651,19 @@ msgstr "Internt fel: uid Àr i ogiltigt format: %s"
 
 #: camel/providers/nntp/camel-nntp-folder.c:153
 #: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:439
+#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:502
+#: camel/providers/pop3/camel-pop3-folder.c:512
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Kan inte hÀmta meddelande %s: %s"
 
 #: camel/providers/nntp/camel-nntp-folder.c:157
+#: camel/providers/pop3/camel-pop3-folder.c:278
+#: camel/providers/pop3/camel-pop3-folder.c:437
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:510
 msgid "User cancelled"
 msgstr "AnvÀndaren avbröt"
 
@@ -8773,65 +8740,57 @@ msgstr "AnvÀnd avbryt"
 msgid "Operation failed: %s"
 msgstr "ÅtgĂ€rden misslyckades: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/pop3/camel-pop3-folder.c:265
 msgid "Retrieving POP summary"
 msgstr "HĂ€mtar POP-sammanfattning"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
+#: camel/providers/pop3/camel-pop3-folder.c:280
 #, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "Kunde inte kontrollera nya meddelanden pÄ POP-servern: %s"
+msgid "Cannot get POP summary: %s"
+msgstr "Kan inte hÀmta POP-sammanfattning: %s"
 
-#: 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:252
+#: camel/providers/pop3/camel-pop3-folder.c:316
 msgid "Expunging deleted messages"
 msgstr "Tömmer borttagna meddelanden"
 
-#: 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: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:367
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "No message with uid %s"
 msgstr "Inget meddelande med uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:371
+#. Sigh, most of the crap in this function is so that the cancel button
+#. returns the proper exception code.  Sigh.
+#: camel/providers/pop3/camel-pop3-folder.c:418
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "HĂ€mtar POP-meddelande %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-folder.c:502
+msgid "Unknown reason"
+msgstr "OkÀnd anledning"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr "Meddelandelager"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "LÀmna meddelanden pÄ servern"
 
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Ta bort efter %s dag(ar)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:59
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:114
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52
+#: camel/providers/pop3/camel-pop3-provider.c:54
 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:69
+#: camel/providers/pop3/camel-pop3-provider.c:71
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -8840,7 +8799,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:79
+#: camel/providers/pop3/camel-pop3-provider.c:81
 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 "
@@ -8850,48 +8809,28 @@ 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: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:198
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
 #, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Kunde inte autentisera till KPOP-server: %s"
+msgid "Failed to connect to POP server %s in secure mode: %s"
+msgstr "Misslyckades med att ansluta till POP-servern %s i sÀkert lÀge: %s"
 
-#: 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:210
+msgid "SSL/TLS extension not supported."
+msgstr "SSL/TLS-tillÀgg stöds inte."
 
-#: 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:251
+msgid "SSL negotiations failed"
+msgstr "SSL-förhandlingar misslyckades"
 
-#: camel/providers/pop3/camel-pop3-store.c:360
+#: camel/providers/pop3/camel-pop3-store.c:348
 #, 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:377
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Kunde inte ansluta till POP-servern,\n"
-"Fel vid skickande av filnamn: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
-msgid "(Unknown)"
-msgstr "(OkÀnd)"
+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:407
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8899,7 +8838,26 @@ msgstr ""
 "Kan inte ansluta till POP-servern.\n"
 "Inget stöd för begÀrd autentiseringsmekanism."
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:405
+#, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "SASL \"%s\"-inloggning misslyckades: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
+msgstr "SASL-protokollfel"
+
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, c-format
+msgid "I/O Error: %s"
+msgstr "I/O-fel: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, fuzzy, c-format
+msgid "%sPlease enter the POP password for %s@%s"
+msgstr "%sAnge ett POP3-lösenord för %s@%s"
+
+#: camel/providers/pop3/camel-pop3-store.c:503
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8908,18 +8866,13 @@ msgstr ""
 "Kan inte ansluta till POP-server.\n"
 "Fel vid skickande av lösenord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:593
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
-#: camel/providers/pop3/camel-pop3-store.c:563
-#, 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:36
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:147
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8931,53 +8884,49 @@ 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:108
+msgid "Could not parse recipient list"
+msgstr "Kunde inte tolka mottagarlistan"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, 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:137
 #, 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:165
 #, 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:178
 #, 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:185
 #, 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:190
 #, 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
-msgid "Could not find 'From' address in message"
-msgstr "Kunde inte hitta \"FrÄn\"-adress i meddelandet"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-msgid "Could not parse recipient list"
-msgstr "Kunde inte tolka mottagarlistan"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:259
+#: camel/providers/sendmail/camel-sendmail-transport.c:204
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr "E-postleverans via programmet sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:74
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:135
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -8987,122 +8936,145 @@ 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:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfel, okÀnt kommando"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfel i parametrar eller argument"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Kommandot inte implementerat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter inte implementerad"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar frÄn systemhjÀlp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "HjÀlpmeddelande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "TjÀnsten klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "TjÀnsten stÀnger överföringskanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "TjÀnsten inte tillgÀnglig, stÀnger överföringskanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "EfterfrÄgad e-postÄtgÀrd okej, fÀrdig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:194
 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:195
+#: camel/providers/smtp/camel-smtp-transport.c:196
 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:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 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:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "EfterfrÄgad ÄtgÀrd avbruten: fel i behandling"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 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:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
 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:205
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "EfterfrÄgad ÄtgÀrd avbruten: överskriden utrymmesallokering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 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:209
+#: camel/providers/smtp/camel-smtp-transport.c:210
 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:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Transaktionen misslyckades"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "En lösenordsöverföring behövs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen Àr för svag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering behövs för begÀrd autentiseringsmekanism"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "TillfÀlligt autentiseringsmisslyckande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Autentisering krÀvs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:318
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, 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:380
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, fuzzy, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr ""
+"Kunde inte ansluta till POP-servern,\n"
+"Fel vid skickande av filnamn: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:336
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "Meddelandet verkar inte vara korrekt utformat"
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "RSET-begÀran gjorde time-out: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, fuzzy
+msgid "STARTTLS response error"
+msgstr "Fel i RSET-svar: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:458
 #, 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:418
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9113,133 +9085,132 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, 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:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-epostleverans via %s"
 
-#: 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:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 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:593 mail/mail-ops.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:604
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan inte skicka meddelande: inga mottagare Àr angivna."
 
-#: camel/providers/smtp/camel-smtp-transport.c:615
+#: camel/providers/smtp/camel-smtp-transport.c:688
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan inte skicka meddelande: en eller flera ogiltiga mottagare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:674
+#: camel/providers/smtp/camel-smtp-transport.c:837
 msgid "SMTP Greeting"
 msgstr "SMTP-hÀlsning"
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:863
 #, 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:716
+#: camel/providers/smtp/camel-smtp-transport.c:883
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Fel i HELO-svar: %s: inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:931
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:754
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "Error creating SASL authentication object."
 msgstr "Fel vid skapande av SASL-autentiseringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:769
-#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:954
+#: camel/providers/smtp/camel-smtp-transport.c:966
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH-begÀran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:790
+#: camel/providers/smtp/camel-smtp-transport.c:975
 msgid "AUTH request failed."
 msgstr "AUTH-begÀran misslyckades."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:1036
 msgid "Bad authentication response from server.\n"
 msgstr "Felaktigt autentiseringssvar frÄn servern.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:864
+#: camel/providers/smtp/camel-smtp-transport.c:1062
 #, 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:883
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1076
+#, fuzzy
+msgid "MAIL FROM response error"
 msgstr "Fel i MAIL FROM-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:908
+#: camel/providers/smtp/camel-smtp-transport.c:1101
 #, 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:927
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Fel i RCPT TO-svar: %s: brevet skickades inte"
+msgid "RCPT TO <%s> failed"
+msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:961
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, 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:980
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "Fel i DATA-svar: %s: brevet skickades inte"
+#. we should have gotten instructions on how to use the DATA command:
+#. * 354 Enter mail, end with "." on a line by itself
+#.
+#: camel/providers/smtp/camel-smtp-transport.c:1167
+#, fuzzy
+msgid "DATA response error"
+msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1020
-#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1207
+#: camel/providers/smtp/camel-smtp-transport.c:1225
 #, 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:1057
-#, 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:1239
+#, fuzzy
+msgid "DATA termination response error"
+msgstr "Felaktigt autentiseringssvar frÄn servern."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1262
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET-begÀran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1100
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1276
+#, fuzzy
+msgid "RSET response error"
 msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1123
+#: camel/providers/smtp/camel-smtp-transport.c:1299
 #, 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:1142
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "Fel i QUIT-svar: %s: inte ödesdigert"
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#, fuzzy
+msgid "QUIT response error"
+msgstr "Fel i RSET-svar: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -9266,7 +9237,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:135
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:149
 msgid "attachment"
 msgstr "bilaga"
 
@@ -9306,7 +9277,7 @@ msgid "MIME type:"
 msgstr "MIME-typ:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:180
+#: composer/e-msg-composer-select-file.c:156
 msgid "Suggest automatic display of attachment"
 msgstr "FöreslÄ automatisk visning av bilaga"
 
@@ -9317,45 +9288,45 @@ msgstr "Klicka hÀr för att ta fram adressboken"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:356
 msgid "From:"
 msgstr "FrÄn:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:362
 msgid "Reply-To:"
 msgstr "Svara till:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:373
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:387
 msgid "To:"
 msgstr "Till:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:388
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:392
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Ange adresserna som ska fÄ en kopia av meddelandet"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Bcc:"
 msgstr "Blindkopia:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:396
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9363,12 +9334,12 @@ msgstr ""
 "Ange adresserna till de som ska ta emot en extra kopia av meddelandet utan "
 "att visas i mottagarlistan av meddelandet."
 
-#: composer/e-msg-composer-select-file.c:291
+#: composer/e-msg-composer-select-file.c:267
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: composer/e-msg-composer.c:688
+#: composer/e-msg-composer.c:716
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9377,38 +9348,34 @@ msgstr ""
 "Fel vid lÀsning av filen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:905
-msgid "Save as..."
-msgstr "Spara som..."
-
-#: composer/e-msg-composer.c:914
+#: composer/e-msg-composer.c:965
 msgid "Warning!"
 msgstr "Varning!"
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:969
 msgid "File exists, overwrite?"
 msgstr "Filen finns, skriv över?"
 
-#: composer/e-msg-composer.c:940
+#: composer/e-msg-composer.c:991
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fel vid sparande av filen: %s"
 
-#: composer/e-msg-composer.c:959
+#: composer/e-msg-composer.c:1010
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid inlÀsning av filen: %s"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:1041
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fel vid Ă„tkomst av filen: %s"
 
-#: composer/e-msg-composer.c:998
+#: composer/e-msg-composer.c:1049
 msgid "Unable to retrieve message from editor"
 msgstr "Kunde inte hÀmta meddelande frÄn redigeraren"
 
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1056
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9417,7 +9384,7 @@ msgstr ""
 "Kan inte spola filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9426,7 +9393,7 @@ msgstr ""
 "Kan inte trunkera filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1021
+#: composer/e-msg-composer.c:1072
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9435,7 +9402,7 @@ msgstr ""
 "Fel vid automatiskt sparande av meddelande: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1123
+#: composer/e-msg-composer.c:1174
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9443,7 +9410,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:1281
+#: composer/e-msg-composer.c:1332
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9453,23 +9420,23 @@ msgstr ""
 "\n"
 "Vill du spara dina Àndringar?"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1339
 msgid "Warning: Modified Message"
 msgstr "Varning: Ändrat meddelande"
 
-#: composer/e-msg-composer.c:1311
+#: composer/e-msg-composer.c:1362
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:1460
+#: composer/e-msg-composer.c:1511
 msgid "Insert File"
 msgstr "Infoga fil"
 
-#: composer/e-msg-composer.c:1846 composer/e-msg-composer.c:2322
+#: composer/e-msg-composer.c:2047 composer/e-msg-composer.c:2644
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:2339
+#: composer/e-msg-composer.c:2661
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9477,7 +9444,7 @@ msgstr ""
 "Kan inte skapa redigerarfönstret:\n"
 "Kan inte aktivera adressvÀljarkontrollen."
 
-#: composer/e-msg-composer.c:2362 composer/e-msg-composer.c:2417
+#: composer/e-msg-composer.c:2684 composer/e-msg-composer.c:2739
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9485,7 +9452,13 @@ msgstr ""
 "Kunde inte skapa redigerarfönstret:\n"
 "Kan inte aktivera HTML-redigerarkomponenten."
 
-#: composer/evolution-composer.c:367
+#: composer/e-msg-composer.c:3464
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
+#: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -9493,7 +9466,7 @@ msgstr ""
 "Kunde inte skapa redigerarfönstret, eftersom du inte har\n"
 "konfigurerat nÄgra identiter i e-postkomponenten."
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan inte initiera Evolutions e-postredigerare."
 
@@ -9545,6 +9518,15 @@ msgstr "Ämnet innehĂ„ller"
 msgid "Subject does not contain"
 msgstr "Ämnet innehĂ„ller inte"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2226
+#: mail/mail-display.c:119
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Det finns redan en fil med det namnet.\n"
+"Ska den skrivas över?"
+
 #. Remember the password?
 #: e-util/e-passwords.c:360 mail/mail-session.c:269
 msgid "Remember this password"
@@ -9649,7 +9631,6 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "Evolutionkomponent för sammanfattningen."
 
@@ -9731,7 +9712,7 @@ msgstr "Flytta %s till nÀsta rad"
 #: executive-summary/component/e-summary-url.c:80
 #, c-format
 msgid "Configure %s"
-msgstr "Konfigura %s"
+msgstr "Konfigurera %s"
 
 #: executive-summary/component/e-summary-url.c:553
 msgid "page"
@@ -9848,7 +9829,7 @@ msgstr "minut"
 msgid "second"
 msgstr "sekund"
 
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:224
 msgid "seconds"
 msgstr "sekunder"
 
@@ -9923,7 +9904,7 @@ msgstr " sedan"
 msgid "ago"
 msgstr " sedan"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:973
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
@@ -9936,11 +9917,11 @@ msgid "Filter Rules"
 msgstr "Filterregler"
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "DĂ„"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "LÀgg till ÄtgÀrd"
 
@@ -9953,7 +9934,7 @@ msgstr ""
 "GĂ„ tillbaka och ange en giltig mapp som e-post kan levereras till."
 
 #: filter/filter-folder.c:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:834
+#: mail/mail-account-gui.c:858
 msgid "Select Folder"
 msgstr "VĂ€lj mapp"
 
@@ -9974,7 +9955,7 @@ msgstr ""
 "Fel i reguljÀra uttrycket \"%s\":\n"
 "%s"
 
-#: filter/filter-part.c:488 shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:45
 msgid "Test"
 msgstr "Test"
 
@@ -9982,39 +9963,39 @@ msgstr "Test"
 msgid "You must name this filter."
 msgstr "Du mÄste ge detta filter ett namn."
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Regelnamn: "
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Om"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "Utför ÄtgÀrder"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "om alla villkor uppfylls"
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:769
 msgid "if any criteria are met"
 msgstr "om nÄgot villkor uppfylls"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "LĂ€gg till villkor"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "inkommande"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "utgÄende"
 
@@ -10072,178 +10053,198 @@ msgid "Attachments"
 msgstr "Bilagor"
 
 #: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Beep"
+msgstr "Belem"
+
+#: filter/libfilter-i18n.h:6
 msgid "contains"
 msgstr "innehÄller"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
 msgstr "Kopiera till mapp"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Ankomstdatum"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "AvsÀndningsdatum"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "does not contain"
 msgstr "innehÄller inte"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "does not end with"
 msgstr "slutar inte med"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not exist"
 msgstr "finns inte"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not sound like"
 msgstr "lÄter inte som"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not start with"
 msgstr "börjar inte med"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "Do Not Exist"
 msgstr "finns inte"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "Draft"
 msgstr "Utkast"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "ends with"
 msgstr "slutar med"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Execute Shell Command"
 msgstr "Kör skalkommando"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr "finns"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "exists"
 msgstr "finns"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "Uttryck"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:25 mail/mail-config.c:74
+#: mail/mail-config.glade.h:82
 msgid "Important"
 msgstr "viktigt"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:26
 msgid "is"
 msgstr "Ă€r"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "is after"
 msgstr "Ă€r efter"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:28
 msgid "is before"
 msgstr "Ă€r innan"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is Flagged"
+msgstr "Flaggad"
+
+#: filter/libfilter-i18n.h:30
 msgid "is greater than"
 msgstr "Àr större Àn"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:31
 msgid "is less than"
 msgstr "Àr mindre Àn"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:32
 msgid "is not"
 msgstr "Ă€r inte"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:33
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Flaggad"
+
+#: filter/libfilter-i18n.h:34
 msgid "Mailing list"
 msgstr "SĂ€ndlista"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:35
 msgid "Message Body"
 msgstr "meddelandetext"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:36
 msgid "Message Header"
 msgstr "meddelandehuvud"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:37
 msgid "Move to Folder"
 msgstr "Flytta till mapp"
 
-#: filter/libfilter-i18n.h:34 mail/message-list.c:671
-#: mail/message-list.etspec.h:4
-msgid "Needs Reply"
-msgstr "KrÀver svar"
+#: filter/libfilter-i18n.h:38
+#, fuzzy
+msgid "Play Sound"
+msgstr "Spela ljud:"
 
 # [Status] [Ă€r] [LĂ€st]
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:39 mail/message-tag-followup.c:58
 msgid "Read"
 msgstr "LĂ€st"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:40
 msgid "Recipients"
 msgstr "Mottagare"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:41
 msgid "Regex Match"
 msgstr "ReguljÀrt uttryck matchar"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:42
 msgid "Replied to"
 msgstr "besvarad"
 
-#: filter/libfilter-i18n.h:39 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
+#: filter/libfilter-i18n.h:43 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:8
 msgid "Score"
 msgstr "PoÀng"
 
-#: filter/libfilter-i18n.h:40 mail/mail-callbacks.c:1486
+#: filter/libfilter-i18n.h:44 mail/mail-callbacks.c:1533
 msgid "Sender"
 msgstr "AvsÀndare"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:45
 msgid "Set Status"
 msgstr "StÀll in status"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:46
 msgid "Size (kB)"
 msgstr "Storlek (kB)"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:47
 msgid "sounds like"
 msgstr "lÄter som"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:48
 msgid "Source Account"
 msgstr "KĂ€llkonto"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:49
 msgid "Specific header"
 msgstr "Specifikt huvud"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:50
 msgid "starts with"
 msgstr "börjar med"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:52
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: filter/libfilter-i18n.h:49 mail/mail-format.c:932
-#: mail/message-list.etspec.h:10
+#: filter/libfilter-i18n.h:53 mail/mail-format.c:938
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Ämne"
 
@@ -10366,72 +10367,105 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "KalenderinstÀllningar"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Konfigurationsverktyg för evolutions att-göra-kanal.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Konfigurationsverktyg för evolutions att-göra-kanal.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Fabrik för Evolutions e-postredigerare."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5 notes/GNOME_Evolution_Notes.oaf.in.h:2
 msgid "Evolution component for handling mail."
 msgstr "Evolutionkomponenten för hantering av e-post."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution mail composer."
 msgstr "Evolutions e-postredigerare."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail executive summary component."
 msgstr "Evolutions e-postsammanfattningskomponent."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail folder display component."
 msgstr "Evolutions e-postvisningskomponent."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder factory component."
 msgstr "Fabrik för Evolutions e-postmappkomponent."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Factory for the Evolution composer."
 msgstr "Fabrik för Evolutions e-postredigerare."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Mail Summary component."
 msgstr "Fabrik för e-postsammanfattningskomponenten."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Epostkonton"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13 mail/mail-config.glade.h:94
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "InstÀllningar"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 msgid "Mail configuration interface"
 msgstr "GrÀnssnitt för e-postkonfiguration"
 
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15
+msgid "This page can be used to configure E-Mail Accounts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
+msgid "This page can be used to configure Mailer preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+msgid "This page can be used to configure the Composer"
+msgstr ""
+
 #: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "Mapp som innehÄller e-post"
 
 #: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr "E-postlagringsmapp (intern)"
-
-#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Virtuell papperskorg"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:101
 msgid "Virtual Trash folder"
 msgstr "Virtuell papperskorgsmapp"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Kunde inte ansluta till lager: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:117
 msgid "This folder cannot contain messages."
 msgstr "Denna mapp kan inte innehÄlla meddelanden."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:401
 msgid "Properties..."
 msgstr "Egenskaper..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:401
 msgid "Change this folder's properties"
 msgstr "Ändra egenskaperna för denna mapp"
 
-#: mail/component-factory.c:786
+#: mail/component-factory.c:764
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10439,212 +10473,234 @@ msgstr ""
 "En del av dina e-postinstÀllningar verkar felaktiga, kontrollera att allt Àr "
 "som det ska vara."
 
-#: mail/component-factory.c:955
+#: mail/component-factory.c:923
+msgid "You have not set a mail transport method"
+msgstr "Du har inte angivit nÄgon e-posttransportmetod"
+
+#: mail/component-factory.c:965
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: mail/component-factory.c:955
-msgid "New _Mail Message"
-msgstr "Nytt e-_postmeddelande"
+#: mail/component-factory.c:965 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "_E-postmeddelande"
 
-#: mail/component-factory.c:980
+#: mail/component-factory.c:992
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan inte initiera Evolutions e-postkomponent."
 
-#: mail/component-factory.c:989
+#: mail/component-factory.c:1001
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan inte initiera Evolutions e-postkonfigurationskomponent."
 
-#: mail/component-factory.c:995
+#: mail/component-factory.c:1007
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan inte initiera Evolutions mappinformationskomponent."
 
-#: mail/component-factory.c:1211
+#: mail/component-factory.c:1207 mail/component-factory.c:1238
+#, fuzzy
+msgid "Connecting..."
+msgstr "Ansluter till server..."
+
+#: mail/component-factory.c:1248
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lager hos skal"
 
-#: mail/folder-browser-ui.c:272
+#: mail/folder-browser-ui.c:343
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper för \"%s\""
 
-#: mail/folder-browser-ui.c:274
+#: mail/folder-browser-ui.c:345
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:298 mail/mail-display.c:298
+#: mail/folder-browser.c:300 mail/mail-display.c:331 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunde inte skapa temporÀr katalog: %s"
 
-#: mail/folder-browser.c:752
+#: mail/folder-browser.c:755
 #, c-format
 msgid "%d new"
 msgstr "%d nya"
 
-#: mail/folder-browser.c:755 mail/folder-browser.c:763
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:758 mail/folder-browser.c:766
+#: mail/folder-browser.c:769
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:757
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d hidden"
-msgstr "%d gömda"
+msgstr "%d dolda"
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:762
 #, c-format
 msgid "%d visible"
 msgstr "%d synliga"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d selected"
 msgstr "%d markerade"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d unsent"
 msgstr "%d oskickade"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 #, c-format
 msgid "%d sent"
 msgstr "%d skickade"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:776
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1055
-msgid "Create vFolder from Search"
-msgstr "Skapa virtuell mapp frÄn sökning"
+#: mail/folder-browser.c:1083
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Skapa _virtuell mapp frÄn meddelande"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1575
 msgid "VFolder on _Subject"
 msgstr "Virtuell mapp pÄ _Àmne"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1576
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp pÄ _avsÀndare"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1577
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp pÄ _mottagare"
 
-#: mail/folder-browser.c:1441
+#: mail/folder-browser.c:1578
 msgid "VFolder on Mailing _List"
 msgstr "Virtuell mapp pÄ sÀnd_lista"
 
-#: mail/folder-browser.c:1445
+#: mail/folder-browser.c:1582
 msgid "Filter on Sub_ject"
 msgstr "Filtrera pÄ _Àmne"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1583
 msgid "Filter on Sen_der"
 msgstr "Filtrera pÄ _avsÀndare"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1584
 msgid "Filter on Re_cipients"
 msgstr "Filtrera pÄ _mottagare"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1585 mail/folder-browser.c:1917
 msgid "Filter on _Mailing List"
 msgstr "Filtrera pÄ sÀ_ndlista"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1603 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
 
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:105
-msgid "_Save As..."
-msgstr "_Spara som..."
-
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1605
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsÀndaren"
 
-#: mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1611 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: mail/folder-browser.c:1465
+#: mail/folder-browser.c:1612
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1616
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1617
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "FĂ€rdigt"
+
+#: mail/folder-browser.c:1618
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "StÀll flagga"
+
+#. separator here?
+#: mail/folder-browser.c:1622 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_Markera som lÀst"
 
-#: mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Markera som _olÀst"
 
-#: mail/folder-browser.c:1469
+#: mail/folder-browser.c:1624
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: mail/folder-browser.c:1470
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1625
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Markera som ovikti_gt"
 
-#: mail/folder-browser.c:1471
-msgid "Mark as Needing Reply"
-msgstr "Markera som svarskrÀvande"
-
-#: mail/folder-browser.c:1472
-msgid "Mark as Not Needing Reply"
-msgstr "Markera som inte svarskrÀvande"
+#: mail/folder-browser.c:1630
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Ångra borttagning"
 
-#: mail/folder-browser.c:1476
-msgid "_Move to Folder..."
-msgstr "_Flytta till mapp..."
+#: mail/folder-browser.c:1634
+#, fuzzy
+msgid "Mo_ve to Folder..."
+msgstr "Flytta till mapp..."
 
-#: mail/folder-browser.c:1477
+#: mail/folder-browser.c:1635 ui/evolution-addressbook.xml.h:36
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:107
-msgid "_Undelete"
-msgstr "_Ångra borttagning"
+#: mail/folder-browser.c:1639
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
 
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1643
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "LÀgg till avsÀndaren i adressboken"
 
-#: mail/folder-browser.c:1486
-msgid "Apply Filters"
+#: mail/folder-browser.c:1647
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "TillÀmpa filter"
 
-#: mail/folder-browser.c:1488
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1651
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "Skapa rege_l frÄn meddelande"
 
-#: mail/folder-browser.c:1657
-msgid "Filter on Mailing List"
-msgstr "Filtrera pÄ sÀndlista"
-
-#: mail/folder-browser.c:1658
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1918
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "Virtuell mapp pÄ sÀndlista"
 
-#: mail/folder-browser.c:1660
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1920
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrera pÄ sÀndlista (%s)"
 
-#: mail/folder-browser.c:1661
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1921
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "Virtuell mapp pÄ sÀndlista (%s)"
 
 #: mail/folder-browser.h:26
@@ -10672,26 +10728,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importerar Outlook Express 4-filer till Evolution"
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "InnehÄll i meddelandetext"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Aktuellt lagringsformat:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Indexering:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "BrevlÄdeformat"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "InnehÄll i meddelandetext"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Nytt lagringsformat:"
 
-#: mail/local-config.glade.h:6
+#: mail/local-config.glade.h:4
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -10701,15 +10750,15 @@ msgstr ""
 "(sÄsom utrymmesbrist pÄ disken) inte automatiskt rÀttas till.\n"
 "AnvÀnd denna finess med försiktighet."
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:10
+#: mail/local-config.glade.h:8
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:11
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
@@ -10727,60 +10776,71 @@ msgstr "Evolutions diskussionsgruppsredigerare"
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontoredigerare"
 
-#: mail/mail-account-gui.c:959
-msgid "Could not save signature file."
-msgstr "Kunde inte spara signaturfilen."
+#: mail/mail-account-gui.c:52 mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Always"
+msgstr "Albany"
 
-#: mail/mail-account-gui.c:1036
-msgid "Save signature"
-msgstr "Spara signatur"
+#: mail/mail-account-gui.c:53 mail/mail-config.glade.h:176
+msgid "Whenever Possible"
+msgstr ""
+
+#: mail/mail-account-gui.c:54 mail/mail-config.glade.h:107
+#, fuzzy
+msgid "Never"
+msgstr "_var"
 
-#: mail/mail-account-gui.c:1042
+#: mail/mail-account-gui.c:1039 mail/mail-account-gui.c:1040
+#: mail/mail-account-gui.c:1283 mail/mail-account-gui.c:1288
+#: mail/mail-config.glade.h:127
+#, fuzzy
+msgid "Random"
+msgstr "Radio"
+
+#: mail/mail-account-gui.c:1109 mail/mail-account-gui.c:1124
 msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Denna signatur har Àndrats, men har inte sparats.\n"
-"\n"
-"Vill du spara dina Àndringar?"
 
-#: mail/mail-account-gui.c:1665
+#: mail/mail-account-gui.c:1794
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan inte skapa tvÄ konton med samma namn."
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr " (standard)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "StÀng av"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "SlÄ pÄ"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:210
 msgid "Are you sure you want to delete this account?"
 msgstr "Är du sĂ€ker pĂ„ att du vill ta bort detta konto?"
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:214
 msgid "Don't delete"
 msgstr "Ta inte bort"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:217
 msgid "Really delete account?"
 msgstr "Verkligen ta bort kontot?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
-msgid "Are you sure you want to delete this news account?"
-msgstr "Är du sĂ€ker pĂ„ att du vill ta bort detta diskussionsgruppskonto?"
+#: mail/mail-accounts.c:340 mail/mail-accounts.c:374
+msgid "Disable"
+msgstr "StÀng av"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:49
-msgid "Mail Settings"
-msgstr "E-postinstÀllningar"
+#: mail/mail-accounts.c:342 mail/mail-accounts.c:376
+msgid "Enable"
+msgstr "SlÄ pÄ"
+
+#: mail/mail-accounts.c:498 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:70
+msgid "Enabled"
+msgstr "PĂ„slagen"
+
+#: mail/mail-accounts.c:499 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "_Kontonamn:"
+
+#: mail/mail-accounts.c:500 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Puerto Rico"
 
 #: mail/mail-autofilter.c:72
 #, c-format
@@ -10806,7 +10866,7 @@ msgstr "SĂ€ndlistan %s"
 msgid "Add Filter Rule"
 msgstr "LĂ€gg till filterregel"
 
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10818,7 +10878,7 @@ msgstr ""
 "ta emot eller skriva nya brev.\n"
 "Vill du konfigurera den nu?"
 
-#: mail/mail-callbacks.c:143
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10826,7 +10886,7 @@ msgstr ""
 "Du mÄste konfigurera en identititet\n"
 "innan du kan skriva brev."
 
-#: mail/mail-callbacks.c:157
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10834,12 +10894,8 @@ msgstr ""
 "Du mÄste konfigurera en e-posttransport\n"
 "innan du kan skriva brev."
 
-#: mail/mail-callbacks.c:187
-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:222
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10847,11 +10903,11 @@ msgstr ""
 "Du skickar ett HTML-formaterat brev, men följande mottagare vill inte ha "
 "HTML-formaterad e-post:\n"
 
-#: mail/mail-callbacks.c:237
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Skicka ÀndÄ?"
 
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10859,19 +10915,19 @@ msgstr ""
 "Detta meddelande har inget Àmne.\n"
 "Vill du verkligen skicka?"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:295
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
-"Eftersom kontaktlistan som du skickar Àr konfigurerad att gömma listans "
+"Eftersom kontaktlistan som du skickar Àr konfigurerad att dölja listans "
 "adresser kommer detta meddelande endast att innehÄlla blindkopiemottagare."
 
-#: mail/mail-callbacks.c:327
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "Detta meddelande innehÄller endast blindkopiemottagare."
 
-#: mail/mail-callbacks.c:331
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10881,19 +10937,15 @@ msgstr ""
 "till ett Apparently-To-huvud.\n"
 "Skicka ÀndÄ?"
 
-#: mail/mail-callbacks.c:461
-msgid "This message contains invalid recipients:"
-msgstr "Detta meddelande innehÄller ogiltiga mottagare:"
-
-#: mail/mail-callbacks.c:496
+#: mail/mail-callbacks.c:408
 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:584
+#: mail/mail-callbacks.c:497
 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:703
+#: mail/mail-callbacks.c:616
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10901,28 +10953,28 @@ msgstr ""
 "Kan inte öppna utkastmappen för detta konto.\n"
 "Vill du anvÀnda standardmappen för utkast?"
 
-#: mail/mail-callbacks.c:913
+#: mail/mail-callbacks.c:962
 msgid "an unknown sender"
 msgstr "en okÀnd avsÀndare"
 
-#: mail/mail-callbacks.c:918
+#: mail/mail-callbacks.c:966
 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:1363 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1411 mail/message-browser.c:130
 msgid "Move message(s) to"
 msgstr "Flytta meddelande(n) till"
 
-#: mail/mail-callbacks.c:1365 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1413 mail/message-browser.c:132
 msgid "Copy message(s) to"
 msgstr "Kopiera meddelande(n) till"
 
-#: mail/mail-callbacks.c:1866
+#: mail/mail-callbacks.c:2070
 #, 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:1891
+#: mail/mail-callbacks.c:2095
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10930,7 +10982,7 @@ msgstr ""
 "Du kan bara redigera meddelanden\n"
 "som du sparat i mappen Utkast."
 
-#: mail/mail-callbacks.c:1930
+#: mail/mail-callbacks.c:2134
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10938,24 +10990,39 @@ msgstr ""
 "Du kan bara skicka om meddelanden\n"
 "som du sparat i mappen Skickat."
 
-#: mail/mail-callbacks.c:1944
+#: mail/mail-callbacks.c:2148
 #, 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:1970
+#: mail/mail-callbacks.c:2174
 msgid "No Message Selected"
 msgstr "Inget meddelande markerat"
 
-#: mail/mail-callbacks.c:2069
+#: mail/mail-callbacks.c:2219 mail/mail-display.c:115
+msgid "Overwrite file?"
+msgstr "Skriv över fil?"
+
+#: mail/mail-callbacks.c:2273
 msgid "Save Message As..."
 msgstr "Spara meddelande som..."
 
-#: mail/mail-callbacks.c:2071
+#: mail/mail-callbacks.c:2275
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:2242
+#: mail/mail-callbacks.c:2343
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Visa nÀsta olÀsta meddelande"
+
+#: mail/mail-callbacks.c:2350
+msgid ""
+"There are no more new messages in this folder.\n"
+"Would you like to go to the next folder?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2590
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10968,7 +11035,7 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa meddelanden?"
 
-#: mail/mail-callbacks.c:2357
+#: mail/mail-callbacks.c:2700
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10977,23 +11044,28 @@ msgstr ""
 "Fel vid lÀsning av filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2369
+#: mail/mail-callbacks.c:2712
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2453
+#: mail/mail-callbacks.c:2755
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "HĂ€mtar meddelande %d av %d"
+
+#: mail/mail-callbacks.c:2807
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/mail-callbacks.c:2480
+#: mail/mail-callbacks.c:2834
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2519
+#: mail/mail-callbacks.c:2869
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
-#: mail/mail-callbacks.c:2685
+#: mail/mail-callbacks.c:3052 mail/mail-callbacks.c:3092
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11051,16 +11123,40 @@ msgstr ""
 "Detta namn kommer endast att anvÀndas för visning."
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoassistent"
 
-#: mail/mail-config.c:354
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:177
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:116
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:167
+#, fuzzy
+msgid "To Do"
+msgstr "Att-göra-lista"
+
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Later"
+msgstr "efter"
+
+#: mail/mail-config.c:631
 #, c-format
 msgid "Account %d"
 msgstr "Konto %d"
 
-#: mail/mail-config.c:1995
+#: mail/mail-config.c:2451
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -11074,100 +11170,187 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:2006
+#: mail/mail-config.c:2462
 #, c-format
 msgid "%s: Inbox"
 msgstr "%s: Inkorg"
 
-#: mail/mail-config.c:2248
+#: mail/mail-config.c:2712
 msgid "Checking Service"
 msgstr "Kontrollerar tjÀnst"
 
-#: mail/mail-config.c:2326 mail/mail-config.c:2330
+#: mail/mail-config.c:2790 mail/mail-config.c:2794
 msgid "Connecting to server..."
 msgstr "Ansluter till server..."
 
+#: mail/mail-config.c:2991
+#, fuzzy
+msgid "Unnamed"
+msgstr "Namnlös kontakt:"
+
+#: mail/mail-config.c:3169
+msgid "Cannot execute signature script"
+msgstr ""
+
 #: mail/mail-config.glade.h:1
+msgid "                        "
+msgstr ""
+
+#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr " _Kontrollera vilka typer som stöds "
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid " color"
 msgstr " fÀrg"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
+msgid "&lt;&lt; S_imple"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
+#, fuzzy
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr "(SSL stöds inte i detta bygge av Evolution)"
+
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL stöds inte i detta bygge av Evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
+msgid "/home/rodo/cvs/evolution/mail/"
+msgstr ""
+
+#: mail/mail-config.glade.h:8
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Kryptera a_lltid till mig sjÀlv nÀr krypterad post skickas"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:9
 msgid "Account"
 msgstr "Konto"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Kontoinformation"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:11 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Kontohantering"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:12
 msgid "Accounts"
 msgstr "Konton"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Ad_vanced &gt;&gt;"
+msgstr "Avancerat"
+
+#: mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Add new signature"
+msgstr "Spara signatur"
+
+#: mail/mail-config.glade.h:15
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Avancerade LDAP-alternativ"
+
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Arkansas"
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr "Skicka alltid blindkopia till:"
+
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Always _carbon-copy (Cc) to:"
+msgstr "Skicka alltid kopia till:"
+
+#: mail/mail-config.glade.h:20
 msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr "Kr_yptera alltid till mig sjÀlv nÀr krypterad post skickas"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:21
 msgid "Always _sign outgoing messages when using this account"
 msgstr "_Signera alltid utgÄende meddelanden nÀr detta konto anvÀnds"
 
-#: mail/mail-config.glade.h:11
-msgid "Always blind carbon-copy to:"
-msgstr "Skicka alltid blindkopia till:"
+#: mail/mail-config.glade.h:22
+#, fuzzy
+msgid "Arabic"
+msgstr "Arica"
 
-#: mail/mail-config.glade.h:12
-msgid "Always carbon-copy to:"
-msgstr "Skicka alltid kopia till:"
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Attach original message"
+msgstr "Bifoga en fil till meddelandet"
 
-#: mail/mail-config.glade.h:13 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:24 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bilaga"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:25
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:15
+# LĂ„ter konstigt
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Automatically detect links"
+msgstr "Kontrollera _automatiskt ny e-post"
+
+#: mail/mail-config.glade.h:27
+msgid "Baltic (IS0-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:28
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:29
 msgid "Beep when new mail arrives"
 msgstr "Pip dÄ ny post anlÀnder"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "Character Set:"
+msgstr "Teckenkodning"
+
+#: mail/mail-config.glade.h:31
 msgid "Checking for New Mail"
 msgstr "Kontrollerar ny e-post"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:32
+#, fuzzy
+msgid "Colors"
+msgstr "Komorerna"
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "Command"
+msgstr "Företag"
+
+#: mail/mail-config.glade.h:34
 msgid "Composer"
 msgstr "Redigerare"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:35
 msgid "Composing Messages"
 msgstr "Redigerar meddelanden"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:36
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:37
 msgid "Confirm when Expunging a folder"
 msgstr "BekrÀfta vid tömning av mapp"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:38
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11182,249 +11365,507 @@ msgstr ""
 "\n"
 "Klicka pÄ \"Slutför\" för att spara dina instÀllningar."
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Dari"
+msgstr "Bari"
+
+#: mail/mail-config.glade.h:45
 msgid "De_fault"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Del Bajio"
+
+#: mail/mail-config.glade.h:47
 msgid "Default Forward style is: "
 msgstr "Standardstil för vidarebefordran Àr: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Default Forward style:"
+msgstr "Standardstil för vidarebefordran Àr: "
+
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Default Reply style:"
+msgstr "Standardstil för vidarebefordran Àr: "
+
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Default character encoding:"
+msgstr "Standardteckenkodning: "
+
+#: mail/mail-config.glade.h:51
 msgid "Default character encoding: "
 msgstr "Standardteckenkodning: "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:52
 msgid "Defaults"
 msgstr "StandardvÀrden"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Delete selected signature"
+msgstr "Ta bort allt utom signatur"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "HĂ€mtar post"
+
+#: mail/mail-config.glade.h:56
 msgid "Digital IDs..."
 msgstr "Digitala ID..."
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:57
 msgid "Display"
 msgstr "Visa"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:58
 msgid "Do not notify me when new mail arrives"
 msgstr "Notifiera inte mig nÀr ny post anlÀnder"
 
-#: mail/mail-config.glade.h:35 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Kan inte öppna meddelande"
+
+#: mail/mail-config.glade.h:60 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Klar"
 
-#: mail/mail-config.glade.h:36 shell/e-local-storage.c:173
+#: mail/mail-config.glade.h:61 shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr "Utkast"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:62
+#, fuzzy
+msgid "E_mail address:"
+msgstr "_E-postadress:"
+
+#: mail/mail-config.glade.h:63
 msgid "E_nable"
 msgstr "Sl_Ä pÄ"
 
-#: mail/mail-config.glade.h:38 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
+#: mail/mail-config.glade.h:64
+#, fuzzy
+msgid "Ed_it..."
 msgstr "Redigera..."
 
-#: mail/mail-config.glade.h:39
-msgid "Enabled"
-msgstr "PĂ„slagen"
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Edi_t..."
+msgstr "Redigera..."
+
+#: mail/mail-config.glade.h:66
+msgid "Edit signature content in editor"
+msgstr ""
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Emacs"
+msgstr "Öst"
+
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Epostkonton"
+
+#: mail/mail-config.glade.h:69
+#, fuzzy
+msgid "Enable advanced options"
+msgstr "SlÄ pÄ radarkartor"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:71
 msgid "Execute Command..."
 msgstr "Kör kommando..."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "File containing signature"
+msgstr "Mapp som innehÄller e-post"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Forwards and Replies"
+msgstr "Vidarebefordra _inuti"
+
+#: mail/mail-config.glade.h:75
 msgid "Get Digital ID..."
 msgstr "HĂ€mta digitalt ID..."
 
-#: mail/mail-config.glade.h:42
-msgid "HTML signature file:"
-msgstr "HTML-signaturfil:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "HTML Mail"
+msgstr "I HTML-brev"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "Hide advanced settings"
+msgstr "VÀderinstÀllningar"
+
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Hulu"
+msgstr "Hurlburt"
+
+#: mail/mail-config.glade.h:79
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:80 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:81
+msgid "If selected signature will be included in random signature list"
+msgstr ""
+
+#: mail/mail-config.glade.h:83
 msgid "In HTML mail"
 msgstr "I HTML-brev"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:84
+msgid "Include in _random signatures list"
+msgstr ""
+
+#: mail/mail-config.glade.h:85
 msgid "Inline"
 msgstr "Inuti"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:86
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:87
+#, fuzzy
+msgid "Keyboard Shortcuts"
+msgstr "GenvÀgar"
+
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Spara och stÀng"
+
+#: mail/mail-config.glade.h:89
+#, fuzzy
+msgid "Language:"
+msgstr "SprÄk"
+
+#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "List of signatures"
+msgstr "Spara signatur"
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Loading Images"
+msgstr "LĂ€s in _bilder"
+
+#: mail/mail-config.glade.h:93
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:95
+msgid "Mail Settings"
+msgstr "E-postinstÀllningar"
+
+#: mail/mail-config.glade.h:96
 msgid "Mailbox location"
 msgstr "BrevlÄdeplats"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:97
 msgid "Make this my _default account"
 msgstr "Gör detta till mitt standard_konto"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Mark messages as read after"
+msgstr "_Markera meddelanden som lÀsta efter"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Message Composer"
+msgstr "Meddelanden"
+
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Message Display"
+msgstr "M_eddelandevisning"
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikronesien"
+
+#: mail/mail-config.glade.h:102
+msgid "Misspelled color: "
+msgstr ""
+
+#: mail/mail-config.glade.h:103
 msgid "NNTP Server:"
 msgstr "NNTP-server:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "N_ew..."
+msgstr "Ny..."
+
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "Name of selected signature"
+msgstr "Ta bort allt utom signatur"
+
+#: mail/mail-config.glade.h:106
+#, fuzzy
+msgid "Ne_w..."
+msgstr "Ny..."
+
+#: mail/mail-config.glade.h:108
 msgid "New Mail Notification"
 msgstr "Notifiering om ny post"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:109
 msgid "News"
 msgstr "Diskussionsgrupper"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:111
 msgid "Optional Information"
 msgstr "Valfri information"
 
-#: mail/mail-config.glade.h:58
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "PGP-_nyckelid:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:117
 msgid "Pick a color"
 msgstr "VÀlj en fÀrg"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:118
 msgid "Play sound file when new mail arrives"
 msgstr "Spela ljudfil dÄ ny post anlÀnder"
 
-#: mail/mail-config.glade.h:63
-msgid "Pretty Good Privacy"
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:120
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr "FrÄga dÄ HTML-meddelanden skickas till kontakter som inte vill ha dem"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:121
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "FrÄga dÄ meddelanden skickas med ett _tomt Àmne"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:122
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject line"
+msgstr "FrÄga dÄ meddelanden skickas med ett _tomt Àmne"
+
+#: mail/mail-config.glade.h:123
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "FrÄga dÄ meddelanden skickas med endast _blindkopiemottagare angivna"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:124
 msgid "Qmail maildir "
 msgstr "Qmail-epostkatalog "
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:125
+#, fuzzy
+msgid "Quote original message"
+msgstr "Kan inte öppna meddelande"
+
+#: mail/mail-config.glade.h:126
 msgid "Quoted"
 msgstr "Citerad"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:128
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:129
 msgid "Re_member this password"
 msgstr "Ko_m ihÄg detta lösenord"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:130 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Mottagande av e-post"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:131
 msgid "Receiving Mail"
 msgstr "Mottagande av post"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:132
 msgid "Receiving Options"
 msgstr "Alternativ för mottagning"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:133
 msgid "Required Information"
 msgstr "Obligatorisk information"
 
-#: mail/mail-config.glade.h:75
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Restore defaults"
+msgstr " (standard)"
+
+#: mail/mail-config.glade.h:136
+#, fuzzy
+msgid "Same as text"
+msgstr "Somerset"
+
+#: mail/mail-config.glade.h:137
+msgid "Script which is run before signature loading from specified filename"
+msgstr ""
+
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "Secure MIME (S/MIME)"
 msgstr "SĂ€ker MIME"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:139
 msgid "Security"
 msgstr "SĂ€kerhet"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:140
 msgid "Select Filter Log file..."
 msgstr "VĂ€lj en filterloggfil..."
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:141
 msgid "Select PGP binary"
 msgstr "VĂ€lj PGP-program"
 
-#: mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "Select PGP program"
+msgstr "VĂ€lj PGP-program"
+
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Signaturfil:"
+
+#: mail/mail-config.glade.h:144
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Ta bort allt utom signatur"
+
+#: mail/mail-config.glade.h:145 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Skickande av e-post"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:146
 msgid "Sending Mail"
 msgstr "Skickande av post"
 
-#: mail/mail-config.glade.h:82 mail/message-list.etspec.h:7
-#: shell/e-local-storage.c:176
+#: mail/mail-config.glade.h:148 mail/message-list.etspec.h:9
+#: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "Skickat"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:149
 msgid "Sent _messages folder:"
 msgstr "Mapp för skickade _meddelanden:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:150
 msgid "Sent and Draft Messages"
 msgstr "Skickade meddelanden och utkast"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:151
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vern krÀver autentisering"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:152
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:153
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: mail/mail-config.glade.h:88
-msgid "Signature file:"
-msgstr "Signaturfil:"
+#: mail/mail-config.glade.h:154
+#, fuzzy
+msgid "Shortcut"
+msgstr "_GenvÀg"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "Shortcuts type:"
+msgstr "GenvÀgar"
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "Show advanced settings"
+msgstr "InstÀllningar för nyhetskÀllor"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "Show animated images"
+msgstr "Visa tid som"
+
+#: mail/mail-config.glade.h:158
+#, fuzzy
+msgid "Signature"
+msgstr "Spara signatur"
+
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "Signatures"
+msgstr "Spara signatur"
+
+#: mail/mail-config.glade.h:160
 msgid "Source"
 msgstr "KĂ€llkod"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:161
 msgid "Source Information"
 msgstr "KĂ€llinformation"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:162
 msgid "Sources"
 msgstr "KĂ€llor"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:163
 msgid "Specify filename:"
 msgstr "Ange filnamn:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:164
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:165
 msgid "Standard Unix mbox"
 msgstr "Standard Unix-brevlÄda"
 
-#: mail/mail-config.glade.h:95
-msgid "Use s_ecure connection (SSL)"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "Text _Signature:"
+msgstr "_HTML-signatur:"
+
+#: mail/mail-config.glade.h:169
+#, fuzzy
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+"Skriv in namnet som du vill anvÀnda för att referera till dessa servrar, "
+"till exempel: \"Jobb\" eller \"Hemma\"."
+
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "_HTML-signatur:"
+
+#: mail/mail-config.glade.h:172
+#, fuzzy
+msgid "Use s_ecure connection (SSL):"
 msgstr "AnvÀnd s_Àker anslutning (SSL)"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:173
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11434,127 +11875,199 @@ msgstr ""
 "\n"
 "Klicka pÄ \"NÀsta\" för att börja. "
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "XEmacs"
+msgstr "Öst"
+
+#: mail/mail-config.glade.h:180
 msgid "_Always load images off the net"
 msgstr "LÀs alltid in _bilder frÄn nÀtet"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:181
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Signera _alltid utgÄende meddelanden nÀr detta konto anvÀnds"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:182
 msgid "_Authentication Type: "
 msgstr "_Autentiseringstyp: "
 
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "_Autentiseringstyp: "
+
 # LĂ„ter konstigt
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:184
 msgid "_Automatically check for new mail"
 msgstr "Kontrollera _automatiskt ny e-post"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:185
 msgid "_Certificate ID:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:186
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "BekrÀfta vid tömning av mapp"
+
+#: mail/mail-config.glade.h:188
 msgid "_Drafts folder:"
 msgstr "_Utkastmapp:"
 
-#: mail/mail-config.glade.h:108
-msgid "_Email Address:"
-msgstr "_E-postadress:"
+#: mail/mail-config.glade.h:190
+#, fuzzy
+msgid "_Edit..."
+msgstr "Redigera..."
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:191
 msgid "_Empty trash folders on exit"
 msgstr "_Töm papperskorgsmappar vid avslut"
 
-#: mail/mail-config.glade.h:110
-msgid "_Full Name:"
-msgstr "_FullstÀndigt namn:"
+#: mail/mail-config.glade.h:192
+msgid "_Enable spell checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:193
+#, fuzzy
+msgid "_Filename"
+msgstr "Filnamn:"
+
+#: mail/mail-config.glade.h:194
+#, fuzzy
+msgid "_Filename:"
+msgstr "Filnamn:"
+
+#: mail/mail-config.glade.h:195
+#, fuzzy
+msgid "_Full name:"
+msgstr "FullstÀndigt namn:"
+
+#: mail/mail-config.glade.h:196
 msgid "_HTML Signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:197
 msgid "_Highlight citations with"
 msgstr "Markera _citat med"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:198
+#, fuzzy
+msgid "_Highlight quotations with"
+msgstr "Markera _citat med"
+
+#: mail/mail-config.glade.h:199
 msgid "_Host:"
 msgstr "_VĂ€rd:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:200
 msgid "_Load images if sender is in addressbook"
 msgstr "LÀs _in bilder om avsÀndaren finns i adressboken"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:201
 msgid "_Log filter actions to:"
 msgstr "_Logga filterÄtgÀrder i:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:202
 msgid "_Mark messages as Read after"
 msgstr "_Markera meddelanden som lÀsta efter"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:203
+#, fuzzy
+msgid "_Name"
+msgstr "_Namn:"
+
+#: mail/mail-config.glade.h:204
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:205
 msgid "_Never load images off the net"
 msgstr "_LÀs aldrig in bilder frÄn nÀtet"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:206
 msgid "_Organization:"
 msgstr "_Organisation:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:207
 msgid "_PGP binary path:"
 msgstr "SökvÀg till _PGP-programmet:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:208
 msgid "_Path:"
 msgstr "_SökvÀg:"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:209
+msgid "_Randomize"
+msgstr ""
+
+#: mail/mail-config.glade.h:210
 msgid "_Remember this password"
 msgstr "_Kom ihÄg detta lösenord"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:211
+#, fuzzy
+msgid "_Script"
+msgstr "_SĂ€kerhet"
+
+#: mail/mail-config.glade.h:212
+#, fuzzy
+msgid "_Script:"
+msgstr "_SĂ€kerhet"
+
+#: mail/mail-config.glade.h:213
 msgid "_Send mail in HTML format by default."
 msgstr "_Skicka brev i HTML-format som standard."
 
-#: mail/mail-config.glade.h:124
-msgid "_Server Type: "
+#: mail/mail-config.glade.h:214
+#, fuzzy
+msgid "_Send messages in HTML format by default"
+msgstr "_Skicka brev i HTML-format som standard."
+
+#: mail/mail-config.glade.h:215
+#, fuzzy
+msgid "_Server type: "
 msgstr "_Servertyp: "
 
-#: mail/mail-config.glade.h:125
-msgid "_Signature file:"
+#: mail/mail-config.glade.h:216
+#, fuzzy
+msgid "_Signatures"
 msgstr "_Signaturfil:"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:217
 msgid "_Username:"
 msgstr "AnvÀndar_namn:"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:218
 msgid "_every"
 msgstr "_var"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:219
+#, fuzzy
+msgid "color"
+msgstr " fÀrg"
+
+#: mail/mail-config.glade.h:220
 msgid "description"
 msgstr "beskrivning"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:222
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:223
 msgid "placeholder"
 msgstr "platshÄllare"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:225
 msgid "seconds."
 msgstr "sekunder."
 
+#: mail/mail-config.glade.h:226
+#, fuzzy
+msgid "use _HTML for this signature"
+msgstr "_HTML-signatur:"
+
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Kunde inte skapa ett PGP-signatursammanhang."
@@ -11591,138 +12104,148 @@ msgstr "Kunde inte skapa ett S/MIME-kuvertsammanhang."
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunde inte skapa ett S/MIME-avkodningssammanhang."
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:276
 msgid "Save Attachment"
 msgstr "Spara bilaga"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:341
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Kunde inte skapa temporÀrt meddelandefÀlt \"%s\": %s"
+
+#: mail/mail-display.c:387
 msgid "Save to Disk..."
 msgstr "Spara till disk..."
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:389
 msgid "View Inline"
 msgstr "Visa inuti"
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:391
 #, c-format
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visa inuti (med %s)"
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
-msgstr "Göm"
+msgstr "Dölj"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Externt visningsprogram"
 
-#: mail/mail-display.c:1162
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "LÀser in meddelandeinnehÄll"
 
-#: mail/mail-display.c:1657
+#: mail/mail-display.c:1757
 msgid "Open Link in Browser"
 msgstr "Öppna lĂ€nk i webblĂ€sare"
 
-#: mail/mail-display.c:1659
+#: mail/mail-display.c:1759
 msgid "Copy Link Location"
 msgstr "Kopiera lÀnkplats"
 
-#: mail/mail-display.c:1662
+#: mail/mail-display.c:1762
 msgid "Save Link as (FIXME)"
 msgstr "Spara lÀnk som (FIXME)"
 
-#: mail/mail-display.c:1665
+#: mail/mail-display.c:1765
 msgid "Save Image as..."
 msgstr "Spara bild som..."
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:652
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:698
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunde inte tolka MIME-meddelande. Visar som kÀllkod."
 
-#: mail/mail-format.c:775
+#: mail/mail-format.c:781
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:873
 msgid "Bad Address"
 msgstr "Felaktig adress"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:3
+#: mail/mail-format.c:916 mail/message-list.etspec.h:6
 msgid "From"
 msgstr "FrÄn"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:920
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:11
+#: mail/mail-format.c:925 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Till"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:930
 msgid "Cc"
 msgstr "Kopia"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:935
 msgid "Bcc"
 msgstr "Blindkopia"
 
-#: mail/mail-format.c:1768
+#: mail/mail-format.c:1712
+#, fuzzy
+msgid "View messages..."
+msgstr "Spara meddelande som..."
+
+#: mail/mail-format.c:1806
 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:1791
+#: mail/mail-format.c:1829
 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:1799
+#: mail/mail-format.c:1837
 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:1807
+#: mail/mail-format.c:1845
 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:2022
+#: mail/mail-format.c:2088
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/mail-format.c:2036
+#: mail/mail-format.c:2102
 #, 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:2041
+#: mail/mail-format.c:2107
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/mail-format.c:2070
+#: mail/mail-format.c:2136
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pekare till fjÀrrdata (%s)"
 
-#: mail/mail-format.c:2078
+#: mail/mail-format.c:2144
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okÀnd extern data (typen \"%s\")"
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2149
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
@@ -11774,7 +12297,7 @@ msgstr "Du kan inte Àndra formatet pÄ en ickelokal mapp."
 #: mail/mail-local.c:1416
 #, c-format
 msgid "Reconfigure /%s"
-msgstr "Konfigura om /%s"
+msgstr "Konfigurera om /%s"
 
 #: mail/mail-mt.c:254
 #, c-format
@@ -11798,117 +12321,117 @@ msgstr ""
 msgid "Working"
 msgstr "Arbetar"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:88
 msgid "Filtering Folder"
 msgstr "Filtrerar mapp"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "HĂ€mtar post"
 
-#: mail/mail-ops.c:498 mail/mail-ops.c:527
+#: mail/mail-ops.c:535 mail/mail-ops.c:564
 msgid "However, the message was successfully sent."
 msgstr "Meddelandet skickades dock utan problem."
 
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:600
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Skickar \"%s\""
 
-#: mail/mail-ops.c:683
+#: mail/mail-ops.c:720
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Skickar meddelande %d av %d"
 
-#: mail/mail-ops.c:702
+#: mail/mail-ops.c:739
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Meddelande %d av %d misslyckades"
 
-#: mail/mail-ops.c:704 mail/mail-send-recv.c:545
+#: mail/mail-ops.c:741 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "FĂ€rdig."
 
-#: mail/mail-ops.c:797
+#: mail/mail-ops.c:834
 msgid "Saving message to folder"
 msgstr "Sparar meddelande till mappen"
 
-#: mail/mail-ops.c:877
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: mail/mail-ops.c:877
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:941
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:944
 msgid "Copying"
 msgstr "Kopierar"
 
-#: mail/mail-ops.c:1017
+#: mail/mail-ops.c:1054
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1067 shell/e-local-storage.c:178
+#: mail/mail-ops.c:1104 shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: mail/mail-ops.c:1200
+#: mail/mail-ops.c:1237
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1243
+#: mail/mail-ops.c:1280
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1315
+#: mail/mail-ops.c:1352
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagret %s"
 
-#: mail/mail-ops.c:1384
+#: mail/mail-ops.c:1421
 #, c-format
 msgid "Removing folder %s"
 msgstr "Byter namn pÄ mappen %s"
 
-#: mail/mail-ops.c:1478
+#: mail/mail-ops.c:1515
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/mail-ops.c:1529
+#: mail/mail-ops.c:1566
 msgid "Refreshing folder"
 msgstr "Uppdaterar mapp"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1602
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: mail/mail-ops.c:1614
+#: mail/mail-ops.c:1651
 #, c-format
 msgid "Retrieving message %s"
 msgstr "HĂ€mtar meddelande %s"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1718
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "HĂ€mtar %d meddelande(n)"
 
-#: mail/mail-ops.c:1767
+#: mail/mail-ops.c:1804
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Sparar %d meddelande(n)"
 
-#: mail/mail-ops.c:1879
+#: mail/mail-ops.c:1916
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11917,7 +12440,7 @@ msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1907
+#: mail/mail-ops.c:1944
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11926,11 +12449,11 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1981
+#: mail/mail-ops.c:2018
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: mail/mail-ops.c:1997
+#: mail/mail-ops.c:2034
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11939,27 +12462,27 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2028
+#: mail/mail-ops.c:2065
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: mail/mail-ops.c:2097
+#: mail/mail-ops.c:2134
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar frÄn %s"
 
-#: mail/mail-ops.c:2098
+#: mail/mail-ops.c:2135
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ansluter igen till %s"
 
-#: mail/mail-ops.c:2197
+#: mail/mail-ops.c:2234
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Kör skalkommando: %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Sök"
 
@@ -11995,42 +12518,42 @@ msgstr "Sök:"
 msgid "Matches:"
 msgstr "TrÀffar:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Avbryter..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, typ: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "SökvÀg: %s, typ: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Skicka och ta emot e-post"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Avbryt allt"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
-#: mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
+#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
 msgid "Waiting..."
 msgstr "VĂ€ntar..."
 
-#: mail/mail-send-recv.c:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Avbruten."
 
@@ -12047,6 +12570,29 @@ msgstr "Ange lösenord för %s"
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
+#: mail/mail-signature-editor.c:44
+msgid "Could not save signature file."
+msgstr "Kunde inte spara signaturfilen."
+
+#: mail/mail-signature-editor.c:128
+msgid "Save signature"
+msgstr "Spara signatur"
+
+#: mail/mail-signature-editor.c:134
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Denna signatur har Àndrats, men har inte sparats.\n"
+"\n"
+"Vill du spara dina Àndringar?"
+
+#: mail/mail-signature-editor.c:313
+#, fuzzy
+msgid "Signature name:"
+msgstr "Signaturfil:"
+
 #: mail/mail-summary.c:109
 msgid "Incomplete message written on pipe!"
 msgstr "Inkomplett meddelande skrevs pÄ rör!"
@@ -12121,78 +12667,136 @@ msgstr "(Inget Àmne)"
 msgid "%s - Message"
 msgstr "%s - Meddelande"
 
-#: mail/message-list.c:662
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "OlÀst"
 
-#: mail/message-list.c:663
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "LĂ€st"
 
-#: mail/message-list.c:664
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Besvarad"
 
-#: mail/message-list.c:665
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Flera olÀsta meddelanden"
 
-#: mail/message-list.c:666
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Flera meddelanden"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "LĂ€gsta"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "LĂ€gre"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "Högre"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "Högsta"
 
-#: mail/message-list.c:937
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:944
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Idag %H.%M"
 
-#: mail/message-list.c:953
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "IgÄr %H.%M"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: mail/message-list.c:975
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2387
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
 #: mail/message-list.etspec.h:2
+#, fuzzy
+msgid "Due By"
+msgstr "Ska utföras "
+
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Flag Status"
+msgstr "Status"
+
+#: mail/message-list.etspec.h:4
 msgid "Flagged"
 msgstr "Flaggad"
 
 #: mail/message-list.etspec.h:5
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:7
 msgid "Received"
 msgstr "Mottaget"
 
-#: mail/message-list.etspec.h:8
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Storlek"
 
+#: mail/message-tag-editor.c:91
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:52
+#, fuzzy
+msgid "Call"
+msgstr "McCall"
+
+#: mail/message-tag-followup.c:53
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Vidarebefordra"
+
+#: mail/message-tag-followup.c:54
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:55
+#, fuzzy
+msgid "For Your Information"
+msgstr "KĂ€llinformation"
+
+#: mail/message-tag-followup.c:56 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Vidarebefordra"
+
+#: mail/message-tag-followup.c:57
+msgid "No Response Necessary"
+msgstr ""
+
+#: mail/message-tag-followup.c:59 ui/evolution-mail-message.xml.h:70
+msgid "Reply"
+msgstr "Svara"
+
+#: mail/message-tag-followup.c:60 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Svara till alla"
+
+#: mail/message-tag-followup.c:61
+#, fuzzy
+msgid "Review"
+msgstr "Förhandsgranska"
+
 #: mail/subscribe-dialog.c:219
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -12258,6 +12862,41 @@ msgstr "_Prenumerera"
 msgid "_Unsubscribe"
 msgstr "_SĂ€g upp prenumeration"
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "Konfigurationsverktyg för evolutions att-göra-kanal.\n"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Evolutions e-postredigerare."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Fabrik för Evolutions uppgiftskomponent."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Fabrik för Evolutions sammanfattningskomponent."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "InstÀllningar"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:6
+msgid "This page can be used to customize the appearance of the Summary page."
+msgstr ""
+
 # Detta Àr namn pÄ orter (metrologiska stationer) vÀrlden runt
 #: my-evolution/Locations.h:1
 msgid "Aarhus"
@@ -22052,115 +22691,128 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "ZĂŒrich"
 
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:48
 msgid "Folder containing the Evolution Summary"
 msgstr "Mapp som innehÄller Evolution-sammanfattningen"
 
-#: 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:340 my-evolution/e-summary-calendar.c:358
+#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "Möten"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 msgid "No appointments"
 msgstr "Inga möten"
 
-#: my-evolution/e-summary-calendar.c:375
+#: my-evolution/e-summary-calendar.c:400
 msgid "%k:%M %d %B"
 msgstr "%k.%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr "%l.%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:395
+#: my-evolution/e-summary-calendar.c:420
 msgid "No description"
 msgstr "Ingen beskrivning"
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-mail.c:134
 msgid "Mail summary"
 msgstr "E-postsammanfattning"
 
+#: my-evolution/e-summary-mail.c:398 shell/e-local-storage.c:1022
+msgid "Local Folders"
+msgstr "Lokala mappar"
+
 #. translators: Put a list of codes for locations you want to see in
 #. My Evolution by default here. You can find the list of all
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:81
-#: my-evolution/e-summary-weather.c:606
+#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "ESGG:ESMS:ESSA:ESNU"
 
-#: my-evolution/e-summary-preferences.c:445
+#: my-evolution/e-summary-preferences.c:466
 msgid "Dictionary.com Word of the Day"
 msgstr "Dagens ord frÄn dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:487
 msgid "Quotes of the Day"
 msgstr "Dagens citat"
 
 # Detta Àr inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:946
+#: my-evolution/e-summary-preferences.c:746
 msgid "Add a news feed"
 msgstr "LÀgg till en nyhetskÀlla"
 
 # Detta Àr inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:954
+#: my-evolution/e-summary-preferences.c:754
 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:958
+#: my-evolution/e-summary-preferences.c:758
 msgid "Name:"
 msgstr "Namn:"
 
-#: my-evolution/e-summary-preferences.c:1504
-msgid "Summary Settings"
-msgstr "SammanfattningsinstÀllningar"
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr "Fel vid hÀmtning av RDF"
 
-#: my-evolution/e-summary-rdf.c:443
+#: my-evolution/e-summary-rdf.c:444
 msgid "News Feed"
 msgstr "NyhetskÀlla"
 
-#: my-evolution/e-summary-tasks.c:241
+#: my-evolution/e-summary-shown.c:467
+#, fuzzy
+msgid "Add->"
+msgstr "LĂ€gg till ->"
+
+#: my-evolution/e-summary-shown.c:473
+#, fuzzy
+msgid "<-Remove"
+msgstr "Ta bort"
+
+#: my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Visa"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Inga uppgifter"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(Ingen beskrivning)"
 
-#: my-evolution/e-summary-weather.c:70
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Mitt vÀder"
 
-#: my-evolution/e-summary-weather.c:504
+# Detta Àr inte diskussionsgrupper utan nyheter
+#: my-evolution/e-summary-weather.c:279
+#, fuzzy
+msgid "There was an error downloading data for"
+msgstr "Ett fel uppstod nÀr nyhetskÀllan hÀmtades"
+
+#: my-evolution/e-summary-weather.c:501
 msgid "Weather"
 msgstr "VĂ€der"
 
-#: my-evolution/e-summary-weather.c:667
-msgid "Regions"
-msgstr "Regioner"
-
-#: my-evolution/e-summary.c:190
+#: my-evolution/e-summary.c:189
 msgid "%A, %B %e %Y"
 msgstr "%A %e %B %Y"
 
-#: my-evolution/e-summary.c:475
+#: my-evolution/e-summary.c:474
 msgid "Please wait..."
 msgstr "Var vÀnlig vÀnta..."
 
-#: my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:565 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Skriv ut sammanfattning"
 
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:611
 msgid "Printing of Summary failed"
 msgstr "Utskrift av sammanfattning misslyckades"
 
@@ -23343,119 +23995,90 @@ msgid "Drifting dust whirls"
 msgstr "Drivande dammvirvlar"
 
 #: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr " _Ta bort"
-
-#: my-evolution/my-evolution.glade.h:2
 msgid "Add n_ews feed"
 msgstr "LÀgg till n_yhetskÀlla"
 
-#: my-evolution/my-evolution.glade.h:3
-msgid "Al_l stations:"
-msgstr "_Alla stationer:"
-
-#: my-evolution/my-evolution.glade.h:4
-msgid "All _folders:"
-msgstr "_Alla mappar:"
-
-# Detta Àr inte diskussionsgrupper utan nyheter
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr "_Alla nyhetskÀllor:"
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr "_Celsius"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 msgid "How many days should the calendar display at once?"
 msgstr "Hur mÄnga dagar ska kalendern visa samtidigt?"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr "_Maximalt antal objekt som visas:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr "InstÀllningar för nyhetskÀllor"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 msgid "One mont_h"
 msgstr "En _mÄnad"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 msgid "One w_eek"
 msgstr "En _vecka"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 msgid "R_efresh time (seconds):"
 msgstr "_Uppdateringstid (sekunder):"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 msgid "Refresh _time (seconds):"
 msgstr "_Uppdateringstid (sekunder):"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 msgid "S_how full path for folders"
 msgstr "Visa _fullstÀndig sökvÀg för mappar"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 msgid "Show _all tasks"
 msgstr "Visa _alla uppgifter"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _today's tasks"
 msgstr "Visa _dagens uppgifter"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr "Visa temperaturer i:"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr "Uppgifter "
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 msgid "Weather settings"
 msgstr "VÀderinstÀllningar"
 
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "_Visa mappar:"
-
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Display stations:"
-msgstr "_Visa stationer:"
-
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Displayed feeds:"
-msgstr "_Visade kÀllor:"
-
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Five days"
 msgstr "_Fem dagar"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Mail"
 msgstr "_E-post"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 msgid "_News Feeds"
 msgstr "_NyhetskÀllor"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 msgid "_One day"
 msgstr "_En dag"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Schedule"
 msgstr "_Schema"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Weather"
 msgstr "_VĂ€der"
 
@@ -23471,26 +24094,23 @@ msgstr "Fabrik för anteckningskontrollen"
 msgid "The Evolution shell."
 msgstr "Evolutionskalet."
 
-#: shell/e-activity-handler.c:200
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Visa detaljer"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Avbryt ÄtgÀrd"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: shell/e-local-storage.c:175
+#: shell/e-local-storage.c:176
 msgid "Outbox"
 msgstr "Utkorg"
 
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Lokala mappar"
-
 #: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Evolution-installation"
@@ -23602,49 +24222,53 @@ msgstr ""
 "katalogen. Var vÀnlig och flytta den sÄ att\n"
 "Evolutions anvÀndarfiler kan installeras."
 
-#: shell/e-shell-about-box.c:40
-msgid "Evolution "
-msgstr "Evolution "
-
-#: 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:43
 msgid "Brought to you by"
-msgstr "Presenterades av"
+msgstr "Presenteras av"
+
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Kan inte kontrollera mapp: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Kan inte byta namn pÄ mapp:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "Kan inte flytta en mapp till sig sjÀlv."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Kan inte kopiera en mapp till sig sjÀlv."
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:206
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Kan inte flytta en mapp till en av dess undermappar."
 
-#: shell/e-shell-folder-commands.c:307
+#: shell/e-shell-folder-commands.c:321
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Ange en mapp att kopiera mappen \"%s\" till:"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Kopieringsmapp"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Ange en mapp att flytta mappen \"%s\" till:"
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Flyttningsmapp"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23653,18 +24277,18 @@ msgstr ""
 "Kan inte ta bort mapp:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Ta bort \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: shell/e-shell-folder-commands.c:425
 #, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Är du sĂ€ker pĂ„ att du vill ta bort mappen \"%s\"?"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23673,16 +24297,16 @@ msgstr ""
 "Kan inte byta namn pÄ mapp:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Byt namn pÄ mappen \"%s\" till:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "Byt namn pÄ mapp"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23697,7 +24321,7 @@ msgstr ""
 "Kan inte skapa den angivna katalogen:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:304
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Skapa ny mapp"
 
@@ -23713,7 +24337,7 @@ msgstr ""
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
+#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
 msgid "(Untitled)"
 msgstr "(Namnlös)"
 
@@ -23886,8 +24510,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Kunde inte starta grÀnssnittet för Evolution-epostguiden\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:495
-#: shell/e-shell-user-creatable-items-handler.c:540
+#: shell/e-shell-user-creatable-items-handler.c:506
+#: shell/e-shell-user-creatable-items-handler.c:551
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Ny"
@@ -23908,92 +24532,92 @@ msgstr "Mappnamnet kan inte innehÄlla snedstreck."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" och \"..\" Àr reserverade mappnamn."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:170
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy hittades inte i din $PATH."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kunde inte köras."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:220
 msgid "About Ximian Evolution"
 msgstr "Om Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:446
 msgid "Go to folder..."
 msgstr "GĂ„ till mapp..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:447
 msgid "Select the folder that you want to open"
 msgstr "Markera den mapp som du vill öppna"
 
-#: shell/e-shell-view-menu.c:545
+#: shell/e-shell-view-menu.c:567
 msgid "Create a new shortcut"
 msgstr "Skapa en ny genvÀg"
 
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:568
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "VÀlj den mapp som du vill att genvÀgen ska peka till:"
 
-#: shell/e-shell-view-menu.c:577
+#: shell/e-shell-view-menu.c:616
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot-verktygen verkar inte vara installerade pÄ detta system."
 
-#: shell/e-shell-view-menu.c:585
+#: shell/e-shell-view-menu.c:624
 #, c-format
 msgid "Error executing %s."
 msgstr "Fel vid körning av %s."
 
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:739
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:752 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "A_rbeta frÄnkopplad"
 
-#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:765 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Arbeta frÄnkopplad"
 
-#: shell/e-shell-view.c:215
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Ingen mapp visas)"
 
-#: shell/e-shell-view.c:1598
+#: shell/e-shell-view.c:1802
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1600
+#: shell/e-shell-view.c:1804
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: shell/e-shell-view.c:1647
+#: shell/e-shell-view.c:1851
 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:1654
+#: shell/e-shell-view.c:1858
 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:1660
+#: shell/e-shell-view.c:1864
 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:651
+#: shell/e-shell.c:652
 #, 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:1660
+#: shell/e-shell.c:1719
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24004,19 +24628,19 @@ 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:1887
+#: shell/e-shell.c:1982
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: shell/e-shell.c:1889
+#: shell/e-shell.c:1984
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera pÄ OAF"
 
-#: shell/e-shell.c:1891
+#: shell/e-shell.c:1986
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
-#: shell/e-shell.c:1893 shell/e-storage.c:500
+#: shell/e-shell.c:1988 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "AllmÀnt fel"
 
@@ -24091,7 +24715,7 @@ msgstr "Byt namn pÄ denna genvÀgsgrupp"
 
 #: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
-msgstr "_Göm genvÀgsraden"
+msgstr "_Dölj genvÀgsraden"
 
 #: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
@@ -24133,15 +24757,15 @@ msgstr "_Ta bort"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Ta bort denna genvÀg frÄn genvÀgsraden"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Fel vid sparande av genvÀgar."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "GenvÀgar"
 
-#: shell/e-storage-set-view.c:658
+#: shell/e-storage-set-view.c:649
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24150,59 +24774,55 @@ msgstr ""
 "Kan inte för över mapp:\n"
 "%s"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Inget namn)"
-
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "Inga fel"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "En mapp med samma namn finns redan"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Den angivna mapptypen Àr inte giltig"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "I/O-fel"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Inte tillrÀckligt med utrymme för att skapa mapp"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Mappen Àr inte tom"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "Den angivna mappen hittades inte"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Funktionen Àr Ànnu inte implementerad i detta lager"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "ÅtgĂ€rden stöds inte"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "Den angivna typen stöds inte i detta lager"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "Den angivna mappen kan inte Àndras eller tas bort"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 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:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "Kan inte skapa en mapp med det namnet"
 
@@ -24253,67 +24873,67 @@ msgstr ""
 "Felet frÄn aktiveringssystemet Àr:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1044
 msgid "CORBA error"
 msgstr "CORBA-fel"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1046
 msgid "Interrupted"
 msgstr "Avbruten"
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1048
 msgid "Invalid argument"
 msgstr "Ogiltigt argument"
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1050
 msgid "Already has an owner"
 msgstr "Har redan en Àgare"
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1052
 msgid "No owner"
 msgstr "Ingen Àgare"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1054
 msgid "Not found"
 msgstr "Hittades inte"
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1056
 msgid "Unsupported type"
 msgstr "Typen stöds inte"
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1058
 msgid "Unsupported schema"
 msgstr "Schemat stöds inte"
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1060
 msgid "Unsupported operation"
 msgstr "ÅtgĂ€rden stöds inte"
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1062
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1066
 msgid "Exists"
 msgstr "Existerar"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1068
 msgid "Invalid URI"
 msgstr "Ogiltig URI"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1072
 msgid "Has subfolders"
 msgstr "Har undermappar"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1074
 msgid "No space left"
 msgstr "Inget utrymme kvar"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1076
 msgid "Old owner has died"
 msgstr "Gamla Àgaren har dött"
 
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:45
 msgid "Test type"
 msgstr "Testtyp"
 
@@ -24442,32 +25062,49 @@ msgstr "FrÄga mig inte igen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importera data frÄn följande filer:"
 
-#: shell/main.c:83
+#: shell/main.c:88
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:89
+#: shell/main.c:94
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avslutar nu..."
 
-#: shell/main.c:210
+#: shell/main.c:223
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan inte komma Ă„t Ximian Evolution-skalet."
 
-#: shell/main.c:219
+#: shell/main.c:232
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan inte initiera Ximian Evolution-skalet: %s"
 
-#: shell/main.c:289
+#: shell/main.c:302
 msgid "Disable splash screen"
 msgstr "AnvÀnd inte startbild"
 
-#: shell/main.c:290
+#: shell/main.c:303
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Startar import"
+
+#: shell/main.c:304
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Startar intelligenta importörer"
+
+#: shell/main.c:305
 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:332
+#: shell/main.c:323
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:353
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet."
 
@@ -24490,241 +25127,209 @@ msgstr "Utdatafil"
 msgid "No filename provided."
 msgstr "Inget filnamn Àr angivet."
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Kopiera till mapp..."
+
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Koiera markeringen"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+msgid "Copy to Folder..."
+msgstr "Kopiera till mapp..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Skapa ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "Skapa ny kontaktlista"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Klipp ut markeringen"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "Ta bort markerade kontakter"
 
 #: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "Ny lista"
+#, fuzzy
+msgid "Dump"
+msgstr "Kasta XML"
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Ski_cka kontakten till annan..."
+
+#: ui/evolution-addressbook.xml.h:15
+msgid "Move to Folder..."
+msgstr "Flytta till mapp..."
+
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Klistra in frÄn urklipp"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:18
 msgid "Previews the contacts to be printed"
 msgstr "Förhandsgranskar kontakterna som ska skrivas ut"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:21
 msgid "Print selected contacts"
 msgstr "Skriv ut markerade kontakter"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23
 msgid "Save selected contacts as a VCard."
 msgstr "Spara markerade kontakter som ett VCard."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select All"
 msgstr "Markera allt"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:25
 msgid "Select all contacts"
 msgstr "Markera alla kontakter"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "Skicka _meddelande till kontakt..."
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send a mess to the selected contacts."
 msgstr "Skicka ett meddelande till de markerade kontakterna."
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send message to contact"
 msgstr "Skicka meddelande till kontakt"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:28
 msgid "Send selected contacts to another person."
 msgstr "Skicka markerade kontakter till en annan person."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:30
 msgid "Stop Loading"
 msgstr "Stoppa inlÀsning"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:31
 msgid "View the current contact"
 msgstr "Visa den aktuella kontakten"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:34
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
 #: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:16
+#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
+#: ui/evolution.xml.h:35
 msgid "_Actions"
 msgstr "_ÅtgĂ€rder"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Addressbook Sources..."
-msgstr "_AdressbokskÀllor..."
-
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: ui/evolution-addressbook.xml.h:33
+#: ui/evolution-addressbook.xml.h:34
 msgid "_Contact List"
 msgstr "_Kontaktlista"
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Vidarebefordra kontakt..."
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:41
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:103
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "Skriv _ut..."
+#: ui/evolution-addressbook.xml.h:39
+msgid "_Move to Folder..."
+msgstr "_Flytta till mapp..."
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Save as VCard"
 msgstr "_Spara som VCard"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Search for Contacts"
 msgstr "_Sök efter kontakter"
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:45
 msgid "_Select All"
 msgstr "_Markera allt"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Konfigurera kalenderns instÀllningar"
+#: ui/evolution-addressbook.xml.h:46
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "Skicka _meddelande till kontakt..."
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Skapa ett nytt _heldagsevenemang"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "Skapa en ny _uppgift"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Skapa ett _nytt möte"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "Skapa en hÀndelse som varar en hel dag"
-
-#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Ta bort mötet"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "GĂ„ till"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "GÄ bakÄt"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "GÄ framÄt"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "GĂ„ till _datum"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "GĂ„ till ett specifikt datum"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "GĂ„ till idag"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "MĂ„nad"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "Nytt möte"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-msgid "New Task"
-msgstr "Ny uppgift"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Förhandsgranskar kalendern som ska skrivas ut"
 
-#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "Förhands_granska"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Skriv ut denna kalender"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publicera ledig-/upptageninformation för denna kalender"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Visa en dag"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Visa en mÄnad"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Visa en vecka"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Visa arbetsveckan"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Vecka"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "_Möte..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "_KalenderinstÀllningar..."
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr "_Publicera ledig-/upptageninformation"
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "_Uppgift..."
-
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -24754,18 +25359,18 @@ msgstr "Förhandsgranska det utskrivna objektet"
 msgid "Print this item"
 msgstr "Skriv ut detta objekt"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Skriv ut..."
-
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Spara"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Spara som..."
+
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Spara och stÀng"
 
@@ -24781,8 +25386,8 @@ 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:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:36
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:40
 msgid "_File"
 msgstr "_Arkiv"
 
@@ -24800,10 +25405,14 @@ msgstr "Spara so_m..."
 msgid "Save the contact and close the dialog box"
 msgstr "Spara kontakten och stÀng dialogrutan"
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "Skicka _meddelande till kontakt..."
+
 #: 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:11
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Save"
 msgstr "_Spara"
 
@@ -24872,82 +25481,54 @@ msgid "Compose _New Message"
 msgstr "Skriv ett _nytt meddelande"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Skapa eller redigera e-postkonton och andra instÀllningar"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Skapa eller redigera regler för filtrering av ny post"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Skapa eller redigera definitioner för virtuella mappar"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Töm _papperskorgen"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "_Glöm lösenord"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Glöm ihÄgkomna lösenord sÄ att du frÄgas efter dem igen"
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "Nytt meddelande"
-
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Öppna ett fönster för skrivning av ett e-postmeddelande"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Ta bort alla borttagna meddelanden frÄn alla mappar permanent"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "Skicka / Ta emot"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "Skicka kölagd e-post och hÀmta ny e-post"
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Visa förhandsgranskningsfönster för meddelanden"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prenumerera eller sÀg upp prenumeration pÄ mappar pÄ fjÀrrservrar"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "_Redigerare för virtuella mappar..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filter..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "_E-postmeddelande"
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "_E-postinstÀllningar..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "F_örhandsgranskningspanel"
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "_Skicka / Ta emot"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "_Prenumerera pÄ mappar..."
 
@@ -24969,20 +25550,20 @@ msgstr "Klipp ut markerade meddelanden"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
-msgstr "Göm _markerade meddelanden"
+msgstr "Dölj _markerade meddelanden"
 
 #: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
-msgstr "Göm _borttagna meddelanden"
+msgstr "Dölj _borttagna meddelanden"
 
 #: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
-msgstr "Göm _lÀsta meddelanden"
+msgstr "Dölj _lÀsta meddelanden"
 
 #: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Göm borttagna meddelanden istÀllet för att visa dem överstrukna"
+msgstr "Dölj borttagna meddelanden istÀllet för att visa dem överstrukna"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
@@ -25023,29 +25604,29 @@ msgstr "Markera alla synliga meddelanden"
 
 #: ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
-msgstr "V_isa gömda meddelanden"
+msgstr "V_isa dolda meddelanden"
 
 #: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
-msgstr "Visa meddelanden som har gömts tillfÀlligt"
+msgstr "Visa meddelanden som har dolts tillfÀlligt"
 
 #: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
-msgstr "Göm alla meddelanden temporÀrt som redan har lÀsts"
+msgstr "Dölj alla meddelanden som redan har lÀsts temporÀrt"
 
 #: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
-msgstr "Göm de markerade meddelandena temporÀrt"
+msgstr "Dölj de markerade meddelandena temporÀrt"
 
 #: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "TrÄdad meddelandelista"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:20
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "T_öm"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Mapp"
 
@@ -25061,148 +25642,158 @@ msgstr "_Egenskaper..."
 msgid "_Threaded Message List"
 msgstr "_TrÄdad meddelandelista"
 
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "LÀgg till avsÀndaren i adressboken"
+
 #: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "TillÀmpa filter"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "LÀgg till avsÀndaren i adressboken"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "TillÀmpa filterregler pÄ de markerade meddelandena"
 
-#: ui/evolution-mail-message.xml.h:3
+#: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Skriv ett svar till alla mottagare av det markerade meddelandet"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Skriv ett svar till sÀndlistan till det markerade meddelandet"
 
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Skriv ett svar till avsÀndaren av det markerade meddelandet"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Kopiera markerade meddelanden till en annan mapp"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Skapa _virtuell mapp frÄn meddelande"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "Skapa en regel för att filtrera meddelanden frÄn denna avsÀndare"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Skapa en regel för att filtrera meddelanden till dessa mottagare"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Skapa en regel för att filtrera meddelanden till denna sÀndlista"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Skapa en regel för att filtrera meddelanden med detta Àmne"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Skapa en virtuell mapp för dessa mottagare"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Skapa en virtuell mapp för denna sÀndlista"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Skapa en virtuell mapp för denna avsÀndare"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Skapa en virtuell mapp för detta Àmne"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Minska textstorleken"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Visa nÀsta viktiga meddelande"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Visa nÀsta meddelande"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Visa nÀsta olÀsta meddelande"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Visa nÀsta olÀsta trÄd"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Visa föregÄende viktiga meddelande"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Visa föregÄende meddelande"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Visa föregÄende olÀsta meddelande"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Vidarebefordra"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filtrera pÄ _sÀndlista..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filtrera pÄ _avsÀndare..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filtrera pÄ _mottagare..."
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filtrera pÄ _Àmne..."
 
-#: ui/evolution-mail-message.xml.h:30
-msgid "Force images in HTML mail to be loaded"
-msgstr "Tvinga att bilder i HTML-epost lÀses in"
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward"
-msgstr "Vidarebefordra"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward As"
-msgstr "Vidarebefordra som"
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Attached"
-msgstr "Vidarebefordra som _bilaga"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "Markera de markerade meddelandena för borttagning"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Inline"
-msgstr "Vidarebefordra _inuti"
+#, fuzzy
+msgid "Follow _Up..."
+msgstr "FullstÀndigt _namn..."
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Forward _Quoted"
-msgstr "Vidarebefordra _citerat"
+msgid "Force images in HTML mail to be loaded"
+msgstr "Tvinga att bilder i HTML-epost lÀses in"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 "Vidarebefordra det markerade meddelandet i texten pÄ ett nytt meddelande"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Vidarebefordra det markerade meddelandet citerat som ett svar"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Vidarebefordra det markerade meddelandet till nÄgon"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Vidarebefordra det markerade meddelandet till nÄgon som en bilaga"
 
@@ -25218,24 +25809,32 @@ msgstr "LĂ€s in _bilder"
 msgid "Mark as I_mportant"
 msgstr "Markera som _viktigt"
 
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Markera som _olÀst"
+
 #: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Markera som ovikti_gt"
 
 #: ui/evolution-mail-message.xml.h:47
-msgid "Mark the selected messages as having been read"
+#, fuzzy
+msgid "Mark the selected message(s) as having been read"
 msgstr "Markera de markerade meddelandena som lÀsta"
 
 #: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected messages as important"
+#, fuzzy
+msgid "Mark the selected message(s) as important"
 msgstr "Markera de markerade meddelandena som viktiga"
 
 #: ui/evolution-mail-message.xml.h:49
-msgid "Mark the selected messages as not having been read"
+#, fuzzy
+msgid "Mark the selected message(s) as not having been read"
 msgstr "Markera de markerade meddelandena som olÀsta"
 
 #: ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as unimportant"
+#, fuzzy
+msgid "Mark the selected message(s) as unimportant"
 msgstr "Markera de markerade meddelandena som oviktiga"
 
 #: ui/evolution-mail-message.xml.h:51
@@ -25247,7 +25846,8 @@ msgid "Move"
 msgstr "Flytta"
 
 #: ui/evolution-mail-message.xml.h:53
-msgid "Move selected messages to another folder"
+#, fuzzy
+msgid "Move selected message(s) to another folder"
 msgstr "Flytta markerade meddelanden till en annan mapp"
 
 #: ui/evolution-mail-message.xml.h:54
@@ -25255,64 +25855,63 @@ msgid "Next"
 msgstr "NĂ€sta"
 
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Important Message"
+#, fuzzy
+msgid "Next _Important Message"
 msgstr "NĂ€sta viktiga meddelande"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Message"
-msgstr "NĂ€sta meddelande"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "NÀsta trÄd"
 
-#: ui/evolution-mail-message.xml.h:58
-msgid "Next Unread Message"
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "NÀsta olÀsta meddelande"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Öppna det markerade meddelandet i ett nytt fönster"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Öppna det markerade meddelandet i redigeraren för Ă„tersĂ€ndning av det"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "_Originalstorlek"
 
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "FöregÄende olÀsta meddelande"
+
 #: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "FöregÄende viktiga meddelande"
+
+#: ui/evolution-mail-message.xml.h:63
 msgid "Preview the message to be printed"
 msgstr "Förhandsgranska meddelandet som ska skrivas ut"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous"
 msgstr "FöregÄende"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Previous Important Message"
-msgstr "FöregÄende viktiga meddelande"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Message"
-msgstr "FöregÄende meddelande"
-
-#: ui/evolution-mail-message.xml.h:66
-msgid "Previous Unread Message"
-msgstr "FöregÄende olÀsta meddelande"
-
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Skriv ut detta meddelande"
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply"
-msgstr "Svara"
+#: ui/evolution-mail-message.xml.h:68
+#, fuzzy
+msgid "Re_direct"
+msgstr "Woensdrecht"
 
-#: ui/evolution-mail-message.xml.h:71
-msgid "Reply to All"
-msgstr "Svara till alla"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Vidarebefordra det markerade meddelandet till nÄgon"
 
 #: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
@@ -25383,8 +25982,9 @@ msgid "VFolder on _Subject..."
 msgstr "Virtuell mapp pÄ _Àmne..."
 
 #: ui/evolution-mail-message.xml.h:92
-msgid "_Apply Filters"
-msgstr "_TillÀmpa filter"
+#, fuzzy
+msgid "_Attached"
+msgstr "Bifoga"
 
 #: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
@@ -25399,43 +25999,71 @@ msgid "_Forward Message"
 msgstr "_Vidarebefordra meddelande"
 
 #: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "GĂ„ till"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "Inuti"
+
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_Större"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "M_eddelandevisning"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Flytta till mapp"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "NĂ€sta meddelande"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "_Öppna meddelande"
 
-#: ui/evolution-mail-message.xml.h:106 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "FöregÄende meddelande"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "Citerad"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "V_erktyg"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "_Ångra borttagning"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 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:6 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:33
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:36
 msgid "_Close"
 msgstr "S_tÀng"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
 msgid "_View"
 msgstr "_Visa"
 
@@ -25459,11 +26087,11 @@ msgstr "Kryptera detta meddelande med PGP"
 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
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
 
@@ -25512,7 +26140,7 @@ msgid "Save in folder..."
 msgstr "Spara i mapp..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Spara aktuell fil"
 
@@ -25537,6 +26165,7 @@ msgid "Send _later"
 msgstr "Skicka senar_e"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Skicka brevet i HTML-format"
 
@@ -25550,7 +26179,7 @@ msgstr "Skicka detta meddelande nu"
 
 #: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
-msgstr "Visa/göm bilaga"
+msgstr "Visa/dölj bilaga"
 
 #: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
@@ -25605,7 +26234,7 @@ msgid "_From Field"
 msgstr "_FrÄnfÀltet"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -25621,7 +26250,7 @@ msgstr "_Svara till-fÀltet"
 msgid "_Security"
 msgstr "_SĂ€kerhet"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_HjÀlp"
 
@@ -25677,41 +26306,39 @@ msgstr "FĂ„ tag i den senaste uppgiftsinformationen"
 msgid "Re_fresh Task"
 msgstr "Upp_datera uppgift"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Konfigurera uppgiftsvyns instÀllningar"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopiera markerad uppgift"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Klipp ut markerad uppgift"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete completed tasks"
 msgstr "Ta bort fÀrdigstÀllda uppgifter"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Ta bort markerade uppgifter"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 msgid "Mar_k as Complete"
 msgstr "Mar_kera som fÀrdig"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Klistra in uppgift frÄn urklipp"
 
-#: ui/evolution-tasks.xml.h:15
-msgid "Tasks Settings..."
-msgstr "UppgiftsinstÀllningar..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Förhandsgranskar kontakterna som ska skrivas ut"
 
-#: ui/evolution-tasks.xml.h:22
-msgid "_Task"
-msgstr "_Uppgift"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Redigera denna uppgift"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -25778,113 +26405,118 @@ msgid "Open this folder in an other window"
 msgstr "Öppna denna mapp i ett annat fönster"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Skicka / Ta emot"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Skicka kölagd e-post och hÀmta ny e-post"
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "Visa information om Ximian Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Skicka felrapport"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Skicka _felrapport"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Skicka en felrapport med Bug-Buddy"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "VĂ€xla"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "VĂ€xla om mappraden ska visas"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "VÀxla om genvÀgsraden ska visas"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "VÀxla om vi arbetar frÄnkopplade."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Visa den markerade mappen"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "FrÄgor och _svar om Ximian Evolution"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Kopiera..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "_Mapprad"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_GĂ„ till mapp..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Importera..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Flytta..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Nytt"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "_Ny mapp"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "_PilotinstÀllningar..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_Byt namn..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_Skicka / Ta emot"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_GenvÀg"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "_GenvÀgsrad"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Ändra instĂ€llningarna för sammanfattningen"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Skriv ut sammanfattning"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "LĂ€s om"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "LĂ€s om vyn"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "_SammanfattningsinstÀllningar..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Adresskort"
@@ -25898,18 +26530,27 @@ msgid "Phone List"
 msgstr "Telefonlista"
 
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "VĂ€lj mapp"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Efter avsÀndare"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Efter status"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Efter Àmne"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "Meddelanden"
 
@@ -25945,11 +26586,22 @@ msgstr ""
 "och vÀlja en tidszon.\n"
 " AnvÀnd höger musknapp för att zooma ut."
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "_Aktuell vy"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "Anpassad sökning"
+
+#: widgets/menus/gal-view-menus.c:333
+#, fuzzy
+msgid "Save Custom View"
+msgstr "Nyckelkund"
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "Definiera vyer"
 
@@ -26041,20 +26693,20 @@ msgstr "Ukrainsk"
 msgid "Visual"
 msgstr "Visuell"
 
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "OkÀnd teckentabell: %s"
 
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Ange teckentabellen att anvÀnda"
 
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Annan..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Teckenkodning"
 
@@ -26062,25 +26714,28 @@ msgstr "Teckenkodning"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Sökredigerare"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Spara sökning"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "LÀgg till i sparade sökningar"
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Spara sökning"
 
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Töm"
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "LÀgg till i sparade sökningar"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Visa alla"
+#: widgets/misc/e-filter-bar.h:93
+#, fuzzy
+msgid "_Advanced Search..."
+msgstr "Avancerad sökning"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -26099,14 +26754,24 @@ msgstr "Meddelande"
 msgid "Don't show this message again."
 msgstr "Visa inte detta meddelande igen."
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "S_ök"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Sök nu"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Töm"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:844
 msgid "Find Now"
 msgstr "Sök nu"
 
+#: widgets/misc/e-search-bar.c:846
+msgid "Clear"
+msgstr "Töm"
+
 #: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
 #: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
 msgid "The Personal Addressbook Server"
@@ -26129,6 +26794,498 @@ msgstr "init_corba(): kunde inte initiera GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
+#~ msgid "Card: "
+#~ msgstr "Kort: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Namn: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Prefix:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Förnamn:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Andranamn:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Efternamn:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Suffix:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "Födelsedatum: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Adress:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Box:           "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "  Anknytning:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Gatuadress:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ort:           "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Region:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Postnummer:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Land:          "
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "Leveransetikett: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefoner:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefon:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "E-post:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "E-post:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Mailer: "
+#~ msgstr ""
+#~ "\n"
+#~ "E-postprogram: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Tidszon: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Geo Location: "
+#~ msgstr ""
+#~ "\n"
+#~ "Geografisk plats: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "Yrkesroll: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "Org: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Namn:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Enhet:   "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Enhet 2: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Enhet 3: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Enhet 4: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "Kategorier: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Kommentar: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "Unik strÀng: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Publik nyckel: "
+
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Ansluter till LDAP-servern..."
+
+#~ msgid "Unable to connect to LDAP server."
+#~ msgstr "Kan inte ansluta till LDAP-servern."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "VÀntar pÄ anslutning till LDAP-servern..."
+
+#~ msgid "New _Contact"
+#~ msgstr "Ny _kontakt"
+
+#~ msgid "New Contact _List"
+#~ msgstr "Ny kontakt_lista"
+
+#~ msgid "Name contains"
+#~ msgstr "Namnet innehÄller"
+
+#~ msgid "Email contains"
+#~ msgstr "E-postadressen innehÄller"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Skapa ett nytt möte"
+
+#~ msgid "Create a new task"
+#~ msgstr "Skapa en ny uppgift"
+
+#~ msgid "New _Task"
+#~ msgstr "Ny _uppgift"
+
+#~ msgid "_Delete this Task"
+#~ msgstr "_Ta bort denna uppgift"
+
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr "Ledig-/upptageninformation (%s till %s)"
+
+#~ msgid "iCalendar information"
+#~ msgstr "iCalendar-information"
+
+#~ msgid "Invalid type in body-contains, expecting string"
+#~ msgstr "Ogiltig typ i \"body-contains\", förvÀntar strÀng"
+
+#~ msgid "NT Login"
+#~ msgstr "NT-inloggning"
+
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "Kunde inte kontrollera nya meddelanden pÄ POP-servern: %s"
+
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr "Kunde inte öppna mapp: meddelandelistningen var inte komplett."
+
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "Kunde inte hÀmta meddelande: %s"
+
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ msgstr "Kunde inte hÀmta meddelande frÄn POP-servern %s: %s"
+
+#~ 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."
+
+#~ msgid "Could not authenticate to KPOP server: %s"
+#~ msgstr "Kunde inte autentisera till KPOP-server: %s"
+
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Kunde inte ansluta till server: %s"
+
+#~ msgid "(Unknown)"
+#~ msgstr "(OkÀnd)"
+
+#~ msgid "Unexpected response from POP server: %s"
+#~ msgstr "OvÀntat svar frÄn POP-servern: %s"
+
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "Kunde inte hitta \"FrÄn\"-adress i meddelandet"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "Kan inte skicka meddelande: avsÀndaradressen Àr inte angiven."
+
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "Fel i RCPT TO-svar: %s: brevet skickades inte"
+
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "Fel i DATA-svar: %s: brevet skickades inte"
+
+#~ msgid "DATA response error: message termination: %s: mail not sent"
+#~ msgstr "Fel i DATA-svar: meddelandeslut: %s: brevet skickades inte"
+
+#~ msgid "QUIT response error: %s: non-fatal"
+#~ msgstr "Fel i QUIT-svar: %s: inte ödesdigert"
+
+#~ msgid "Needs Reply"
+#~ msgstr "KrÀver svar"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "E-postlagringsmapp (intern)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Kunde inte ansluta till lager: %s"
+
+#~ msgid "New _Mail Message"
+#~ msgstr "Nytt e-_postmeddelande"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Skapa virtuell mapp frÄn sökning"
+
+#~ msgid "Mark as Unim_portant"
+#~ msgstr "Markera som ovikti_gt"
+
+#~ msgid "Mark as Needing Reply"
+#~ msgstr "Markera som svarskrÀvande"
+
+#~ msgid "Mark as Not Needing Reply"
+#~ msgstr "Markera som inte svarskrÀvande"
+
+#~ msgid "Filter on Mailing List"
+#~ msgstr "Filtrera pÄ sÀndlista"
+
+#~ msgid "Indexing:"
+#~ msgstr "Indexering:"
+
+#~ msgid "Mailbox Format"
+#~ msgstr "BrevlÄdeformat"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Är du sĂ€ker pĂ„ att du vill ta bort detta diskussionsgruppskonto?"
+
+#~ msgid "This message contains invalid recipients:"
+#~ msgstr "Detta meddelande innehÄller ogiltiga mottagare:"
+
+#~ msgid "HTML signature file:"
+#~ msgstr "HTML-signaturfil:"
+
+#~ msgid "_Email Address:"
+#~ msgstr "_E-postadress:"
+
+#~ msgid "_Full Name:"
+#~ msgstr "_FullstÀndigt namn:"
+
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "Kan inte initiera Evolutions sammanfattningskomponent."
+
+#~ msgid "Summary Settings"
+#~ msgstr "SammanfattningsinstÀllningar"
+
+#~ msgid "Regions"
+#~ msgstr "Regioner"
+
+#~ msgid " _Remove"
+#~ msgstr " _Ta bort"
+
+#~ msgid "Al_l stations:"
+#~ msgstr "_Alla stationer:"
+
+#~ msgid "All _folders:"
+#~ msgstr "_Alla mappar:"
+
+# Detta Àr inte diskussionsgrupper utan nyheter
+#~ msgid "All news _feeds:"
+#~ msgstr "_Alla nyhetskÀllor:"
+
+#~ msgid "_Display folders:"
+#~ msgstr "_Visa mappar:"
+
+#~ msgid "_Display stations:"
+#~ msgstr "_Visa stationer:"
+
+#~ msgid "_Displayed feeds:"
+#~ msgstr "_Visade kÀllor:"
+
+#~ msgid "Evolution "
+#~ msgstr "Evolution "
+
+#~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+#~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
+
+#~ msgid "(No name)"
+#~ msgstr "(Inget namn)"
+
+#~ msgid "New List"
+#~ msgstr "Ny lista"
+
+#~ msgid "_Addressbook Sources..."
+#~ msgstr "_AdressbokskÀllor..."
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Konfigurera kalenderns instÀllningar"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Skapa ett nytt _heldagsevenemang"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Skapa en ny _uppgift"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Skapa ett _nytt möte"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Skapa en hÀndelse som varar en hel dag"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Möte..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_KalenderinstÀllningar..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Uppgift..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Skapa eller redigera e-postkonton och andra instÀllningar"
+
+#~ msgid "New Message"
+#~ msgstr "Nytt meddelande"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "_E-postinstÀllningar..."
+
+#~ msgid "Forward As"
+#~ msgstr "Vidarebefordra som"
+
+#~ msgid "Forward _Attached"
+#~ msgstr "Vidarebefordra som _bilaga"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "Vidarebefordra _citerat"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_TillÀmpa filter"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Konfigurera uppgiftsvyns instÀllningar"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "UppgiftsinstÀllningar..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Ändra instĂ€llningarna för sammanfattningen"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "_SammanfattningsinstÀllningar..."
+
+#~ msgid "Show All"
+#~ msgstr "Visa alla"
+
+#~ msgid "Sear_ch"
+#~ msgstr "S_ök"
+
 #~ msgid ""
 #~ "Evolution will use this Distinguished Name (DN) to authenticate you with "
 #~ "the server"
@@ -26455,9 +27612,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Password:"
 #~ msgstr "Lösenord:"
 
-#~ msgid "Couldn't create temporary mbox `%s': %s"
-#~ msgstr "Kunde inte skapa temporÀrt meddelandefÀlt \"%s\": %s"
-
 #~ msgid ""
 #~ "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 #~ "This probably means that the %s component has crashed."
@@ -26545,10 +27699,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%Y-%m-%d"
 
-# Detta Àr inte diskussionsgrupper utan nyheter
-#~ msgid "There was an error downloading news feed"
-#~ msgstr "Ett fel uppstod nÀr nyhetskÀllan hÀmtades"
-
 #~ msgid "All Attendees"
 #~ msgstr "Alla deltagare"
 
@@ -26609,9 +27759,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Vidarebefordrat meddelande:\n"
 
-#~ msgid "Factory for the Evolution addressbook component."
-#~ msgstr "Fabrik för Evolutions adressbokskomponent."
-
 #~ msgid "123"
 #~ msgstr "123"
 
@@ -26747,9 +27894,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "12 hour (am/pm)"
 #~ msgstr "12 timmar (fm/em)"
 
-#~ msgid "Calendar Preferences"
-#~ msgstr "KalenderinstÀllningar"
-
 #~ msgid "This is an event that can be added to your calendar."
 #~ msgstr "Detta Àr ett evenemang som kan lÀggas till i din kalender."
 
@@ -26846,9 +27990,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Help"
 #~ msgstr "HjÀlp"
 
-#~ msgid "Se_nd contact to other..."
-#~ msgstr "Ski_cka kontakten till annan..."
-
 #~ msgid "See online help"
 #~ msgstr "Se online-hjÀlpen"
 
@@ -26909,9 +28050,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Hot Contacts"
 #~ msgstr "Heta kontakter"
 
-#~ msgid "Key Customer"
-#~ msgstr "Nyckelkund"
-
 #~ msgid "Strategies"
 #~ msgstr "Strategier"
 
@@ -26975,9 +28113,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Authentication:"
 #~ msgstr "Autentisering:"
 
-#~ msgid "Advanced LDAP Options"
-#~ msgstr "Avancerade LDAP-alternativ"
-
 #~ msgid "Path:"
 #~ msgstr "SökvÀg:"
 
@@ -27074,9 +28209,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "TasksPreferences"
 #~ msgstr "UppgiftsvyinstÀllningar..."
 
-#~ msgid "Edit this task"
-#~ msgstr "Redigera denna uppgift"
-
 #~ msgid "Delete all Occurrences"
 #~ msgstr "Ta bort alla förekomster"
 
@@ -27117,9 +28249,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Create a new calendar"
 #~ msgstr "Skapa en ny kalender"
 
-#~ msgid "Open Calendar"
-#~ msgstr "Öppna kalender"
-
 #~ msgid "Save calendar as something else"
 #~ msgstr "Spara kalender som nÄgot annat"
 
@@ -27168,9 +28297,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "[%s] (forwarded message)"
 #~ msgstr "[%s] (vidarebefordrat meddelande)"
 
-#~ msgid "Add ->"
-#~ msgstr "LĂ€gg till ->"
-
 #~ msgid "Remove <-"
 #~ msgstr "Ta bort <-"
 
@@ -27282,9 +28408,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Detailed forecast"
 #~ msgstr "Detaljerad prognos"
 
-#~ msgid "Enable radar maps"
-#~ msgstr "SlÄ pÄ radarkartor"
-
 #~ msgid "(sec)"
 #~ msgstr "(sek)"
 
@@ -27336,9 +28459,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Overdue Items:"
 #~ msgstr "Objekt som skulle ha utförts:"
 
-#~ msgid "Show"
-#~ msgstr "Visa"
-
 #~ msgid "Time Until Due"
 #~ msgstr "Tid till förfallodatum"
 
@@ -27462,9 +28582,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Cop_y to Folder... (FIXME)"
 #~ msgstr "K_opiera till mapp... (FIXME)"
 
-#~ msgid "Dump XML"
-#~ msgstr "Kasta XML"
-
 #~ msgid "Dump the UI Xml description"
 #~ msgstr "Kasta anvÀndargrÀnssnittsbeskrivningen i XML"
 
@@ -27639,9 +28756,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Search \"%s\""
 #~ msgstr "Sök i \"%s\""
 
-#~ msgid "Configure Folder..."
-#~ msgstr "Konfigura mapp..."
-
 #~ msgid "Copy message to a new folder"
 #~ msgstr "Kopiera meddelandet till en ny mapp"
 
@@ -27749,12 +28863,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Mark as Read"
 #~ msgstr "Markera som lÀst"
 
-#~ msgid "Move to Folder..."
-#~ msgstr "Flytta till mapp..."
-
-#~ msgid "Copy to Folder..."
-#~ msgstr "Kopiera till mapp..."
-
 #~ msgid "_Compose"
 #~ msgstr "Skriv _nytt"
 
@@ -27834,31 +28942,18 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Kerberos"
 #~ msgstr "Kerberos"
 
-#~ msgid "Mail Account"
-#~ msgstr "Epostkonton"
-
 #~ msgid "Plain Text"
 #~ msgstr "Vanlig text"
 
 #~ msgid "Remember my password"
 #~ msgstr "Kom ihÄg mitt lösenord"
 
-#~ msgid "Reply address:"
-#~ msgstr "Svarsadress:"
-
 #~ msgid "Required"
 #~ msgstr "KrÀvs"
 
 #~ msgid "Transport Authentication"
 #~ msgstr "Transportautentisering"
 
-#~ msgid ""
-#~ "Type the name by which you would like to refer to these servers. For "
-#~ "example: \"Work\" or \"Home\"."
-#~ msgstr ""
-#~ "Skriv in namnet som du vill anvÀnda för att referera till dessa servrar, "
-#~ "till exempel: \"Jobb\" eller \"Hemma\"."
-
 #~ msgid "minutes."
 #~ msgstr "minuter."
 
@@ -27900,7 +28995,7 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "<okÀnt>"
 
 #~ msgid "_Message Hiding"
-#~ msgstr "_Meddelandegömning"
+#~ msgstr "_Meddelandedöljning"
 
 #~ msgid "The time is invalid"
 #~ msgstr "Tiden Àr ogiltig"
@@ -28005,9 +29100,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Evolution ToDo Conduit"
 #~ msgstr "Evolutions att-göra-kanal"
 
-#~ msgid "Configuration utility for the evolution todo conduit.\n"
-#~ msgstr "Konfigurationsverktyg för evolutions att-göra-kanal.\n"
-
 #~ msgid "The priority must be between 1 and 9, inclusive"
 #~ msgstr "Prioriteten mÄste vara mellan 1 och 9"
 
@@ -28268,16 +29360,16 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "UNIX-brevfiler i qmail-brevlÄdekatalogformat (CamelLocal-version)"
 
 #~ msgid "Hide deleted"
-#~ msgstr "Göm borttagna"
+#~ msgstr "Dölj borttagna"
 
 #~ msgid "Hide Subject"
-#~ msgstr "Göm Àmne"
+#~ msgstr "Dölj Àmne"
 
 #~ msgid "Hide from Sender"
-#~ msgstr "Göm för avsÀndaren"
+#~ msgstr "Dölj för avsÀndaren"
 
 #~ msgid "Hide from Sender <%s>"
-#~ msgstr "Göm för avsÀndaren <%s>"
+#~ msgstr "Dölj för avsÀndaren <%s>"
 
 #~ msgid "You have no mail sources configured"
 #~ msgstr "Du har inte konfigurerat nÄgra e-postkÀllor"
@@ -28294,9 +29386,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ "du vill, ange namnet pÄ din organisation och en fil att lÀsa din signatur "
 #~ "frÄn."
 
-#~ msgid "Full name:"
-#~ msgstr "FullstÀndigt namn:"
-
 #~ msgid "Signature File"
 #~ msgstr "Signaturfil"
 
@@ -28468,9 +29557,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Retrieving message %d of %d (uid \"%s\")"
 #~ msgstr "HĂ€mtar meddelande %d av %d (uid \"%s\")"
 
-#~ msgid "N_ew Directory Server"
-#~ msgstr "N_y katalogserver"
-
 #~ msgid "appointment"
 #~ msgstr "möte"
 
@@ -28582,9 +29668,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Kan inte initiera Evolutions hashfunktion för e-postlagring."
 
-#~ msgid "Set Flag"
-#~ msgstr "StÀll flagga"
-
 #~ msgid "does not match regex"
 #~ msgstr "matchar inte reguljÀra uttrycket"
 
@@ -28663,12 +29746,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "To Do List Properties"
 #~ msgstr "Egenskaper för att-göra-listan"
 
-#~ msgid "To Do List"
-#~ msgstr "Att-göra-lista"
-
-#~ msgid "Preferences"
-#~ msgstr "InstÀllningar"
-
 #~ msgid "Beep on display alarms"
 #~ msgstr "Pip vid alarmvisning"
 
@@ -28700,9 +29777,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ "Mötet kommer dock att dyka upp vid den angivna tiden och kommer att visas "
 #~ "korrekt i kalendervyerna."
 
-#~ msgid "Custom search"
-#~ msgstr "Anpassad sökning"
-
 #~ msgid ""
 #~ "Welcome to the Evolution Mail configuration wizard!\n"
 #~ "By filling in some information about your email\n"