Updated Swedish translation.

2001-08-20  Christian Rose  <menthos@menthos.com>

	* sv.po: Updated Swedish translation.

svn path=/trunk/; revision=12230

1 files changed, 2621 insertions, 1338 deletions

diff --git a/po/sv.po b/po/sv.po
index 81ca3c3e50..b6d7627b06 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,13 +5,13 @@
 # Christian Rose <menthos@menthos.com>, 2000, 2001.
 # Martin Norbäck <d95mback@dtek.chalmers.se>, 2001.
 #
-# $Id: sv.po,v 1.102 2001/08/13 17:18:33 menthos Exp $
+# $Id: sv.po,v 1.103 2001/08/19 22:13:43 menthos Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-08-13 19:16+0200\n"
-"PO-Revision-Date: 2001-08-13 19:17+0200\n"
+"POT-Creation-Date: 2001-08-20 00:08+0200\n"
+"PO-Revision-Date: 2001-08-20 00:12+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,11 +26,11 @@ msgstr "Fabrik för import av VCard-filer till Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importerar VCard-filer till Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3624
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -38,7 +38,7 @@ msgstr ""
 "\n"
 "Namn: "
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -46,7 +46,7 @@ msgstr ""
 "\n"
 "  Prefix:     "
 
-#: addressbook/backend/ebook/e-card.c:3628
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -54,7 +54,7 @@ msgstr ""
 "\n"
 "  Förnamn:    "
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -62,7 +62,7 @@ msgstr ""
 "\n"
 "  Andranamn:  "
 
-#: addressbook/backend/ebook/e-card.c:3630
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -70,7 +70,7 @@ msgstr ""
 "\n"
 "  Efternamn:  "
 
-#: addressbook/backend/ebook/e-card.c:3631
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -78,7 +78,7 @@ msgstr ""
 "\n"
 "  Suffix:     "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -86,7 +86,7 @@ msgstr ""
 "\n"
 "Födelsedatum: "
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -94,7 +94,7 @@ msgstr ""
 "\n"
 "Adress:"
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -102,7 +102,7 @@ msgstr ""
 "\n"
 "  Box:           "
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
@@ -110,7 +110,7 @@ msgstr ""
 "\n"
 "  Anknytning:    "
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -118,7 +118,7 @@ msgstr ""
 "\n"
 "  Gatuadress:    "
 
-#: addressbook/backend/ebook/e-card.c:3661
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -126,7 +126,7 @@ msgstr ""
 "\n"
 "  Ort:           "
 
-#: addressbook/backend/ebook/e-card.c:3662
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -134,7 +134,7 @@ msgstr ""
 "\n"
 "  Region:        "
 
-#: addressbook/backend/ebook/e-card.c:3663
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -142,7 +142,7 @@ msgstr ""
 "\n"
 "  Postnummer:    "
 
-#: addressbook/backend/ebook/e-card.c:3664
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -150,7 +150,7 @@ msgstr ""
 "\n"
 "  Land:          "
 
-#: addressbook/backend/ebook/e-card.c:3677
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
@@ -158,7 +158,7 @@ msgstr ""
 "\n"
 "Leveransetikett: "
 
-#: addressbook/backend/ebook/e-card.c:3689
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -166,7 +166,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -174,7 +174,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -182,7 +182,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -190,7 +190,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3738
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -198,7 +198,7 @@ msgstr ""
 "\n"
 "E-postprogram: "
 
-#: addressbook/backend/ebook/e-card.c:3744
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -206,7 +206,7 @@ msgstr ""
 "\n"
 "Tidszon: "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -214,7 +214,7 @@ msgstr ""
 "\n"
 "Geografisk plats: "
 
-#: addressbook/backend/ebook/e-card.c:3756
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -222,7 +222,7 @@ msgstr ""
 "\n"
 "Yrkesroll: "
 
-#: addressbook/backend/ebook/e-card.c:3768
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -230,7 +230,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3769
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -238,7 +238,7 @@ msgstr ""
 "\n"
 "  Namn:    "
 
-#: addressbook/backend/ebook/e-card.c:3770
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -246,7 +246,7 @@ msgstr ""
 "\n"
 "  Enhet:   "
 
-#: addressbook/backend/ebook/e-card.c:3771
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -254,7 +254,7 @@ msgstr ""
 "\n"
 "  Enhet 2: "
 
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -262,7 +262,7 @@ msgstr ""
 "\n"
 "  Enhet 3: "
 
-#: addressbook/backend/ebook/e-card.c:3773
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -270,7 +270,7 @@ msgstr ""
 "\n"
 "  Enhet 4: "
 
-#: addressbook/backend/ebook/e-card.c:3777
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -278,7 +278,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -296,7 +296,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3791
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -304,7 +304,7 @@ msgstr ""
 "\n"
 "Unik sträng: "
 
-#: addressbook/backend/ebook/e-card.c:3794
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -312,11 +312,11 @@ msgstr ""
 "\n"
 "Publik nyckel: "
 
-#: addressbook/backend/ebook/e-card.c:4066
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "Flera VCard"
 
-#: addressbook/backend/ebook/e-card.c:4074
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard för %s"
@@ -402,6 +402,23 @@ msgstr "Fabrik för Evolutions adressbokskomponent."
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabrik för adressbokstestkontrollen"
 
+#: addressbook/gui/component/addressbook-component.c:385
+#: ui/evolution-addressbook.xml.h:11
+msgid "New Contact"
+msgstr "Ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:385
+msgid "New _Contact"
+msgstr "Ny _kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:386
+msgid "New Contact List"
+msgstr "Ny kontaktlista"
+
+#: addressbook/gui/component/addressbook-component.c:386
+msgid "New Contact _List"
+msgstr "Ny kontakt_lista"
+
 #: addressbook/gui/component/addressbook-config.c:144
 msgid "Edit Addressbook"
 msgstr "Redigera adressbok"
@@ -419,52 +436,56 @@ msgid "Add Addressbook"
 msgstr "Lägg till adressbok"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "Adressbokskällor"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/addressbook-config.glade.h:6
 msgid "Base"
 msgstr "Bas"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:7
 #: calendar/gui/dialogs/task-editor.c:151
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
+#: addressbook/gui/component/addressbook-config.glade.h:8
 msgid "De_lete"
 msgstr "Ta _bort"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.glade.h:9
 msgid "One"
 msgstr "En"
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
+#: addressbook/gui/component/addressbook-config.glade.h:10
 msgid "Search _base:"
 msgstr "_Utgångspunkt för sökning:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "Search s_cope: "
 msgstr "Sök_omfattning: "
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/addressbook-config.glade.h:12
 msgid "Server Name"
 msgstr "Servernamn"
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/addressbook-config.glade.h:13
 msgid "Sub"
 msgstr "Pren"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/gui/component/addressbook-config.glade.h:14
 msgid "The information below is required in order to add an addressbook.  "
 msgstr ""
 "Informationen nedan krävs för att en adressbok ska kunna läggas till.  "
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
+#: addressbook/gui/component/addressbook-config.glade.h:15
 msgid "This information is not required for most ldap servers. "
 msgstr "Denna information krävs inte för de flesta ldap-servrar. "
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
 "This information is used by your ldap server to specify which nodes are used "
 "in a search. Contact your server administrator for more information."
@@ -472,7 +493,7 @@ msgstr ""
 "Denna information används av din ldap-server för att ange vilka noder som "
 "används i en sökning. Kontakta din serveradministratör för mer information."
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:17
 msgid ""
 "This is the base node for all your searches on the ldap server. Contact your "
 "server administrator for more information."
@@ -480,15 +501,15 @@ msgstr ""
 "Detta är basnoden för alla dina sökningar på ldap-servern. Kontakta din "
 "serveradministratör för mer information."
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
+#: addressbook/gui/component/addressbook-config.glade.h:18
 msgid "This is the name of the server where your addressbook is located."
 msgstr "Detta är namnet på servern där din adressbok finns."
 
-#: addressbook/gui/component/addressbook-config.glade.h:18
+#: addressbook/gui/component/addressbook-config.glade.h:19
 msgid "This is the port that your ldap server uses."
 msgstr "Detta är porten som din ldap-server använder."
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
+#: addressbook/gui/component/addressbook-config.glade.h:20
 msgid ""
 "This name will be used to identify your account. It is for display purposes "
 "only."
@@ -496,64 +517,65 @@ msgstr ""
 "Detta namn kommer att användas för att identifiera ditt konto. Det används "
 "endast för visning."
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
+#: addressbook/gui/component/addressbook-config.glade.h:21
 msgid "_Account name:"
 msgstr "_Kontonamn:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9 mail/mail-config.glade.h:88
-#: my-evolution/my-evolution.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:89 my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "_Lägg till"
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-#: mail/mail-config.glade.h:93 ui/evolution-mail-messagedisplay.xml.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:94
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
+#: addressbook/gui/component/addressbook-config.glade.h:24
 msgid "_My server requires authentication"
 msgstr "_Min server kräver autentisering"
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/addressbook-config.glade.h:25
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/addressbook-config.glade.h:26
 msgid "_Server name:"
 msgstr "_Servernamn:"
 
-#: addressbook/gui/component/addressbook-storage.c:135
+#: addressbook/gui/component/addressbook-storage.c:138
 msgid "Other Contacts"
 msgstr "Andra kontakter"
 
-#: addressbook/gui/component/addressbook.c:372
+#: addressbook/gui/component/addressbook.c:378
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "Ange din e-postadress och ditt lösenord för åtkomst till %s"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:386
 msgid "LDAP Authentication"
 msgstr "LDAP-autentisering"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:397
 msgid "Email Address:"
 msgstr "E-postadress:"
 
-#: addressbook/gui/component/addressbook.c:404
+#: addressbook/gui/component/addressbook.c:410
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: addressbook/gui/component/addressbook.c:467
+#: addressbook/gui/component/addressbook.c:473
 msgid "Unable to open addressbook"
 msgstr "Kan inte öppna adressboken"
 
-#: addressbook/gui/component/addressbook.c:474
+#: addressbook/gui/component/addressbook.c:480
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -563,7 +585,7 @@ msgstr ""
 "att du har angett en felaktig URI eller att LDAP-servern är\n"
 "onåbar"
 
-#: addressbook/gui/component/addressbook.c:479
+#: addressbook/gui/component/addressbook.c:485
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -575,7 +597,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:487
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -583,47 +605,54 @@ 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:638
-#: calendar/gui/cal-search-bar.c:54
+#: addressbook/gui/component/addressbook.c:634
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Något fält innehåller"
 
-#: addressbook/gui/component/addressbook.c:639
+#: addressbook/gui/component/addressbook.c:635
 msgid "Name contains"
 msgstr "Namnet innehåller"
 
-#: addressbook/gui/component/addressbook.c:640
+#: addressbook/gui/component/addressbook.c:636
 msgid "Email contains"
 msgstr "E-postadressen innehåller"
 
-#: addressbook/gui/component/addressbook.c:641
+#: addressbook/gui/component/addressbook.c:637
+#: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategori är"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:642 widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:638 widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avancerat..."
 
-#: addressbook/gui/component/addressbook.c:834
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:866
+#: calendar/gui/cal-search-bar.c:412
+msgid "Any Category"
+msgstr "Alla kategorier"
+
+#: addressbook/gui/component/addressbook.c:904
 msgid "The URI that the Folder Browser will display"
 msgstr "URI:n som mappbläddraren kommer att visa"
 
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1581
+#: addressbook/gui/contact-editor/e-contact-editor.c:1597
 msgid "Primary Email"
 msgstr "Primär e-post"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1582
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1583
-#: addressbook/gui/widgets/e-addressbook-view.c:802
+#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "E-post 3"
 
@@ -639,7 +668,7 @@ msgstr "Skapa en ny kontakt \"%s\""
 #: addressbook/gui/component/e-address-popup.c:597
 #, c-format
 msgid "Add address to existing contact \"%s\""
-msgstr "Lägg till adress till existerande kontakten \"%s\""
+msgstr "Lägg till adress till befintliga kontakten \"%s\""
 
 #: addressbook/gui/component/e-address-popup.c:859
 msgid "Querying Addressbook..."
@@ -678,10 +707,10 @@ 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:156
-#: addressbook/gui/component/select-names/e-select-names.c:640
+#: addressbook/gui/component/select-names/e-select-names.c:661
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:543 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:176 shell/e-shortcuts-view.c:385
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -697,11 +726,11 @@ msgstr "Skicka HTML-post?"
 msgid "Unnamed Contact"
 msgstr "Namnlös kontakt:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:430
 msgid "Unable to get local storage.  This should never happen."
 msgstr "Kan inte få tag i lokalt lagringsutrymme. Detta borde aldrig hända."
 
-#: addressbook/gui/component/select-names/e-select-names.c:484
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Välj kontakter från adressboken"
 
@@ -765,11 +794,10 @@ msgid "Details"
 msgstr "Detaljer"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
-msgstr "Spara som:"
+msgid "File A_s:"
+msgstr "Arkivera so_m:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "General"
 msgstr "Allmänt"
 
@@ -793,177 +821,178 @@ msgstr "Telefontyper"
 msgid "Wants to receive _HTML mail"
 msgstr "Vill ha _HTML-post"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "Webbsideadress:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "_Adress..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "_Assistentens namn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "_Födelsedag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "Företa_g"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Kontakter..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1472 mail/folder-browser.c:1313
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:88
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1319 mail/mail-config.glade.h:93
+#: ui/evolution-mail-message.xml.h:88 ui/evolution-tasks.xml.h:12
+#: ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Ta bort"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "Av_delning:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "_Fullständigt namn..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "_Hem"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "_Jobbtitel:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "Chefens na_mn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "_Mobil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "_Smeknamn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "K_ontor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_Yrke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "Partne_r:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "De_tta är postadressen"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_Web page address:"
+msgstr "_Webbsideadress:"
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Ta bort kontakten?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr "Denna kontakt tillhör dessa kategorier:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1539
-#: addressbook/gui/widgets/e-addressbook-view.c:809
+#: addressbook/gui/contact-editor/e-contact-editor.c:1555
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1540
-#: addressbook/gui/contact-editor/e-contact-editor.c:1607
+#: addressbook/gui/contact-editor/e-contact-editor.c:1556
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Business"
 msgstr "Företag"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1541
+#: addressbook/gui/contact-editor/e-contact-editor.c:1557
 msgid "Business 2"
 msgstr "Företag 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1542
-#: addressbook/gui/widgets/e-addressbook-view.c:789
+#: addressbook/gui/contact-editor/e-contact-editor.c:1558
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Företagsfax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1543
+#: addressbook/gui/contact-editor/e-contact-editor.c:1559
 msgid "Callback"
 msgstr "Tillbakaringning"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1544
+#: addressbook/gui/contact-editor/e-contact-editor.c:1560
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1545
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
 msgid "Company"
 msgstr "Företag"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1546
-#: addressbook/gui/contact-editor/e-contact-editor.c:1608
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
 msgid "Home"
 msgstr "Hem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1547
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home 2"
 msgstr "Hem 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1548
-#: addressbook/gui/widgets/e-addressbook-view.c:790
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Fax hem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1549
-#: addressbook/gui/widgets/e-addressbook-view.c:793
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1550
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1551
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
-#: mail/mail-config.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: mail/mail-config.glade.h:50
 msgid "Other"
 msgstr "Annat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1552
-#: addressbook/gui/widgets/e-addressbook-view.c:795
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Annan fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1553
-#: addressbook/gui/widgets/e-addressbook-view.c:796
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Personsökare"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1554
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
 msgid "Primary"
 msgstr "Primär"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1555
-#: addressbook/gui/widgets/e-addressbook-view.c:797
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1556
-#: addressbook/gui/widgets/e-addressbook-view.c:798
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1557
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
@@ -976,7 +1005,7 @@ msgid "Edit Full"
 msgstr "Redigera fullständigt namn"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:293
-#: addressbook/gui/widgets/e-addressbook-view.c:776
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Fullständigt namn"
 
@@ -998,42 +1027,958 @@ msgid "Address _2:"
 msgstr "Adress _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr "Albanien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr "Algeriet"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr "Samoa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr "Andorra"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr "Angola"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr "Anguilla"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+msgid "Antarctica"
+msgstr "Antarktis"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr "Antigua och Barbados"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+msgid "Argentina"
+msgstr "Argentina"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr "Armenien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr "Aruba"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr "Australien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+msgid "Austria"
+msgstr "Österrike"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr "Azerbajdzjan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr "Bahamas"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr "Bahrain"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr "Barbados"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+msgid "Belarus"
+msgstr "Vitryssland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr "Belgien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+msgid "Belize"
+msgstr "Belize"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+msgid "Benin"
+msgstr "Benin"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr "Bermuda"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr "Bolivia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr "Bosnien och Hercegovina"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr "Botswana"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr "Bouvetön"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+msgid "Brazil"
+msgstr "Brasilien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr "Brittiskt territorium i Indiska Oceanen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr "Jungfruöarna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr "Brunei"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr "Bulgarien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr "Burundi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr "Kambodja"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr "Kamerun"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr "Kap Verde"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr "Caymanöarna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr "Centralafrikanska republiken"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+msgid "Chad"
+msgstr "Tchad"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Kontrollera adress"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+msgid "Chile"
+msgstr "Chile"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+msgid "China"
+msgstr "Kina"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr "Julön"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr "Kokosöarna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr "Colombia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+msgid "Comoros"
+msgstr "Komorerna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+msgid "Congo"
+msgstr "Kongo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr "Cooköarna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr "Elfenbenskusten"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "_Land:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr "Kroatien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr "Kuba"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr "Cypern"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr "Tjeckien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr "Danmark"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr "Djibouti"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr "Dominica"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr "Dominikanska republiken"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr "Östtimor"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr "Ecuador"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr "Egypten"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr "El Salvador"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr "Ekvatorialguinea"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr "Eritrea"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr "Estland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr "Etiopien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr "Falklandsöarna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr "Färöarna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr "Fiji"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+msgid "France"
+msgstr "Frankrike"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr "Franska Guyana"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr "Polynesien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr "Franska sydterritorierna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr "Gabon"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr "Gambia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr "Georgien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr "Tyskland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr "Ghana"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr "Gibraltar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+msgid "Greece"
+msgstr "Grekland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+msgid "Greenland"
+msgstr "Grönland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+msgid "Grenada"
+msgstr "Grenada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr "Guadeloupe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+msgid "Guam"
+msgstr "Guam"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr "Guatemala"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+msgid "Guinea"
+msgstr "Guinea"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr "Guinea-Bissau"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr "Guyana"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+msgid "Haiti"
+msgstr "Haiti"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr "Heard och McDonald-öarna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr "Vatikanstaten"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+msgid "Honduras"
+msgstr "Honduras"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr "Hong Kong"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+msgid "Hungary"
+msgstr "Ungern"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr "Island"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr "Indien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr "Indonesien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr "Irland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr "Israel"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr "Italien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr "Jamaica"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr "Japan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr "Jordanien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr "Kazakstan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr "Kenya"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr "Kiribati"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr "Kuwait"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr "Kirgizistan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+msgid "Laos"
+msgstr "Laos"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr "Lettland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr "Libanon"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+msgid "Lesotho"
+msgstr "Lesotho"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+msgid "Liberia"
+msgstr "Liberia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr "Litauen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr "Luxemburg"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+msgid "Macau"
+msgstr "Macao"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr "Makedonien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+msgid "Malawi"
+msgstr "Malawi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr "Malaysia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr "Maldiverna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+msgid "Mali"
+msgstr "Mali"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+msgid "Malta"
+msgstr "Malta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr "Marshallöarna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr "Martinique"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr "Mauretanien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+msgid "Mauritius"
+msgstr "Mauritius"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+msgid "Mayotte"
+msgstr "Mayotte"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr "Mexiko"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr "Mikronesien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+msgid "Monaco"
+msgstr "Monaco"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr "Mongoliet"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr "Montserrat"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr "Marocko"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+msgid "Mozambique"
+msgstr "Moçambique"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+msgid "Myanmar"
+msgstr "Myanmar (Burma)"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr "Namibia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr "Nauru"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+msgid "Nepal"
+msgstr "Nepal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+msgid "Netherlands"
+msgstr "Nederländerna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr "Nederländska Antillerna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+msgid "New Caledonia"
+msgstr "Nya Kaledonien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+msgid "New Zealand"
+msgstr "Nya Zeeland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+msgid "Niger"
+msgstr "Nigeria"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+msgid "Niue"
+msgstr "Niue"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr "Norfolköarna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr "Norra Marianeröarna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+msgid "Norway"
+msgstr "Norge"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr "Oman"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr "Palau"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+msgid "Panama"
+msgstr "Panama"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr "Papua Nya Guinea"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr "Paraguay"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+msgid "Peru"
+msgstr "Peru"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr "Filippinerna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr "Pitcairn"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+msgid "Poland"
+msgstr "Polen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+msgid "Portugal"
+msgstr "Portugal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr "Puerto Rico"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+msgid "Qatar"
+msgstr "Qatar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr "Sydkorea"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr "Moldavien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+msgid "Reunion"
+msgstr "Réunion"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr "Rumänien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr "Ryssland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+msgid "Rwanda"
+msgstr "Rwanda"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr "Saint Kitts och Nevis"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr "Saint Lucia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr "Saint Vincent och Grenadinerna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+msgid "Samoa"
+msgstr "Samoa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr "San Marino"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr "São Tomé och Principe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr "Saudiarabien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+msgid "Senegal"
+msgstr "Senegal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+msgid "Seychelles"
+msgstr "Seychellerna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr "Singapore"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr "Slovakien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr "Slovenien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr "Solomonöarna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+msgid "Somalia"
+msgstr "Somalia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr "Sydafrika"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr "Sydgeorgien och södra Sandwichöarna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+msgid "Spain"
+msgstr "Spanien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr "St. Helena"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr "St. Pierre och Miquelon"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+msgid "Sudan"
+msgstr "Sudan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+msgid "Suriname"
+msgstr "Surinam"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr "Svalbard och Jan Mayen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+msgid "Swaziland"
+msgstr "Swaziland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+msgid "Sweden"
+msgstr "Sverige"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr "Schweiz"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+msgid "Tajikistan"
+msgstr "Tadzjikistan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+msgid "Thailand"
+msgstr "Thailand"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+msgid "Togo"
+msgstr "Togo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+msgid "Tonga"
+msgstr "Tonga"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr "Trinidad och Tobago"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr "Tunisien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+msgid "Turkey"
+msgstr "Turkiet"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr "Turks och Caicosöarna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr "Jungfruöarna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+msgid "Uganda"
+msgstr "Uganda"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr "Ukraina"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr "Förenade Arabemiraten"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr "Storbritannien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr "Tanzania"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+msgid "United States"
 msgstr "USA"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr "USA:s mindre avlägsna öar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr "Uruguay"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr "Venezuela"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+msgid "Viet Nam"
+msgstr "Vietnam"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr "Wallis och Futunaöarna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr "Västsahara"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+msgid "Yemen"
+msgstr "Jemen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr "Jugoslavien"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr "Zambia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_Adress:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "_Ort:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "_Box:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "Del_stat/Provins:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "_Postnummer:"
 
@@ -1122,7 +2067,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Göm 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 msgid "_Remove"
 msgstr "_Ta bort"
 
@@ -1140,7 +2085,7 @@ msgid "Add Anyway"
 msgstr "Lägg till ändå"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr "Dublett av kontakten upptäckt"
 
@@ -1161,14 +2106,18 @@ msgstr ""
 "här mappen. Vill du lägga till den ändå?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+msgid "Change Anyway"
+msgstr "Ändra ändå"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "Ändrad kontakt:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr "Kontakt i konflikt:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1176,17 +2125,13 @@ msgstr ""
 "Denna kontakts ändrade namn eller e-postadress finns\n"
 "redan i den här mappen. Vill du lägga till den ändå?"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
-msgid "_Change Anyway"
-msgstr "_Ändra ändå"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:242
+#: widgets/misc/e-filter-bar.c:243
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:258
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Sök"
 
@@ -1300,10 +2245,10 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
-#: addressbook/gui/widgets/e-addressbook-view.c:610
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: addressbook/gui/widgets/e-addressbook-view.c:1286
-#: ui/evolution-addressbook.xml.h:18
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Spara som VCard"
 
@@ -1313,35 +2258,33 @@ msgid "Open"
 msgstr "Öppna"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: ui/evolution-addressbook.xml.h:25
-msgid "Send contact to other"
-msgstr "Skicka kontakt till annan"
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Vidarebefordra kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:674
-#: ui/evolution-addressbook.xml.h:26
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+msgid "Send Message to Contact"
 msgstr "Skicka meddelande till kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:675
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:63
-#: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: 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:63
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Skriv ut"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr "Skriv ut kuvert"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:679 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/mail-accounts.c:267
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 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:16
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
@@ -1358,7 +2301,7 @@ msgid "Success"
 msgstr "Lyckades"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1619
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1649
 #: shell/e-storage.c:503
 msgid "Unknown error"
 msgstr "Okänt fel"
@@ -1384,7 +2327,11 @@ msgid "Protocol not supported"
 msgstr "Protokollet stöds inte"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr "Avbruten"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1408,131 +2355,131 @@ msgid "Error removing list"
 msgstr "Fel vid borttagning av lista"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1159
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 msgid "Error removing card"
 msgstr "Fel vid borttagning av kort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:774
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 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:775
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr "Arkivera som"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:777
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:778
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "Primär telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:779
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr "Sekreterartelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:780
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "Arbetstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:781
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr "Tillbakaringningstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:782
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "Företagets telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:783
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "Hemtelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:784
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:785
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "Företagsadress"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:786
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Hemadress"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:787
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:788
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:791
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "Företagstelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:792
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "Hemtelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:794
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "Annan telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:799
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "Annan adress"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "Webbsida"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "Avdelning"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:806
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "Yrke"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:811
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "Partner"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:812
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "Notering"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr "Ledig/Upptagen-URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1156
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 msgid "Done."
 msgstr "Klar."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1188
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Removing cards..."
 msgstr "Tar bort kort..."
 
@@ -1735,8 +2682,8 @@ msgstr "Skriv ut kort"
 msgid "Print card"
 msgstr "Skriv ut kort"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Skriv ut kuvert"
 
@@ -1897,42 +2844,42 @@ msgstr "Kunde inte initiera gnome-vfs"
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunde inte skapa fabriken för alarmaviseringstjänsten"
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:414
 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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
 #: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:426
+#: calendar/gui/calendar-commands.c:435
 #, c-format
 msgid "%d"
 msgstr "%dd"
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
 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:433
+#: calendar/gui/calendar-commands.c:442
 #: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
 #: my-evolution/e-summary-calendar.c:240
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:579
+#: calendar/gui/calendar-commands.c:601
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -1970,20 +2917,20 @@ msgstr "V"
 
 #: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:641
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "Hög"
 
 #: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
 #: calendar/gui/calendar-model.c:1624
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:640
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:639
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "Låg"
 
@@ -2017,13 +2964,6 @@ msgstr "Pågår"
 msgid "Completed"
 msgstr "Färdigt"
 
-#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
-msgid "Cancelled"
-msgstr "Avbruten"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
@@ -2072,14 +3012,13 @@ msgid "Undefined"
 msgstr "Odefinierad"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190
-#: calendar/gui/dialogs/e-timezone-dialog.c:202
-#: calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1404
-#: mail/mail-accounts.c:134 mail/mail-accounts.c:374
-#: mail/mail-config.glade.h:47 shell/e-shell-view.c:1386
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:437
-#: widgets/misc/e-dateedit.c:1356 widgets/misc/e-dateedit.c:1471
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1416
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:390
+#: mail/mail-config.glade.h:48 shell/e-shell-view.c:1452
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
 msgid "None"
 msgstr "Ingen"
 
@@ -2093,13 +3032,13 @@ msgstr "Tilldelad"
 
 #: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
 #: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/dialogs/meeting-page.c:1183
-#: calendar/gui/dialogs/meeting-page.c:1279
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "Ja"
 
 #: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
-#: calendar/gui/dialogs/meeting-page.c:1280
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "Nej"
 
@@ -2119,30 +3058,37 @@ msgstr "Veckovy"
 msgid "Month View"
 msgstr "Månadsvy"
 
-#: calendar/gui/cal-search-bar.c:55
+#: calendar/gui/cal-search-bar.c:56
 msgid "Summary contains"
 msgstr "Sammanfattningen innehåller"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:57
 msgid "Description contains"
 msgstr "Beskrivningen innehåller"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "Kommentaren innehåller"
 
-#: calendar/gui/cal-search-bar.c:378
-msgid "Category:"
-msgstr "Kategori:"
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr "Omatchad"
 
-#. All, Unmatched, separator items
-#: calendar/gui/cal-search-bar.c:498
-msgid "All"
-msgstr "Alla"
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Skapa ett nytt möte"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+msgid "New _Appointment"
+msgstr "Nytt _möte"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-tasks.xml.h:4
+msgid "Create a new task"
+msgstr "Skapa en ny uppgift"
 
-#: calendar/gui/cal-search-bar.c:503
-msgid "Unfiled"
-msgstr "Inte kategoriserad"
+#: calendar/gui/component-factory.c:409
+msgid "New _Task"
+msgstr "Ny _uppgift"
 
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
@@ -2212,95 +3158,95 @@ msgstr "timme"
 msgid "minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, c-format
 msgid "%d days"
 msgstr "%d dagar"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 day"
 msgstr "1 dag"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, c-format
 msgid "%d weeks"
 msgstr "%d veckor"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 msgid "1 week"
 msgstr "1 vecka"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, c-format
 msgid "%d hours"
 msgstr "%d timmar"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 hour"
 msgstr "1 timme"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuter"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 msgid "1 minute"
 msgstr "1 minut"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Spela ett ljud"
 
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Visa ett meddelande"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Skicka ett brev"
 
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Kör ett program"
 
-#: calendar/gui/dialogs/alarm-page.c:349 calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
 #: calendar/gui/dialogs/meeting-page.c:601
 #: calendar/gui/dialogs/meeting-page.c:636
 #: calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:1251
-#: calendar/gui/dialogs/meeting-page.c:1267
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Okänd"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:409
 msgid "before start of appointment"
 msgstr "innan start på möte"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 msgid "after start of appointment"
 msgstr "efter start på möte"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 msgid "before end of appointment"
 msgstr "före slut på möte"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 msgid "after end of appointment"
 msgstr "efter slut på möte"
 
@@ -2311,7 +3257,6 @@ msgstr "Grundläggande"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
-#: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "Datum/tid:"
 
@@ -2321,7 +3266,7 @@ msgstr "Påminnelser"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammanfattning:"
 
@@ -2350,7 +3295,7 @@ msgstr "slut på möte"
 msgid "hour(s)"
 msgstr "timme/timmar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:113
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:114
 msgid "minute(s)"
 msgstr "minut(er)"
 
@@ -2367,160 +3312,196 @@ msgid "10 minutes"
 msgstr "10 minuter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 timmar (fm/em)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minuter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 timmar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minuter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minuter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Calendar Preferences"
-msgstr "Kalenderinställningar"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+msgid "Calendar and Tasks Settings"
+msgstr "Kalender- och uppgiftsinställningar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Color for overdue tasks"
 msgstr "Färg för uppgifter som skulle ha gjorts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for tasks due today"
 msgstr "Färg för uppgifter som ska utföras idag"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "Create new appointments with a default _reminder"
+msgstr "Skapa nya möten med en standard_påminnelse"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Days"
+msgstr "dag"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Compress weekends in month view"
-msgstr "Tryck ihop helger i månadsvyn"
+msgid "First day of wee_k:"
+msgstr "Första dagen i vec_kan:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:26
-msgid "Display"
-msgstr "Visa"
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr "fredag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "End of day:"
-msgstr "Dagen slutar:"
+msgid "Hide completed tasks after"
+msgstr "Göm färdiga uppgifter efter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "First day of week:"
-msgstr "Första dagen i veckan:"
+msgid "Hours"
+msgstr "timme"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Fri"
-msgstr "fre"
+msgid "Minutes"
+msgstr "minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "fredag"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "måndag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "lördag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Mon"
-msgstr "mån"
+msgid "Show appointment _end times in week and month views"
+msgstr "Visa s_luttiderna på möten i vecko- och månadsvyerna"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "måndag"
+msgid "Show week _numbers in date navigator"
+msgstr "Visa vecko_nummer i datumbläddraren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Overdue tasks:"
-msgstr "Uppgifter som skulle ha utförts:"
+msgid "Sta_rt of day:"
+msgstr "Dagen sta_rtar:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Sat"
-msgstr "lör"
+msgid "Su_n"
+msgstr "_sön"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "lördag"
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "söndag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Show appointment end times in week and month views"
-msgstr "Visa sluttiderna på möten i vecko- och månadsvyerna"
+msgid "T_hu"
+msgstr "to_r"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Show week numbers in date navigator"
-msgstr "Visa veckonummer i datumbläddraren"
+msgid "T_ue"
+msgstr "t_is"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Start of day:"
-msgstr "Dagen startar:"
+msgid "Tas_ks due today:"
+msgstr "Uppgi_fter som ska ha utförts idag:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Sun"
-msgstr "sön"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "torsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "söndag"
+msgid "Time"
+msgstr "Tid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Task List"
-msgstr "Uppgiftslista"
+msgid "Time _zone:"
+msgstr "Tids_zon:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Tasks due today:"
-msgstr "Uppgifter som ska ha utförts idag:"
+msgid "Time di_visions:"
+msgstr "Tidsdi_visioner:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Thu"
-msgstr "tor"
+msgid "Time format:"
+msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "torsdag"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "tisdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Time"
-msgstr "Tid"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "onsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Time divisions:"
-msgstr "Tidsdivisioner:"
+#: ui/evolution-calendar.xml.h:31
+msgid "Work Week"
+msgstr "Arbetsvecka"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Time format:"
-msgstr "Tidsformat:"
+msgid "_12 hour (AM/PM)"
+msgstr "_12-timmars (FM/EM)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Time zone:"
-msgstr "Tidszon:"
+msgid "_24 hour"
+msgstr "_24-timmars"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Tue"
-msgstr "tis"
+msgid "_Ask for confirmation when deleting items"
+msgstr "_Fråga efter bekräftelse vid borttagning av objekt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "tisdag"
+msgid "_Compress weekends in month view"
+msgstr "_Tryck ihop helger i månadsvyn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Wed"
-msgstr "ons"
+msgid "_Display"
+msgstr "_Visning"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "onsdag"
+msgid "_End of day:"
+msgstr "_Dagen slutar:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Work Week"
-msgstr "Arbetsvecka"
+msgid "_Fri"
+msgstr "_fre"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "_General"
+msgstr "Allm_änt"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "_Mon"
+msgstr "_mån"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "_Other"
+msgstr "A_nnat"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+msgid "_Overdue tasks:"
+msgstr "Uppgifter som skulle ha utf_örts:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+msgid "_Sat"
+msgstr "_lör"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "_Task List"
+msgstr "_Uppgiftslista"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "_Wed"
+msgstr "_ons"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "before the start of the appointment"
+msgstr "innan starten på mötet"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2584,61 +3565,62 @@ 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:154
-#: calendar/gui/e-itip-control.c:630 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
 msgid " to "
 msgstr " till "
 
-#: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:634 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (Färdigt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:636 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "Färdigt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:641 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr " (Ska utföras "
 
-#: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:643 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "Ska utföras "
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1026
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: calendar/gui/dialogs/comp-editor.c:459
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: calendar/gui/dialogs/comp-editor.c:459
+#: calendar/gui/dialogs/comp-editor.c:464
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:462
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:465
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagbokspost - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:479
+#: calendar/gui/dialogs/comp-editor.c:484
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: calendar/gui/dialogs/comp-editor.c:843 mail/mail-callbacks.c:1485
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:854 mail/mail-callbacks.c:1489
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: calendar/gui/dialogs/comp-editor.c:847 mail/mail-callbacks.c:1490
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:858 mail/mail-callbacks.c:1495
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2646,12 +3628,12 @@ msgstr ""
 "Det finns redan en fil med det namnet.\n"
 "Ska den skrivas över?"
 
-#: calendar/gui/dialogs/comp-editor.c:910 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:921 ui/evolution-comp-editor.xml.h:15
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1063
+#: calendar/gui/dialogs/comp-editor.c:1074
 msgid "Unable to obtain current version!"
 msgstr "Kunde inte få tag i aktuell version!"
 
@@ -2709,28 +3691,6 @@ msgstr "Delegera till:"
 msgid "Enter Delegate"
 msgstr "Ange delegerad person"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-msgid "Select a Time Zone"
-msgstr "Välj en tidszon"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
-msgid "Selection:"
-msgstr "Markering:"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr "Tidszoner"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-" Use the right mouse button to zoom out."
-msgstr ""
-"Använd vänster musknapp för att zooma in på ett intressant område på kartan "
-"och välja en tidszon.\n"
-" Använd höger musknapp för att zooma ut."
-
 #: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "Möte"
@@ -2805,83 +3765,83 @@ msgstr "_Starttid:"
 
 #: calendar/gui/dialogs/meeting-page.c:576
 #: calendar/gui/dialogs/meeting-page.c:593
-#: calendar/gui/dialogs/meeting-page.c:1179
-#: calendar/gui/dialogs/meeting-page.c:1247
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr "Person"
 
 #: calendar/gui/dialogs/meeting-page.c:578
 #: calendar/gui/dialogs/meeting-page.c:595
-#: calendar/gui/dialogs/meeting-page.c:1248
+#: calendar/gui/dialogs/meeting-page.c:1252
 msgid "Group"
 msgstr "Grupp"
 
 #: calendar/gui/dialogs/meeting-page.c:580
 #: calendar/gui/dialogs/meeting-page.c:597
-#: calendar/gui/dialogs/meeting-page.c:1249
+#: calendar/gui/dialogs/meeting-page.c:1253
 msgid "Resource"
 msgstr "Resurs"
 
 #: calendar/gui/dialogs/meeting-page.c:582
 #: calendar/gui/dialogs/meeting-page.c:599
-#: calendar/gui/dialogs/meeting-page.c:1250
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr "Rum"
 
 #: calendar/gui/dialogs/meeting-page.c:611
 #: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:1263
+#: calendar/gui/dialogs/meeting-page.c:1267
 msgid "Chair"
 msgstr "Mötesordförande"
 
 #: calendar/gui/dialogs/meeting-page.c:613
 #: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1181
-#: calendar/gui/dialogs/meeting-page.c:1264
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr "Nödvändig deltagare"
 
 #: calendar/gui/dialogs/meeting-page.c:615
 #: calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1265
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr "Valfri deltagare"
 
 #: calendar/gui/dialogs/meeting-page.c:617
 #: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/dialogs/meeting-page.c:1266
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr "Icke-deltagare"
 
 #: calendar/gui/dialogs/meeting-page.c:663
 #: calendar/gui/dialogs/meeting-page.c:686
-#: calendar/gui/dialogs/meeting-page.c:1189
-#: calendar/gui/dialogs/meeting-page.c:1292
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 msgid "Needs Action"
 msgstr "Behöver åtgärd"
 
 #: calendar/gui/dialogs/meeting-page.c:665
 #: calendar/gui/dialogs/meeting-page.c:688
-#: calendar/gui/dialogs/meeting-page.c:1293
+#: calendar/gui/dialogs/meeting-page.c:1297
 msgid "Accepted"
 msgstr "Godtaget"
 
 #: calendar/gui/dialogs/meeting-page.c:667
 #: calendar/gui/dialogs/meeting-page.c:690
-#: calendar/gui/dialogs/meeting-page.c:1294
+#: calendar/gui/dialogs/meeting-page.c:1298
 msgid "Declined"
 msgstr "Avböjt"
 
 #: calendar/gui/dialogs/meeting-page.c:669
 #: calendar/gui/dialogs/meeting-page.c:692
-#: calendar/gui/dialogs/meeting-page.c:1295
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Preliminärt"
 
 #: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/meeting-page.c:694
-#: calendar/gui/dialogs/meeting-page.c:1296
+#: calendar/gui/dialogs/meeting-page.c:1300
 msgid "Delegated"
 msgstr "Delegerat"
 
@@ -2895,31 +3855,31 @@ msgid "That person is already attending the meeting!"
 msgstr "Personen är redan närvarande på mötet!"
 
 #: calendar/gui/dialogs/meeting-page.c:788
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Chair Persons"
 msgstr "Ordförandepersoner"
 
 #: calendar/gui/dialogs/meeting-page.c:790
-#: calendar/gui/dialogs/meeting-page.c:838
-#: calendar/gui/dialogs/meeting-page.c:958
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 msgid "Required Participants"
 msgstr "Nödvändiga deltagare"
 
 #: calendar/gui/dialogs/meeting-page.c:792
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Optional Participants"
 msgstr "Valfria deltagare"
 
 #: calendar/gui/dialogs/meeting-page.c:794
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Non-Participants"
 msgstr "Icke-deltagare"
 
-#: calendar/gui/dialogs/meeting-page.c:916
+#: calendar/gui/dialogs/meeting-page.c:920
 msgid "Sent By:"
 msgstr "Skickat av:"
 
-#: calendar/gui/dialogs/meeting-page.c:1467
+#: calendar/gui/dialogs/meeting-page.c:1471
 msgid "_Delegate To..."
 msgstr "_Delegera till..."
 
@@ -2962,7 +3922,7 @@ msgid "Status"
 msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:83
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:84
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -3009,7 +3969,7 @@ msgstr "den"
 msgid "th"
 msgstr ":e"
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 msgid "occurrences"
 msgstr "förekomster"
 
@@ -3104,7 +4064,7 @@ msgid "Progress"
 msgstr "Förlopp"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
@@ -3194,49 +4154,51 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:849 calendar/gui/e-day-view.c:3378
-#: calendar/gui/e-week-view.c:3230 mail/folder-browser.c:1278
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1284
 msgid "_Open"
 msgstr "_Öppna"
 
-#: calendar/gui/e-calendar-table.c:853 calendar/gui/e-day-view.c:3387
-#: calendar/gui/e-week-view.c:3239 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 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:855 calendar/gui/e-day-view.c:3389
-#: calendar/gui/e-week-view.c:3241 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:32 ui/evolution-tasks.xml.h:14
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:35 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:11
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: calendar/gui/e-calendar-table.c:857 calendar/gui/e-day-view.c:3364
-#: calendar/gui/e-day-view.c:3391 calendar/gui/e-week-view.c:3217
-#: calendar/gui/e-week-view.c:3243 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:35 ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:13
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: calendar/gui/e-calendar-table.c:862
+#: calendar/gui/e-calendar-table.c:863
 msgid "_Mark as Complete"
 msgstr "_Markera som färdig"
 
-#: calendar/gui/e-calendar-table.c:864
+#: calendar/gui/e-calendar-table.c:865
 msgid "_Delete this Task"
 msgstr "_Ta bort denna uppgift"
 
-#: calendar/gui/e-calendar-table.c:867
+#: calendar/gui/e-calendar-table.c:868
 msgid "_Mark Tasks as Complete"
 msgstr "_Markera uppgifterna som färdiga"
 
-#: calendar/gui/e-calendar-table.c:869
+#: calendar/gui/e-calendar-table.c:870
 msgid "_Delete Selected Tasks"
 msgstr "_Ta bort markerade uppgifter"
 
-#: calendar/gui/e-calendar-table.c:1129
-msgid "Click here to add a task"
-msgstr "Klicka här för att lägga till en uppgift"
+#: calendar/gui/e-calendar-table.c:1130
+msgid "Click to add a task"
+msgstr "Klicka för att lägga till en uppgift"
 
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
@@ -3275,7 +4237,8 @@ msgstr "Prioritet"
 msgid "Start Date"
 msgstr "Startdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-storage-set-view.c:1464
+#: shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Sammanfattning"
 
@@ -3318,120 +4281,224 @@ msgstr "fm"
 msgid "pm"
 msgstr "em"
 
-#: calendar/gui/e-day-view.c:3357
-msgid "New _Appointment"
-msgstr "Nytt _möte"
-
-#: calendar/gui/e-day-view.c:3359 calendar/gui/e-week-view.c:3212
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsarrangemang"
 
-#: calendar/gui/e-day-view.c:3369 calendar/gui/e-week-view.c:3222
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to _Today"
 msgstr "Gå till _idag"
 
-#: calendar/gui/e-day-view.c:3371 calendar/gui/e-week-view.c:3224
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 msgid "_Go to Date..."
 msgstr "_Gå till datum..."
 
-#: calendar/gui/e-day-view.c:3380 calendar/gui/e-week-view.c:3232
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 msgid "_Delete this Appointment"
 msgstr "_Ta bort detta möte"
 
-#: calendar/gui/e-day-view.c:3399 calendar/gui/e-week-view.c:3257
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 msgid "Make this Occurrence _Movable"
 msgstr "Gör denna förekomst _flyttbar"
 
-#: calendar/gui/e-day-view.c:3401 calendar/gui/e-week-view.c:3259
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: calendar/gui/e-day-view.c:3403 calendar/gui/e-week-view.c:3261
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
-#: calendar/gui/e-itip-control.c:697
-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."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> har publicerat mötesinformation."
+
+#: calendar/gui/e-itip-control.c:618
+msgid "Meeting Information"
+msgstr "Mötesinformation"
+
+#: calendar/gui/e-itip-control.c:622
+#, 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:623
+msgid "Meeting Proposal"
+msgstr "Mötesförslag"
+
+#: calendar/gui/e-itip-control.c:627
+#, 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:628
+msgid "Meeting Update"
+msgstr "Mötesuppdatering"
+
+#: calendar/gui/e-itip-control.c:632
+#, 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:633
+msgid "Meeting Update Request"
+msgstr "Begäran av mötesuppdatering"
+
+#: calendar/gui/e-itip-control.c:637
+#, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr "<b>%s</b> har svarat på en mötesbegäran."
+
+#: calendar/gui/e-itip-control.c:638
+msgid "Meeting Reply"
+msgstr "Mötessvar"
+
+#: calendar/gui/e-itip-control.c:642
+#, 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:643
+msgid "Meeting Cancellation"
+msgstr "Mötesavbokning"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, 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:648
+msgid "Bad Meeting Message"
+msgstr "Felaktigt mötesmeddelande"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> har publicerat mötesinformation."
+
+#: calendar/gui/e-itip-control.c:666
+msgid "Task Information"
+msgstr "Uppgiftsinformation"
+
+#: calendar/gui/e-itip-control.c:670
+#, 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:671
+msgid "Task Proposal"
+msgstr "Uppgiftsförslag"
+
+#: calendar/gui/e-itip-control.c:675
+#, 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:676
+msgid "Task Update"
+msgstr "Uppgiftsuppdatering"
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is a meeting request."
-msgstr "Detta är en mötesbegäran."
+#: calendar/gui/e-itip-control.c:680
+#, 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:703
-msgid "This is one or more additions to a current meeting."
-msgstr "Detta är en eller flera tillägg till ett aktuellt möte."
+#: calendar/gui/e-itip-control.c:681
+msgid "Task Update Request"
+msgstr "Begäran om uppgiftsuppdatering"
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a request for the latest event information."
-msgstr "Detta är en begäran av den senaste evenemangsinformationen."
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
+msgstr "<b>%s</b> har svarat på en uppgiftstilldelning."
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is a reply to a meeting request."
-msgstr "Detta är ett svar på en mötesbegäran."
+#: calendar/gui/e-itip-control.c:686
+msgid "Task Reply"
+msgstr "Uppgiftssvar"
 
-#: calendar/gui/e-itip-control.c:712
-msgid "This is an event cancellation."
-msgstr "Detta är en evenemangsavbokning."
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> har avbokat en uppgift."
 
-#: calendar/gui/e-itip-control.c:715 calendar/gui/e-itip-control.c:755
-#: calendar/gui/e-itip-control.c:783
-msgid "The message is not understandable."
-msgstr "Detta meddelande kan inte förstås."
+#: calendar/gui/e-itip-control.c:691
+msgid "Task Cancellation"
+msgstr "Uppgiftsavbokning"
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is an task that can be added to your calendar."
-msgstr "Detta är en uppgift som kan läggas till i din kalender."
+#: calendar/gui/e-itip-control.c:696
+msgid "Bad Task Message"
+msgstr "Felaktigt uppgiftsmeddelande"
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a task request."
-msgstr "Detta är en begäran om en uppgift."
+#: calendar/gui/e-itip-control.c:713
+#, 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:746
-msgid "This is a request for the latest task information."
-msgstr "Detta är en begäran av den senaste uppgiftsinformationen."
+#: calendar/gui/e-itip-control.c:714
+msgid "Free/Busy Information"
+msgstr "Ledig-/upptageninformation"
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is a reply to a task request."
-msgstr "Detta är ett svar på en uppgiftsbegäran."
+#: calendar/gui/e-itip-control.c:718
+#, 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:752
-msgid "This is an task cancellation."
-msgstr "Detta är en uppgiftsavbokning."
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
+msgstr "Ledig/Upptagen-begäran"
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is freebusy information."
-msgstr "Detta är ledig-/upptageninformation."
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
+msgstr "<b>%s</b> har svarat på en ledig-/upptagenbegäran."
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a request for freebusy information."
-msgstr "Detta är en begäran av ledig-/upptageninformation."
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
+msgstr "Ledig/Upptagen-svar"
 
-#: calendar/gui/e-itip-control.c:780
-msgid "This is a reply to a freebusy request."
-msgstr "Detta är ett svar på en begäran av ledig-/upptageninformation."
+#: calendar/gui/e-itip-control.c:729
+msgid "Bad Free/Busy Message"
+msgstr "Felaktigt ledig/upptagenmeddelande"
 
-#: calendar/gui/e-itip-control.c:837
+#: calendar/gui/e-itip-control.c:786
 msgid "The message does not appear to be properly formed"
 msgstr "Meddelandet verkar inte vara korrekt utformat"
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:805
 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:880
+#: calendar/gui/e-itip-control.c:829
 msgid "The information contained in this attachment was not valid"
 msgstr "Informationen i denna bilaga var inte giltig"
 
-#: calendar/gui/e-itip-control.c:992
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr "Jag kunde inte uppdatera din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:1018
+#: calendar/gui/e-itip-control.c:942
+msgid "Update complete\n"
+msgstr "Uppdateringen färdig\n"
+
+#: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Jag kunde inte ta bort objektet från din kalenderfil!\n"
 
+#: calendar/gui/e-itip-control.c:969
+msgid "Removal Complete"
+msgstr "Borttagning färdig"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+msgid "Item sent!\n"
+msgstr "Objektet skickat!\n"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be send!\n"
+msgstr "Objektet kunde inte skickas!\n"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3479,16 +4546,16 @@ msgstr "Kunde inte läsa in uppgifterna i \"%s\""
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som krävs för att läsa in \"%s\" stöds inte"
 
-#: calendar/gui/e-week-view.c:3210 calendar/gui/e-week-view.c:3248
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
-#: calendar/gui/gnome-cal.c:1248
+#: calendar/gui/gnome-cal.c:1258
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunde inte öppna mappen i \"%s\""
 
-#: calendar/gui/gnome-cal.c:1259
+#: calendar/gui/gnome-cal.c:1269
 #, 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"
@@ -3706,7 +4773,7 @@ msgid "Sa"
 msgstr "Lö"
 
 #: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:212
-#: my-evolution/e-summary-tasks.c:228 shell/e-local-storage.c:179
+#: my-evolution/e-summary-tasks.c:228 shell/e-local-storage.c:180
 #: shell/e-shortcuts.c:1025 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Uppgifter"
@@ -3744,9 +4811,9 @@ msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1854 my-evolution/e-summary.c:511
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:10
+#: mail/mail-callbacks.c:1898 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-comp-editor.xml.h:10
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Förhandsgranska"
 
@@ -3949,7 +5016,7 @@ msgstr "Återsynkroniserar med servern"
 
 #: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
-msgstr "Du måste vara ansluten för att kunna genomföra detta"
+msgstr "Du måste vara ansluten för att kunna genomföra denna åtgärd"
 
 #: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
@@ -4212,7 +5279,7 @@ msgid "Connection cancelled"
 msgstr "Anslutning avbruten"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunde inte ansluta till %s (port %d): %s"
@@ -4225,7 +5292,7 @@ msgstr "(okänd värd)"
 #: camel/camel-remote-store.c:484
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
-msgstr "Operation avbruten"
+msgstr "Åtgärden avbruten"
 
 #: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
@@ -4358,7 +5425,7 @@ msgstr "Okänt autentiseringstillstånd."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:53
 msgid "Password"
 msgstr "Lösenord"
 
@@ -4389,37 +5456,37 @@ msgstr "POP innan SMTP-auktorisering med en källa som inte är POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Misslyckades med kompilering av reguljärt uttryck: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL:en \"%s\" behöver ett användarnamn"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL:en \"%s\" behöver ett värdnamn"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL:en \"%s\" behöver en sökväg"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr "Slår upp: %s"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Namnuppslagning misslyckades: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Uppslagning av värdnamn misslyckades: %s: värden kunde inte hittas"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Uppslagning av värdnamn misslyckades: %s: okänd orsak"
@@ -4484,7 +5551,7 @@ msgstr "Misslyckades med att avkoda meddelandet."
 msgid "Failed to verify certificates."
 msgstr "Misslyckades med att verifiera certifikat."
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4494,7 +5561,7 @@ msgstr ""
 "Ämne: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4590,21 +5657,21 @@ msgstr "Mappen förstördes och återskapades på servern."
 msgid "Scanning for changed messages"
 msgstr "Letar efter ändrade meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:1478
-#: camel/providers/imap/camel-imap-folder.c:1902
+#: camel/providers/imap/camel-imap-folder.c:1491
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Detta meddelande är inte tillgängligt för tillfället"
 
-#: camel/providers/imap/camel-imap-folder.c:1620
-#: camel/providers/imap/camel-imap-folder.c:1701
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr "Hämtar meddelandeinformation för nya meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:1626
+#: camel/providers/imap/camel-imap-folder.c:1640
 msgid "Scanning for new messages"
 msgstr "Letar efter nya meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:1935
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
@@ -4623,7 +5690,7 @@ msgstr "Kontrollerar ny e-post"
 msgid "Check for new messages in all folders"
 msgstr "Kontrollerar nya meddelanden i alla mappar"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:655
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:717
 msgid "Folders"
 msgstr "Mappar"
 
@@ -4662,7 +5729,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:473
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Inget stöd för autentiseringstypen %s"
@@ -4673,7 +5740,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:512
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Du angav inte något lösenord."
 
@@ -4688,12 +5755,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:327
+#: camel/providers/imap/camel-imap-store.c:837 mail/mail-local.c:333
 #, c-format
 msgid "No such folder %s"
 msgstr "Det finns ingen mapp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1023
+#: camel/providers/imap/camel-imap-store.c:1037
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Föräldermappen får inte innehålla undermappar"
 
@@ -5184,35 +6251,35 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Kan inte öppna eller skapa .newsrc-fil för %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:193
+#: camel/providers/pop3/camel-pop3-folder.c:190
 msgid "Retrieving POP summary"
 msgstr "Hämtar POP-sammanfattning"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:196
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Kunde inte kontrollera nya meddelanden på POP-servern: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:239
+#: camel/providers/pop3/camel-pop3-folder.c:236
 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:332
+#: camel/providers/pop3/camel-pop3-folder.c:329
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Kunde inte hämta meddelande: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:348
+#: camel/providers/pop3/camel-pop3-folder.c:345
 #, 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:371
+#: camel/providers/pop3/camel-pop3-folder.c:368
 #, c-format
 msgid "No message with uid %s"
 msgstr "Inget meddelande med uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:375
+#: camel/providers/pop3/camel-pop3-folder.c:372
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Hämtar POP-meddelande %d"
@@ -5230,7 +6297,7 @@ msgstr "Lämna meddelanden på servern"
 msgid "Delete after %s day(s)"
 msgstr "Ta bort efter %s dag(ar)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:52
 msgid "POP"
 msgstr "POP"
 
@@ -5325,7 +6392,7 @@ msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:71
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5379,7 +6446,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "E-postleverans via programmet sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:63
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:64
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5389,122 +6456,122 @@ msgstr ""
 "För leverans av e-post genom anslutning till ett fjärr-epostnav som använder "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfel, okänt kommando"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfel i parametrar eller argument"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "Kommandot inte implementerat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter inte implementerad"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar från systemhjälp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "Hjälpmeddelande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "Tjänsten klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr "Tjänsten stänger överföringskanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr "Tjänsten inte tillgänglig, stänger överföringskanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr "Efterfrågad e-poståtgärd okej, färdig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr "Användaren inte lokal; vidarebefordrar till <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Efterfrågad e-poståtgärd inte utförd: brevlådan inte tillgänglig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Efterfrågad åtgärd inte utförd: brevlådan inte tillgänglig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr "Efterfrågad åtgärd avbruten: fel i behandling"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr "Användaren inte lokal; försök med <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Efterfrågad åtgärd inte utförd: otillräckligt systemutrymme"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Efterfrågad åtgärd avbruten: överskriden utrymmesallokering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Efterfrågad åtgärd inte utförd: brevlådenamn inte tillåtet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Börja skriva in brevet, avsluta med <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "Transaktionen misslyckades"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr "En lösenordsöverföring behövs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen är för svag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering behövs för begärd autentiseringsmekanism"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr "Tillfälligt autentiseringsmisslyckande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "Autentisering krävs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Fel på välkomstsvar: %s: möjligtvis inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP-servern %s stöder inte den begärda autentiseringstypen %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, 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:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5515,126 +6582,126 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, 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:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-epostleverans via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan inte skicka meddelande: avsändaradressen är inte angiven."
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan inte skicka meddelande: avsändaradressen är inte giltig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:595
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan inte skicka meddelande: inga mottagare är angivna."
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr "SMTP-hälsning"
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO-begäran gjorde time-out: %s: inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Fel i HELO-svar: %s: inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:760
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:766
 msgid "Error creating SASL authentication object."
 msgstr "Fel vid skapande av SASL-autentiseringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr "AUTH-begäran misslyckades."
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr "Felaktigt autentiseringssvar från servern.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM-begäran gjorde time-out: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Fel i MAIL FROM-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO-begäran gjorde time-out: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Fel i RCPT TO-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:969
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:988
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Fel i DATA-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1005
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, 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:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, 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:1127
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Fel i QUIT-svar: %s: inte ödesdigert"
@@ -5664,7 +6731,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "bilaga"
 
@@ -5755,7 +6822,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: composer/e-msg-composer.c:687
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5764,7 +6831,7 @@ msgstr ""
 "Kunde inte öppna filen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:683
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5773,29 +6840,29 @@ msgstr ""
 "Fel vid läsning av filen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:890
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: composer/e-msg-composer.c:899
+#: composer/e-msg-composer.c:874
 msgid "Warning!"
 msgstr "Varning!"
 
-#: composer/e-msg-composer.c:901
+#: composer/e-msg-composer.c:876
 msgid "File exists, overwrite?"
 msgstr "Filen finns, skriv över?"
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:898
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fel vid sparande av filen: %s"
 
-#: composer/e-msg-composer.c:943
+#: composer/e-msg-composer.c:918
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid inläsning av filen: %s"
 
-#: composer/e-msg-composer.c:1014
+#: composer/e-msg-composer.c:989
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5803,16 +6870,16 @@ msgstr ""
 "Kan inte öppna mallmappen för detta konto.\n"
 "Vill du använda standardmappen för mallar?"
 
-#: composer/e-msg-composer.c:1064
+#: composer/e-msg-composer.c:1042
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fel vid åtkomst av filen: %s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1050
 msgid "Unable to retrieve message from editor"
 msgstr "Kunde inte hämta meddelande från redigeraren"
 
-#: composer/e-msg-composer.c:1078
+#: composer/e-msg-composer.c:1056
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5821,7 +6888,7 @@ msgstr ""
 "Kan inte spola filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1062
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5830,7 +6897,7 @@ msgstr ""
 "Kan inte trunkera filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1093
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5839,7 +6906,7 @@ msgstr ""
 "Fel vid automatiskt sparande av meddelande: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1193
+#: composer/e-msg-composer.c:1171
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
 "Would you like to attempt recovery?"
@@ -5847,7 +6914,7 @@ msgstr ""
 "Evolution har hittat osparade filer från en tidigare session.\n"
 "Vill du göra ett återställningsförsök?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1319
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5857,24 +6924,24 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: composer/e-msg-composer.c:1348 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1326 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1349
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:1520
+#: composer/e-msg-composer.c:1498
 msgid "Insert File"
 msgstr "Infoga fil"
 
-#: composer/e-msg-composer.c:1894 composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:1874 composer/e-msg-composer.c:2315
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:2384
+#: composer/e-msg-composer.c:2405
 msgid "Could not create composer window."
 msgstr "Kunde inte skapa fönster för meddelanderedigering."
 
@@ -5902,11 +6969,43 @@ msgstr "adresskort"
 msgid "calendar information"
 msgstr "kalenderinformation"
 
+#: default_user/searches.xml.h:1
+msgid "Body contains"
+msgstr "Meddelandetexten innehåller"
+
+#: default_user/searches.xml.h:2
+msgid "Body does not contain"
+msgstr "Meddelandetexten innehåller inte"
+
+#: default_user/searches.xml.h:3
+msgid "Body or subject contains"
+msgstr "Meddelandetexten eller ämnet innehåller"
+
+#: default_user/searches.xml.h:4
+msgid "Message contains"
+msgstr "Meddelandet innehåller"
+
+#: default_user/searches.xml.h:5
+msgid "Recipients contain"
+msgstr "Mottagarna innehåller"
+
+#: default_user/searches.xml.h:6
+msgid "Sender contains"
+msgstr "Avsändaren innehåller"
+
+#: default_user/searches.xml.h:7
+msgid "Subject contains"
+msgstr "Ämnesraden innehåller"
+
+#: default_user/searches.xml.h:8
+msgid "Subject does not contain"
+msgstr "Ämnesraden innehåller inte"
+
 #. strptime format for a date.
 #: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
 #: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
@@ -5924,15 +7023,15 @@ msgstr "%H.%M.%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
-#: widgets/misc/e-dateedit.c:1515
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 msgid "%I:%M %p"
 msgstr "%I.%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
-#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
-#: widgets/misc/e-dateedit.c:1512
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H.%M"
 
@@ -6074,7 +7173,7 @@ msgstr " sedan"
 msgid "ago"
 msgstr " sedan"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:929
+#: filter/filter-datespec.c:711 mail/message-list.c:936
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
@@ -6082,7 +7181,7 @@ msgstr "%d %b %H.%M"
 msgid "<click here to select a date>"
 msgstr "<klicka här för att välja ett datum>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Filterregler"
 
@@ -6104,7 +7203,7 @@ msgstr ""
 "Gå tillbaka och ange en giltig mapp som e-post kan levereras till."
 
 #: filter/filter-folder.c:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:796
+#: mail/mail-account-gui.c:808
 msgid "Select Folder"
 msgstr "Välj mapp"
 
@@ -6116,7 +7215,7 @@ msgstr "Ange mappens URI"
 msgid "<click here to select a folder>"
 msgstr "<klicka här för att välja en mapp>"
 
-#: filter/filter-input.c:197
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6166,30 +7265,22 @@ msgid "outgoing"
 msgstr "utgående"
 
 #: filter/filter.glade.h:1
-msgid "Add"
-msgstr "Lägg till"
-
-#: filter/filter.glade.h:3
-msgid "Edit"
-msgstr "Redigera"
-
-#: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Redigera filter"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "Redigera virtuella mappar"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Inkommande"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "Utgående"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtuella mappar"
 
@@ -6308,7 +7399,7 @@ msgstr "besvarad"
 msgid "Score"
 msgstr "Poäng"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1070
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1074
 msgid "Sender"
 msgstr "Avsändare"
 
@@ -6431,8 +7522,7 @@ msgstr "Hoppsan. Du måste ange minst en mapp som källa."
 
 #: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
 #: importers/netscape-importer.c:814 importers/pine-importer.c:627
-#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
-#: shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:651 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importera"
 
@@ -6525,164 +7615,171 @@ msgstr "Fabrik för e-postsammanfattningskomponenten."
 msgid "Mail configuration interface"
 msgstr "Gränssnitt för e-postkonfiguration"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:112
 msgid "This folder cannot contain messages."
 msgstr "Denna mapp kan inte innehålla meddelanden."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:332
 msgid "Properties..."
 msgstr "Egenskaper..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:332
 msgid "Change this folder's properties"
 msgstr "Ändra egenskaperna för denna mapp"
 
-#: mail/component-factory.c:757
+#: mail/component-factory.c:739
+msgid "New Mail Message"
+msgstr "Nytt e-postmeddelande"
+
+#: mail/component-factory.c:739
+msgid "New _Mail Message"
+msgstr "Nytt _e-postmeddelande"
+
+#: mail/component-factory.c:771
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan inte initiera Evolutions e-postkomponent."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:908
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lager hos skal"
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:257
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper för \"%s\""
 
-#: mail/folder-browser-ui.c:258
+#: mail/folder-browser-ui.c:259
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:232 mail/mail-display.c:278
+#: mail/folder-browser.c:233 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunde inte skapa temporär katalog: %s"
 
-#: mail/folder-browser.c:900
+#: mail/folder-browser.c:906
 msgid "Create vFolder from Search"
 msgstr "Skapa virtuell mapp från sökning"
 
-#: mail/folder-browser.c:1245
+#: mail/folder-browser.c:1251
 msgid "VFolder on _Subject"
 msgstr "Virtuell mapp på _ämnesrad"
 
-#: mail/folder-browser.c:1248
+#: mail/folder-browser.c:1254
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på _avsändare"
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1257
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på _mottagare"
 
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1260
 msgid "VFolder on Mailing _List"
 msgstr "Virtuell mapp på sänd_lista"
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1266
 msgid "Filter on Sub_ject"
 msgstr "Filtrera på _ämnesrad"
 
-#: mail/folder-browser.c:1263
+#: mail/folder-browser.c:1269
 msgid "Filter on Sen_der"
 msgstr "Filtrera på _avsändare"
 
-#: mail/folder-browser.c:1266
+#: mail/folder-browser.c:1272
 msgid "Filter on Re_cipients"
 msgstr "Filtrera på _mottagare"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1275
 msgid "Filter on _Mailing List"
 msgstr "Filtrera på sä_ndlista"
 
-#: mail/folder-browser.c:1280 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:96
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1288 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: mail/folder-browser.c:1284 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1290
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsändaren"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1297 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1299 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1301
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1304 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
-msgstr "Mar_kera som läst"
+msgstr "_Markera som läst"
 
-#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1306 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Markera som _oläst"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1308
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1310
 msgid "Mark as Unim_portant"
 msgstr "Markera som ovikti_gt"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1315
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp..."
 
-#: mail/folder-browser.c:1311
+#: mail/folder-browser.c:1317
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: mail/folder-browser.c:1315 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1321 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Ångra borttagning"
 
-#: mail/folder-browser.c:1320
+#: mail/folder-browser.c:1326
 msgid "Add Sender to Address Book"
 msgstr "Lägg till avsändaren i adressboken"
 
-#: mail/folder-browser.c:1325
+#: mail/folder-browser.c:1331
 msgid "Apply Filters"
 msgstr "Tillämpa filter"
 
-#: mail/folder-browser.c:1329
+#: mail/folder-browser.c:1335
 msgid "Create Ru_le From Message"
 msgstr "Skapa rege_l från meddelande"
 
-#: mail/folder-browser.c:1487
+#: mail/folder-browser.c:1493
 msgid "Filter on Mailing List"
 msgstr "Filtrera på sändlista"
 
-#: mail/folder-browser.c:1488
+#: mail/folder-browser.c:1494
 msgid "VFolder on Mailing List"
 msgstr "Virtuell mapp på sändlista"
 
-#: mail/folder-browser.c:1490
+#: mail/folder-browser.c:1496
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrera på sändlista (%s)"
 
-#: mail/folder-browser.c:1491
+#: mail/folder-browser.c:1497
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Virtuell mapp på sändlista (%s)"
 
-#: mail/folder-info.c:60
+#: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Hämtar mappinformation"
 
@@ -6750,11 +7847,11 @@ msgstr "Evolutions diskussionsgruppsredigerare"
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontoredigerare"
 
-#: mail/mail-account-gui.c:986
+#: mail/mail-account-gui.c:998
 msgid "Save signature"
 msgstr "Spara signatur"
 
-#: mail/mail-account-gui.c:992
+#: mail/mail-account-gui.c:1004
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6764,38 +7861,38 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (standard)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "Stäng av"
 
-#: mail/mail-accounts.c:176
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "Slå på"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 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:268
+#: mail/mail-accounts.c:284
 msgid "Don't delete"
 msgstr "Ta inte bort"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr "Verkligen ta bort kontot?"
 
-#: mail/mail-accounts.c:495 mail/mail-accounts.c:499
+#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
 msgid "Are you sure you want to delete this news account?"
 msgstr "Är du säker på att du vill ta bort detta diskussionsgruppskonto?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:741
-msgid "Evolution Account Manager"
-msgstr "Evolutions kontohanterare"
+#: mail/mail-accounts.c:757 mail/mail-config.glade.h:41
+msgid "Mail Settings"
+msgstr "E-postinställningar"
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6821,7 +7918,7 @@ msgstr "Sändlistan %s"
 msgid "Add Filter Rule"
 msgstr "Lägg till filterregel"
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -6833,7 +7930,7 @@ msgstr ""
 "ta emot eller skriva nya brev.\n"
 "Vill du konfigurera den nu?"
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -6841,7 +7938,7 @@ msgstr ""
 "Du måste konfigurera en identititet\n"
 "innan du kan skriva brev."
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -6849,11 +7946,11 @@ msgstr ""
 "Du måste konfigurera en e-posttransport\n"
 "innan du kan skriva brev."
 
-#: mail/mail-callbacks.c:184
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr "Du har inte angivit någon e-posttransportmetod"
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6861,7 +7958,7 @@ msgstr ""
 "Detta meddelande har ingen ämnesrad.\n"
 "Vill du verkligen skicka?"
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6873,37 +7970,36 @@ msgstr ""
 "till ett Apparently-To-huvud.\n"
 "Skicka ändå?"
 
-#: mail/mail-callbacks.c:338
+#: mail/mail-callbacks.c:339
 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:389
+#: mail/mail-callbacks.c:390
 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:632
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "Den %s skrev %s:"
+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:893
+#: mail/mail-callbacks.c:894
 msgid "Forwarded message:\n"
 msgstr "Vidarebefordrat meddelande:\n"
 
-#: mail/mail-callbacks.c:990
+#: mail/mail-callbacks.c:994
 msgid "Move message(s) to"
 msgstr "Flytta meddelande(n) till"
 
-#: mail/mail-callbacks.c:992
+#: mail/mail-callbacks.c:996
 msgid "Copy message(s) to"
 msgstr "Kopiera meddelande(n) till"
 
-#: mail/mail-callbacks.c:1361
+#: mail/mail-callbacks.c:1365
 #, 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:1383
+#: mail/mail-callbacks.c:1387
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6911,7 +8007,7 @@ msgstr ""
 "Du kan bara redigera meddelanden\n"
 "som du sparat i mappen Drafts."
 
-#: mail/mail-callbacks.c:1417
+#: mail/mail-callbacks.c:1421
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6919,24 +8015,45 @@ msgstr ""
 "Du kan bara skicka om meddelanden\n"
 "som du sparat i mappen Sent."
 
-#: mail/mail-callbacks.c:1429
+#: mail/mail-callbacks.c:1433
 #, 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:1450
+#: mail/mail-callbacks.c:1454
 msgid "No Message Selected"
 msgstr "Inget meddelande markerat"
 
-#: mail/mail-callbacks.c:1534
+#: mail/mail-callbacks.c:1539
 msgid "Save Message As..."
 msgstr "Spara meddelande som..."
 
-#: mail/mail-callbacks.c:1536
+#: mail/mail-callbacks.c:1541
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:1759
+#: mail/mail-callbacks.c:1686 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Varning"
+
+#: mail/mail-callbacks.c:1691
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Denna åtgärd kommer att permanent ta bort de meddelanden som har markerats "
+"som borttagna. Om du fortsätter kommer du inte att kunna återställa dessa "
+"meddelanden.\n"
+"\n"
+"Vill du verkligen ta bort dessa meddelanden?"
+
+#: mail/mail-callbacks.c:1698
+msgid "Do not ask me again."
+msgstr "Fråga mig inte igen."
+
+#: mail/mail-callbacks.c:1803
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6945,25 +8062,25 @@ msgstr ""
 "Fel vid läsning av filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1769
+#: mail/mail-callbacks.c:1813
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:1815
+#: mail/mail-callbacks.c:1859
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/mail-callbacks.c:1861
+#: mail/mail-callbacks.c:1905
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
-#: mail/mail-callbacks.c:1945
+#: mail/mail-callbacks.c:1989
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Är du säker på att du vill öppna alla %d meddelanden i separata fönster?"
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -6973,7 +8090,7 @@ msgstr ""
 "behöver du inte fylla i såvida du inte vill inkludera denna information i "
 "den e-post som du skickar."
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
 msgid ""
 "Please enter information about your incoming mail server below. If you don't "
 "know what kind of server you use, contact your system administrator or "
@@ -6983,7 +8100,7 @@ msgstr ""
 "vad för server du använder kan du kontakta din systemadministratör eller din "
 "Internetleverantör."
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:141
 msgid ""
 "Please enter information about your outgoing mail protocol below. If you "
 "don't know which protocol you use, contact your system administrator or "
@@ -6993,7 +8110,7 @@ msgstr ""
 "för protokoll du använder kan du kontakta din systemadministratör eller "
 "Internetleverantör."
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -7007,15 +8124,25 @@ msgstr ""
 "detta konto nedan. Detta namn kommer endast att användas för visning."
 
 #. set window title
-#: mail/mail-config-druid.c:463
-msgid "Evolution Account Wizard"
-msgstr "Kontoguide för Evolution"
+#: mail/mail-config-druid.c:622
+msgid "Evolution Account Assistant"
+msgstr "Evolutions kontoassistent"
+
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1577
+#, c-format
+msgid "%s: Inbox"
+msgstr "%s: Inkorg"
 
-#: mail/mail-config.c:1570
+#: mail/mail-config.c:1807
 msgid "Checking Service"
 msgstr "Kontrollerar tjänst"
 
-#: mail/mail-config.c:1641 mail/mail-config.c:1644
+#: mail/mail-config.c:1878 mail/mail-config.c:1881
 msgid "Connecting to server..."
 msgstr "Ansluter till server..."
 
@@ -7106,11 +8233,15 @@ msgstr "Standardteckenkodning: "
 msgid "Digital IDs..."
 msgstr "Digitala ID..."
 
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "Visa"
+
 #: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Klar"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:175
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Mallar"
 
@@ -7162,263 +8293,263 @@ msgstr "Kerberos "
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 msgid "Mailbox location"
 msgstr "Brevlådeplats"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "Make this my _default account"
 msgstr "Gör detta till mitt standard_konto"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Message _preview should be displayed by default"
 msgstr "_Meddelandeförhandsgranskningen ska visas som standard"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 msgid "Message list should display in a _threaded fashion by default"
 msgstr "Meddelandelistan ska visas på ett _trådat vis som standard"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:46
 msgid "NNTP Server:"
 msgstr "NNTP-server:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "News"
 msgstr "Diskussionsgrupper"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "Optional Information"
 msgstr "Valfri information"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "PGP Key ID:"
 msgstr "PGP-nyckelid:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "Pick a color"
 msgstr "Välj en färg"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Fråga då meddelanden skickas med en t_om ämnesrad"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 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:57
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr "Qmail-epostkatalog "
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Quoted"
 msgstr "Citerad"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Receiving Email"
 msgstr "Mottagande av e-post"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Receiving Mail"
 msgstr "Mottagande av post"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:62
 msgid "Receiving Options"
 msgstr "Alternativ för mottagning"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Required Information"
 msgstr "Obligatorisk information"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Secure MIME"
 msgstr "Säker MIME"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
 msgid "Security"
 msgstr "Säkerhet"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Select Filter Log file..."
 msgstr "Välj en filterloggfil..."
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Select PGP binary"
 msgstr "Välj PGP-program"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Sending Email"
 msgstr "Skickande av e-post"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Sending Mail"
 msgstr "Skickande av post"
 
-#: mail/mail-config.glade.h:71 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:178
+#: mail/mail-config.glade.h:72 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "Skickat"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sent and Draft Messages"
 msgstr "Skickade meddelanden och mallar"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Sent messages folder:"
 msgstr "Mapp för skickade meddelanden:"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Server Type: "
 msgstr "Servertyp: "
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server requires _authentication"
 msgstr "Servern kräver _autentisering"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Source"
 msgstr "Källkod"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Source Information"
 msgstr "Källinformation"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Sources"
 msgstr "Källor"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Special Folders"
 msgstr "Specialmappar"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Standard Unix mbox"
 msgstr "Standard Unix-brevlåda"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Use secure connection (_SSL)"
 msgstr "Använd säker anslutning (_SSL)"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:86
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
-"Välkommen till Evolutions guide för e-postkonfiguration.\n"
+"Välkommen till Evolutions assistent för e-postkonfiguration.\n"
 "\n"
 "Klicka på \"Nästa\" för att börja. "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "_Always load images off the net"
 msgstr "Läs _alltid in bilder från nätet"
 
 # Låter konstigt
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "_Automatically check for new mail every"
 msgstr "Kontrollera _automatiskt ny e-post var"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Check for supported types"
-msgstr "_Kontrollera vilka typer som stöds"
+msgstr "Kontrollera vilka _typer som stöds"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "_Email Address:"
 msgstr "_E-postadress:"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "_Empty trash folders on exit"
 msgstr "_Töm papperskorgsmappar vid avslut"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "_Full Name:"
 msgstr "_Fullständigt namn:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_HTML Signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_Highlight citations with"
 msgstr "_Markera citat med"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Host:"
 msgstr "_Värd:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Load images if sender is in addressbook"
 msgstr "_Läs in bilder om avsändaren finns i adressboken"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Log filter actions to:"
 msgstr "_Logga filteråtgärder i:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Mark messages as Read after"
 msgstr "_Markera meddelanden som lästa efter"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Never load images off the net"
 msgstr "Läs _aldrig in bilder från nätet"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Organization:"
 msgstr "_Organisation:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_PGP binary path:"
 msgstr "Sökväg till _PGP-programmet:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_Path:"
 msgstr "_Sökväg:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Remember PGP Passphrase until exit"
 msgstr "_Kom ihåg GPG-lösenordsfrasen fram till avslut"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Remember this password"
 msgstr "_Kom ihåg detta lösenord"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_Send mail in HTML format by default."
 msgstr "_Skicka brev i HTML-format som standard."
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "_Signature file:"
 msgstr "_Signaturfil:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "_Username:"
-msgstr "_Användarnamn:"
+msgstr "Användar_namn:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "placeholder"
 msgstr "platshållare"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "seconds."
 msgstr "sekunder."
 
@@ -7458,76 +8589,82 @@ 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:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Spara bilaga"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Spara till disk..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "Visa inuti"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visa inuti (med %s)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Göm"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Externt visningsprogram"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "Läser in meddelandeinnehåll"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 msgid "Open Link in Browser"
 msgstr "Öppna länk i webbläsare"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 msgid "Copy Link Location"
 msgstr "Kopiera länkplats"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 msgid "Save Link as (FIXME)"
 msgstr "Spara länk som (FIXME)"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 msgid "Save Image as..."
 msgstr "Spara bild som..."
 
-#: mail/mail-folder-cache.c:146
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr "%d nya"
 
-#: mail/mail-folder-cache.c:152 mail/mail-folder-cache.c:159
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:153
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr "%d gömda"
 
-#: mail/mail-folder-cache.c:162
+#: mail/mail-folder-cache.c:161
+#, c-format
+msgid "%d selected"
+msgstr "%d markerade"
+
+#: mail/mail-folder-cache.c:170
 #, c-format
 msgid "%d unsent"
 msgstr "%d oskickade"
 
-#: mail/mail-folder-cache.c:164
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
@@ -7618,17 +8755,17 @@ msgstr "Pekare till okänd extern data (typen \"%s\")"
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
-#: mail/mail-local.c:459
+#: mail/mail-local.c:466
 #, c-format
 msgid "Opening '%s'"
 msgstr "Öppnar \"%s\""
 
-#: mail/mail-local.c:749
+#: mail/mail-local.c:754
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Byter format på mappen \"%s\" till \"%s\""
 
-#: mail/mail-local.c:870
+#: mail/mail-local.c:875
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7637,7 +8774,7 @@ msgstr ""
 "Kan inte spara metadata för mapp; du kommer antagligen att\n"
 "upptäcka att du inte kan öppna denna mapp längre: %s"
 
-#: mail/mail-local.c:909
+#: mail/mail-local.c:914
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7645,11 +8782,11 @@ msgstr ""
 "Om du inte längre kan öppna denna brevlåda måste\n"
 "du kanske reparera den manuellt."
 
-#: mail/mail-local.c:1002
+#: mail/mail-local.c:1007
 msgid "You cannot change the format of a non-local folder."
 msgstr "Du kan inte ändra formatet på en ickelokal mapp."
 
-#: mail/mail-local.c:1013
+#: mail/mail-local.c:1018
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Konfigura om %s"
@@ -7669,7 +8806,7 @@ msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
-"Fel vid utförande av operation:\n"
+"Fel vid utförande av åtgärd:\n"
 "%s"
 
 #. Remember the password?
@@ -7736,7 +8873,7 @@ msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:180
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "Papperskorg"
 
@@ -7813,12 +8950,12 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2064
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: mail/mail-ops.c:2131
+#: mail/mail-ops.c:2133
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar från %s"
@@ -7831,31 +8968,31 @@ msgstr "_Sök"
 msgid "(Untitled Message)"
 msgstr "(Namnlöst meddelande)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 msgid "Untitled Message"
 msgstr "Namnlöst meddelande"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 msgid "Empty Message"
 msgstr "Tomt meddelande"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 msgid "Find in Message"
 msgstr "Sök i meddelande"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr "Gör skillnad på gemener/VERSALER"
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 msgid "Search Forward"
 msgstr "Sök vidare"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr "Sök:"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 msgid "Matches:"
 msgstr "Träffar:"
 
@@ -7897,7 +9034,7 @@ msgstr "Vidarebefordrat meddelande - %s"
 msgid "Forwarded message"
 msgstr "Vidarebefordrat meddelande"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 msgid "Forwarded Message"
 msgstr "Vidarebefordrat meddelande"
 
@@ -7918,70 +9055,66 @@ msgstr "(Inget ämne)"
 msgid "%s - Message"
 msgstr "%s - Meddelande"
 
-#: mail/message-list.c:629
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "Oläst"
 
-#: mail/message-list.c:630
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "Läst"
 
-#: mail/message-list.c:631
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "Besvarad"
 
-#: mail/message-list.c:632
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr "Flera olästa meddelanden"
 
-#: mail/message-list.c:633
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr "Flera meddelanden"
 
-#: mail/message-list.c:637
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "Lägsta"
 
-#: mail/message-list.c:638
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "Lägre"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "Högre"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "Högsta"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "Idag %H.%M"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "Igår %H.%M"
 
-#: mail/message-list.c:921
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2312
+#: mail/message-list.c:2314
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
-#: mail/message-list.c:2324
-msgid "Updating message list"
-msgstr "Uppdaterar meddelandelistan"
-
 #: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Flaggad"
@@ -7994,36 +9127,36 @@ msgstr "Mottaget"
 msgid "Size"
 msgstr "Storlek"
 
-#: mail/subscribe-dialog.c:166
+#: mail/subscribe-dialog.c:167
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Genomsöker mappar under %s på \"%s\""
 
-#: mail/subscribe-dialog.c:168
+#: mail/subscribe-dialog.c:169
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Genomsöker mappar på rotnivå på \"%s\""
 
-#: mail/subscribe-dialog.c:267
+#: mail/subscribe-dialog.c:268
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Prenumererar på mappen \"%s\""
 
-#: mail/subscribe-dialog.c:269
+#: mail/subscribe-dialog.c:270
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Säger upp prenumeration på mappen \"%s\""
 
-#: mail/subscribe-dialog.c:1190 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1241 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mapp"
 
-#: mail/subscribe-dialog.c:1432
+#: mail/subscribe-dialog.c:1483
 msgid "No server has been selected"
 msgstr "Ingen server har valts"
 
-#: mail/subscribe-dialog.c:1489
+#: mail/subscribe-dialog.c:1540
 msgid "Please select a server."
 msgstr "Välj en server."
 
@@ -8067,7 +9200,7 @@ msgstr "Evolutionkomponent för sammanfattningen."
 msgid "Factory for the Evolution executive summary component."
 msgstr "Fabrik för Evolutions sammanfattningskomponent."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Kan inte initiera Evolutions sammanfattningskomponent."
 
@@ -8091,31 +9224,40 @@ msgstr "%a %H.%M"
 msgid "Mail summary"
 msgstr "E-postsammanfattning"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:602
+msgid "KBOS:ZSAM:EGAA"
+msgstr "ESGG:ESMS:ESSA:ESNU"
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr "Dagens ord från dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr "Dagens citat"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr "Lägg till en nyhetskälla"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 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:881
+#: my-evolution/e-summary-preferences.c:889
 msgid "Name:"
 msgstr "Namn:"
 
-#: my-evolution/e-summary-preferences.c:1403
-msgid "My Evolution Settings"
-msgstr "Inställningar för Mitt Evolution"
+#: my-evolution/e-summary-preferences.c:1421
+msgid "Summary Settings"
+msgstr "Sammanfattningsinställningar"
 
 # Detta är inte diskussionsgrupper utan nyheter
 #: my-evolution/e-summary-rdf.c:281
@@ -8126,6 +9268,10 @@ msgstr "Ett fel uppstod när nyhetskällan hämtades"
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Fel vid hämtning av RDF</b>"
 
+#: my-evolution/e-summary-rdf.c:479
+msgid "RDF Summary"
+msgstr "RDF-sammanfattning"
+
 #: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
 msgstr "Inga uppgifter"
@@ -8134,25 +9280,29 @@ msgstr "Inga uppgifter"
 msgid "My Weather"
 msgstr "Mitt väder"
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Väderservern kunde inte kontaktas</b></dd>"
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+msgid "Weather"
+msgstr "Väder"
+
+#: my-evolution/e-summary-weather.c:663
 msgid "Regions"
 msgstr "Regioner"
 
 #: my-evolution/e-summary.c:145
-msgid "%A, %d %B %Y"
-msgstr "%A %d %B %Y"
+msgid "%A, %B %e %Y"
+msgstr "%A %e %B %Y"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
-msgid "Print My Evolution"
-msgstr "Skriv ut Mitt Evolution"
+msgid "Print Summary"
+msgstr "Skriv ut sammanfattning"
 
 #: my-evolution/e-summary.c:518
-msgid "Printing of My Evolution failed"
-msgstr "Utskrift av Mitt Evolution misslyckades"
+msgid "Printing of Summary failed"
+msgstr "Utskrift av sammanfattning misslyckades"
 
 #: my-evolution/main.c:52
 msgid "Executive summary component could not initialize Bonobo.\n"
@@ -9329,7 +10479,7 @@ msgstr "Alla _mappar:"
 msgid "All news _feeds:"
 msgstr "Alla nyhets_källor:"
 
-#: my-evolution/my-evolution.glade.h:6 shell/e-local-storage.c:173
+#: my-evolution/my-evolution.glade.h:6 shell/e-local-storage.c:174
 #: shell/e-shortcuts.c:1024
 msgid "Calendar"
 msgstr "Kalender"
@@ -9442,21 +10592,17 @@ msgstr "Visa detaljer"
 msgid "Cancel Operation"
 msgstr "Avbryt åtgärd"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1026
-msgid "Contacts"
-msgstr "Kontakter"
-
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1023
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1023
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:178
 msgid "Outbox"
 msgstr "Utkorg"
 
-#: shell/e-local-storage.c:593
+#: shell/e-local-storage.c:592
 msgid "Local Folders"
 msgstr "Lokala mappar"
 
@@ -9510,7 +10656,7 @@ msgstr ""
 "Ett fel inträffade vid kopiering av filer till\n"
 "\"%s\"."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9521,7 +10667,7 @@ msgstr ""
 "Var vänlig och flytta den så att installationen\n"
 "av Evolutions användarfiler kan genomföras."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9535,7 +10681,7 @@ msgstr ""
 "starta.\n"
 "Vill du att jag ska ta bort katalogen?"
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9638,11 +10784,11 @@ msgstr ""
 "Den markerade typen av mapp är inte giltig för\n"
 "den begärda åtgärden."
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:514 shell/e-shell-folder-title-bar.c:515
+#: shell/e-shell-folder-title-bar.c:569 shell/e-shell-folder-title-bar.c:570
 msgid "(Untitled)"
 msgstr "(Namnlös)"
 
@@ -9731,7 +10877,7 @@ msgstr "Automatisk"
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "Välj en fil"
 
@@ -9751,19 +10897,31 @@ msgstr "Välj en destinationsmapp för importen av denna data"
 msgid "Closing connections..."
 msgstr "Kopplar från anslutningar..."
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:536
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+"Var god vänta...\n"
+"Letar efter befintliga konfigurationer"
+
+#: shell/e-shell-startup-wizard.c:539
+msgid "Starting Intelligent Importers"
+msgstr "Startar intelligenta importörer"
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy hittades inte i din $PATH."
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kunde inte köras."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9773,90 +10931,90 @@ msgstr ""
 "e-post, kalender- och kontakthantering\n"
 "inom GNOME-skrivbordsmiljön."
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Gå till mapp..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr "Markera den mapp som du vill öppna"
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 msgid "Create a new shortcut"
 msgstr "Skapa en ny genväg"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 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:702
+#: shell/e-shell-view-menu.c:684
 msgid "Work Online"
 msgstr "Arbeta ansluten"
 
-#: shell/e-shell-view-menu.c:715 shell/e-shell-view-menu.c:728
-#: ui/evolution.xml.h:35
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
-#: shell/e-shell-view.c:178
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr "(Ingen mapp visas)"
 
-#: shell/e-shell-view.c:1391
+#: shell/e-shell-view.c:1457
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1393
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1431
+#: shell/e-shell-view.c:1497
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution är just nu ansluten. Klicka på denna knapp för att koppla från."
 
-#: shell/e-shell-view.c:1438
+#: shell/e-shell-view.c:1504
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution håller på att koppla från."
 
-#: shell/e-shell-view.c:1444
+#: shell/e-shell-view.c:1510
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution är just nu frånkopplad. Klicka på denna knapp för att ansluta."
 
-#: shell/e-shell.c:491
+#: shell/e-shell.c:508
 #, 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:1405
+#: shell/e-shell.c:1435
 #, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
-"Hoppsan! Vyn för \"%s\" dog oväntat. :-(\n"
+"Hoppsan! Vyerna för \"%s\" dog oväntat. :-(\n"
 "Det här betyder antagligen att komponenten %s har kraschat."
 
-#: shell/e-shell.c:1609 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1639 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1611
+#: shell/e-shell.c:1641
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: shell/e-shell.c:1613
+#: shell/e-shell.c:1643
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera på OAF"
 
-#: shell/e-shell.c:1615
+#: shell/e-shell.c:1645
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
-#: shell/e-shell.c:1617 shell/e-storage.c:481
+#: shell/e-shell.c:1647 shell/e-storage.c:481
 msgid "Generic error"
 msgstr "Allmänt fel"
 
@@ -9949,7 +11107,7 @@ msgstr "Byt namn på den markerade genvägen till:"
 msgid "Open the folder linked to this shortcut"
 msgstr "Öppna mappen som är länkad till denna genväg"
 
-#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:20
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "Öppna i nytt fönster"
 
@@ -9973,10 +11131,6 @@ msgstr "Fel vid sparande av genvägar."
 msgid "Shortcuts"
 msgstr "Genvägar"
 
-#: shell/e-storage-set-view.c:1464 shell/e-summary-storage.c:78
-msgid "My Evolution"
-msgstr "Mitt Evolution"
-
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Inget namn)"
@@ -10059,21 +11213,29 @@ msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klicka på \"Importera\" för att börja importera filen till Evolution. "
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Evolutions importverktyg"
+msgid "Evolution Import Assistant"
+msgstr "Evolutions importassistent"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Evolutions importverktyg"
+msgid "Evolution Importer Assistant"
+msgstr "Evolutions importörsassistent"
+
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr "Importera fil (steg 2 av 2)"
+
+#: shell/importer/import.glade.h:5
+msgid "Select a File (step 1 of 2)"
+msgstr "Välj en fil (steg 1 av 2)"
 
 #: shell/importer/import.glade.h:6
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
-"Välkommen till Evolutions importverktyg.\n"
-"Denna guide kommer att hjälpa dig igenom processen med att\n"
+"Välkommen till Evolutions importassistent.\n"
+"Denna assistent kommer att hjälpa dig igenom processen med att\n"
 "importera externa filer till Evolution."
 
 #: shell/importer/intelligent.c:191
@@ -10089,8 +11251,8 @@ msgid "Don't ask me again"
 msgstr "Fråga mig inte igen"
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
-msgstr "Evolution har hittat följande datakällor:"
+msgid "Evolution can import data from the following files:"
+msgstr "Evolution kan importera data från följande filer:"
 
 #: shell/main.c:95
 #, no-c-format
@@ -10131,29 +11293,28 @@ msgstr ""
 "Tack\n"
 "Evolution-teamet\n"
 
-#: shell/main.c:154
+#: shell/main.c:173
 msgid "Cannot access the Evolution shell."
 msgstr "Kan inte komma åt Evolutionskalet."
 
-#: shell/main.c:163
+#: shell/main.c:184
 #, c-format
 msgid "Cannot initialize the Evolution shell: %s"
 msgstr "Kan inte initiera Evolutionskalet: %s"
 
-#: shell/main.c:221
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr "Använd inte startbild"
 
-#: shell/main.c:222
+#: shell/main.c:229
 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:261
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 msgid "Copy"
 msgstr "Kopiera"
 
@@ -10169,11 +11330,11 @@ msgstr "Skapa ny kontakt"
 msgid "Create new contact list"
 msgstr "Skapa ny kontaktlista"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:9
 msgid "Cut the selection"
 msgstr "Klipp ut markeringen"
 
@@ -10181,89 +11342,90 @@ msgstr "Klipp ut markeringen"
 msgid "Delete selected contacts"
 msgstr "Ta bort markerade kontakter"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Ny kontakt"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "New list"
+#: ui/evolution-addressbook.xml.h:12
+msgid "New List"
 msgstr "Ny lista"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13
 msgid "Paste"
 msgstr "Klistra in"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:21
 msgid "Paste the clipboard"
 msgstr "Klistra in från urklipp"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Förhandsgranskar kontakterna som ska skrivas ut"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Skriv ut markerade kontakter"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Spara markerade kontakter som ett VCard."
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Markera allt"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Markera alla kontakter"
 
-#: ui/evolution-addressbook.xml.h:22
-msgid "Send _contact to other"
-msgstr "Skicka _kontakt till annan"
-
-#: ui/evolution-addressbook.xml.h:23
-msgid "Send _message to contact"
-msgstr "Skicka _meddelande till kontakt"
+#: 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
 msgid "Send a mess to the selected contacts."
 msgstr "Skicka ett meddelande till de markerade kontakterna."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "Skicka meddelande till kontakt"
+
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send selected contacts to another person."
 msgstr "Skicka markerade kontakter till en annan person."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Stoppa inläsning"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:29
-#: ui/evolution-comp-editor.xml.h:19 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
+#: ui/evolution-comp-editor.xml.h:20 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:25
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
 #: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "_Åtgärder"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "_Adressbokskällor..."
 
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:33
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact List"
 msgstr "_Kontaktlista"
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:36
-#: ui/evolution-contact-editor.xml.h:16 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+msgid "_Forward Contact..."
+msgstr "_Vidarebefordra kontakt..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:37
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
@@ -10272,17 +11434,17 @@ msgid "_Save as VCard"
 msgstr "_Spara som VCard"
 
 #: ui/evolution-addressbook.xml.h:38
-msgid "_Search for contacts"
-msgstr "_Sök kontakter"
+msgid "_Search for Contacts"
+msgstr "_Sök efter kontakter"
 
 #: ui/evolution-addressbook.xml.h:39
 msgid "_Select All"
 msgstr "_Markera allt"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:37
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:20
-#: ui/my-evolution.xml.h:6
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:40
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:15
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Verktyg"
 
@@ -10295,104 +11457,108 @@ msgid "Create a New All-Day _Event"
 msgstr "Skapa ett nytt _heldagsevenemang"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a _New Appointment"
-msgstr "Skapa ett _nytt möte"
+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"
+msgid "Create a _New Appointment"
+msgstr "Skapa ett _nytt möte"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Create an event for the whole day"
 msgstr "Skapa en händelse som varar en hel dag"
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:10
+msgid "Day"
+msgstr "Dag"
+
+#: ui/evolution-calendar.xml.h:11 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Gå till"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
-msgstr "Gå bakåt i tiden"
+#: ui/evolution-calendar.xml.h:12
+msgid "Go back"
+msgstr "Gå bakåt"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
-msgstr "Gå framåt i tiden"
+#: ui/evolution-calendar.xml.h:13
+msgid "Go forward"
+msgstr "Gå framåt"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Date"
 msgstr "Gå till _datum"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Gå till ett specifikt datum"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "Gå till nuvarande tid"
+#: ui/evolution-calendar.xml.h:17
+msgid "Go to today"
+msgstr "Gå till idag"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:18
+msgid "Month"
+msgstr "Månad"
+
+#: ui/evolution-calendar.xml.h:19
 msgid "New Appointment"
 msgstr "Nytt möte"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:20 ui/evolution-tasks.xml.h:8
+msgid "New Task"
+msgstr "Ny uppgift"
+
+#: ui/evolution-calendar.xml.h:22
 msgid "Previews the calendar to be printed"
 msgstr "Förhandsgranskar kalendern som ska skrivas ut"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "Skriv ut kalender"
+#: ui/evolution-calendar.xml.h:23 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "Förhands_granska"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
+#: ui/evolution-calendar.xml.h:24
+msgid "Print this calendar"
 msgstr "Skriv ut denna kalender"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy Information"
-msgstr "Publicera ledig-/upptageninformation"
-
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:25
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publicera ledig-/upptageninformation för denna kalender"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
-msgstr "Visa 1 dag"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
-msgstr "Visa 1 månad"
-
 #: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
-msgstr "Visa 1 vecka"
+msgid "Show one day"
+msgstr "Visa en dag"
 
 #: ui/evolution-calendar.xml.h:27
-msgid "Show the working week"
-msgstr "Visa arbetsveckan"
+msgid "Show one month"
+msgstr "Visa en månad"
 
 #: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr "_Arbetsvecka"
+msgid "Show one week"
+msgstr "Visa en vecka"
+
+#: ui/evolution-calendar.xml.h:29
+msgid "Show work week"
+msgstr "Visa arbetsvecka"
 
 #: ui/evolution-calendar.xml.h:30
+msgid "Week"
+msgstr "Vecka"
+
+#: ui/evolution-calendar.xml.h:33
 msgid "_Appointment..."
 msgstr "_Möte..."
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:34
 msgid "_Calendar Settings..."
 msgstr "_Kalenderinställningar..."
 
-#: ui/evolution-calendar.xml.h:33
-msgid "_Day"
-msgstr "_Dag"
-
-#: ui/evolution-calendar.xml.h:34
-msgid "_Month"
-msgstr "_Månad"
-
 #: ui/evolution-calendar.xml.h:38
-msgid "_Week"
-msgstr "_Vecka"
+msgid "_Publish Free/Busy Information"
+msgstr "_Publicera ledig-/upptageninformation"
+
+#: ui/evolution-calendar.xml.h:39
+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
@@ -10403,15 +11569,15 @@ msgid "Close"
 msgstr "Stäng"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Stäng detta möte"
+msgid "Close this item"
+msgstr "Stäng detta objekt"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Ta bort detta möte"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Ta bort detta objekt"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Huvudverktygsrad"
 
@@ -10419,15 +11585,11 @@ msgstr "Huvudverktygsrad"
 msgid "Preview the printed item"
 msgstr "Förhandsgranska det utskrivna objektet"
 
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
-msgid "Print Pre_view"
-msgstr "Förhands_granska"
-
 #: ui/evolution-comp-editor.xml.h:11
 msgid "Print S_etup"
 msgstr "Skrivar_inställningar"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Skriv ut detta objekt"
 
@@ -10435,73 +11597,53 @@ msgstr "Skriv ut detta objekt"
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: ui/evolution-comp-editor.xml.h:15
-msgid "Save and Close"
-msgstr "Spara och stäng"
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Spara"
 
 #: ui/evolution-comp-editor.xml.h:16
-msgid "Save the appointment and close the dialog box"
-msgstr "Spara mötet och stäng dialogrutan"
+msgid "Save and Close"
+msgstr "Spara och stäng"
 
 #: ui/evolution-comp-editor.xml.h:17
+msgid "Save the item and close the dialog box"
+msgstr "Spara objektet och stäng dialogrutan"
+
+#: ui/evolution-comp-editor.xml.h:18
 msgid "Save this item to disk"
 msgstr "Spara detta objekt till disk"
 
-#: ui/evolution-comp-editor.xml.h:18
+#: ui/evolution-comp-editor.xml.h:19 ui/evolution-mail-message.xml.h:73
 msgid "Setup the page settings for your current printer"
 msgstr "Ställ in sidinställningarna för din aktuella skrivare"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:37
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete this item"
-msgstr "Ta bort detta objekt"
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Hjälp"
-
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Skriv ut ku_vert..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:244
-msgid "Save"
-msgstr "Spara"
-
-#: ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Spara so_m..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Spara kontakten och stäng dialogrutan"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Ski_cka kontakten till annan..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Se online-hjälpen"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Skicka _meddelande till kontakt..."
-
-#: ui/evolution-contact-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
@@ -10532,19 +11674,19 @@ msgstr "Skicka _meddelande till lista..."
 msgid "Cancel Mee_ting"
 msgstr "Avboka m_öte"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
 msgstr "Avboka mötet för detta objekt"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "Vidarebefordra som i_Calendar"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Vidarebefordra detta objekt via e-post"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr "Få tag i den senaste mötesinformationen"
 
@@ -10556,7 +11698,7 @@ msgstr "U_ppdatera möte"
 msgid "Schedule _Meeting"
 msgstr "Boka _möte"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Schedule a meeting for this item"
 msgstr "Boka ett möte för detta objekt"
 
@@ -10570,47 +11712,47 @@ msgstr "Avbryt"
 
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
-msgstr "Avbryt aktuell e-postoperation"
+msgstr "Avbryt aktuell e-poståtgärd"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "Skriv"
-
-#: ui/evolution-mail-global.xml.h:4
 msgid "Compose _New Message"
 msgstr "Skriv ett _nytt meddelande"
 
-#: ui/evolution-mail-global.xml.h:5
+#: 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:6
+#: 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:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr "Skapa eller redigera definitioner för virtuella mappar"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Töm _papperskorgen"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "_Glöm lösenord"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 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
 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
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Radera alla borttagna meddelanden från alla mappar permanent"
+msgstr "Ta bort alla borttagna meddelanden från alla mappar permanent"
 
 #: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
@@ -10660,97 +11802,101 @@ msgstr "_Prenumerera på mappar..."
 msgid "Change the properties of this folder"
 msgstr "Ändra egenskaperna för denna mapp"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
 msgstr "Kopiera markerade meddelanden"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+msgid "Cu_t"
+msgstr "Klipp _ut"
+
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
 msgstr "Klipp ut markerade meddelanden"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Göm _markerade meddelanden"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Göm _borttagna meddelanden"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr "Göm _lästa meddelanden"
 
-#: ui/evolution-mail-list.xml.h:9
+#: 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"
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Markera alla som l_ästa"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Markera alla synliga meddelanden som lästa"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr "Klistra in meddelandet i urklipp"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "Radera alla borttagna meddelanden från denna mapp permanent"
+msgstr "Ta bort alla borttagna meddelanden från denna mapp permanent"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Markera _alla"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Markera trå_d"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 "Markera alla och endast de meddelanden som inte är markerade för tillfället"
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Markera alla meddelanden i samma tråd som det markerade meddelandet"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Markera alla synliga meddelanden"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
 msgstr "V_isa gömda meddelanden"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Visa meddelanden som har gömts tillfälligt"
 
-#: ui/evolution-mail-list.xml.h:22
+#: 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"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Göm de markerade meddelandena temporärt"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Trådad meddelandelista"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:25
 msgid "_Expunge"
 msgstr "T_öm"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Mapp"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Omvänd markering"
 
@@ -10913,7 +12059,7 @@ msgstr "Markera som _viktigt"
 
 #: ui/evolution-mail-message.xml.h:43
 msgid "Mark as Unimp_ortant"
-msgstr "Markera som ovi_ktigt"
+msgstr "Markera som ovikti_gt"
 
 #: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
@@ -10972,8 +12118,8 @@ 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:58
-msgid "Previews the message to be printed"
-msgstr "Förhandsgranskar meddelandet som ska skrivas ut"
+msgid "Preview the message to be printed"
+msgstr "Förhandsgranska meddelandet som ska skrivas ut"
 
 #: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
@@ -10991,35 +12137,27 @@ msgstr "Föregående meddelande"
 msgid "Previous Unread Message"
 msgstr "Föregående olästa meddelande"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Print Message..."
-msgstr "Skriv ut meddelande..."
-
 #: ui/evolution-mail-message.xml.h:65
-msgid "Print Preview..."
-msgstr "Förhandsgranska..."
-
-#: ui/evolution-mail-message.xml.h:66
 msgid "Print this message"
 msgstr "Skriv ut detta meddelande"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Svara"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 msgid "S_earch Message"
 msgstr "S_ök meddelande"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 msgid "Save the message as a text file"
 msgstr "Spara meddelandet som en textfil"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr "Sök efter text i meddelandetexten på det visade meddelandet"
 
@@ -11102,12 +12240,12 @@ msgstr "Stäng detta fönster"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "S_täng"
 
 #: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:54
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Visa"
 
@@ -11298,7 +12436,7 @@ msgstr "_Svara till-fältet"
 msgid "_Security"
 msgstr "_Säkerhet"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:45
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "_Hjälp"
 
@@ -11331,14 +12469,26 @@ msgid "Unsubscribe"
 msgstr "Säg upp prenumeration"
 
 #: ui/evolution-task-editor.xml.h:1
+msgid "Assign Task"
+msgstr "Tilldela uppgift"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr "Tilldela denna uppgift till andra"
+
+#: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
 msgstr "Avboka uppgift"
 
-#: ui/evolution-task-editor.xml.h:3
-msgid "Delegate Task"
-msgstr "Delegera uppgift"
+#: ui/evolution-task-editor.xml.h:4
+msgid "Cancel this task"
+msgstr "Avboka denna uppgift"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr "Få tag i den senaste uppgiftsinformationen"
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr "Upp_datera uppgift"
 
@@ -11350,10 +12500,6 @@ msgstr "Konfigurera uppgiftsvyns inställningar"
 msgid "Copy selected task"
 msgstr "Kopiera markerad uppgift"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "Skapa en ny uppgift"
-
 #: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Klipp ut markerad uppgift"
@@ -11362,23 +12508,15 @@ msgstr "Klipp ut markerad uppgift"
 msgid "Delete selected tasks"
 msgstr "Ta bort markerade uppgifter"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "New Task"
-msgstr "Ny uppgift"
-
 #: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Klistra in uppgift från urklipp"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Save task as something else"
-msgstr "Spara uppgift som något annat"
-
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:10
 msgid "Tasks Settings"
 msgstr "Uppgiftsinställningar"
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:14
 msgid "_Task"
 msgstr "_Uppgift"
 
@@ -11435,132 +12573,124 @@ msgid "Exit the program"
 msgstr "Avsluta programmet"
 
 #: ui/evolution.xml.h:16
-msgid "Getting _Started"
-msgstr "Komma i _gång"
-
-#: ui/evolution.xml.h:17
 msgid "Import an external file format"
 msgstr "Importera ett externt filformat"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:18
 msgid "Move this folder to another place"
 msgstr "Flytta denna mapp till ett annat ställe"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr "Öppna i nytt _fönster"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr "Öppna denna mapp i ett annat fönster"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Visa information om Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "Skicka felrapport"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "Skicka _felrapport"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Skicka en felrapport med Bug-Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr "Växla"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "Växla om mappraden ska visas"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Växla om genvägsraden ska visas"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr "Växla om vi arbetar frånkopplade."
 
-#: ui/evolution.xml.h:31
-msgid "Using the C_ontact Manager"
-msgstr "Använda k_ontakthanteraren"
-
-#: ui/evolution.xml.h:32
-msgid "Using the _Calendar"
-msgstr "Använda _kalendern"
-
-#: ui/evolution.xml.h:33
-msgid "Using the _Mailer"
-msgstr "Använda _e-postdelen"
-
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "Visa den markerade mappen"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "_Kopiera..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "Mapp_rad"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "_Gå till mapp..."
 
-#: ui/evolution.xml.h:46
-msgid "_Import file..."
-msgstr "_Infoga fil..."
+#: ui/evolution.xml.h:42
+msgid "_Import File..."
+msgstr "_Importera fil..."
 
-#: ui/evolution.xml.h:47
-msgid "_Index"
-msgstr "_Index"
-
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr "_Flytta..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Nytt"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "_Ny mapp"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_Byt namn..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "_Genväg"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_Genvägsrad"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
-msgstr "Ändra inställningarna för Mitt Evolution"
+msgid "Change the settings for the summary"
+msgstr "Ändra inställningarna för sammanfattningen"
 
 #: ui/my-evolution.xml.h:4
-msgid "_My Evolution Settings..."
-msgstr "Inställningar för _Mitt Evolution..."
+msgid "Print summary"
+msgstr "Skriv ut sammanfattning"
+
+#: ui/my-evolution.xml.h:5
+msgid "Reload"
+msgstr "Läs om"
+
+#: ui/my-evolution.xml.h:6
+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"
@@ -11594,6 +12724,28 @@ msgstr "Meddelanden"
 msgid "With Category"
 msgstr "Med kategori"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
+msgstr "Välj en tidszon"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr "Markering:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr "Tidszoner"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+"Använd vänster musknapp för att zooma in på ett intressant område på kartan "
+"och välja en tidszon.\n"
+" Använd höger musknapp för att zooma ut."
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11688,15 +12840,15 @@ msgstr "MTOTFLS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Nu"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Idag"
 
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Tiden måste anges i formatet: %s"
@@ -11794,10 +12946,6 @@ msgstr "Visa alla"
 msgid "Information"
 msgstr "Information"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Varning"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Fel"
@@ -11815,11 +12963,11 @@ msgstr "Meddelande"
 msgid "Don't show this message again."
 msgstr "Visa inte detta meddelande igen."
 
-#: widgets/misc/e-search-bar.c:312
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "S_ök"
 
-#: widgets/misc/e-search-bar.c:407
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "Sök nu"
 
@@ -11843,6 +12991,174 @@ msgstr "init_corba(): kunde inte initiera GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
+#~ msgid "The item could not be sent!\n"
+#~ msgstr "Objektet kunde inte skickas!\n"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "Den %s skrev %s:"
+
+#~ msgid "USA"
+#~ msgstr "USA"
+
+#~ msgid "Send contact to other"
+#~ msgstr "Skicka kontakt till annan"
+
+#~ msgid "Canceled"
+#~ msgstr "Avbruten"
+
+#~ msgid "All"
+#~ msgstr "Alla"
+
+#~ msgid "Unfiled"
+#~ msgstr "Inte kategoriserad"
+
+#~ 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."
+
+#~ msgid "This is a meeting request."
+#~ msgstr "Detta är en mötesbegäran."
+
+#~ msgid "This is one or more additions to a current meeting."
+#~ msgstr "Detta är en eller flera tillägg till ett aktuellt möte."
+
+#~ msgid "This is a request for the latest event information."
+#~ msgstr "Detta är en begäran av den senaste evenemangsinformationen."
+
+#~ msgid "This is an event cancellation."
+#~ msgstr "Detta är en evenemangsavbokning."
+
+#~ msgid "The message is not understandable."
+#~ msgstr "Detta meddelande kan inte förstås."
+
+#~ msgid "This is an task that can be added to your calendar."
+#~ msgstr "Detta är en uppgift som kan läggas till i din kalender."
+
+#~ msgid "This is a task request."
+#~ msgstr "Detta är en begäran om en uppgift."
+
+#~ msgid "This is a reply to a task request."
+#~ msgstr "Detta är ett svar på en uppgiftsbegäran."
+
+#~ msgid "Add"
+#~ msgstr "Lägg till"
+
+#~ msgid "Edit"
+#~ msgstr "Redigera"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Evolutions kontohanterare"
+
+#~ msgid "Evolution Account Wizard"
+#~ msgstr "Kontoguide för Evolution"
+
+#~ msgid "Updating message list"
+#~ msgstr "Uppdaterar meddelandelistan"
+
+#~ msgid "My Evolution Settings"
+#~ msgstr "Inställningar för Mitt Evolution"
+
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%A %d %B %Y"
+
+#~ msgid "Print My Evolution"
+#~ msgstr "Skriv ut Mitt Evolution"
+
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "Utskrift av Mitt Evolution misslyckades"
+
+#~ msgid "My Evolution"
+#~ msgstr "Mitt Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "Ny kontakt"
+
+#~ msgid "Send _contact to other"
+#~ msgstr "Skicka _kontakt till annan"
+
+#~ msgid "Send _message to contact"
+#~ msgstr "Skicka _meddelande till kontakt"
+
+#~ msgid "Go to present time"
+#~ msgstr "Gå till nuvarande tid"
+
+#~ msgid "Print calendar"
+#~ msgstr "Skriv ut kalender"
+
+#~ msgid "Print this Calendar"
+#~ msgstr "Skriv ut denna kalender"
+
+#~ msgid "Show the working week"
+#~ msgstr "Visa arbetsveckan"
+
+#~ msgid "W_ork Week"
+#~ msgstr "_Arbetsvecka"
+
+#~ msgid "_Day"
+#~ msgstr "_Dag"
+
+#~ msgid "_Month"
+#~ msgstr "_Månad"
+
+#~ msgid "_Week"
+#~ msgstr "_Vecka"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Stäng detta möte"
+
+#~ msgid "Delete this appointment"
+#~ msgstr "Ta bort detta möte"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Spara mötet och stäng dialogrutan"
+
+#~ 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"
+
+#~ msgid "Compose"
+#~ msgstr "Skriv"
+
+#~ msgid "Print Message..."
+#~ msgstr "Skriv ut meddelande..."
+
+#~ msgid "Print Preview..."
+#~ msgstr "Förhandsgranska..."
+
+#~ msgid "Delegate Task"
+#~ msgstr "Delegera uppgift"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Spara uppgift som något annat"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Komma i _gång"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Använda k_ontakthanteraren"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Använda _kalendern"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Använda _e-postdelen"
+
+#~ msgid "_Index"
+#~ msgstr "_Index"
+
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "Inställningar för _Mitt Evolution..."
+
 #~ msgid "R_esend..."
 #~ msgstr "Skicka _om..."
 
@@ -12012,9 +13328,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "FIXME Description help text here"
 #~ msgstr "FIXME Beskrivningshjälptext här"
 
-#~ msgid "Addressbook Sources"
-#~ msgstr "Adressbokskällor"
-
 #~ msgid "Name"
 #~ msgstr "Namn"
 
@@ -12107,9 +13420,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Receiving"
 #~ msgstr "Tar emot"
 
-#~ msgid "Sending"
-#~ msgstr "Skickar"
-
 #~ msgid "Set task view preferences"
 #~ msgstr "Ställ in inställningar för uppgiftsvy"
 
@@ -12168,12 +13478,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Create a new calendar"
 #~ msgstr "Skapa en ny kalender"
 
-#~ msgid "Day"
-#~ msgstr "Dag"
-
-#~ msgid "Month"
-#~ msgstr "Månad"
-
 #~ msgid "New _Event"
 #~ msgstr "Nytt _evenemang"
 
@@ -12189,9 +13493,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Settings..."
 #~ msgstr "Inställningar..."
 
-#~ msgid "Week"
-#~ msgstr "Vecka"
-
 #~ msgid "_Open Calendar"
 #~ msgstr "_Öppna kalender"
 
@@ -12411,9 +13712,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Location:"
 #~ msgstr "Plats:"
 
-#~ msgid "Update:"
-#~ msgstr "Uppdatera:"
-
 #~ msgid "WeatherInfo missing location"
 #~ msgstr "Väderinformation-plats saknas."
 
@@ -12447,9 +13745,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Alarms timeout after"
 #~ msgstr "Ljudalarm stängs av efter"
 
-#~ msgid "Colors"
-#~ msgstr "Färger"
-
 #~ msgid "Enable snoozing for"
 #~ msgstr "Aktivera slummer i"
 
@@ -12471,9 +13766,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Show"
 #~ msgstr "Visa"
 
-#~ msgid "TaskPad"
-#~ msgstr "Uppgiftsyta"
-
 #~ msgid "Time Until Due"
 #~ msgstr "Tid till förfallodatum"
 
@@ -12664,9 +13956,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Factory for the RDF summary."
 #~ msgstr "Fabrik för RDF-sammanfattningen."
 
-#~ msgid "RDF Summary"
-#~ msgstr "RDF-sammanfattning"
-
 #~ msgid "Factory for the test bonobo component."
 #~ msgstr "Fabrik för Bonobo-testkomponenten."
 
@@ -12760,9 +14049,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Schedule some sort of a meeting"
 #~ msgstr "Boka någon typ av möte"
 
-#~ msgid "Task _Request (FIXME)"
-#~ msgstr "_Uppgiftsbegäran (FIXME)"
-
 #~ msgid "_About..."
 #~ msgstr "_Om..."
 
@@ -12790,12 +14076,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_Insert text file... (FIXME)"
 #~ msgstr "_Infoga textfil... (FIXME)"
 
-#~ msgid "Assig_n Task (FIXME)"
-#~ msgstr "Tilldela _uppgift (FIXME)"
-
-#~ msgid "Meeting Re_quest (FIXME)"
-#~ msgstr "_Mötesbegäran (FIXME)"
-
 #~ msgid "Redo"
 #~ msgstr "Gör om"
 
@@ -12862,12 +14142,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Create a new email"
 #~ msgstr "Skriv ett nytt e-brev"
 
-#~ msgid "Executive Summary Settings..."
-#~ msgstr "Inställningar för sammanfattningen..."
-
-#~ msgid "New Mail"
-#~ msgstr "Ny post"
-
 #~ msgid "Edit Task"
 #~ msgstr "Redigera uppgift"
 
@@ -12984,9 +14258,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr ""
 #~ "Vidarebefordra detta meddelande inuti ditt brev, så att du kan redigera det"
 
-#~ msgid "Hide Deleted Messages"
-#~ msgstr "Göm borttagna meddelanden"
-
 #~ msgid "Invert Selection"
 #~ msgstr "Omvänd markering"
 
@@ -13389,24 +14660,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Error saving composition to 'Drafts': %s"
 #~ msgstr "Fel vid sparande av alster i \"Drafts\": %s"
 
-#~ msgid "Body or subject contains"
-#~ msgstr "Meddelandetexten eller ämnet innehåller"
-
-#~ msgid "Body contains"
-#~ msgstr "Meddelandetexten innehåller"
-
-#~ msgid "Subject contains"
-#~ msgstr "Ämnesraden innehåller"
-
-#~ msgid "Body does not contain"
-#~ msgstr "Meddelandetexten innehåller inte"
-
-#~ msgid "Subject does not contain"
-#~ msgstr "Ämnesraden innehåller inte"
-
-#~ msgid "Sender contains"
-#~ msgstr "Avsändaren innehåller"
-
 #~ msgid "Note: When converting between mailbox formats, a failure\n"
 #~ msgstr ""
 #~ "Observera: Vid konvertering mellan brevlådeformat kommer ett misslyckande\n"
@@ -13494,9 +14747,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Calendar Preferences..."
 #~ msgstr "Inställningar för kalendern..."
 
-#~ msgid "_Print this calendar"
-#~ msgstr "Skriv _ut denna kalender"
-
 #~ msgid "Create Rule"
 #~ msgstr "Skapa regel"
 
@@ -13563,18 +14813,9 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Open..."
 #~ msgstr "Öppna..."
 
-#~ msgid "Days"
-#~ msgstr "dag"
-
-#~ msgid "Hours"
-#~ msgstr "timme"
-
 #~ msgid "Mail _to:"
 #~ msgstr "E-posta _till:"
 
-#~ msgid "Minutes"
-#~ msgstr "minut"
-
 #~ msgid "_Audio"
 #~ msgstr "_Ljud"
 
@@ -13665,9 +14906,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
 #~ msgstr "UNIX-brevfiler i qmail-brevlådekatalogformat (CamelLocal-version)"
 
-#~ msgid "Hide selected"
-#~ msgstr "Göm markerade"
-
 #~ msgid "Hide deleted"
 #~ msgstr "Göm borttagna"
 
@@ -13792,9 +15030,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Rebuilding message view"
 #~ msgstr "Bygger om meddelandevyn"
 
-#~ msgid "Rebuild message view"
-#~ msgstr "Bygg om meddelandevyn"
-
 #~ msgid "External Directories"
 #~ msgstr "Externa kataloger"
 
@@ -13909,9 +15144,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_Save Calendar As"
 #~ msgstr "_Spara kalendern som"
 
-#~ msgid "may"
-#~ msgstr "maj"
-
 #~ msgid "sept"
 #~ msgstr "sept"
 
@@ -13963,9 +15195,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "yesterday"
 #~ msgstr "igår"
 
-#~ msgid "today"
-#~ msgstr "idag"
-
 #~ msgid "this"
 #~ msgstr "den"
 
@@ -14102,9 +15331,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Time format"
 #~ msgstr "Tidsformat"
 
-#~ msgid "12-hour (AM/PM)"
-#~ msgstr "12-timmars (FM/EM)"
-
 #~ msgid "24-hour"
 #~ msgstr "24-timmars"
 
@@ -14229,3 +15455,60 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
 #~ msgid "Send a message to the selected contacts."
 #~ msgstr "Skicka ett meddelande till de markerade kontakterna."
+
+#~ msgid "Antigua"
+#~ msgstr "Antigua och Barbuda"
+
+#~ msgid "Ascention Island"
+#~ msgstr "Ascentionön"
+
+#~ msgid "Australian Antartic Territory"
+#~ msgstr "Australiska Antarktisterritoriet"
+
+#~ msgid "Brunei"
+#~ msgstr "Brunei"
+
+#~ msgid "Diego Garcia"
+#~ msgstr "Diego Garcia"
+
+#~ msgid "Federated States of Micronesia"
+#~ msgstr "Mikronesiska Federationen"
+
+#~ msgid "French Antilles"
+#~ msgstr "Franska Antillerna"
+
+#~ msgid "Guantanomo Bay"
+#~ msgstr "Guantonomobukten"
+
+#~ msgid "INMARSAT"
+#~ msgstr "INMARSAT"
+
+#~ msgid "INMARSAT Atlantic East"
+#~ msgstr "INMARSAT Atlantic East"
+
+#~ msgid "Iran"
+#~ msgstr "Iran"
+
+#~ msgid "Iraq"
+#~ msgstr "Irak"
+
+#~ msgid "Ivory Coast"
+#~ msgstr "Elfenbenskusten"
+
+#~ msgid "South Korea"
+#~ msgstr "Sydkorea"
+
+#~ msgid "Libya"
+#~ msgstr "Libyen"
+
+#~ msgid "Tanzania"
+#~ msgstr "Tanzania"
+
+#~ msgid "UK"
+#~ msgstr "Storbritannien"
+
+#~ msgid "Vatican City"
+#~ msgstr "Vatikanstaten"
+
+#~ msgid "Zaire"
+#~ msgstr "Kongo (f.d. Zaire)"