Updated Swedish translation.

2004-12-18 Christian Rose <menthos@menthos.com> * sv.po: Updated Swedish translation. svn path=/trunk/; revision=28149
author: Christian Rose <menthos@menthos.com> 2004-12-18 07:07:59 +0800
committer: Christian Rose <menthos@src.gnome.org> 2004-12-18 07:07:59 +0800
commit: 84700b4c86fa9b5de9c802fdf32f9f089a54c9b5 (patch)
tree: f503a23a3fef7e2c373325a8cba71c435e6eb02d /po/sv.po
parent: 02e497ddf29a17f87aa8979cc511506d5eb46011 (diff)
download: gsoc2013-evolution-84700b4c86fa9b5de9c802fdf32f9f089a54c9b5.tar.gz
gsoc2013-evolution-84700b4c86fa9b5de9c802fdf32f9f089a54c9b5.tar.zst
gsoc2013-evolution-84700b4c86fa9b5de9c802fdf32f9f089a54c9b5.zip
1 files changed, 4170 insertions, 3676 deletions
diff --git a/po/sv.po b/po/sv.po
index d61d435209..4570e02bfe 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,15 +9,16 @@
 # Terminology
 # appointment = möte
 # meeting = sammanträde
+# event = evenemang
 #
-# $Id: sv.po,v 1.202 2004/08/13 20:06:29 jpr Exp $
+# $Id: sv.po,v 1.203 2004/12/17 23:07:59 menthos Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-13 14:55-0400\n"
-"PO-Revision-Date: 2004-07-02 17:45+0200\n"
+"POT-Creation-Date: 2004-12-18 00:04+0100\n"
+"PO-Revision-Date: 2004-12-18 00:06+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,65 @@ msgstr ""
 
 #: a11y/addressbook/ea-addressbook-view.c:94
 #: a11y/addressbook/ea-addressbook-view.c:103
-#: a11y/addressbook/ea-minicard-view.c:119
+#: a11y/addressbook/ea-minicard-view.c:172
 msgid "evolution addressbook"
 msgstr "evolution-adressbok"
 
+#: a11y/addressbook/ea-minicard-view.c:34
+#: addressbook/gui/component/addressbook-component.c:97
+msgid "New Contact"
+msgstr "Ny kontakt"
+
+#: a11y/addressbook/ea-minicard-view.c:35
+#: addressbook/gui/component/addressbook-component.c:105
+msgid "New Contact List"
+msgstr "Ny kontaktlista"
+
 # Buggigt!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61060
-#: a11y/addressbook/ea-minicard-view.c:101
+#: a11y/addressbook/ea-minicard-view.c:153
 msgid "current addressbook folder "
 msgstr "aktuella adressboksmappen "
 
 # Buggigt!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61060
-#: a11y/addressbook/ea-minicard-view.c:102
+#: a11y/addressbook/ea-minicard-view.c:154
 msgid "have "
 msgstr "har "
 
 # Buggigt!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61060
-#: a11y/addressbook/ea-minicard-view.c:102
+#: a11y/addressbook/ea-minicard-view.c:154
 msgid "has "
 msgstr "har "
 
 # Buggigt!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61060
-#: a11y/addressbook/ea-minicard-view.c:104
+#: a11y/addressbook/ea-minicard-view.c:156
 msgid " cards"
 msgstr " kort"
 
 # Buggigt!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61060
-#: a11y/addressbook/ea-minicard-view.c:104
+#: a11y/addressbook/ea-minicard-view.c:156
 msgid " card"
 msgstr " kort"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "kontaktens huvud: "
+#: a11y/addressbook/ea-minicard.c:31
+#: calendar/gui/alarm-notify/alarm-queue.c:863
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Öppna"
+
+#: a11y/addressbook/ea-minicard.c:138
+msgid "Contact List: "
+msgstr "Kontaktlista: "
+
+#: a11y/addressbook/ea-minicard.c:139
+msgid "Contact: "
+msgstr "Kontakt: "
 
-#: a11y/addressbook/ea-minicard.c:166
+#: a11y/addressbook/ea-minicard.c:165
 msgid "evolution minicard"
 msgstr "evolution-minikort"
 
@@ -77,11 +98,11 @@ msgstr "Denna adressbok kunde inte öppnas."
 #. addressbook:ldap-init secondary
 #: addressbook/addressbook-errors.xml.h:4
 msgid ""
-"This addressbook server might unreachable or the server name may be "
+"This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
 "Denna adressboksserver kan vara onåbar, servernamnet kan vara felstavat, "
-"eller din nätverksanslutning kan vara nere."
+"eller så kan din nätverksanslutning vara nere."
 
 #. addressbook:ldap-auth primary
 #: addressbook/addressbook-errors.xml.h:6
@@ -135,9 +156,23 @@ msgstr "LDAP-servern svarade inte med giltig schemainformation."
 msgid "Could not remove addressbook."
 msgstr "Kunde inte ta bort adressboken."
 
+#. addressbook:ask-delete-addressbook primary
+#: addressbook/addressbook-errors.xml.h:22
+msgid "Delete address book '{0}'?"
+msgstr "Ta bort adressboken \"{0}\"?"
+
+#. addressbook:ask-delete-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "This address book will be removed permanently."
+msgstr "Denna adressbok kommer att tas bort permanent."
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:26
+msgid "Category editor not available."
+msgstr "Kategoriredigeraren är inte tillgänglig."
+
 # Vad är detta?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61062
-#. addressbook:remove-addressbook secondary
 #. addressbook:generic-error primary
 #. addressbook:load-error secondary
 #. addressbook:search-error secondary
@@ -149,10 +184,9 @@ msgstr "Kunde inte ta bort adressboken."
 #. mail:session-message-error-cancel secondary
 #. mail:ask-session-password secondary
 #. mail:filter-load-error secondary
-#: addressbook/addressbook-errors.xml.h:22
-#: addressbook/addressbook-errors.xml.h:26
-#: addressbook/addressbook-errors.xml.h:34
-#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: addressbook/addressbook-errors.xml.h:28
+#: addressbook/addressbook-errors.xml.h:36
+#: addressbook/addressbook-errors.xml.h:40 mail/mail-errors.xml.h:70
 #: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
 #: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
 #: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
@@ -160,61 +194,54 @@ msgstr "Kunde inte ta bort adressboken."
 msgid "{0}"
 msgstr "{0}"
 
-#. addressbook:edit-categories primary
-#: addressbook/addressbook-errors.xml.h:24
-msgid "Category editor not available."
-msgstr "Kategoriredigeraren är inte tillgänglig."
-
 # Vad är detta?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61062
 #. addressbook:generic-error secondary
 #. mail-composer:no-attach secondary
 #. mail:no-save-path secondary
-#: addressbook/addressbook-errors.xml.h:28
+#: addressbook/addressbook-errors.xml.h:30
 #: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
 msgid "{1}"
 msgstr "{1}"
 
 #. addressbook:load-error title
-#: addressbook/addressbook-errors.xml.h:30
+#: addressbook/addressbook-errors.xml.h:32
 msgid "Unable to open addressbook"
 msgstr "Kan inte öppna adressbok"
 
 #. addressbook:load-error primary
-#: addressbook/addressbook-errors.xml.h:32
+#: addressbook/addressbook-errors.xml.h:34
 msgid "Error loading addressbook."
 msgstr "Fel vid inläsning av adressbok."
 
 #. addressbook:search-error primary
-#: addressbook/addressbook-errors.xml.h:36
+#: addressbook/addressbook-errors.xml.h:38
 msgid "Unable to perform search."
 msgstr "Kan inte utföra sökning."
 
 #. addressbook:prompt-save primary
-#: addressbook/addressbook-errors.xml.h:40
+#: addressbook/addressbook-errors.xml.h:42
 msgid "Would you like to save your changes?"
 msgstr "Vill du spara dina ändringar?"
 
 #. addressbook:prompt-save secondary
-#: addressbook/addressbook-errors.xml.h:42
+#: addressbook/addressbook-errors.xml.h:44
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Du har ändrat denna kontakt. Vill du spara dessa ändringar?"
 
-#: addressbook/addressbook-errors.xml.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:2803
-#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+#: addressbook/addressbook-errors.xml.h:45
 msgid "_Discard"
 msgstr "_Förkasta"
 
 #. addressbook:prompt-move primary
-#: addressbook/addressbook-errors.xml.h:45
+#: addressbook/addressbook-errors.xml.h:47
 msgid "Cannot move contact."
 msgstr "Kan inte flytta kontakt."
 
 #. addressbook:prompt-move secondary
-#: addressbook/addressbook-errors.xml.h:47
+#: addressbook/addressbook-errors.xml.h:49
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -223,146 +250,200 @@ msgstr ""
 "inte flyttas från källan. Vill du spara en kopia istället?"
 
 #. addressbook:save-error primary
-#: addressbook/addressbook-errors.xml.h:49
+#: addressbook/addressbook-errors.xml.h:51
 msgid "Unable to save contact(s)."
 msgstr "Kunde inte spara kontakt(er)."
 
 #. addressbook:save-error secondary
-#: addressbook/addressbook-errors.xml.h:51
+#: addressbook/addressbook-errors.xml.h:53
 msgid "Error saving contacts to {0}: {1}"
 msgstr "Fel vid sparande av kontakter till {0}: {1}"
 
 #. addressbook:backend-died primary
-#: addressbook/addressbook-errors.xml.h:53
+#: addressbook/addressbook-errors.xml.h:55
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolutions adressbok har oväntat avslutats."
 
 #. addressbook:backend-died secondary
-#: addressbook/addressbook-errors.xml.h:55
+#: addressbook/addressbook-errors.xml.h:57
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Dina kontakter för {0} kommer inte att vara tillgängliga innan Evolution har "
 "startats om."
 
+#. addressbook:ask-list-add-exists primary
+#: addressbook/addressbook-errors.xml.h:59
+msgid "Address '{0}' already exists."
+msgstr "Adressen \"{0}\" finns redan."
+
+#. addressbook:ask-list-add-exists secondary
+#: addressbook/addressbook-errors.xml.h:61
+msgid ""
+"A contact already exists with this address.  Would you like to add a new "
+"card with the same address anyway?"
+msgstr ""
+"Det finns redan en kontakt med denna adress. Vill du ändå lägga till ett "
+"nytt kort med samma adress?"
+
+#: addressbook/addressbook-errors.xml.h:62 mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Lägg till"
+
 #: addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Standardsynkroniseringsadress:"
 
-#: addressbook/conduit/address-conduit.c:1181
-#: addressbook/conduit/address-conduit.c:1182
+#: addressbook/conduit/address-conduit.c:1183
+#: addressbook/conduit/address-conduit.c:1184
 msgid "Could not load addressbook"
 msgstr "Kunde inte läsa in adressboken"
 
-#: addressbook/conduit/address-conduit.c:1250
-#: addressbook/conduit/address-conduit.c:1253
+#: addressbook/conduit/address-conduit.c:1252
+#: addressbook/conduit/address-conduit.c:1255
 msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte läsa pilotens adressprogramblock"
 
-# Varför är detta markerat för översättning?
-# http://bugzilla.ximian.com/show_bug.cgi?id=61062
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "*Control*F2"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Autocompletion"
 msgstr "Automatisk ifyllning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "K_ontakter"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "Certificates"
 msgstr "Certifikat"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configure autocomplete here"
 msgstr "Konfigurera automatisk ifyllning här"
 
 #. Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/gui/component/addressbook-view.c:1104
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/addressbook-view.c:1118
 #: calendar/gui/migration.c:377
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Addressbook"
 msgstr "Evolutions adressbok"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address pop-up"
 msgstr "Adress-popup för Evolutions adressbok"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address viewer"
 msgstr "Adressvisare för Evolutions adressbok"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook card viewer"
 msgstr "Kortvisare för Evolutions adressbok"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook component"
 msgstr "Evolutions adressbokskomponent"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Evolutionkontroll för S/Mime-certifikathantering"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
 msgstr "Evolutions konfigurationskontroll för mappinställningar"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manage your S/MIME certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:93
-msgid "New Contact"
-msgstr "Ny kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:94
+#: addressbook/gui/component/addressbook-component.c:98
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:95
+#: addressbook/gui/component/addressbook-component.c:99
 msgid "Create a new contact"
 msgstr "Skapa en ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:101
-msgid "New Contact List"
-msgstr "Ny kontaktlista"
-
-#: addressbook/gui/component/addressbook-component.c:102
+#: addressbook/gui/component/addressbook-component.c:106
 msgid "Contact _List"
 msgstr "Kontakt_lista"
 
-#: addressbook/gui/component/addressbook-component.c:103
+#: addressbook/gui/component/addressbook-component.c:107
 msgid "Create a new contact list"
 msgstr "Skapa en ny kontaktlista"
 
-#: addressbook/gui/component/addressbook-component.c:109
-#: addressbook/gui/component/addressbook-view.c:773
+#: addressbook/gui/component/addressbook-component.c:113
+#: addressbook/gui/component/addressbook-config.c:1073
+#: addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "Ny adressbok"
 
-#: addressbook/gui/component/addressbook-component.c:110
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:114
 msgid "Address _Book"
-msgstr "Adress_bok:"
+msgstr "Adress_bok"
 
-#: addressbook/gui/component/addressbook-component.c:111
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:115
 msgid "Create a new address book"
-msgstr "Skapa en ny uppgift"
+msgstr "Skapa en ny adressbok"
 
-#: addressbook/gui/component/addressbook-component.c:184
+#: addressbook/gui/component/addressbook-component.c:188
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Misslyckades med att uppgradera inställningar eller mappar."
 
+#: addressbook/gui/component/addressbook-config.c:314
+msgid "Base"
+msgstr "Bas"
+
+#: addressbook/gui/component/addressbook-config.c:509
+#: calendar/gui/dialogs/calendar-setup.c:191
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Typ:"
+
+#: addressbook/gui/component/addressbook-config.c:862
+#: addressbook/gui/component/ldap-config.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/calendar-setup.c:324
+#: calendar/gui/dialogs/calendar-setup.c:334 mail/em-folder-properties.c:213
+#: mail/mail-config.glade.h:85 smime/gui/smime-ui.glade.h:27
+msgid "General"
+msgstr "Allmänt"
+
+#: addressbook/gui/component/addressbook-config.c:863
+#: mail/importers/pine-importer.c:479
+msgid "Addressbook"
+msgstr "Adressbok"
+
+#: addressbook/gui/component/addressbook-config.c:866
+msgid "Server Information"
+msgstr "Serverinformation"
+
+#: addressbook/gui/component/addressbook-config.c:868
+msgid "Authentication"
+msgstr "Autentisering"
+
+#: addressbook/gui/component/addressbook-config.c:871
+#: addressbook/gui/component/ldap-config.glade.h:18
+#: mail/mail-dialogs.glade.h:12 smime/gui/smime-ui.glade.h:19
+msgid "Details"
+msgstr "Detaljer"
+
+#: addressbook/gui/component/addressbook-config.c:872
+msgid "Searching"
+msgstr "Söker"
+
+#: addressbook/gui/component/addressbook-config.c:874
+msgid "Downloading"
+msgstr "Hämtning"
+
+#: addressbook/gui/component/addressbook-config.c:1071
+#: addressbook/gui/component/ldap-config.glade.h:14
+msgid "Address Book Properties"
+msgstr "Egenskaper för adressboken"
+
 #: addressbook/gui/component/addressbook-migrate.c:72
 #: calendar/gui/migration.c:141 mail/em-migrate.c:1160
 msgid "Migrating..."
@@ -377,9 +458,9 @@ msgstr "Migrerar \"%s\""
 #. create the local source group
 #. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:493
-#: calendar/gui/migration.c:450 calendar/gui/migration.c:532
+#: calendar/gui/migration.c:451 calendar/gui/migration.c:544
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-component.c:245 mail/mail-vfolder.c:218
+#: mail/mail-component.c:270 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "På denna dator"
 
@@ -389,9 +470,9 @@ msgstr "På denna dator"
 #. orange
 #: addressbook/gui/component/addressbook-migrate.c:501
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/migration.c:458 calendar/gui/migration.c:540
+#: calendar/gui/migration.c:459 calendar/gui/migration.c:552
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:102
 msgid "Personal"
 msgstr "Personligt"
 
@@ -450,15 +531,9 @@ msgstr ""
 "\n"
 "Ha tålamod medan Evolution migrerar dina Pilot Sync-data..."
 
-#: addressbook/gui/component/addressbook-view.c:671
-#, c-format
-msgid "Address book '%s' will be removed. Are you sure you want to continue?"
-msgstr ""
-"Adressboken \"%s\" kommer att tas bort. Är du säker på att du vill fortsätta?"
-
-#: addressbook/gui/component/addressbook-view.c:774
-#: addressbook/gui/widgets/e-addressbook-view.c:1124
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:376
+#: addressbook/gui/component/addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-view.c:934
+#: calendar/gui/calendar-component.c:385 calendar/gui/tasks-component.c:330
 #: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -467,8 +542,8 @@ msgstr ""
 msgid "Delete"
 msgstr "Ta bort"
 
-#: addressbook/gui/component/addressbook-view.c:775
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:378
+#: addressbook/gui/component/addressbook-view.c:760
+#: calendar/gui/calendar-component.c:386 calendar/gui/tasks-component.c:331
 msgid "Properties..."
 msgstr "Egenskaper..."
 
@@ -477,38 +552,66 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Ansluter anonymt till LDAP-servern"
 
 #: addressbook/gui/component/addressbook.c:184
-#: camel/providers/groupwise/camel-gw-listener.c:420
+#: camel/providers/groupwise/camel-gw-listener.c:494
 msgid "Failed to authenticate.\n"
 msgstr "Misslyckades med autentisering.\n"
 
 #: addressbook/gui/component/addressbook.c:191
-#: camel/providers/groupwise/camel-gw-listener.c:409
+#: camel/providers/groupwise/camel-gw-listener.c:483
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sAnge lösenord för %s (användare %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
-msgid "EFolderList xml for the list of completion uris"
-msgstr "EFolderList xml för listan över ifyllnings-URI:er"
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "EFolderList XML för listan över ifyllnings-URI:er"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "EFolderList XML för listan över ifyllnings-URI:er"
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid "Position of the vertical pane in main view"
 msgstr "Position för den vertikala panelen i huvudvyn"
 
-# Evolution bör skrivas med stort E
-# http://bugzilla.ximian.com/show_bug.cgi?id=61065
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+msgid "Position of the vertical pane in main view."
+msgstr "Position för den vertikala panelen i huvudvyn."
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Show the \"Preview\" pane"
+msgstr "Visa panelen \"Förhandsvisning\""
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Show the \"Preview\" pane."
+msgstr "Visa panelen \"Förhandsvisning\"."
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid ""
-"The number of characters that must be typed before evolution will attempt to "
+"The number of characters that must be typed before Evolution will attempt to "
 "autocomplete"
 msgstr ""
-"Antalet tecken som måste skrivas innan evolution automatiskt kommer att "
+"Antalet tecken som måste skrivas innan Evolution automatiskt kommer att "
 "försöka fylla i"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+"Antalet tecken som måste skrivas innan Evolution automatiskt kommer att "
+"försöka fylla i."
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI för den mapp som senast användes i namnväljardialogen"
 
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+msgid "URI for the folder last used in the select names dialog."
+msgstr "URI för den mapp som senast användes i namnväljardialogen."
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -576,16 +679,10 @@ msgid "<b>Type:</b>"
 msgstr "<b>Typ:</b>"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
 msgid "Add Address Book"
-msgstr "Adressbok"
-
-#: addressbook/gui/component/ldap-config.glade.h:14
-msgid "Address Book Properties"
-msgstr "Egenskaper för adressboken"
+msgstr "Lägg till adressbok"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid "Always"
 msgstr "Alltid"
 
@@ -597,11 +694,6 @@ msgstr "Anonymt"
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: addressbook/gui/component/ldap-config.glade.h:18
-#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
-msgid "Details"
-msgstr "Detaljer"
-
 #: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Distinguished name"
@@ -621,19 +713,11 @@ msgstr ""
 msgid "Find Possible Search Bases"
 msgstr "Sök möjliga sökbaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
-msgid "General"
-msgstr "Allmänt"
-
 #: addressbook/gui/component/ldap-config.glade.h:24
-#, fuzzy
 msgid "Lo_gin:"
-msgstr "Inloggning"
+msgstr "Inlo_ggning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Never"
 msgstr "Aldrig"
 
@@ -721,15 +805,13 @@ msgstr ""
 "Detta är det största antalet poster att hämta. Att ställa in detta tal för "
 "högt kommer att slöa ned adressboken."
 
-# Evolution bör skrivas med stort E
-# http://bugzilla.ximian.com/show_bug.cgi?id=61065
 #: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
-"This is the method evolution will use to authenticate you.  Note that "
+"This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
-"Detta är den metod som evolution kommer att använda för att autentisera dig. "
+"Detta är den metod som Evolution kommer att använda för att autentisera dig. "
 "Observera att ställa in detta till \"E-postadress\" kräver anonym åtkomst "
 "till din ldap-server."
 
@@ -759,15 +841,13 @@ msgstr "Använder distinguished name (DN)"
 msgid "Using email address"
 msgstr "Använder e-postadress"
 
-#: addressbook/gui/component/ldap-config.glade.h:42 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:156
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid "Whenever Possible"
 msgstr "Närsomhelst"
 
 #: addressbook/gui/component/ldap-config.glade.h:43
-#, fuzzy
 msgid "_Add Address Book"
-msgstr "Adressbok"
+msgstr "_Lägg till adressbok"
 
 #: addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
@@ -782,7 +862,8 @@ msgid "_Log in method:"
 msgstr "_Inloggningsmetod:"
 
 #: addressbook/gui/component/ldap-config.glade.h:47
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
+#: calendar/gui/dialogs/calendar-setup.c:243
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Namn:"
 
@@ -811,9 +892,9 @@ msgid "cards"
 msgstr "kort"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:12
 #: calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
-#: mail/mail-config.glade.h:183
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:16
 msgid "minutes"
 msgstr "minut"
 
@@ -821,35 +902,35 @@ msgstr "minut"
 msgid "Evolution Addressbook name selection interface"
 msgstr "Evolutions adressboks namnvalsgränssnitt"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+#: addressbook/gui/component/select-names/e-select-names-popup.c:207
 msgid "Remove All"
 msgstr "Ta bort alla"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
-#: addressbook/gui/component/select-names/e-select-names.c:702
-#: calendar/gui/dialogs/cal-prefs-dialog.c:724
+#: addressbook/gui/component/select-names/e-select-names-popup.c:214
+#: addressbook/gui/component/select-names/e-select-names.c:690
+#: calendar/gui/dialogs/cal-prefs-dialog.c:723
 msgid "Remove"
 msgstr "Ta bort"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:222
+#: addressbook/gui/component/select-names/e-select-names-popup.c:221
 msgid "View Contact List"
 msgstr "Visa kontaktlista"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:222
+#: addressbook/gui/component/select-names/e-select-names-popup.c:221
 msgid "View Contact Info"
 msgstr "Visa kontaktinformation"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:229
-#: addressbook/gui/component/select-names/e-select-names-popup.c:330
+#: addressbook/gui/component/select-names/e-select-names-popup.c:228
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
 msgid "Send HTML Mail?"
 msgstr "Skicka HTML-post?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/component/select-names/e-select-names-popup.c:319
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Lägg till i kontakter"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:348
+#: addressbook/gui/component/select-names/e-select-names-popup.c:345
 msgid "Unnamed Contact"
 msgstr "Namnlös kontakt:"
 
@@ -861,7 +942,7 @@ msgstr "Namn"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:228
+#: addressbook/gui/widgets/e-addressbook-view.c:229
 msgid "Source"
 msgstr "Källkod"
 
@@ -932,7 +1013,7 @@ msgstr "<b>Jobb</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "AIM"
 msgstr "AIM"
 
@@ -966,14 +1047,14 @@ msgstr "Företag:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: addressbook/gui/contact-editor/e-contact-editor.c:272
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:172
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:173
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:526
+#: addressbook/gui/contact-editor/e-contact-editor.c:533
 msgid "Contact Editor"
 msgstr "Kontaktredigerare"
 
@@ -1065,10 +1146,10 @@ msgstr "Webblogg:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:235
 #: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:147
 msgid "Work"
 msgstr "Jobb"
 
@@ -1085,26 +1166,26 @@ msgid "_File under:"
 msgstr "_Arkivera under:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Var:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:352
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Address"
 msgstr "Adress"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:186
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:187
 #: addressbook/gui/widgets/e-addressbook-model.c:309
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard-view.c:519
 #: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Redigerbar"
@@ -1846,7 +1927,7 @@ msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Saint Vincent And The Grena-dines"
+msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent och Grenadinerna"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
@@ -2083,7 +2164,7 @@ msgstr "AOL Instant Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2093,7 +2174,7 @@ msgstr "Yahoo Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
 #: addressbook/gui/contact-editor/e-contact-editor.c:188
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2102,7 +2183,7 @@ msgid "Service"
 msgstr "Tjänst"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/dialogs/cal-prefs-dialog.c:577
 #: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Location"
 msgstr "Plats"
@@ -2111,28 +2192,28 @@ msgstr "Plats"
 msgid "Username"
 msgstr "Användarnamn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:231
 #: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Hem"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:239
 #: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Annat"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:350
 msgid "MSN"
 msgstr "MSN"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:189
-#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2152,24 +2233,27 @@ msgstr "Är ny kontakt"
 msgid "Writable Fields"
 msgstr "Skrivbara fält"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:300
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+msgid "Required Fields"
+msgstr "Obligatoriska fält"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:307
 msgid "Changed"
 msgstr "Ändrad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2428
+#: addressbook/gui/contact-editor/e-contact-editor.c:2463
 msgid "This contact belongs to these categories:"
 msgstr "Denna kontakt tillhör dessa kategorier:"
 
-#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2505
+#: addressbook/gui/contact-editor/e-contact-editor.c:2556
 msgid "Please select an image for this contact"
 msgstr "Välj en bild för denna kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2509
+#: addressbook/gui/contact-editor/e-contact-editor.c:2557
 msgid "No image"
 msgstr "Ingen bild"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2712
+#: addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2177,26 +2261,10 @@ msgstr ""
 "Data för kontakten är ogiltiga:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2740
+#: addressbook/gui/contact-editor/e-contact-editor.c:2885
 msgid "Invalid contact."
 msgstr "Ogiltig kontakt."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2799
-msgid ""
-"The contact cannot be saved to the selected address book. Do you want to "
-"discard changes?"
-msgstr ""
-"Kontakten kan inte sparas till den valda adressboken. Vill du förkasta "
-"ändringar?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2822
-msgid ""
-"You are moving the contact from one address book to another, but it cannot "
-"be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"Du flyttar kontakten från en adressbok till en annan, men den kan inte tas "
-"bort från källan. Vill du spara en kopia istället?"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Snabbinläggning av kontakt"
@@ -2206,7 +2274,7 @@ msgid "_Edit Full"
 msgstr "_Redigera fullständigt namn"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:156
 msgid "_Full Name:"
 msgstr "_Fullständigt namn:"
 
@@ -2356,62 +2424,58 @@ msgid "Add an email to the List"
 msgstr "Lägg till ett e-brev till listan"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:814
+msgid "Contact List Editor"
+msgstr "Kontaktlisteredigerare"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email adresses from Adress Book"
 msgstr "Infoga e-postadressen från adressboken"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:714
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:715
 msgid "Members"
 msgstr "Medlemmar"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Ta bort e-postadresser från listan"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "Select"
 msgstr "Markera"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Dölj adresser då e-post skickas till denna lista"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_List name:"
 msgstr "_Listnamn:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Ange en e-postadress eller dra en kontakt till listan nedan:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
-
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:165
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:166
 #: addressbook/gui/widgets/e-addressbook-model.c:295
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:221
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:377
+#: addressbook/gui/widgets/e-addressbook-view.c:222
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
-#: addressbook/gui/widgets/e-minicard-view.c:484
+#: addressbook/gui/widgets/e-minicard-view.c:505
 msgid "Book"
 msgstr "Bok"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:179
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:180
 msgid "Is New List"
 msgstr "Är ny lista"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:736
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:737
 #: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
+#: calendar/gui/e-meeting-list-view.c:458
 msgid "Required Participants"
 msgstr "Nödvändiga deltagare"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:813
-msgid "Contact List Editor"
-msgstr "Kontaktlisteredigerare"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Ändrad kontakt:"
@@ -2467,10 +2531,10 @@ msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakter"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:235
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
+#: addressbook/gui/widgets/e-addressbook-view.c:236
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#: addressbook/gui/widgets/e-minicard-view.c:491
+#: addressbook/gui/widgets/e-minicard-view.c:512
 msgid "Query"
 msgstr "Fråga"
 
@@ -2478,7 +2542,7 @@ msgstr "Fråga"
 msgid "Error getting book view"
 msgstr "Fel vid hämtande av bokvy"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 msgid "Model"
 msgstr "Modell"
 
@@ -2486,130 +2550,101 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Fel vid ändring av kort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Name begins with"
 msgstr "Namn börjar med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:168
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Email begins with"
 msgstr "E-postadress börjar med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:169
-#: calendar/gui/cal-search-bar.c:54
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori är"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:170
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Något fält innehåller"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:171
-#: addressbook/gui/widgets/e-addressbook-view.c:176
+#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:177
 msgid "Advanced..."
 msgstr "Avancerat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:242
+#: addressbook/gui/widgets/e-addressbook-view.c:243
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:227
+#: calendar/gui/e-meeting-list-view.c:228
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Typ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:544
+#: addressbook/gui/widgets/e-addressbook-view.c:540
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
-#: addressbook/gui/widgets/e-addressbook-view.c:2098
+#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:1972
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Spara som VCard..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1095
+#: addressbook/gui/widgets/e-addressbook-view.c:917
 msgid "New Contact..."
 msgstr "Ny kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
+#: addressbook/gui/widgets/e-addressbook-view.c:918
 msgid "New Contact List..."
 msgstr "Ny kontaktlista..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-msgid "Go to Folder..."
-msgstr "Gå till mapp..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
-msgid "Import..."
-msgstr "Importera..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1102
-msgid "Search for Contacts..."
-msgstr "Sök efter kontakter..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1103
-msgid "Address Book Sources..."
-msgstr "Adressbokskällor..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1105
-msgid "Pilot Settings..."
-msgstr "Pilotinställningar..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:922
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Vidarebefordra kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1110
+#: addressbook/gui/widgets/e-addressbook-view.c:923
 msgid "Send Message to Contact"
 msgstr "Skicka meddelande till kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1111 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:924 calendar/gui/print.c:2483
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
-msgid "Print Envelope"
-msgstr "Skriv ut kuvert"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: addressbook/gui/widgets/e-addressbook-view.c:927
 msgid "Copy to Address Book..."
 msgstr "Kopiera till adressbok..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: addressbook/gui/widgets/e-addressbook-view.c:928
 msgid "Move to Address Book..."
 msgstr "Flytta till adressbok..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1121
+#: addressbook/gui/widgets/e-addressbook-view.c:931
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1122
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:374
+#: addressbook/gui/widgets/e-addressbook-view.c:932
+#: calendar/gui/calendar-component.c:384 calendar/gui/tasks-component.c:329
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiera"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: addressbook/gui/widgets/e-addressbook-view.c:933
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Klistra in"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1128
-#: calendar/gui/e-calendar-view.c:1418
-msgid "Current View"
-msgstr "Aktuell vy"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1683
-#: calendar/gui/cal-search-bar.c:358
+#: addressbook/gui/widgets/e-addressbook-view.c:1526
+#: calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "Alla kategorier"
 
@@ -2642,6 +2677,7 @@ msgid "Car Phone"
 msgstr "Biltelefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-cal-list-view.etspec.h:1
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Categories"
@@ -2652,17 +2688,17 @@ msgid "Company Phone"
 msgstr "Företagets telefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:547 smime/lib/e-cert.c:826
+#: addressbook/gui/widgets/eab-contact-display.c:560 smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-post"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/eab-popup-control.c:441
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/eab-popup-control.c:451
 msgid "Email 3"
 msgstr "E-post 3"
 
@@ -2703,7 +2739,7 @@ msgid "Manager"
 msgstr "Manager"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/widgets/eab-contact-display.c:379
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
@@ -2712,7 +2748,7 @@ msgid "Nickname"
 msgstr "Smeknamn"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:377
+#: addressbook/gui/widgets/eab-contact-display.c:390
 msgid "Note"
 msgstr "Notering"
 
@@ -2721,7 +2757,7 @@ msgid "Office"
 msgstr "Kontor"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:347
+#: addressbook/gui/widgets/eab-contact-display.c:360
 msgid "Organization"
 msgstr "Organisation"
 
@@ -2747,7 +2783,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:234
+#: calendar/gui/e-meeting-list-view.c:235
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Roll"
@@ -2812,7 +2848,21 @@ msgstr "Maximal fältnamnslängd"
 msgid "Column Width"
 msgstr "Kolumnbredd"
 
-#: addressbook/gui/widgets/e-minicard-view.c:164
+#: addressbook/gui/widgets/e-minicard-view.c:171
+msgid ""
+"\n"
+"\n"
+"Search for the Contact\n"
+"\n"
+"or double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Sök efter kontakten\n"
+"\n"
+"eller dubbelklicka här för att skapa en ny kontakt."
+
+#: addressbook/gui/widgets/e-minicard-view.c:174
 msgid ""
 "\n"
 "\n"
@@ -2826,7 +2876,17 @@ msgstr ""
 "\n"
 "Dubbelklicka här för att skapa en ny kontakt."
 
-#: addressbook/gui/widgets/e-minicard-view.c:167
+#: addressbook/gui/widgets/e-minicard-view.c:179
+msgid ""
+"\n"
+"\n"
+"Search for the Contact."
+msgstr ""
+"\n"
+"\n"
+"Sök efter kontakten."
+
+#: addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -2836,7 +2896,7 @@ msgstr ""
 "\n"
 "Det finns inga objekt att visa i denna vy."
 
-#: addressbook/gui/widgets/e-minicard-view.c:477
+#: addressbook/gui/widgets/e-minicard-view.c:498
 msgid "Adapter"
 msgstr "Adapter"
 
@@ -2861,55 +2921,55 @@ msgid "map"
 msgstr "karta"
 
 # Osäker
-#: addressbook/gui/widgets/eab-contact-display.c:261
-#: addressbook/gui/widgets/eab-contact-display.c:528
+#: addressbook/gui/widgets/eab-contact-display.c:274
+#: addressbook/gui/widgets/eab-contact-display.c:541
 msgid "List Members"
 msgstr "Listmedlemmar"
 
-#: addressbook/gui/widgets/eab-contact-display.c:324
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:339
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:361
 msgid "Position"
 msgstr "Position"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Video Conferencing"
 msgstr "Videokonferens"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:378
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/widgets/eab-contact-display.c:368
 msgid "work"
 msgstr "jobb"
 
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/eab-contact-display.c:582
+#: addressbook/gui/widgets/eab-contact-display.c:376
+#: addressbook/gui/widgets/eab-contact-display.c:595
 msgid "Blog"
 msgstr "Webblogg"
 
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:383
 msgid "personal"
 msgstr "personligt"
 
-#: addressbook/gui/widgets/eab-contact-display.c:543
+#: addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Job Title"
 msgstr "Jobbtitel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:574
+#: addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Home page"
 msgstr "Hemsida"
 
@@ -2964,13 +3024,11 @@ msgstr "Protokollet stöds inte"
 #. E_BOOK_ERROR_CANCELLED
 #: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
-#: calendar/gui/e-calendar-table.c:473 calendar/gui/print.c:2349
-#: camel/camel-service.c:724 camel/camel-service.c:762
-#: camel/camel-service.c:846 camel/camel-service.c:886
-#: camel/providers/pop3/camel-pop3-store.c:456
-#: camel/providers/pop3/camel-pop3-store.c:537
+#: calendar/gui/e-cal-component-preview.c:231
+#: calendar/gui/e-cal-model-tasks.c:347 calendar/gui/e-cal-model-tasks.c:650
+#: calendar/gui/e-calendar-table.c:457 calendar/gui/print.c:2352
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Avbruten"
 
@@ -2981,6 +3039,7 @@ msgstr "Kunde inte avbryta"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: addressbook/gui/widgets/eab-gui-util.c:63
+#: calendar/gui/comp-editor-factory.c:431
 msgid "Authentication Failed"
 msgstr "Autentisering misslyckades"
 
@@ -3080,7 +3139,7 @@ msgid "Error adding list"
 msgstr "Fel vid tillägg av lista"
 
 #: addressbook/gui/widgets/eab-gui-util.c:170
-#: addressbook/gui/widgets/eab-gui-util.c:640
+#: addressbook/gui/widgets/eab-gui-util.c:643
 msgid "Error adding contact"
 msgstr "Fel vid tillägg av kontakt"
 
@@ -3097,22 +3156,26 @@ msgid "Error removing list"
 msgstr "Fel vid borttagning av lista"
 
 #: addressbook/gui/widgets/eab-gui-util.c:193
-#: addressbook/gui/widgets/eab-gui-util.c:598
+#: addressbook/gui/widgets/eab-gui-util.c:601
 msgid "Error removing contact"
 msgstr "Fel vid borttagning av kontakt"
 
-# This needs ngettext!
-# http://bugzilla.ximian.com/show_bug.cgi?id=61066
 #: addressbook/gui/widgets/eab-gui-util.c:275
 #, c-format
 msgid ""
+"Opening %d contact will open %d new window as well.\n"
+"Do you really want to display this contact?"
+msgid_plural ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
-msgstr ""
+msgstr[0] ""
+"Att öppna %d kontakt kommer även att öppna %d nytt fönster.\n"
+"Vill du verkligen visa denna kontakt?"
+msgstr[1] ""
 "Att öppna %d kontakter kommer även att öppna %d nya fönster.\n"
 "Vill du verkligen visa alla dessa kontakter?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:301
+#: addressbook/gui/widgets/eab-gui-util.c:304
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3121,44 +3184,44 @@ msgstr ""
 "%s finns redan\n"
 "Vill du skriva över den?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:305
+#: addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Overwrite"
 msgstr "Skriv över"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:383
+#: addressbook/gui/widgets/eab-gui-util.c:386
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:545
+#: addressbook/gui/widgets/eab-gui-util.c:548
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:694
+#: addressbook/gui/widgets/eab-gui-util.c:697
 msgid "Move contact to"
 msgstr "Flytta kontakt till"
 
-#: addressbook/gui/widgets/eab-gui-util.c:696
+#: addressbook/gui/widgets/eab-gui-util.c:699
 msgid "Copy contact to"
 msgstr "Kopiera kontakt till"
 
-#: addressbook/gui/widgets/eab-gui-util.c:699
+#: addressbook/gui/widgets/eab-gui-util.c:702
 msgid "Move contacts to"
 msgstr "Flytta kontakter till"
 
-#: addressbook/gui/widgets/eab-gui-util.c:701
+#: addressbook/gui/widgets/eab-gui-util.c:704
 msgid "Copy contacts to"
 msgstr "Kopiera kontakter till"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
+#: addressbook/gui/widgets/eab-gui-util.c:707
 msgid "Select target addressbook."
 msgstr "Välj måladressbok."
 
-#: addressbook/gui/widgets/eab-gui-util.c:927
+#: addressbook/gui/widgets/eab-gui-util.c:930
 msgid "Multiple VCards"
 msgstr "Flera VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:930
+#: addressbook/gui/widgets/eab-gui-util.c:933
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard för %s"
@@ -3168,37 +3231,37 @@ msgstr "VCard för %s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:199
+#: addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(ingen)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:432
+#: addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Primär e-post"
 
-#: addressbook/gui/widgets/eab-popup-control.c:568
+#: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Välj en åtgärd"
 
-#: addressbook/gui/widgets/eab-popup-control.c:576
+#: addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Skapa en ny kontakt \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:592
+#: addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Lägg till adress till befintliga kontakten \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:870
+#: addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
 msgstr "Frågar adressboken..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:953
+#: addressbook/gui/widgets/eab-popup-control.c:952
 msgid "Edit Contact Info"
 msgstr "Redigera kontaktinformation"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1008
+#: addressbook/gui/widgets/eab-popup-control.c:1007
 msgid "Merge E-Mail Address"
 msgstr "Slå samman e-postadress"
 
@@ -3259,10 +3322,6 @@ msgid "Evolution VCard Importer"
 msgstr "Evolutions VCard-importör"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Evolutions VCard-importör"
-
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
@@ -3369,6 +3428,12 @@ msgid "Number of columns:"
 msgstr "Antal kolumner:"
 
 #: addressbook/printing/e-contact-print.glade.h:23
+#: camel/providers/groupwise/camel-groupwise-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:64
+#: camel/providers/imap4/camel-imap4-provider.c:49
+#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:79
+#: camel/providers/local/camel-local-provider.c:99
 msgid "Options"
 msgstr "Alternativ"
 
@@ -3437,6 +3502,7 @@ msgid "Top:"
 msgstr "Överst:"
 
 #: addressbook/printing/e-contact-print.glade.h:40
+#: calendar/gui/dialogs/calendar-setup.c:175
 msgid "Type:"
 msgstr "Typ:"
 
@@ -3504,11 +3570,9 @@ msgstr "[vcard|csv]"
 msgid "Export in asynchronous mode "
 msgstr "Exportera i asynkront läge "
 
-# Lack of space after the comma
-# http://bugzilla.ximian.com/show_bug.cgi?id=61069
 #: addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
+"The number of cards in one output file in asychronous mode, default size 100."
 msgstr "Antalet kort i en utdatafil i asynkront läge, standardstorleken 100."
 
 #: addressbook/tools/evolution-addressbook-export.c:63
@@ -3529,15 +3593,13 @@ msgstr "Stöd endast csv- eller vcard-format."
 msgid "In async mode, output must be file."
 msgstr "Utdatan måste vara en fil i asynkront läge."
 
-# Strange use of English
-# http://bugzilla.ximian.com/show_bug.cgi?id=61070
 #: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
-msgstr "Storleksflaggan borde inte behövas i normalt läge."
+msgid "In normal mode, there is no need for the size option."
+msgstr "Storleksflaggan behövs inte i normalt läge."
 
 #: addressbook/tools/evolution-addressbook-export.c:153
-msgid "Impossible internal error."
-msgstr "Omöjligt internt fel."
+msgid "Unhandled error"
+msgstr "Fel som inte hanteras"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3551,10 +3613,6 @@ msgstr "Indatafil"
 msgid "No filename provided."
 msgstr "Inget filnamn är angivet."
 
-#: addressbook/util/e-destination.c:577
-msgid "Unnamed List"
-msgstr "Namnlös lista"
-
 #. calendar:prompt-cancel-meeting primary
 #. calendar:prompt-cancel-task primary
 #: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
@@ -3738,7 +3796,6 @@ msgid "You have made changes to this appointment, but not yet saved them."
 msgstr "Du har gjort ändringar i detta möte, men inte sparat dem än."
 
 #: calendar/calendar-errors.xml.h:73 calendar/calendar-errors.xml.h:81
-#: composer/mail-composer-errors.xml.h:33
 msgid "Discard Changes"
 msgstr "Förkasta ändringar"
 
@@ -3748,21 +3805,18 @@ msgstr "Spara ändringar"
 
 #. calendar:prompt-save-task title
 #: calendar/calendar-errors.xml.h:76
-#, fuzzy
 msgid "Save Task"
-msgstr "Spara som"
+msgstr "Spara uppgift"
 
 #. calendar:prompt-save-task primary
 #: calendar/calendar-errors.xml.h:78
-#, fuzzy
 msgid "Would you like to save your changes to this task?"
-msgstr "Vill du spara dina ändringar i detta möte?"
+msgstr "Vill du spara dina ändringar i denna uppgift?"
 
 #. calendar:prompt-save-task secondary
 #: calendar/calendar-errors.xml.h:80
-#, fuzzy
 msgid "You have made changes to this task, but not yet saved them."
-msgstr "Du har gjort ändringar i detta möte, men inte sparat dem än."
+msgstr "Du har gjort ändringar i denna uppgift, men inte sparat dem än."
 
 #. calendar:prompt-meeting-invite primary
 #: calendar/calendar-errors.xml.h:84
@@ -3850,7 +3904,61 @@ msgstr ""
 "Dina kalendrar kommer inte att vara tillgängliga innan Evolution har "
 "startats om."
 
-#: calendar/common/authentication.c:48 calendar/gui/e-pub-utils.c:301
+#. calendar:prompt-delete-calendar primary
+#: calendar/calendar-errors.xml.h:116
+msgid "Delete calendar '{0}'?"
+msgstr "Ta bort kalendern \"{0}\"?"
+
+#. calendar:prompt-delete-calendar secondary
+#: calendar/calendar-errors.xml.h:118
+msgid "This calendar will be removed permanently."
+msgstr "Denna kalender kommer att tas bort permanent."
+
+#. calendar:prompt-delete-task-list primary
+#: calendar/calendar-errors.xml.h:120
+msgid "Delete task list '{0}'?"
+msgstr "Ta bort uppgiftslistan \"{0}\"?"
+
+#. calendar:prompt-delete-task-list secondary
+#: calendar/calendar-errors.xml.h:122
+msgid "This task list will be removed permanently."
+msgstr "Denna uppgiftslista kommer att tas bort permanent."
+
+#. calendar:prompt-send-no-subject-calendar primary
+#: calendar/calendar-errors.xml.h:124
+msgid "Are you sure you want to send the appointment without a summary?"
+msgstr "Är du säker på att du vill skicka mötet utan en sammanfattning?"
+
+#. calendar:prompt-send-no-subject-calendar secondary
+#: calendar/calendar-errors.xml.h:126
+msgid ""
+"Adding a meaningful Summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr ""
+"Att lägga till en meningsfull sammanfattning till ditt möte kommer att ge "
+"dina mottagare en ledtråd till vad mötet handlar om."
+
+#: calendar/calendar-errors.xml.h:127 calendar/calendar-errors.xml.h:132
+#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+msgid "_Send"
+msgstr "_Skicka"
+
+#. calendar:prompt-send-no-subject-task primary
+#: calendar/calendar-errors.xml.h:129
+msgid "Are you sure you want to send the task without a summary?"
+msgstr "Är du säker på att du vill skicka uppgiften utan en sammanfattning?"
+
+#. calendar:prompt-send-no-subject-task secondary
+#: calendar/calendar-errors.xml.h:131
+msgid ""
+"Adding a meaningful Summary to your task will give your recipients an idea "
+"of what your appointment is about."
+msgstr ""
+"Att lägga till en meningsfull sammanfattning till din uppgift kommer att ge "
+"dina mottagare en ledtråd till vad mötet handlar om."
+
+#: calendar/common/authentication.c:49 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Ange lösenord"
@@ -3859,15 +3967,15 @@ msgstr "Ange lösenord"
 msgid "Split Multi-Day Events:"
 msgstr "Delade flerdagsevenemang:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1356
-#: calendar/conduits/calendar/calendar-conduit.c:1357
+#: calendar/conduits/calendar/calendar-conduit.c:1359
+#: calendar/conduits/calendar/calendar-conduit.c:1360
 #: calendar/conduits/todo/todo-conduit.c:879
 #: calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "Kunde inte starta evolution-data-server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
 #: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1471
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunde inte läsa pilotens kalenderprogramblock"
 
@@ -3880,68 +3988,57 @@ msgstr "Standardprioritet:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunde inte läsa pilotens att-göra-programblock"
 
-# Varför är detta markerat för översättning?
-# http://bugzilla.ximian.com/show_bug.cgi?id=61062
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "*Control*F3"
-
-# Varför är detta markerat för översättning?
-# http://bugzilla.ximian.com/show_bug.cgi?id=61062
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "*Control*F4"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
 msgstr "Kalender och uppgifter"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#: calendar/gui/calendar-component.c:1079
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: calendar/gui/calendar-component.c:1082
 msgid "Calendars"
 msgstr "Kalendrar"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Konfigurera din tidszon, kalender och uppgiftslista här "
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
 msgstr "Evolutionkalender och -uppgifter"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
 msgstr "Evolutionkalenderns konfigurationskontroll"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Evolutionkalenderns schemaläggningsmeddelandevisare"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
 msgstr "Evolutions kalender-/uppgiftsredigerare"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
 msgstr "Evolutions kalenderkomponent"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Tasks component"
 msgstr "Evolutions uppgiftskomponent"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1198 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:419 calendar/gui/tasks-component.c:889
-#: calendar/gui/tasks-control.c:408 calendar/importers/icalendar-importer.c:83
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: calendar/gui/e-tasks.c:1189 calendar/gui/print.c:1822
+#: calendar/gui/tasks-component.c:408 calendar/gui/tasks-component.c:878
+#: calendar/gui/tasks-control.c:410 calendar/importers/icalendar-importer.c:83
 #: calendar/importers/icalendar-importer.c:709
+#: camel/providers/groupwise/camel-gw-listener.c:406
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
 msgstr "_Kalendrar"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Uppgifter"
@@ -3950,56 +4047,95 @@ msgstr "_Uppgifter"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolutionkalenderns alarmaviseringstjänst"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
-msgid "Starting:"
-msgstr "Startar:"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
-msgid "Ending:"
-msgstr "Slutar:"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
-msgid "Evolution Alarm"
-msgstr "Evolutionalarm"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
-#, c-format
-msgid "Alarm on %s"
-msgstr "Alarm den %s"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:79
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minut"
+msgstr[1] "minuter"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-msgid "Snooze _time (minutes):"
-msgstr "Slumrings_tid (minuter):"
+#: calendar/gui/dialogs/event-editor.c:138 calendar/gui/print.c:2298
+msgid "Appointment"
+msgstr "Möte"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "_Edit appointment"
-msgstr "_Redigera möte"
+msgid "Appointment Title"
+msgstr "Mötestitel"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "End time:"
+msgstr "Sluttid:"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/e-itip-control.c:1118
+msgid "Location:"
+msgstr "Plats:"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:5
+msgid "Snooze _time:"
+msgstr "Slumrings_tid:"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:6
+msgid "Start time:"
+msgstr "Starttid:"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:11
+#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22 ui/evolution.xml.h:30
+msgid "_Edit"
+msgstr "_Redigera"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "_Snooze"
 msgstr "_Slumra"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Öppna"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:9
+msgid "description of appointment"
+msgstr "beskrivning av möte"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:10
+msgid "end-time"
+msgstr "sluttid"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:11
+msgid "location"
+msgstr "plats"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:13
+msgid "start-time"
+msgstr "starttid"
 
 # Osäker
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:864
 msgid "Dismiss"
 msgstr ""
 
 # Osäker
-#: calendar/gui/alarm-notify/alarm-queue.c:889
+#: calendar/gui/alarm-notify/alarm-queue.c:865
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:954
+#: calendar/gui/alarm-notify/alarm-queue.c:947
+msgid "No summary available."
+msgstr "Ingen sammanfattning finns tillgänglig."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:956
+#: calendar/gui/alarm-notify/alarm-queue.c:958
 msgid "No description available."
 msgstr "Ingen beskrivning finns tillgänglig."
 
+#: calendar/gui/alarm-notify/alarm-queue.c:966
+msgid "No location information available."
+msgstr "Ingen platsinformation finns tillgänglig."
+
 # Osäker
-#: calendar/gui/alarm-notify/alarm-queue.c:974
+#: calendar/gui/alarm-notify/alarm-queue.c:982
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4012,12 +4148,12 @@ msgstr ""
 "Startar %s\n"
 "Slutar %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1074
-#: calendar/gui/alarm-notify/alarm-queue.c:1098
+#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1108
 msgid "Warning"
 msgstr "Varning"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
+#: calendar/gui/alarm-notify/alarm-queue.c:1088
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4029,7 +4165,7 @@ msgstr ""
 "konfigurerad att skicka e-post. Evolution kommer att\n"
 "visa en normal dialogruta istället."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1114
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4046,7 +4182,7 @@ msgstr ""
 "\n"
 "Är du säker på att du vill köra detta program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1118
+#: calendar/gui/alarm-notify/alarm-queue.c:1128
 msgid "Do not ask me about this program again."
 msgstr "Fråga mig inte om detta program igen."
 
@@ -4104,7 +4240,7 @@ msgstr "Timme som arbetsdagen börjar"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 msgid "Intervals shown in Day and Work Week views"
-msgstr ""
+msgstr "Intervall som visas i dags- och arbetsveckovyerna"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "List of urls for free/busy publishing"
@@ -4212,35 +4348,34 @@ msgstr "Huruvida tider ska visas i 24-timmarsformat istället för fm/em"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Huruvida veckonummer ska visas i datumbläddraren"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Sammanfattningen innehåller"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Beskrivningen innehåller"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Kommentaren innehåller"
 
-#: calendar/gui/cal-search-bar.c:53
+#: calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Platsen innehåller"
 
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+#: calendar/gui/cal-search-bar.c:350 camel/camel-vee-store.c:343
 msgid "Unmatched"
 msgstr "Omatchade"
 
-#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:564
-#: calendar/gui/dialogs/select-source-dialog.c:112
-#: calendar/gui/gnome-cal.c:1860
-#: camel/providers/groupwise/camel-gw-listener.c:331
-#: camel/providers/groupwise/camel-gw-listener.c:361
+#: calendar/gui/calendar-commands.c:120 calendar/gui/calendar-component.c:567
+#: calendar/gui/dialogs/calendar-setup.c:325 calendar/gui/gnome-cal.c:1925
+#: camel/providers/groupwise/camel-gw-listener.c:405
+#: camel/providers/groupwise/camel-gw-listener.c:435
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/calendar-commands.c:352
+#: calendar/gui/calendar-commands.c:355
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -4250,19 +4385,24 @@ msgstr ""
 "mängden tid. Om du fortsätter kommer du inte att kunna återställa dessa "
 "evenemang."
 
-#: calendar/gui/calendar-commands.c:358
+#: calendar/gui/calendar-commands.c:361
 msgid "Purge events older than"
 msgstr "Töm evenemang äldre än"
 
-#: calendar/gui/calendar-commands.c:363
+#: calendar/gui/calendar-commands.c:366
 #: calendar/gui/dialogs/alarm-dialog.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:14
 msgid "days"
 msgstr "dag"
 
-#: calendar/gui/calendar-commands.c:432
-msgid "%A %d %B %Y"
-msgstr "%A %d %B %Y"
+#: calendar/gui/calendar-component.c:383
+#: calendar/gui/dialogs/calendar-setup.c:403
+msgid "New Calendar"
+msgstr "Ny kalender"
+
+#: calendar/gui/calendar-component.c:519
+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.
@@ -4270,173 +4410,152 @@ msgstr "%A %d %B %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:519
-#: calendar/gui/e-day-view-top-item.c:714 calendar/gui/e-day-view.c:1588
-#: calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/calendar-component.c:522
+#: calendar/gui/e-day-view-top-item.c:708 calendar/gui/e-day-view.c:1572
+#: calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:521
-#: calendar/gui/calendar-component.c:526 calendar/gui/calendar-component.c:528
+#: calendar/gui/calendar-component.c:524 calendar/gui/calendar-component.c:529
+#: calendar/gui/calendar-component.c:531
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
-#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
-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:465
-#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/calendar-component.c:370
-#, c-format
-msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
-msgstr ""
-"Kalendern \"%s\" kommer att tas bort. Är du säker på att du vill fortsätta?"
-
-#: calendar/gui/calendar-component.c:426
-msgid "New Calendar"
-msgstr "Ny kalender"
-
-#: calendar/gui/calendar-component.c:516
-#, fuzzy
-msgid "%A %d %b %Y"
-msgstr "%a %d %b %Y"
-
-#: calendar/gui/calendar-component.c:540 calendar/gui/calendar-component.c:547
-#: calendar/gui/calendar-component.c:553 calendar/gui/calendar-component.c:555
-#, fuzzy
+#: calendar/gui/calendar-component.c:543 calendar/gui/calendar-component.c:550
+#: calendar/gui/calendar-component.c:556 calendar/gui/calendar-component.c:558
 msgid "%d %b %Y"
-msgstr "%d %B %Y"
+msgstr "%d %b %Y"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-component.c:545
-#: calendar/gui/e-day-view-top-item.c:718 calendar/gui/e-day-view.c:1604
-#: calendar/gui/e-week-view-main-item.c:343
+#: calendar/gui/calendar-component.c:548
+#: calendar/gui/e-day-view-top-item.c:712 calendar/gui/e-day-view.c:1588
+#: calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/calendar-component.c:635
+#: calendar/gui/calendar-component.c:638
 msgid "Failed upgrading calendars."
 msgstr "Misslyckades med att uppgradera kalendrar."
 
-#: calendar/gui/calendar-component.c:931
+#: calendar/gui/calendar-component.c:934
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Kan inte öppna kalendern \"%s\" för skapande av evenemang och sammanträden"
 
-#: calendar/gui/calendar-component.c:947
+#: calendar/gui/calendar-component.c:950
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 "Det finns ingen kalender tillgänglig för skapande av evenemang och "
 "sammanträden"
 
-#: calendar/gui/calendar-component.c:1245
+#: calendar/gui/calendar-component.c:1248
 msgid "New appointment"
 msgstr "Nytt möte"
 
-#: calendar/gui/calendar-component.c:1246
+#: calendar/gui/calendar-component.c:1249
 msgid "_Appointment"
 msgstr "_Möte"
 
-#: calendar/gui/calendar-component.c:1247
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt möte"
 
-#: calendar/gui/calendar-component.c:1253
+#: calendar/gui/calendar-component.c:1256
 msgid "New meeting"
 msgstr "Nytt sammanträde"
 
-#: calendar/gui/calendar-component.c:1254
+#: calendar/gui/calendar-component.c:1257
 msgid "M_eeting"
 msgstr "_Sammanträde"
 
-#: calendar/gui/calendar-component.c:1255
+#: calendar/gui/calendar-component.c:1258
 msgid "Create a new meeting request"
 msgstr "Skapa en ny sammanträdesbegäran"
 
-#: calendar/gui/calendar-component.c:1261
+#: calendar/gui/calendar-component.c:1264
 msgid "New all day appointment"
 msgstr "Nytt heldagsmöte"
 
-#: calendar/gui/calendar-component.c:1262
-#, fuzzy
+#: calendar/gui/calendar-component.c:1265
 msgid "All Day A_ppointment"
 msgstr "Hel_dagsmöte"
 
-#: calendar/gui/calendar-component.c:1263
+#: calendar/gui/calendar-component.c:1266
 msgid "Create a new all-day appointment"
 msgstr "Skapa ett nytt heldagsmöte"
 
-#: calendar/gui/calendar-component.c:1269
+#: calendar/gui/calendar-component.c:1272
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:1270
+#: calendar/gui/calendar-component.c:1273
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: calendar/gui/calendar-component.c:1271
+#: calendar/gui/calendar-component.c:1274
 msgid "Create a new calendar"
 msgstr "Skapa en ny kalender"
 
 # Detta borde nog inte vara markerat för översättning
 # http://bugzilla.ximian.com/show_bug.cgi?id=61076
-#: calendar/gui/calendar-offline-handler.c:192
+#: calendar/gui/calendar-offline-handler.c:191
 #, c-format
 msgid "backend_go_offline(): %s"
 msgstr "backend_go_offline(): %s"
 
 # Detta borde nog inte vara markerat för översättning
 # http://bugzilla.ximian.com/show_bug.cgi?id=61076
-#: calendar/gui/calendar-offline-handler.c:215
+#: calendar/gui/calendar-offline-handler.c:214
 #, c-format
 msgid "backend_go_online(): %s"
 msgstr "backend_go_online(): %s"
 
-#: calendar/gui/calendar-view-factory.c:118
+#: calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
 msgstr "Dagsvy"
 
-#: calendar/gui/calendar-view-factory.c:121
+#: calendar/gui/calendar-view-factory.c:112
 msgid "Work Week View"
 msgstr "Arbetsveckovy"
 
-#: calendar/gui/calendar-view-factory.c:124
+#: calendar/gui/calendar-view-factory.c:115
 msgid "Week View"
 msgstr "Veckovy"
 
-#: calendar/gui/calendar-view-factory.c:127
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Month View"
 msgstr "Månadsvy"
 
-#: calendar/gui/comp-editor-factory.c:409
+#: calendar/gui/comp-editor-factory.c:413
 msgid "Error while opening the calendar"
 msgstr "Fel vid öppnande av kalendern"
 
-#: calendar/gui/comp-editor-factory.c:420
+#: calendar/gui/comp-editor-factory.c:419
 msgid "Method not supported when opening the calendar"
 msgstr "Metoden stöds inte vid öppnande av kalendern"
 
-#: calendar/gui/comp-editor-factory.c:426
+#: calendar/gui/comp-editor-factory.c:425
 msgid "Permission denied to open the calendar"
 msgstr "Åtkomst nekas för öppnande av kalendern"
 
+#: calendar/gui/comp-editor-factory.c:437
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:288
+#: camel/providers/pop3/camel-pop3-store.c:526
+#: camel/providers/pop3/camel-pop3-store.c:533
+#: camel/providers/pop3/camel-pop3-store.c:539 shell/e-shell.c:1247
+msgid "Unknown error"
+msgstr "Okänt fel"
+
 # Detta borde nog inte vara markerat för översättning
 # http://bugzilla.ximian.com/show_bug.cgi?id=61076
-#: calendar/gui/comp-editor-factory.c:474
+#: calendar/gui/comp-editor-factory.c:481
 #, c-format
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
@@ -4536,7 +4655,7 @@ msgid "hour(s)"
 msgstr "timme/timmar"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:15
 msgid "hours"
 msgstr "timme"
 
@@ -4544,11 +4663,31 @@ msgstr "timme"
 msgid "minute(s)"
 msgstr "minut(er)"
 
+# Konstigt...
 #: calendar/gui/dialogs/alarm-dialog.glade.h:28
+msgid "option menu to choose alarm action"
+msgstr "alternativmeny att välja alarmåtgärd"
+
+# Konstigt...
+#: calendar/gui/dialogs/alarm-dialog.glade.h:29
+msgid "option menu to choose alarm relative"
+msgstr "alternativmeny att välja alarmsläkting"
+
+# Konstigt...
+#: calendar/gui/dialogs/alarm-dialog.glade.h:30
+msgid "option menu to choose alarm time"
+msgstr "alternativmeny att välja alarmtid"
+
+# Konstigt...
+#: calendar/gui/dialogs/alarm-dialog.glade.h:31
+msgid "option menu to choose alarm value units"
+msgstr "alternativmeny att välja alarmvärdesenheter"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:32
 msgid "start of appointment"
 msgstr "start på möte"
 
-#: calendar/gui/dialogs/alarm-list-dialog.c:192
+#: calendar/gui/dialogs/alarm-list-dialog.c:199
 msgid "Action/Trigger"
 msgstr "Åtgärd/trigger"
 
@@ -4562,34 +4701,34 @@ msgstr "Alarm"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
+#: calendar/gui/dialogs/cal-prefs-dialog.c:566 mail/em-account-prefs.c:480
+#: mail/em-composer-prefs.c:678 mail/em-composer-prefs.c:945
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:720
 msgid "Are you sure you want to remove this URL?"
 msgstr "Är du säker på att du vill ta bort denna URL?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:729
+#: calendar/gui/dialogs/cal-prefs-dialog.c:728
 msgid "Don't Remove"
 msgstr "Ta inte bort"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:778
-#: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
-#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
-#: mail/em-composer-prefs.c:684
+#: calendar/gui/dialogs/cal-prefs-dialog.c:777
+#: calendar/gui/dialogs/cal-prefs-dialog.c:810
+#: calendar/gui/dialogs/cal-prefs-dialog.c:843 mail/em-account-prefs.c:327
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:386
+#: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655
+#: mail/em-composer-prefs.c:685
 msgid "Disable"
 msgstr "Inaktivera"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:778
-#: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
-#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
-#: mail/em-composer-prefs.c:684
+#: calendar/gui/dialogs/cal-prefs-dialog.c:777
+#: calendar/gui/dialogs/cal-prefs-dialog.c:810
+#: calendar/gui/dialogs/cal-prefs-dialog.c:845 mail/em-account-prefs.c:327
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:388
+#: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655
+#: mail/em-composer-prefs.c:685
 msgid "Enable"
 msgstr "Aktivera"
 
@@ -4658,7 +4797,7 @@ msgid "Display"
 msgstr "Visning"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "A_ktivera"
 
@@ -4667,8 +4806,8 @@ msgid "Free/Busy Publishing"
 msgstr "Publicering av ledig/upptagen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:581
+#: calendar/gui/dialogs/recurrence-page.c:1031
+#: calendar/gui/e-itip-control.c:732
 msgid "Friday"
 msgstr "fredag"
 
@@ -4681,8 +4820,8 @@ msgid "Minutes"
 msgstr "minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1034
-#: calendar/gui/e-itip-control.c:577
+#: calendar/gui/dialogs/recurrence-page.c:1027
+#: calendar/gui/e-itip-control.c:728
 msgid "Monday"
 msgstr "måndag"
 
@@ -4691,8 +4830,8 @@ msgid "S_un"
 msgstr "_sön"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:582
+#: calendar/gui/dialogs/recurrence-page.c:1032
+#: calendar/gui/e-itip-control.c:733
 msgid "Saturday"
 msgstr "lördag"
 
@@ -4705,8 +4844,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Visa v_eckonummer i datumbläddraren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:576
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:727
 msgid "Sunday"
 msgstr "söndag"
 
@@ -4719,8 +4858,8 @@ msgid "T_hu"
 msgstr "to_r"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:580
+#: calendar/gui/dialogs/recurrence-page.c:1030
+#: calendar/gui/e-itip-control.c:731
 msgid "Thursday"
 msgstr "torsdag"
 
@@ -4733,8 +4872,8 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1035
-#: calendar/gui/e-itip-control.c:578
+#: calendar/gui/dialogs/recurrence-page.c:1028
+#: calendar/gui/e-itip-control.c:729
 msgid "Tuesday"
 msgstr "tisdag"
 
@@ -4743,8 +4882,8 @@ msgid "W_eek starts:"
 msgstr "V_eckan börjar:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:579
+#: calendar/gui/dialogs/recurrence-page.c:1029
+#: calendar/gui/e-itip-control.c:730
 msgid "Wednesday"
 msgstr "onsdag"
 
@@ -4776,17 +4915,6 @@ msgstr "T_ryck ihop helger i månadsvyn"
 msgid "_Day begins:"
 msgstr "_Dagen börjar:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
-#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:22
-msgid "_Edit"
-msgstr "_Redigera"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_fre"
@@ -4827,48 +4955,42 @@ msgstr "_ons"
 msgid "before every appointment"
 msgstr "före varje möte"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Du måste ange en plats att hämta kalendern från."
+# Konstigt...
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+msgid "option menu to choose reminder units"
+msgstr "alternativmeny att välja påminnarenheter"
 
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Källplatsen \"%s\" är inte välformad."
+# Konstigt...
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "option menu to choose time units"
+msgstr "alternativmeny att välja tidsenheter"
 
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Källplatsen \"%s\" är inte en webcal-källa."
+#: calendar/gui/dialogs/calendar-setup.c:299
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "F_ärg:"
 
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Källan med namnet \"%s\" finns redan i den markerade gruppen"
+#: calendar/gui/dialogs/calendar-setup.c:335
+msgid "Tasks List"
+msgstr "Uppgiftslista"
 
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Gruppen \"%s\" är en fjärrgrupp. Du måste ange en plats att hämta kalendern "
-"från"
+#: calendar/gui/dialogs/calendar-setup.c:401
+msgid "Calendar Properties"
+msgstr "Egenskaper för kalendern"
+
+#: calendar/gui/dialogs/calendar-setup.c:467
+msgid "Task List Properties"
+msgstr "Egenskaper för uppgiftslistan"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Lägg till kalender"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
 msgid "Add Task List"
-msgstr "Lägg till ny uppgiftslista"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "F_ärg:"
+msgstr "Lägg till uppgiftslista"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:103
 msgid "Pick a color"
 msgstr "Välj en färg"
 
@@ -4877,23 +4999,18 @@ msgid "_Add Calendar"
 msgstr "_Lägg till kalender"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
 msgid "_Add Task List"
-msgstr "Lägg till ny uppgiftslista"
+msgstr "_Lägg till uppgiftslista"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr "_Uppdatera:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Typ:"
-
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:21
 msgid "weeks"
 msgstr "veckor"
 
@@ -4948,67 +5065,79 @@ msgstr "%s  Du har inte gjort några ändringar, uppdatera redigeraren?"
 msgid "Validation error: %s"
 msgstr "Valideringsfel: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2261
 msgid " to "
 msgstr " till "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2265
 msgid " (Completed "
 msgstr " (Färdigt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2267
 msgid "Completed "
 msgstr "Färdigt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2272
 msgid " (Due "
 msgstr " (Ska utföras "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2274
 msgid "Due "
 msgstr "Ska utföras "
 
-#: calendar/gui/dialogs/comp-editor.c:264
+#: calendar/gui/dialogs/comp-editor.c:257
 msgid "Could not update object"
 msgstr "Kunde inte uppdatera objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:878
-#: calendar/gui/dialogs/comp-editor.c:915
+#: calendar/gui/dialogs/comp-editor.c:899
+#: calendar/gui/dialogs/comp-editor.c:942
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: calendar/gui/dialogs/comp-editor.c:883
-#: calendar/gui/dialogs/comp-editor.c:920
+#: calendar/gui/dialogs/comp-editor.c:905
+#: calendar/gui/dialogs/comp-editor.c:948
+#, c-format
+msgid "Meeting - %s"
+msgstr "Sammanträde - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:907
+#: calendar/gui/dialogs/comp-editor.c:950
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:886
-#: calendar/gui/dialogs/comp-editor.c:923
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:954
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tilldelad uppgift - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:913
+#: calendar/gui/dialogs/comp-editor.c:956
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:889
-#: calendar/gui/dialogs/comp-editor.c:926
+#: calendar/gui/dialogs/comp-editor.c:916
+#: calendar/gui/dialogs/comp-editor.c:959
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagbokspost - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:936
+#: calendar/gui/dialogs/comp-editor.c:927
+#: calendar/gui/dialogs/comp-editor.c:969
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: calendar/gui/dialogs/comp-editor.c:1302
 #: calendar/gui/dialogs/comp-editor.c:1335
-#: calendar/gui/dialogs/comp-editor.c:1359
+#: calendar/gui/dialogs/comp-editor.c:1368
+#: calendar/gui/dialogs/comp-editor.c:1392
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Ändringar som görs i detta objekt kan komma att kastas om en uppdatering "
 "kommer"
 
-#: calendar/gui/dialogs/comp-editor.c:1383
+#: calendar/gui/dialogs/comp-editor.c:1416
 msgid "Unable to use current version!"
 msgstr "Kan inte använda aktuell version!"
 
@@ -5084,70 +5213,66 @@ msgstr "Delegera till:"
 msgid "Enter Delegate"
 msgstr "Ange delegerad person"
 
-#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
-msgid "Appointment"
-msgstr "Möte"
-
-#: calendar/gui/dialogs/event-editor.c:162
+#: calendar/gui/dialogs/event-editor.c:147
 msgid "Recurrence"
 msgstr "Upprepning"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:239
-#: calendar/gui/dialogs/event-editor.c:381
+#: calendar/gui/dialogs/event-editor.c:156
+#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:367
 msgid "Scheduling"
 msgstr "Schemaläggning"
 
-#: calendar/gui/dialogs/event-editor.c:176
-#: calendar/gui/dialogs/event-editor.c:242
-#: calendar/gui/dialogs/event-editor.c:384
+#: calendar/gui/dialogs/event-editor.c:163
+#: calendar/gui/dialogs/event-editor.c:226
+#: calendar/gui/dialogs/event-editor.c:370
 msgid "Invitations"
 msgstr "Inbjudningar"
 
-#: calendar/gui/dialogs/event-page.c:692
+#: calendar/gui/dialogs/event-page.c:674
 msgid "Event with no start date"
 msgstr "Evenemang utan startdatum"
 
-#: calendar/gui/dialogs/event-page.c:695
+#: calendar/gui/dialogs/event-page.c:677
 msgid "Event with no end date"
 msgstr "Evenemang utan slutdatum"
 
-#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
+#: calendar/gui/dialogs/event-page.c:837 calendar/gui/dialogs/task-page.c:505
 msgid "Start date is wrong"
 msgstr "Startdatumet är fel"
 
-#: calendar/gui/dialogs/event-page.c:865
+#: calendar/gui/dialogs/event-page.c:847
 msgid "End date is wrong"
 msgstr "Slutdatumet är fel"
 
-#: calendar/gui/dialogs/event-page.c:888
+#: calendar/gui/dialogs/event-page.c:870
 msgid "Start time is wrong"
 msgstr "Starttiden är fel"
 
-#: calendar/gui/dialogs/event-page.c:895
+#: calendar/gui/dialogs/event-page.c:877
 msgid "End time is wrong"
 msgstr "Sluttiden är fel"
 
-#: calendar/gui/dialogs/event-page.c:1605
+#: calendar/gui/dialogs/event-page.c:1587
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kan inte öppna kalendern \"%s\"."
 
-#: calendar/gui/dialogs/event-page.c:1804
+#: calendar/gui/dialogs/event-page.c:1784
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag före möte"
 msgstr[1] "%d dagar före möte"
 
-#: calendar/gui/dialogs/event-page.c:1812
+#: calendar/gui/dialogs/event-page.c:1792
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d timme före möte"
 msgstr[1] "%d timmar före möte"
 
-#: calendar/gui/dialogs/event-page.c:1820
+#: calendar/gui/dialogs/event-page.c:1800
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -5192,107 +5317,107 @@ msgid "Cale_ndar:"
 msgstr "Kale_nder:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Classi_fication:"
 msgstr "Klassi_fikation:"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:355 calendar/gui/e-calendar-table.c:377
+#: calendar/gui/dialogs/task-page.glade.h:7 calendar/gui/e-cal-list-view.c:255
+#: calendar/gui/e-cal-model.c:346 calendar/gui/e-calendar-table.c:361
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-#, fuzzy
-msgid "Locat_ion:"
-msgstr "Plats:"
+msgid "Event Description"
+msgstr "Evenemangsbeskrivning"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:353 calendar/gui/e-calendar-table.c:376
+msgid "Locat_ion:"
+msgstr "_Plats:"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:254
+#: calendar/gui/e-cal-model.c:344 calendar/gui/e-calendar-table.c:360
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
-#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:344 calendar/gui/e-cal-model.c:351
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-cal-list-view.c:253 calendar/gui/e-cal-model.c:335
+#: calendar/gui/e-cal-model.c:342 calendar/gui/e-calendar-table.c:359
 msgid "Public"
 msgstr "Publikt"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:17
 msgid "Show time as _busy"
 msgstr "Visa tid som _upptagen"
 
-#: calendar/gui/dialogs/event-page.glade.h:17
-#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:18
+#: calendar/gui/dialogs/task-page.glade.h:12
 msgid "Su_mmary:"
 msgstr "Sa_mmanfattning:"
 
-#: calendar/gui/dialogs/event-page.glade.h:18
+#: calendar/gui/dialogs/event-page.glade.h:19
 msgid "This appointment has customized alarms"
 msgstr "Detta möte har anpassade alarm"
 
-#: calendar/gui/dialogs/event-page.glade.h:19
+#: calendar/gui/dialogs/event-page.glade.h:20
 msgid "_Alarm"
 msgstr "_Alarm"
 
-#: calendar/gui/dialogs/event-page.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:21
 msgid "_Description:"
 msgstr "_Beskrivning:"
 
-#: calendar/gui/dialogs/event-page.glade.h:21
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "Slutti_d:"
 
-#: calendar/gui/dialogs/event-page.glade.h:22
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/dialogs/event-page.glade.h:23
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "_Starttid:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
 #. Put the "None" and "UTC" entries at the top of the combo's list.
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:316
+#: calendar/gui/dialogs/meeting-page.c:296
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:953
-#: composer/e-msg-composer.c:2097 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:933
-#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
-#: mail/mail-config.glade.h:103
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
-#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
+#: calendar/gui/e-cal-model-tasks.c:642 calendar/gui/e-itip-control.c:1104
+#: composer/e-msg-composer.c:2115 filter/filter-rule.c:878
+#: mail/em-account-prefs.c:441 mail/em-folder-view.c:961
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:190
+#: widgets/misc/e-cell-date-edit.c:248 widgets/misc/e-dateedit.c:458
+#: widgets/misc/e-dateedit.c:1497 widgets/misc/e-dateedit.c:1651
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/dialogs/meeting-page.c:449
+#: calendar/gui/dialogs/meeting-page.c:432
 msgid "The organizer selected no longer has an account."
 msgstr "Organisatören som valts har inte längre ett konto."
 
-#: calendar/gui/dialogs/meeting-page.c:455
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "An organizer is required."
 msgstr "En organisatör krävs."
 
-#: calendar/gui/dialogs/meeting-page.c:470
+#: calendar/gui/dialogs/meeting-page.c:453
 msgid "At least one attendee is required."
 msgstr "Det måste finnas åtminstone en deltagare."
 
-#: calendar/gui/dialogs/meeting-page.c:793
+#: calendar/gui/dialogs/meeting-page.c:778
 msgid "_Delegate To..."
 msgstr "_Delegera till..."
 
-#: calendar/gui/dialogs/meeting-page.c:797
-#: composer/e-msg-composer-attachment-bar.c:453
+#: calendar/gui/dialogs/meeting-page.c:781
+#: composer/e-msg-composer-attachment-bar.c:440
 msgid "_Remove"
 msgstr "_Ta bort"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:218
+#: calendar/gui/e-meeting-list-view.c:219
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Deltagare"
@@ -5330,41 +5455,42 @@ msgstr "Medlem"
 # RSVP borde kanske förklaras med en kommentar?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61071
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1085 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:242
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "OSA"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/dialogs/task-editor.c:145
 #: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:63
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#, fuzzy
 msgid "<b>Att_endees</b>"
-msgstr "<b>Deltagare</b>"
+msgstr "<b>D_eltagare</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#, fuzzy
 msgid "C_hange Organizer"
-msgstr "Ändra or_ganisatör"
+msgstr "_Ändra organisatör"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:415
+#: calendar/gui/e-meeting-time-sel.c:419
 msgid "Con_tacts..."
 msgstr "Kon_takter..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:6
-#, fuzzy
 msgid "Or_ganizer:"
-msgstr "Organisatör:"
+msgstr "Or_ganisatör:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:7
+msgid "Organizer"
+msgstr "Organisatör"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:8
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisatör:"
@@ -5419,72 +5545,72 @@ msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Du ändrar en återkommande dagsbokspost. Vad vill du ändra?"
 
-#: calendar/gui/dialogs/recur-comp.c:85
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Endast denna instans"
 
-#: calendar/gui/dialogs/recur-comp.c:89
+#: calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "Denna och tidigare instanser"
 
-#: calendar/gui/dialogs/recur-comp.c:95
+#: calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "Denna och framtida instanser"
 
-#: calendar/gui/dialogs/recur-comp.c:100
+#: calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Alla instanser"
 
-#: calendar/gui/dialogs/recurrence-page.c:511
+#: calendar/gui/dialogs/recurrence-page.c:493
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Detta möte har upprepningsregler som inte kan redigeras med Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:806
+#: calendar/gui/dialogs/recurrence-page.c:799
 msgid "Recurrence date is invalid"
 msgstr "Upprepningsdatumet är ogiltigt"
 
-#: calendar/gui/dialogs/recurrence-page.c:917
+#: calendar/gui/dialogs/recurrence-page.c:910
 msgid "on"
 msgstr "vid"
 
-#: calendar/gui/dialogs/recurrence-page.c:978
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "first"
 msgstr "första"
 
 # Bugrapporterat, http://bugzilla.ximian.com/show_bug.cgi?id=36245
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:972
 msgid "second"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:973
 msgid "third"
 msgstr "tredje"
 
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:974
 msgid "fourth"
 msgstr "fjärde"
 
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:975
 msgid "last"
 msgstr "sista"
 
-#: calendar/gui/dialogs/recurrence-page.c:1005
+#: calendar/gui/dialogs/recurrence-page.c:998
 msgid "Other Date"
 msgstr "Annat datum"
 
-#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/dialogs/recurrence-page.c:1026
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1170
+#: calendar/gui/dialogs/recurrence-page.c:1163
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1356
+#: calendar/gui/dialogs/recurrence-page.c:1349
 msgid "occurrences"
 msgstr "förekomster"
 
-#: calendar/gui/dialogs/recurrence-page.c:2309
+#: calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Datum/tid"
 
@@ -5493,9 +5619,8 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Undantag</b>"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
-#, fuzzy
 msgid "<b>Preview</b>"
-msgstr "Förhandsgranska"
+msgstr "<b>Förhandsvisning</b>"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "<b>Recurrence</b>"
@@ -5533,19 +5658,8 @@ msgstr "veckor"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
-msgid "Select destination"
-msgstr "Välj mål"
-
-#: calendar/gui/dialogs/select-source-dialog.c:110
-msgid "_Destination"
-msgstr "_Mål"
-
-#: calendar/gui/dialogs/select-source-dialog.c:112
-msgid "Task List"
-msgstr "Uppgiftslista"
-
-#: calendar/gui/dialogs/task-details-page.c:427
+#: calendar/gui/dialogs/task-details-page.c:410
+#: calendar/gui/dialogs/task-details-page.c:429
 msgid "Completed date is wrong"
 msgstr "Utförtdatumet är fel"
 
@@ -5562,44 +5676,44 @@ msgstr "<span weight=\"bold\">Status</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
-#: calendar/gui/e-calendar-table.c:472 calendar/gui/e-itip-control.c:745
-#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
-#: calendar/gui/print.c:2346
+#: calendar/gui/e-cal-component-preview.c:228
+#: calendar/gui/e-cal-model-tasks.c:345 calendar/gui/e-cal-model-tasks.c:648
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-meeting-store.c:188 calendar/gui/e-meeting-store.c:211
+#: calendar/gui/print.c:2349
 msgid "Completed"
 msgstr "Färdigt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:397 mail/message-list.c:1012
+#: calendar/gui/e-cal-component-preview.c:247
+#: calendar/gui/e-calendar-table.c:381 mail/message-list.c:1011
 msgid "High"
 msgstr "Hög"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
-#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/print.c:2343
+#: calendar/gui/e-cal-component-preview.c:225
+#: calendar/gui/e-cal-model-tasks.c:343 calendar/gui/e-cal-model-tasks.c:646
+#: calendar/gui/e-cal-model-tasks.c:721 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/print.c:2346
 msgid "In Progress"
 msgstr "Pågår"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:399 mail/message-list.c:1010
+#: calendar/gui/e-cal-component-preview.c:251
+#: calendar/gui/e-calendar-table.c:383 mail/message-list.c:1009
 msgid "Low"
 msgstr "Låg"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:943
-#: calendar/gui/e-calendar-table.c:398 mail/message-list.c:1011
+#: calendar/gui/e-cal-component-preview.c:249 calendar/gui/e-cal-model.c:940
+#: calendar/gui/e-calendar-table.c:382 mail/message-list.c:1010
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
-#: calendar/gui/e-calendar-table.c:470 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-component-preview.c:235
+#: calendar/gui/e-cal-model-tasks.c:341 calendar/gui/e-cal-model-tasks.c:644
+#: calendar/gui/e-calendar-table.c:454 calendar/gui/print.c:2343
 msgid "Not Started"
 msgstr "Inte startad"
 
@@ -5608,7 +5722,7 @@ msgid "P_ercent complete:"
 msgstr "Pr_ocent klar:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:384
 msgid "Undefined"
 msgstr "Odefinierad"
 
@@ -5628,21 +5742,21 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Webbsida:"
 
-#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+#: calendar/gui/dialogs/task-editor.c:136 calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Uppgift"
 
-#: calendar/gui/dialogs/task-editor.c:165
-#: calendar/gui/dialogs/task-editor.c:225
-#: calendar/gui/dialogs/task-editor.c:361
+#: calendar/gui/dialogs/task-editor.c:153
+#: calendar/gui/dialogs/task-editor.c:214
+#: calendar/gui/dialogs/task-editor.c:352
 msgid "Assignment"
 msgstr "Tilldelning"
 
-#: calendar/gui/dialogs/task-page.c:496
+#: calendar/gui/dialogs/task-page.c:478
 msgid "Due date is wrong"
 msgstr "Förfallodatumet är fel"
 
-#: calendar/gui/dialogs/task-page.c:831
+#: calendar/gui/dialogs/task-page.c:813
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan inte öppna uppgifter i \"%s\"."
@@ -5659,37 +5773,37 @@ msgstr "<span weight=\"bold\">Grundläggande</span>"
 msgid "<span weight=\"bold\">Date and Time</span>"
 msgstr "<span weight=\"bold\">Datum och tid</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "D_escription:"
-msgstr "Beskrivning:"
+msgstr "B_eskrivning:"
 
-#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Sta_rt date:"
 msgstr "Sta_rtdatum:"
 
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:13
+msgid "Task Description"
+msgstr "Uppgiftsbeskrivning"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
 msgid "_Due date:"
 msgstr "_Förfallodatum:"
 
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "_Group:"
 msgstr "_Grupp:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-#, fuzzy
 msgid "<b>Free/Busy C_alendars</b>"
-msgstr "Ledig-/upptageninformation slutar: <b>"
+msgstr "<b>Ledig-/upptagenk_alendrar</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
 msgid "<b>Publishing Frequency</b>"
-msgstr "Publiceringsfrekvens"
+msgstr "<b>Publiceringsfrekvens</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-#, fuzzy
 msgid "<b>Publishing _Location</b>"
-msgstr "Publiceringsplats för ledig-/upptagen"
+msgstr "<b>Publiceringsplats</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Editor"
@@ -5697,35 +5811,29 @@ msgstr "Ledig-/upptagenredigerare"
 
 # Tror det har att göra med "Användaren publicerar"
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-#, fuzzy
 msgid "_Daily"
-msgstr "dagligen"
+msgstr "_Dagligen"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#, fuzzy
 msgid "_Manual"
-msgstr "Managua"
+msgstr "_Manuellt"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#, fuzzy
 msgid "_Password:"
-msgstr "Lösenord:"
+msgstr "_Lösenord:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-#, fuzzy
 msgid "_Remember password"
-msgstr "Kom ihåg lösenord"
+msgstr "_Kom ihåg lösenord"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-#, fuzzy
 msgid "_Username:"
-msgstr "Användar_namn:"
+msgstr "_Användarnamn:"
 
 # Tror det har att göra med "Användaren publicerar"
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-#, fuzzy
 msgid "_Weekly"
-msgstr "veckovis"
+msgstr "_Veckovis"
 
 #: calendar/gui/e-alarm-list.c:395
 #, c-format
@@ -5818,46 +5926,46 @@ msgstr "%s vid %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s för en okänd triggertyp"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2385
+#: calendar/gui/e-cal-component-preview.c:69 mail/em-folder-view.c:2467
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicka för att öppna %s"
 
-#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+#: calendar/gui/e-cal-component-preview.c:154 filter/filter-rule.c:795
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-cal-component-preview.c:185
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammanfattning:"
 
-#: calendar/gui/e-cal-component-preview.c:194
-#: calendar/gui/e-cal-component-preview.c:205
+#: calendar/gui/e-cal-component-preview.c:192
+#: calendar/gui/e-cal-component-preview.c:203
 msgid "Start Date:"
 msgstr "Startdatum:"
 
-#: calendar/gui/e-cal-component-preview.c:216
+#: calendar/gui/e-cal-component-preview.c:214
 msgid "Due Date:"
 msgstr "Förfallodatum:"
 
 #. write status
-#: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-cal-component-preview.c:221
+#: calendar/gui/e-itip-control.c:1132
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-cal-component-preview.c:247
+#: calendar/gui/e-cal-component-preview.c:245
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
+#: calendar/gui/e-cal-component-preview.c:266
+#: calendar/gui/e-itip-control.c:1164 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: calendar/gui/e-cal-component-preview.c:300
+#: calendar/gui/e-cal-component-preview.c:298
 msgid "Web Page:"
 msgstr "Webbsida:"
 
@@ -5870,48 +5978,48 @@ msgid "Start Date"
 msgstr "Startdatum"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:21
 msgid "Summary"
 msgstr "Sammanfattning"
 
-#: calendar/gui/e-cal-model-calendar.c:175 calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-cal-model-calendar.c:175 calendar/gui/e-calendar-table.c:433
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/e-cal-model-calendar.c:178 calendar/gui/e-calendar-table.c:450
-#: calendar/gui/e-meeting-time-sel.c:399
+#: calendar/gui/e-cal-model-calendar.c:178 calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-meeting-time-sel.c:403
 msgid "Busy"
 msgstr "Upptagen"
 
 # Detta borde ha en förklarande kommentar.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61080
 # Tror detta är "Norr"
-#: calendar/gui/e-cal-model-tasks.c:302
+#: calendar/gui/e-cal-model-tasks.c:297
 msgid "N"
 msgstr "N"
 
 # Detta borde ha en förklarande kommentar.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61080
 # Tror detta är "Söder"
-#: calendar/gui/e-cal-model-tasks.c:302
+#: calendar/gui/e-cal-model-tasks.c:297
 msgid "S"
 msgstr "S"
 
 # Detta borde ha en förklarande kommentar.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61080
 # Tror detta är "Öster"
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+#: calendar/gui/e-cal-model-tasks.c:299 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "Ö"
 
 # Detta borde ha en förklarande kommentar.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61080
 # Tror detta är "Väster"
-#: calendar/gui/e-cal-model-tasks.c:304
+#: calendar/gui/e-cal-model-tasks.c:299
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/e-cal-model-tasks.c:601
+#: calendar/gui/e-cal-model-tasks.c:596
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -5921,184 +6029,177 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:949
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+#: calendar/gui/e-cal-model-tasks.c:1007 calendar/gui/e-cal-model.c:946
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:160
+#: calendar/gui/e-meeting-store.c:170 calendar/gui/e-meeting-store.c:773
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:949
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-cal-model-tasks.c:1007 calendar/gui/e-cal-model.c:946
+#: calendar/gui/e-meeting-list-view.c:148 calendar/gui/e-meeting-store.c:172
 msgid "No"
 msgstr "Nej"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:357 calendar/gui/e-cal-model.c:360
-#: calendar/gui/e-itip-control.c:998 calendar/gui/e-itip-control.c:1212
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1763 camel/camel-gpg-context.c:1814
+#: calendar/gui/e-cal-model.c:348 calendar/gui/e-cal-model.c:351
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-meeting-list-view.c:123
+#: calendar/gui/e-meeting-list-view.c:137 calendar/gui/e-meeting-store.c:116
+#: calendar/gui/e-meeting-store.c:151 calendar/gui/e-meeting-store.c:216
+#: camel/camel-gpg-context.c:1767 camel/camel-gpg-context.c:1818
 #: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1402
-#: camel/providers/imap4/camel-imap4-engine.c:1432
-#: camel/providers/imap4/camel-imap4-engine.c:1464
-#: camel/providers/imap4/camel-imap4-engine.c:1506
-#: camel/providers/imap4/camel-imap4-store.c:1223
-#: camel/providers/imap4/camel-imap4-utils.c:457
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1155
+#: camel/providers/imap4/camel-imap4-engine.c:1465
+#: camel/providers/imap4/camel-imap4-engine.c:1504
+#: camel/providers/imap4/camel-imap4-engine.c:1549
+#: camel/providers/imap4/camel-imap4-engine.c:1605
+#: camel/providers/imap4/camel-imap4-store.c:1241
+#: camel/providers/imap4/camel-imap4-utils.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:218 mail/em-utils.c:1157
 #: shell/e-component-registry.c:207 shell/e-component-registry.c:211
 #: widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Okänd"
 
-#: calendar/gui/e-cal-model.c:945
+#: calendar/gui/e-cal-model.c:942
 msgid "Recurring"
 msgstr "Återkommande"
 
-#: calendar/gui/e-cal-model.c:947
+#: calendar/gui/e-cal-model.c:944
 msgid "Assigned"
 msgstr "Tilldelad"
 
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:403
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:404
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:405
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:422
+#: calendar/gui/e-calendar-table.c:406
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:407
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:408
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:409
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:410
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:411
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:412
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:413
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:703 calendar/gui/e-calendar-view.c:658
+#: calendar/gui/e-calendar-table.c:689 calendar/gui/e-calendar-view.c:652
 msgid "Deleting selected objects"
 msgstr "Tar bort markerade objekt"
 
-#: calendar/gui/e-calendar-table.c:867 calendar/gui/e-calendar-view.c:762
+#: calendar/gui/e-calendar-table.c:868 calendar/gui/e-calendar-view.c:756
 msgid "Updating objects"
 msgstr "Uppdaterar objekt"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1084
-#: calendar/gui/e-calendar-view.c:1431 calendar/gui/e-calendar-view.c:1512
-#: mail/em-folder-view.c:899 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-view.c:1064
+#: composer/e-msg-composer.c:1194
+msgid "Save as..."
+msgstr "Spara som..."
+
+#: calendar/gui/e-calendar-table.c:1151 calendar/gui/e-calendar-view.c:1389
+#: mail/em-folder-view.c:927 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Öppna"
 
-#: calendar/gui/e-calendar-table.c:1044
+#: calendar/gui/e-calendar-table.c:1152
 msgid "Open _Web Page"
 msgstr "Öppna _webbsida"
 
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1090
-#: calendar/gui/e-calendar-view.c:1432 calendar/gui/e-calendar-view.c:1518
-#: mail/em-folder-view.c:901 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1153 calendar/gui/e-calendar-view.c:1390
+#: mail/em-folder-view.c:929 mail/em-popup.c:498
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1088
-#: calendar/gui/e-calendar-view.c:1410 calendar/gui/e-calendar-view.c:1433
-#: calendar/gui/e-calendar-view.c:1516 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1154 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1391 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: calendar/gui/e-calendar-table.c:1050 calendar/gui/e-calendar-table.c:1079
-#: calendar/gui/e-calendar-view.c:1438 calendar/gui/e-calendar-view.c:1482
+#: calendar/gui/e-calendar-table.c:1158 calendar/gui/e-calendar-view.c:1395
 #: 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:1051 calendar/gui/e-calendar-table.c:1077
-#: calendar/gui/e-calendar-view.c:1439 calendar/gui/e-calendar-view.c:1480
-#: mail/em-folder-tree.c:965 mail/message-list.c:1702
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
-#: ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1159 calendar/gui/e-calendar-view.c:1396
+#: composer/e-msg-composer.c:2882 mail/em-folder-tree.c:1024
+#: mail/message-list.c:1712 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: calendar/gui/e-calendar-table.c:1052 calendar/gui/e-calendar-table.c:1086
-#: calendar/gui/e-calendar-view.c:1414 calendar/gui/e-calendar-view.c:1440
-#: calendar/gui/e-calendar-view.c:1514 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1160 calendar/gui/e-calendar-view.c:1373
+#: calendar/gui/e-calendar-view.c:1397 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-table.c:1164
 msgid "_Assign Task"
 msgstr "_Tilldela uppgift"
 
-#: calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1165
 msgid "_Forward as iCalendar"
 msgstr "_Vidarebefordra som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1058
+#: calendar/gui/e-calendar-table.c:1166
 msgid "_Mark as Complete"
 msgstr "_Markera som färdig"
 
-#: calendar/gui/e-calendar-table.c:1059
+#: calendar/gui/e-calendar-table.c:1167
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markera markerade uppgifter som färdiga"
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1063 calendar/gui/e-calendar-table.c:1081
-#: calendar/gui/e-calendar-view.c:1451 calendar/gui/e-calendar-view.c:1484
-#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:924
+#: calendar/gui/e-calendar-table.c:1171 calendar/gui/e-calendar-view.c:1408
+#: mail/em-folder-tree.c:2742 mail/em-folder-view.c:952
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Ta bort"
 
-#: calendar/gui/e-calendar-table.c:1064 calendar/gui/e-calendar-table.c:1082
+#: calendar/gui/e-calendar-table.c:1172
 msgid "_Delete Selected Tasks"
 msgstr "_Ta bort markerade uppgifter"
 
-#: calendar/gui/e-calendar-table.c:1196 calendar/gui/e-calendar-view.c:1060
-#: composer/e-msg-composer.c:1178
-msgid "Save as..."
-msgstr "Spara som..."
-
-#: calendar/gui/e-calendar-table.c:1374
+#: calendar/gui/e-calendar-table.c:1323
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klicka för att lägga till en uppgift"
@@ -6109,7 +6210,7 @@ msgid "% Complete"
 msgstr "% färdigt"
 
 #: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
-#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:611
 msgid "Complete"
 msgstr "Färdigt"
 
@@ -6133,88 +6234,82 @@ msgstr "Startdatum"
 msgid "Task sort"
 msgstr "Sortera efter uppgift"
 
-#: calendar/gui/e-calendar-view.c:1176
+#: calendar/gui/e-calendar-view.c:1179
 msgid "Moving items"
 msgstr "Flyttar objekt"
 
-#: calendar/gui/e-calendar-view.c:1178
+#: calendar/gui/e-calendar-view.c:1181
 msgid "Copying items"
 msgstr "Kopierar objekt"
 
-#: calendar/gui/e-calendar-view.c:1403 calendar/gui/e-calendar-view.c:1492
+#: calendar/gui/e-calendar-view.c:1364
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
-#: calendar/gui/e-calendar-view.c:1404 calendar/gui/e-calendar-view.c:1497
+#: calendar/gui/e-calendar-view.c:1365
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsevenemang"
 
-#: calendar/gui/e-calendar-view.c:1405 calendar/gui/e-calendar-view.c:1502
+#: calendar/gui/e-calendar-view.c:1366
 msgid "New Meeting"
 msgstr "Nytt sammanträde"
 
-#: calendar/gui/e-calendar-view.c:1406 calendar/gui/e-calendar-view.c:1507
+#: calendar/gui/e-calendar-view.c:1367
 msgid "New Task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/e-calendar-view.c:1420 ui/evolution-calendar.xml.h:26
+#. FIXME: hook in this somehow
+#: calendar/gui/e-calendar-view.c:1377
+msgid "Current View"
+msgstr "Aktuell vy"
+
+#: calendar/gui/e-calendar-view.c:1379 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Markera i_dag"
 
-#: calendar/gui/e-calendar-view.c:1421
+#: calendar/gui/e-calendar-view.c:1380
 msgid "_Select Date..."
 msgstr "_Markera datum..."
 
-#: calendar/gui/e-calendar-view.c:1425 ui/evolution-calendar.xml.h:45
+#. TODO: Why is this in a context menu when it applies globally?
+#: calendar/gui/e-calendar-view.c:1385 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicera ledig-/upptageninformation"
 
-#: calendar/gui/e-calendar-view.c:1444
+#: calendar/gui/e-calendar-view.c:1401
 msgid "Cop_y to Calendar..."
 msgstr "Kopi_era till kalender..."
 
-#: calendar/gui/e-calendar-view.c:1445
+#: calendar/gui/e-calendar-view.c:1402
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytta till kalender..."
 
-#: calendar/gui/e-calendar-view.c:1446
+#: calendar/gui/e-calendar-view.c:1403
 msgid "_Schedule Meeting..."
 msgstr "_Boka sammanträde..."
 
-#: calendar/gui/e-calendar-view.c:1447
+#: calendar/gui/e-calendar-view.c:1404
 msgid "_Forward as iCalendar..."
 msgstr "_Vidarebefordra som iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1452
+#: calendar/gui/e-calendar-view.c:1409
 msgid "Make this Occurrence _Movable"
 msgstr "Gör denna förekomst _flyttbar"
 
-#: calendar/gui/e-calendar-view.c:1453 calendar/gui/e-calendar-view.c:1485
+#: calendar/gui/e-calendar-view.c:1410
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: calendar/gui/e-calendar-view.c:1454 calendar/gui/e-calendar-view.c:1486
+#: calendar/gui/e-calendar-view.c:1411
 msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
-#: calendar/gui/e-calendar-view.c:1488
-msgid "Go to _Today"
-msgstr "Gå till _idag"
-
-#: calendar/gui/e-calendar-view.c:1490
-msgid "_Go to Date..."
-msgstr "_Gå till datum..."
-
-#: calendar/gui/e-calendar-view.c:1520 ui/evolution.xml.h:35
-msgid "_Settings..."
-msgstr "_Inställningar..."
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:115 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y-%m-%d %H.%M.%S"
@@ -6224,12 +6319,12 @@ msgstr "%a %Y-%m-%d %H.%M.%S"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %H.%M.%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:125
+#: calendar/gui/e-cell-date-edit-text.c:123
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6240,7 +6335,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
+#: calendar/gui/e-day-view-time-item.c:527
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutdivisioner"
@@ -6251,31 +6346,31 @@ msgstr "%02i minutdivisioner"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: calendar/gui/e-day-view-top-item.c:710 calendar/gui/e-day-view.c:1571
-#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
+#: calendar/gui/e-day-view-top-item.c:704 calendar/gui/e-day-view.c:1555
+#: calendar/gui/e-week-view-main-item.c:312 calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:583
-#: calendar/gui/print.c:838
+#: calendar/gui/e-day-view.c:811 calendar/gui/e-week-view.c:578
+#: calendar/gui/print.c:841
 msgid "am"
 msgstr "fm"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:586
-#: calendar/gui/print.c:840
+#: calendar/gui/e-day-view.c:814 calendar/gui/e-week-view.c:581
+#: calendar/gui/print.c:843
 msgid "pm"
 msgstr "em"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:761
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja, (Komplex upprepning)"
 
 # Detta %d blir inte så lyckat med vissa språk, eftersom en
 # ordningsangivelse och inte bara en siffra krävs.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61082
-#: calendar/gui/e-itip-control.c:621
+#: calendar/gui/e-itip-control.c:772
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -6285,7 +6380,7 @@ msgstr[1] "Var %d dag"
 # Detta %d blir inte så lyckat med vissa språk, eftersom en
 # ordningsangivelse och inte bara en siffra krävs.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61082
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -6295,23 +6390,23 @@ msgstr[1] "Var %d vecka"
 # Detta %d blir inte så lyckat med vissa språk, eftersom en
 # ordningsangivelse och inte bara en siffra krävs.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61082
-#: calendar/gui/e-itip-control.c:628
+#: calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Varje vecka på "
 msgstr[1] "Var %d vecka på "
 
-#: calendar/gui/e-itip-control.c:636
+#: calendar/gui/e-itip-control.c:787
 msgid " and "
 msgstr " och "
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:794
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s dagen i "
 
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/e-itip-control.c:807
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s i "
@@ -6319,7 +6414,7 @@ msgstr "Den %s %s i "
 # Detta %d blir inte så lyckat med vissa språk, eftersom en
 # ordningsangivelse och inte bara en siffra krävs.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61082
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:814
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -6329,353 +6424,342 @@ msgstr[1] "var %d månad"
 # Detta %d blir inte så lyckat med vissa språk, eftersom en
 # ordningsangivelse och inte bara en siffra krävs.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61082
-#: calendar/gui/e-itip-control.c:667
+#: calendar/gui/e-itip-control.c:818
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Varje år"
 msgstr[1] "Var %d år"
 
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:829
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "totalt %d gång"
 msgstr[1] "totalt %d gånger"
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:838
 msgid ", ending on "
 msgstr ", med slut den "
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:862
 msgid "Starts"
 msgstr "Börjar"
 
-#: calendar/gui/e-itip-control.c:724
+#: calendar/gui/e-itip-control.c:875
 msgid "Ends"
 msgstr "Slutar"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:909
 msgid "Due"
 msgstr "Ska utföras"
 
-#: calendar/gui/e-itip-control.c:798 calendar/gui/e-itip-control.c:855
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-itip-control.c:1006
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:966
 msgid "iCalendar Error"
 msgstr "iCalendar-fel"
 
-#: calendar/gui/e-itip-control.c:887 calendar/gui/e-itip-control.c:903
-#: calendar/gui/e-itip-control.c:914 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:1038 calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-itip-control.c:1082
 msgid "An unknown person"
 msgstr "En okänd person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:938
+#: calendar/gui/e-itip-control.c:1089
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Granska följande information, och välj sedan en åtgärd från menyn nedan."
 
-#: calendar/gui/e-itip-control.c:967
-msgid "Location:"
-msgstr "Plats:"
-
-#: calendar/gui/e-itip-control.c:986 calendar/gui/e-meeting-list-view.c:158
-#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
-#: calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1137 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-meeting-store.c:180 calendar/gui/e-meeting-store.c:203
+#: calendar/gui/itip-utils.c:421
 msgid "Accepted"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:990 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:1141 calendar/gui/itip-utils.c:424
 msgid "Tentatively Accepted"
 msgstr "Preliminärt godtaget"
 
-#: calendar/gui/e-itip-control.c:994 calendar/gui/e-meeting-list-view.c:159
-#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
-#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-meeting-list-view.c:160
+#: calendar/gui/e-meeting-store.c:182 calendar/gui/e-meeting-store.c:205
+#: calendar/gui/itip-utils.c:427 calendar/gui/itip-utils.c:453
 msgid "Declined"
 msgstr "Avböjt"
 
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1081
-#: calendar/gui/e-itip-control.c:1107 calendar/gui/e-itip-control.c:1120
-#: calendar/gui/e-itip-control.c:1133 calendar/gui/e-itip-control.c:1158
-msgid "Choose an action:"
-msgstr "Välj en åtgärd:"
-
-#: calendar/gui/e-itip-control.c:1054
-msgid "Update"
-msgstr "Uppdatera"
-
-#: calendar/gui/e-itip-control.c:1055 calendar/gui/e-itip-control.c:1086
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/e-itip-control.c:1122
-#: calendar/gui/e-itip-control.c:1135 calendar/gui/e-itip-control.c:1160
-#: shell/e-shell.c:1210 widgets/misc/e-cell-date-edit.c:265
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:1082
-msgid "Accept"
-msgstr "Acceptera"
-
-#: calendar/gui/e-itip-control.c:1083
-msgid "Tentatively accept"
-msgstr "Acceptera preliminärt"
-
-#: calendar/gui/e-itip-control.c:1084
-msgid "Decline"
-msgstr "Neka"
-
-#: calendar/gui/e-itip-control.c:1108
-msgid "Send Free/Busy Information"
-msgstr "Skicka ledig-/upptageninformation"
-
-#: calendar/gui/e-itip-control.c:1121
-msgid "Update respondent status"
-msgstr "Uppdatera svarandestatus"
-
-#: calendar/gui/e-itip-control.c:1134
-msgid "Send Latest Information"
-msgstr "Skicka senaste information"
-
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1229
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1231
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1159 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1310
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publicerat sammanträdesinformation."
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1311
 msgid "Meeting Information"
 msgstr "Sammanträdesinformation"
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1317
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> begär att %s närvarar vid ett sammanträde."
 
-#: calendar/gui/e-itip-control.c:1243
+#: calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> begär din närvaro vid ett sammanträde."
 
-#: calendar/gui/e-itip-control.c:1244
+#: calendar/gui/e-itip-control.c:1320
 msgid "Meeting Proposal"
 msgstr "Sammanträdesförslag"
 
-#: calendar/gui/e-itip-control.c:1265
+#. FIXME Whats going on here?
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> vill lägga till i ett befintligt sammanträde."
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update"
 msgstr "Sammanträdesuppdatering"
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> vill få den senaste sammanträdesinformationen."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1332
 msgid "Meeting Update Request"
 msgstr "Begäran av sammanträdesuppdatering"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1339
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svarat på en sammanträdesbegäran."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1340
 msgid "Meeting Reply"
 msgstr "Sammanträdessvar"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1347
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har avbokat ett sammanträde."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1348
 msgid "Meeting Cancellation"
 msgstr "Sammanträdesavbokning"
 
-#: calendar/gui/e-itip-control.c:1294 calendar/gui/e-itip-control.c:1362
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1358 calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1475
 #, 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:1295
+#: calendar/gui/e-itip-control.c:1359
 msgid "Bad Meeting Message"
 msgstr "Felaktigt sammanträdesmeddelande"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publicerat uppgiftsinformation."
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1387
 msgid "Task Information"
 msgstr "Uppgiftsinformation"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1394
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> begär att %s utför en uppgift."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1396
 #, 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:1329
+#: calendar/gui/e-itip-control.c:1397
 msgid "Task Proposal"
 msgstr "Uppgiftsförslag"
 
-#: calendar/gui/e-itip-control.c:1333
+#. FIXME Whats going on here?
+#: calendar/gui/e-itip-control.c:1403
 #, 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:1334
+#: calendar/gui/e-itip-control.c:1404
 msgid "Task Update"
 msgstr "Uppgiftsuppdatering"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1408
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1409
 msgid "Task Update Request"
 msgstr "Begäran om uppgiftsuppdatering"
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1416
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svarat på en uppgiftstilldelning."
 
-#: calendar/gui/e-itip-control.c:1347
+#: calendar/gui/e-itip-control.c:1417
 msgid "Task Reply"
 msgstr "Uppgiftssvar"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1424
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har avbokat en uppgift."
 
-#: calendar/gui/e-itip-control.c:1355
+#: calendar/gui/e-itip-control.c:1425
 msgid "Task Cancellation"
 msgstr "Uppgiftsavbokning"
 
-#: calendar/gui/e-itip-control.c:1363
+#: calendar/gui/e-itip-control.c:1436
 msgid "Bad Task Message"
 msgstr "Felaktigt uppgiftsmeddelande"
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1460
 #, 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:1383
+#: calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Information"
 msgstr "Ledig-/upptageninformation"
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1465
 #, 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:1388
+#: calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Request"
 msgstr "Ledig-/Upptagenbegäran"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> har svarat på en ledig-/upptagenbegäran."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1471
 msgid "Free/Busy Reply"
 msgstr "Ledig-/Upptagensvar"
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1476
 msgid "Bad Free/Busy Message"
 msgstr "Felaktigt ledig-/upptagenmeddelande"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1551
 msgid "The message does not appear to be properly formed"
 msgstr "Meddelandet verkar inte vara korrekt utformat"
 
-#: calendar/gui/e-itip-control.c:1532
+#: calendar/gui/e-itip-control.c:1610
 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:1563
+#: calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilagan innehåller inte ett giltigt kalendermeddelande"
 
-#: calendar/gui/e-itip-control.c:1595
+#: calendar/gui/e-itip-control.c:1675
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilagan har inga visningsbara kalenderobjekt"
 
-#: calendar/gui/e-itip-control.c:1829
+#: calendar/gui/e-itip-control.c:1909
 msgid "Update complete\n"
 msgstr "Uppdateringen färdig\n"
 
-#: calendar/gui/e-itip-control.c:1857
+#: calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet är ogiltigt och kan inte uppdateras\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1947
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Detta svar är inte från en nuvarande deltagare. Lägg till som deltagare?"
 
-#: calendar/gui/e-itip-control.c:1879
+#: calendar/gui/e-itip-control.c:1959
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Närvarostatus kunde inte uppdateras på grund av ogiltig status!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1976
 msgid "Attendee status updated\n"
 msgstr "Närvarostatus är uppdaterad\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1979
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Närvarostatusen kan inte uppdateras eftersom objektet inte längre finns"
 
-#: calendar/gui/e-itip-control.c:1926
+#: calendar/gui/e-itip-control.c:2006
 msgid "Removal Complete"
 msgstr "Borttagning färdig"
 
-#: calendar/gui/e-itip-control.c:1949 calendar/gui/e-itip-control.c:1997
+#: calendar/gui/e-itip-control.c:2029 calendar/gui/e-itip-control.c:2077
 msgid "Item sent!\n"
 msgstr "Objektet skickat!\n"
 
-#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2031 calendar/gui/e-itip-control.c:2081
 msgid "The item could not be sent!\n"
 msgstr "Objektet kunde inte skickas!\n"
 
+#: calendar/gui/e-itip-control.c:2161
+msgid "Choose an action:"
+msgstr "Välj en åtgärd:"
+
+#: calendar/gui/e-itip-control.c:2232
+msgid "Update"
+msgstr "Uppdatera"
+
+#: calendar/gui/e-itip-control.c:2260
+msgid "Accept"
+msgstr "Acceptera"
+
+#: calendar/gui/e-itip-control.c:2261
+msgid "Tentatively accept"
+msgstr "Acceptera preliminärt"
+
+#: calendar/gui/e-itip-control.c:2262
+msgid "Decline"
+msgstr "Neka"
+
+#: calendar/gui/e-itip-control.c:2291
+msgid "Send Free/Busy Information"
+msgstr "Skicka ledig-/upptageninformation"
+
+#: calendar/gui/e-itip-control.c:2319
+msgid "Update respondent status"
+msgstr "Uppdatera svarandestatus"
+
+#: calendar/gui/e-itip-control.c:2347
+msgid "Send Latest Information"
+msgstr "Skicka senaste information"
+
+#: calendar/gui/e-itip-control.c:2375 calendar/gui/itip-utils.c:441
+#: mail/mail-send-recv.c:408 mail/mail-send-recv.c:460
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Avbryt"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -6725,69 +6809,69 @@ msgstr "Valfria deltagare"
 msgid "Resources"
 msgstr "Resurser"
 
-#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
-#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:91
+#: calendar/gui/e-meeting-store.c:108 calendar/gui/e-meeting-store.c:767
 msgid "Individual"
 msgstr "Person"
 
-#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
-#: calendar/gui/e-meeting-store.c:109
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:93
+#: calendar/gui/e-meeting-store.c:110
 msgid "Group"
 msgstr "Grupp"
 
-#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
-#: calendar/gui/e-meeting-store.c:111
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:95
+#: calendar/gui/e-meeting-store.c:112
 msgid "Resource"
 msgstr "Resurs"
 
-#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
-#: calendar/gui/e-meeting-store.c:113
+#: calendar/gui/e-meeting-list-view.c:122 calendar/gui/e-meeting-store.c:97
+#: calendar/gui/e-meeting-store.c:114
 msgid "Room"
 msgstr "Rum"
 
-#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
-#: calendar/gui/e-meeting-store.c:142
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:126
+#: calendar/gui/e-meeting-store.c:143
 msgid "Chair"
 msgstr "Mötesordförande"
 
-#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
-#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:128
+#: calendar/gui/e-meeting-store.c:145 calendar/gui/e-meeting-store.c:770
 msgid "Required Participant"
 msgstr "Nödvändig deltagare"
 
-#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
-#: calendar/gui/e-meeting-store.c:146
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:130
+#: calendar/gui/e-meeting-store.c:147
 msgid "Optional Participant"
 msgstr "Valfri deltagare"
 
-#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
-#: calendar/gui/e-meeting-store.c:148
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:132
+#: calendar/gui/e-meeting-store.c:149
 msgid "Non-Participant"
 msgstr "Icke-deltagare"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
-#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
+#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:178
+#: calendar/gui/e-meeting-store.c:201 calendar/gui/e-meeting-store.c:780
 msgid "Needs Action"
 msgstr "Behöver åtgärd"
 
-#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:184
+#: calendar/gui/e-meeting-store.c:207 calendar/gui/e-meeting-time-sel.c:402
 msgid "Tentative"
 msgstr "Preliminärt"
 
-#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
-#: calendar/gui/e-meeting-store.c:208
+#: calendar/gui/e-meeting-list-view.c:162 calendar/gui/e-meeting-store.c:186
+#: calendar/gui/e-meeting-store.c:209
 msgid "Delegated"
 msgstr "Delegerat"
 
-#: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212
+#: calendar/gui/e-meeting-store.c:190 calendar/gui/e-meeting-store.c:213
 msgid "In Process"
 msgstr "Pågår"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2069
+#: calendar/gui/e-meeting-time-sel-item.c:444
+#: calendar/gui/e-meeting-time-sel.c:2089
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
@@ -6797,8 +6881,8 @@ msgstr "%A %d %B %Y"
 #. %m = month number, %d = month day, %Y = full year.
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2102 e-util/e-time-utils.c:203
+#: calendar/gui/e-meeting-time-sel-item.c:448
+#: calendar/gui/e-meeting-time-sel.c:2122 e-util/e-time-utils.c:203
 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %Y-%m-%d"
@@ -6809,60 +6893,60 @@ msgstr "%a %Y-%m-%d"
 #. This is the preferred date format for the locale.
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+#: calendar/gui/e-meeting-time-sel-item.c:452 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1660
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:404 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Inte inne"
 
-#: calendar/gui/e-meeting-time-sel.c:401
+#: calendar/gui/e-meeting-time-sel.c:405
 msgid "No Information"
 msgstr "Ingen information"
 
-#: calendar/gui/e-meeting-time-sel.c:432
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "A_lternativ"
 
-#: calendar/gui/e-meeting-time-sel.c:449
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Visa _endast arbetstimmar"
 
-#: calendar/gui/e-meeting-time-sel.c:459
+#: calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Visa ut_zoomade"
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "_Uppdatera ledig/upptagen"
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:507
+#: calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "_Autovälj"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "_Allt folk och resurser"
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "Allt _folk och en resurs"
 
-#: calendar/gui/e-meeting-time-sel.c:557
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "Folk som k_rävs"
 
-#: calendar/gui/e-meeting-time-sel.c:566
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "Folk som krävs _och en resurs"
 
@@ -6871,7 +6955,7 @@ msgstr "Folk som krävs _och en resurs"
 msgid "Enter the password for %s"
 msgstr "Ange lösenordet för %s"
 
-#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2263
+#: calendar/gui/e-tasks.c:734 calendar/gui/gnome-cal.c:2429
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6880,50 +6964,73 @@ msgstr ""
 "Fel vid %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:792
+#: calendar/gui/e-tasks.c:782
 msgid "Loading tasks"
 msgstr "Läser in uppgifter"
 
-#: calendar/gui/e-tasks.c:873
+#: calendar/gui/e-tasks.c:864
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Öppnar uppgifter i %s"
 
-#: calendar/gui/e-tasks.c:1070
+#: calendar/gui/e-tasks.c:1061
 msgid "Completing tasks..."
 msgstr "Färdigställer uppgifter..."
 
-#: calendar/gui/e-tasks.c:1093
+#: calendar/gui/e-tasks.c:1084
 msgid "Deleting selected objects..."
 msgstr "Tar bort markerade objekt..."
 
-#: calendar/gui/e-tasks.c:1120
+#: calendar/gui/e-tasks.c:1111
 msgid "Expunging"
 msgstr "Tömmer"
 
-#: calendar/gui/gnome-cal.c:705
+#: calendar/gui/e-timezone-entry.c:133
+msgid "Timezone Button"
+msgstr "Tidszonsknapp"
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:329 calendar/gui/print.c:1501
+msgid "%d %B"
+msgstr "%d %B"
+
+#: calendar/gui/gnome-cal.c:718
 msgid "Updating query"
 msgstr "Uppdaterar fråga"
 
-#: calendar/gui/gnome-cal.c:2040
+#. bonobo displays this string so it must be in locale
+#: calendar/gui/gnome-cal.c:2040 widgets/menus/gal-view-menus.c:351
+msgid "Custom View"
+msgstr "Anpassad vy"
+
+#: calendar/gui/gnome-cal.c:2041
+msgid "Save Custom View"
+msgstr "Spara anpassad vy"
+
+#: calendar/gui/gnome-cal.c:2046 widgets/menus/gal-view-menus.c:373
+msgid "Define Views..."
+msgstr "Definiera vyer..."
+
+#: calendar/gui/gnome-cal.c:2206
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Läser in möten i %s"
 
-#: calendar/gui/gnome-cal.c:2059
+#: calendar/gui/gnome-cal.c:2225
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Läser in uppgifter i %s"
 
-#: calendar/gui/gnome-cal.c:2152
+#: calendar/gui/gnome-cal.c:2318
 #, c-format
 msgid "Opening %s"
 msgstr "Öppnar %s"
 
-#: calendar/gui/gnome-cal.c:3122
-#, fuzzy
+#: calendar/gui/gnome-cal.c:3286
 msgid "Purging"
-msgstr "Skriv ut"
+msgstr "Tömmer"
 
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
@@ -6981,57 +7088,57 @@ msgstr "september"
 msgid "_Select Today"
 msgstr "_Välj idag"
 
-#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
-#: calendar/gui/itip-utils.c:351
+#: calendar/gui/itip-utils.c:270 calendar/gui/itip-utils.c:318
+#: calendar/gui/itip-utils.c:350
 msgid "An organizer must be set."
 msgstr "En organisatör måste vara angiven."
 
-#: calendar/gui/itip-utils.c:306
+#: calendar/gui/itip-utils.c:305
 msgid "At least one attendee is necessary"
 msgstr "Åtminstone en deltagare krävs"
 
-#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
+#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
 msgid "Event information"
 msgstr "Evenemangsinformation"
 
-#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
+#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
 msgid "Task information"
 msgstr "Uppgiftsinformation"
 
-#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
+#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:506
 msgid "Journal information"
 msgstr "Dagboksinformation"
 
-#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
+#: calendar/gui/itip-utils.c:399 calendar/gui/itip-utils.c:524
 msgid "Free/Busy information"
 msgstr "Ledig-/upptageninformation"
 
-#: calendar/gui/itip-utils.c:402
+#: calendar/gui/itip-utils.c:401
 msgid "Calendar information"
 msgstr "Kalenderinformation"
 
-#: calendar/gui/itip-utils.c:438
+#: calendar/gui/itip-utils.c:437
 msgid "Updated"
 msgstr "Uppdaterat"
 
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/itip-utils.c:445
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: calendar/gui/itip-utils.c:450
+#: calendar/gui/itip-utils.c:449
 msgid "Counter-proposal"
 msgstr "Motförslag"
 
-#: calendar/gui/itip-utils.c:521
+#: calendar/gui/itip-utils.c:520
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig-/upptageninformation (%s till %s)"
 
-#: calendar/gui/itip-utils.c:531
+#: calendar/gui/itip-utils.c:530
 msgid "iCalendar information"
 msgstr "iCalendar-information"
 
-#: calendar/gui/itip-utils.c:673
+#: calendar/gui/itip-utils.c:672
 msgid "You must be an attendee of the event."
 msgstr "Du måste delta i evenemanget."
 
@@ -7064,337 +7171,324 @@ msgid "Birthdays & Anniversaries"
 msgstr "Födelsedagar och jubileum"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:466 calendar/gui/migration.c:548
+#: calendar/gui/migration.c:478 calendar/gui/migration.c:571
 msgid "On The Web"
 msgstr "På webben"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:712 calendar/gui/migration.c:864
+#: calendar/gui/migration.c:735 calendar/gui/migration.c:887
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Kan inte migrera gamla inställningar från evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:741
+#: calendar/gui/migration.c:764
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kan inte migrera kalendern \"%s\""
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:893
+#: calendar/gui/migration.c:916
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kan inte migrera uppgifterna \"%s\""
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "1st"
 msgstr "1:a"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "2nd"
 msgstr "2:a"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "3rd"
 msgstr "3:e"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "4th"
 msgstr "4:e"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "5th"
 msgstr "5:e"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "6th"
 msgstr "6:e"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "7th"
 msgstr "7:e"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "8th"
 msgstr "8:e"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "9th"
 msgstr "9:e"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "10th"
 msgstr "10:e"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "11th"
 msgstr "11:e"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "12th"
 msgstr "12:e"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "13th"
 msgstr "13:e"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "14th"
 msgstr "14:e"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "15th"
 msgstr "15:e"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "16th"
 msgstr "16:e"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "17th"
 msgstr "17:e"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "18th"
 msgstr "18:e"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "19th"
 msgstr "19:e"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "20th"
 msgstr "20:e"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "21st"
 msgstr "21:a"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "22nd"
 msgstr "22:a"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "23rd"
 msgstr "23:e"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "24th"
 msgstr "24:e"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "25th"
 msgstr "25:e"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "26th"
 msgstr "26:e"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "27th"
 msgstr "27:e"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "28th"
 msgstr "28:e"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "29th"
 msgstr "29:e"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "30th"
 msgstr "30:e"
 
-#: calendar/gui/print.c:495
+#: calendar/gui/print.c:498
 msgid "31st"
 msgstr "31:a"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Su"
 msgstr "Sö"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Mo"
 msgstr "Må"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Tu"
 msgstr "Ti"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "We"
 msgstr "On"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Th"
 msgstr "To"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Sa"
 msgstr "Lö"
 
 #. Day
-#: calendar/gui/print.c:1914
+#: calendar/gui/print.c:1917
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Markerad dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
+#: calendar/gui/print.c:1942 calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1940
+#: calendar/gui/print.c:1943
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
-#: calendar/gui/print.c:1947
+#: calendar/gui/print.c:1947 calendar/gui/print.c:1949
+#: calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1951
+#: calendar/gui/print.c:1954
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Markerad vecka (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1959
+#: calendar/gui/print.c:1962
 msgid "Selected month (%b %Y)"
 msgstr "Markerad månad (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1966
+#: calendar/gui/print.c:1969
 msgid "Selected year (%Y)"
 msgstr "Markerat år (%Y)"
 
-#: calendar/gui/print.c:2356
+#: calendar/gui/print.c:2359
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2373
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2385
+#: calendar/gui/print.c:2388
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent klar: %i"
 
-#: calendar/gui/print.c:2397
+#: calendar/gui/print.c:2400
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2411
+#: calendar/gui/print.c:2414
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2425
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
+#: calendar/gui/print.c:2562 calendar/gui/print.c:2648
+#: calendar/gui/print.c:2740 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Förhandsgranska"
 
-#: calendar/gui/print.c:2593
+#: calendar/gui/print.c:2596
 msgid "Print Item"
 msgstr "Skriv ut objekt"
 
-#: calendar/gui/print.c:2759
+#: calendar/gui/print.c:2762
 msgid "Print Setup"
 msgstr "Skrivarinställningar"
 
-#: calendar/gui/tasks-component.c:314
-#, c-format
-msgid "Task List '%s' will be removed. Are you sure you want to continue?"
-msgstr ""
-"Uppgiftslistan \"%s\" kommer att tas bort. Är du säker på att du vill "
-"fortsätta?"
-
-#: calendar/gui/tasks-component.c:372
+#: calendar/gui/tasks-component.c:328
 msgid "New Task List"
 msgstr "Ny uppgiftslista"
 
-#: calendar/gui/tasks-component.c:415
+#: calendar/gui/tasks-component.c:404
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d uppgift"
 msgstr[1] "%d uppgifter"
 
-#: calendar/gui/tasks-component.c:417 mail/mail-component.c:498
+#: calendar/gui/tasks-component.c:406 mail/mail-component.c:523
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d markerad"
 msgstr[1] ", %d markerade"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:453
 msgid "Failed upgrading tasks."
 msgstr "Misslyckades med att uppgradera uppgifter."
 
-#: calendar/gui/tasks-component.c:758
+#: calendar/gui/tasks-component.c:747
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Kan inte öppna uppgiftslistan \"%s\" för skapande av evenemang och "
 "sammanträden"
 
-#: calendar/gui/tasks-component.c:773
+#: calendar/gui/tasks-component.c:762
 msgid "There is no calendar available for creating tasks"
 msgstr "Det finns ingen kalender tillgänglig för skapande av uppgifter"
 
-#: calendar/gui/tasks-component.c:1047
+#: calendar/gui/tasks-component.c:1036
 msgid "New task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1037
 msgid "_Task"
 msgstr "_Uppgift"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1038
 msgid "Create a new task"
 msgstr "Skapa en ny uppgift"
 
-#: calendar/gui/tasks-component.c:1055
-#, fuzzy
+#: calendar/gui/tasks-component.c:1044
 msgid "New assigned task"
-msgstr "Tilldela uppgift"
+msgstr "Ny tilldelad uppgift"
 
-#: calendar/gui/tasks-component.c:1056
-#, fuzzy
+#: calendar/gui/tasks-component.c:1045
 msgid "Assigne_d Task"
-msgstr "Tilldela uppgift"
+msgstr "Tilldela_d uppgift"
 
-#: calendar/gui/tasks-component.c:1057
-#, fuzzy
+#: calendar/gui/tasks-component.c:1046
 msgid "Create a new assigned task"
-msgstr "Skapa en ny uppgift"
+msgstr "Skapa en ny tilldelad uppgift"
 
-#: calendar/gui/tasks-component.c:1063
-#, fuzzy
+#: calendar/gui/tasks-component.c:1052
 msgid "New task list"
-msgstr "Ny uppgift"
+msgstr "Ny uppgiftslista"
 
-#: calendar/gui/tasks-component.c:1064
-#, fuzzy
+#: calendar/gui/tasks-component.c:1053
 msgid "Task l_ist"
-msgstr "Uppgiftslista"
+msgstr "Uppgiftsl_ista"
 
-#: calendar/gui/tasks-component.c:1065
-#, fuzzy
+#: calendar/gui/tasks-component.c:1054
 msgid "Create a new task list"
-msgstr "Skapa en ny uppgift"
+msgstr "Skapa en ny uppgiftslista"
 
-#: calendar/gui/tasks-control.c:370
+#: calendar/gui/tasks-control.c:372
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -7407,15 +7501,15 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa uppgifter?"
 
-#: calendar/gui/tasks-control.c:373
+#: calendar/gui/tasks-control.c:375
 msgid "Do not ask me again."
 msgstr "Fråga mig inte igen."
 
-#: calendar/gui/tasks-control.c:431
+#: calendar/gui/tasks-control.c:433
 msgid "Print Tasks"
 msgstr "Skriv ut uppgifter"
 
-#: calendar/gui/weekday-picker.c:326
+#: calendar/gui/weekday-picker.c:318
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
@@ -7992,7 +8086,7 @@ msgstr "Amerika/Montserrat"
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: calendar/zones.h:138
+#: calendar/zones.h:138 widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
@@ -8992,60 +9086,56 @@ msgstr "Stilla_Havet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stilla_Havet/Yap"
 
-#: camel/camel-cipher-context.c:102
+#: camel/camel-cipher-context.c:103
 msgid "Signing is not supported by this cipher"
 msgstr "Signering stöds inte av detta chiffer"
 
-#: camel/camel-cipher-context.c:128
-#, fuzzy
+#: camel/camel-cipher-context.c:129
 msgid "Signing message"
-msgstr "Skickar meddelande"
+msgstr "Signerar meddelande"
 
-#: camel/camel-cipher-context.c:145
+#: camel/camel-cipher-context.c:146
 msgid "Verifying is not supported by this cipher"
 msgstr "Verifiering stöds inte av detta chiffer"
 
-#: camel/camel-cipher-context.c:171
-#, fuzzy
+#: camel/camel-cipher-context.c:172
 msgid "Verifying message"
-msgstr "Skickar meddelande"
+msgstr "Verifierar meddelande"
 
-#: camel/camel-cipher-context.c:189
+#: camel/camel-cipher-context.c:190
 msgid "Encryption is not supported by this cipher"
 msgstr "Kryptering stöds inte av detta chiffer"
 
-#: camel/camel-cipher-context.c:215
-#, fuzzy
+#: camel/camel-cipher-context.c:216
 msgid "Encrypting message"
-msgstr "Skickar meddelande"
+msgstr "Krypterar meddelande"
 
-#: camel/camel-cipher-context.c:232
+#: camel/camel-cipher-context.c:233
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering stöds inte av detta chiffer"
 
-#: camel/camel-cipher-context.c:254
-#, fuzzy
+#: camel/camel-cipher-context.c:255
 msgid "Decrypting message"
-msgstr "Skickar meddelande"
+msgstr "Dekrypterar meddelande"
 
-#: camel/camel-cipher-context.c:271
+#: camel/camel-cipher-context.c:272
 msgid "You may not import keys with this cipher"
 msgstr "Du kan inte importera nycklar med detta chiffer"
 
-#: camel/camel-cipher-context.c:301
+#: camel/camel-cipher-context.c:302
 msgid "You may not export keys with this cipher"
 msgstr "Du kan inte exportera nycklar med detta chiffer"
 
-#: camel/camel-data-cache.c:133
+#: camel/camel-data-cache.c:134
 msgid "Unable to create cache path"
 msgstr "Kan inte skapa cachesökväg"
 
-#: camel/camel-data-cache.c:375
+#: camel/camel-data-cache.c:376
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kunde inte ta bort cacheposten: %s: %s"
 
-#: camel/camel-disco-diary.c:194
+#: camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -9056,7 +9146,7 @@ msgstr ""
 "Ytterligare åtgärder på denna server kommer inte att spelas tillbaka\n"
 "då du återansluter till nätverket."
 
-#: camel/camel-disco-diary.c:257
+#: camel/camel-disco-diary.c:258
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -9067,35 +9157,35 @@ msgstr ""
 "%s\n"
 "Ändringar i denna mapp kommer inte att återsynkroniseras."
 
-#: camel/camel-disco-diary.c:293
+#: camel/camel-disco-diary.c:294
 msgid "Resynchronizing with server"
 msgstr "Återsynkroniserar med servern"
 
-#: camel/camel-disco-folder.c:41
+#: camel/camel-disco-folder.c:42 camel/providers/imap4/camel-imap4-folder.c:61
 msgid "Copy folder content locally for offline operation"
 msgstr ""
 
-#: camel/camel-disco-folder.c:103
+#: camel/camel-disco-folder.c:104
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:466
+#: camel/camel-disco-folder.c:467
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Förbereder mappen \"%s\" för frånkopplat"
 
-#: camel/camel-disco-store.c:404
+#: camel/camel-disco-store.c:405
 msgid "You must be working online to complete this operation"
 msgstr "Du måste vara ansluten för att kunna genomföra denna åtgärd"
 
-#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:512
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Misslyckades med att skapa rör till \"%s\": %s"
 
 #: camel/camel-filter-driver.c:713 camel/camel-process.c:90
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Misslyckades med att skapa barnprocessen \"%s\": %s"
 
@@ -9113,7 +9203,7 @@ msgstr "Synkroniserar mappar"
 msgid "Error parsing filter: %s: %s"
 msgstr "Fel vid tolkning av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1429
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fel vid körning av filter: %s: %s"
@@ -9154,30 +9244,30 @@ msgstr "Hämtar meddelande %d av %d"
 msgid "Failed at message %d of %d"
 msgstr "Misslyckades vid meddelande %d av %d"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
 msgstr "Misslyckades med att hämta meddelande"
 
-#: camel/camel-filter-search.c:386
+#: camel/camel-filter-search.c:385
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ogiltiga argument till (system-flag)"
 
-#: camel/camel-filter-search.c:401
+#: camel/camel-filter-search.c:400
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ogiltiga argument till (user-tag)"
 
-#: camel/camel-filter-search.c:549
+#: camel/camel-filter-search.c:548
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Misslyckades med att skapa barnprocessen \"%s\": %s"
 
 #. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: camel/camel-filter-search.c:671 camel/camel-filter-search.c:679
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fel vid körning av filtersökning: %s: %s"
 
-#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#: camel/camel-folder-search.c:357 camel/camel-folder-search.c:478
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -9186,7 +9276,7 @@ msgstr ""
 "Kan inte tolka sökuttrycket: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#: camel/camel-folder-search.c:367 camel/camel-folder-search.c:488
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -9197,75 +9287,75 @@ msgstr ""
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61084
-#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+#: camel/camel-folder-search.c:674 camel/camel-folder-search.c:707
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) kräver ett ensamt booleskt resultat"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61084
-#: camel/camel-folder-search.c:755
+#: camel/camel-folder-search.c:757
 msgid "(match-threads) not allowed inside match-all"
 msgstr "(match-threads) är inte tillåtet inuti match-all"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61084
-#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
+#: camel/camel-folder-search.c:760 camel/camel-folder-search.c:764
 msgid "(match-threads) requires a match type string"
 msgstr "(match-threads) kräver en matchtypssträng"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61084
-#: camel/camel-folder-search.c:784
+#: camel/camel-folder-search.c:786
 msgid "(match-threads) expects an array result"
 msgstr "(match-threads) kräver ett vektorresultat"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61084
-#: camel/camel-folder-search.c:790
+#: camel/camel-folder-search.c:792
 msgid "(match-threads) requires the folder set"
 msgstr "(match-threads) kräver att mappen är inställd"
 
-#: camel/camel-folder-search.c:879
+#: camel/camel-folder-search.c:881
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Utför fråga på okänt huvud: %s"
 
-#: camel/camel-folder.c:653
+#: camel/camel-folder.c:610
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Åtgärden stöds inte: lägg till meddelande: för %s"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1200
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Åtgärden stöds inte: sökning med uttryck: för %s"
 
-#: camel/camel-folder.c:1302
+#: camel/camel-folder.c:1240
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Åtgärden stöds inte: sökning med uid: för %s"
 
-#: camel/camel-folder.c:1416
+#: camel/camel-folder.c:1352
 msgid "Moving messages"
 msgstr "Flyttar meddelanden"
 
-#: camel/camel-folder.c:1416
+#: camel/camel-folder.c:1352
 msgid "Copying messages"
 msgstr "Kopierar meddelanden"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61087
-#: camel/camel-folder.c:1665
+#: camel/camel-folder.c:1601
 msgid "Learning junk"
 msgstr "Lär skräp"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61087
-#: camel/camel-folder.c:1682
+#: camel/camel-folder.c:1618
 msgid "Learning non-junk"
 msgstr "Lär ickeskräp"
 
-#: camel/camel-folder.c:1701
+#: camel/camel-folder.c:1637
 msgid "Filtering new message(s)"
 msgstr "Filtrerar nya meddelanden"
 
@@ -9299,9 +9389,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:804 camel/camel-gpg-context.c:1314
 #: camel/camel-gpg-context.c:1498 camel/camel-gpg-context.c:1589
-#: camel/camel-gpg-context.c:1697 camel/providers/nntp/camel-nntp-store.c:1231
-#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
-#: mail/mail-send-recv.c:611
+#: camel/camel-gpg-context.c:1701 camel/providers/nntp/camel-nntp-store.c:1262
+#: mail/mail-ops.c:718 mail/mail-send-recv.c:607
 msgid "Cancelled."
 msgstr "Avbruten."
 
@@ -9335,21 +9424,21 @@ msgstr ""
 msgid "Failed to GPG %s: %s\n"
 msgstr "Misslyckades med att GPG:a %s: %s\n"
 
-#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:389
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Kunde inte generera signeringsdata: %s"
 
-#: camel/camel-gpg-context.c:1307 camel/camel-gpg-context.c:1762
-#: camel/camel-gpg-context.c:1813
+#: camel/camel-gpg-context.c:1307 camel/camel-gpg-context.c:1766
+#: camel/camel-gpg-context.c:1817
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Misslyckades med att köra gpg: %s"
 
 #: camel/camel-gpg-context.c:1331 camel/camel-gpg-context.c:1491
 #: camel/camel-gpg-context.c:1582 camel/camel-gpg-context.c:1605
-#: camel/camel-gpg-context.c:1690 camel/camel-gpg-context.c:1714
-#: camel/camel-gpg-context.c:1784 camel/camel-gpg-context.c:1835
+#: camel/camel-gpg-context.c:1694 camel/camel-gpg-context.c:1718
+#: camel/camel-gpg-context.c:1788 camel/camel-gpg-context.c:1839
 msgid "Failed to execute gpg."
 msgstr "Misslyckades med att köra gpg."
 
@@ -9358,8 +9447,8 @@ msgid "This is a digitally signed message part"
 msgstr "Detta är en digitalt signerad meddelandedel"
 
 #: camel/camel-gpg-context.c:1431 camel/camel-gpg-context.c:1437
-#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:721
-#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:692
+#: camel/camel-smime-context.c:703 camel/camel-smime-context.c:710
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Kan inte verifiera meddelandesignatur: Felaktigt meddelandeformat"
 
@@ -9378,11 +9467,15 @@ msgstr "Kunde inte generera krypteringsdata: %s"
 msgid "This is a digitally encrypted message part"
 msgstr "Detta är en digitalt signerad meddelandedel"
 
-#: camel/camel-gpg-context.c:1721 camel/camel-smime-context.c:995
+#: camel/camel-gpg-context.c:1674
+msgid "Failed to decrypt MIME part: protocol error"
+msgstr "Misslyckades med att dekryptera MIME-del: protokollfel"
+
+#: camel/camel-gpg-context.c:1725 camel/camel-smime-context.c:966
 msgid "Encrypted content"
 msgstr "Krypterat innehåll"
 
-#: camel/camel-gpg-context.c:1740
+#: camel/camel-gpg-context.c:1744
 msgid "Unable to parse message content"
 msgstr "Kunde inte tolka meddelandeinnehåll"
 
@@ -9426,69 +9519,61 @@ msgstr "Misslyckades med att få lås med fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Misslyckades med att få lås med flock(2): %s"
 
-#: camel/camel-movemail.c:107
+#: camel/camel-movemail.c:104
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Kunde inte kontrollera brevlådefilen %s: %s"
 
-#: camel/camel-movemail.c:120
+#: camel/camel-movemail.c:117
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kunde inte öppna brevlådefilen %s: %s"
 
-#: camel/camel-movemail.c:128
+#: camel/camel-movemail.c:125
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Kunde inte öppna temporära brevlådefilen %s: %s"
 
-#: camel/camel-movemail.c:157
+#: camel/camel-movemail.c:154
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Misslyckades med att lagra e-post i temporära filen %s: %s"
 
-#: camel/camel-movemail.c:187
+#: camel/camel-movemail.c:184
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kunde inte skapa rör: %s"
 
-#: camel/camel-movemail.c:199
+#: camel/camel-movemail.c:196
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Kunde inte grena: %s"
 
-#: camel/camel-movemail.c:237
+#: camel/camel-movemail.c:234
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Programmet movemail misslyckades: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:235
 msgid "(Unknown error)"
 msgstr "(Okänt fel)"
 
-#: camel/camel-movemail.c:261
+#: camel/camel-movemail.c:258
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Fel vid läsning av brevlådefil: %s"
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:269
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Fel vid skrivande av temporär brevlådefil: %s"
 
-#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
+#: camel/camel-movemail.c:462 camel/camel-movemail.c:529
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Fel vid kopierande av temporär brevfil: %s"
 
-#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
-msgid "Failed to decrypt MIME part: protocol error"
-msgstr "Misslyckades med att dekryptera MIME-del: protokollfel"
-
-#: camel/camel-multipart-encrypted.c:257
-msgid "Failed to decrypt MIME part: invalid structure"
-msgstr "Misslyckades med att dekryptera MIME-del: ogiltig struktur"
-
-#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
+#: camel/camel-multipart-signed.c:559
 msgid "parse error"
 msgstr "tolkningsfel"
 
@@ -9500,22 +9585,22 @@ msgstr "E-postleverantör för virtuell mapp"
 msgid "For reading mail as a query of another set of folders"
 msgstr "För läsande av e-post som en fråga av en annan samling mappar"
 
-#: camel/camel-provider.c:172
+#: camel/camel-provider.c:185
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Kunde inte läsa in %s: Modulinläsning stöds inte på detta system."
 
-#: camel/camel-provider.c:181
+#: camel/camel-provider.c:194
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunde inte läsa in %s: %s"
 
-#: camel/camel-provider.c:189
+#: camel/camel-provider.c:202
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunde inte läsa in %s: Ingen initieringskod i modulen."
 
-#: camel/camel-provider.c:356 camel/camel-session.c:160
+#: camel/camel-provider.c:374 camel/camel-session.c:161
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Det finns ingen leverantör för protokollet \"%s\""
@@ -9529,7 +9614,7 @@ msgid "This option will connect to the server using an anonymous login."
 msgstr ""
 "Detta alternativ ansluter till servern genom att använda anonym inloggning."
 
-#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:87
+#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:88
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
@@ -9560,11 +9645,11 @@ msgstr ""
 "Spårningsinformation för ogiltig:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:35
+#: camel/camel-sasl-cram-md5.c:36
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/camel-sasl-cram-md5.c:37
+#: camel/camel-sasl-cram-md5.c:38
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -9572,11 +9657,11 @@ msgstr ""
 "Detta alternativ kommer att ansluta till servern med ett säkert CRAM-MD5-"
 "lösenord, om servern stöder det."
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:49
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:50
+#: camel/camel-sasl-digest-md5.c:51
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -9584,41 +9669,41 @@ msgstr ""
 "Detta alternativ kommer att ansluta till servern med ett DIGEST-MD5-"
 "lösenord, om servern stöder det."
 
-#: camel/camel-sasl-digest-md5.c:813
+#: camel/camel-sasl-digest-md5.c:814
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Serverutmaningen var för lång (>2048 oktetter)\n"
 
-#: camel/camel-sasl-digest-md5.c:822
+#: camel/camel-sasl-digest-md5.c:823
 msgid "Server challenge invalid\n"
 msgstr "Serverutmaningen var ogiltig\n"
 
-#: camel/camel-sasl-digest-md5.c:828
+#: camel/camel-sasl-digest-md5.c:829
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr "Serverutmaningen innehöll ogiltig \"Quality of Protection\"-flagga\n"
 
-#: camel/camel-sasl-digest-md5.c:850
+#: camel/camel-sasl-digest-md5.c:859
 msgid "Server response did not contain authorization data\n"
 msgstr "Serversvaret innehöll inte autentiseringsdata\n"
 
-#: camel/camel-sasl-digest-md5.c:868
+#: camel/camel-sasl-digest-md5.c:877
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Serversvaret innehöll ofullständig autentiseringsdata\n"
 
-#: camel/camel-sasl-digest-md5.c:878
+#: camel/camel-sasl-digest-md5.c:887
 msgid "Server response does not match\n"
 msgstr "Serversvaret stämmer inte överens\n"
 
-#: camel/camel-sasl-gssapi.c:52
+#: camel/camel-sasl-gssapi.c:53
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: camel/camel-sasl-gssapi.c:54
+#: camel/camel-sasl-gssapi.c:55
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "Detta alternativ kommer att ansluta till servern med Kerberos 5-"
 "autentisering."
 
-#: camel/camel-sasl-gssapi.c:152
+#: camel/camel-sasl-gssapi.c:153
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -9626,11 +9711,11 @@ msgstr ""
 "Den angivna mekanismen stöds inte av det tillhandahållna kreditivet, eller "
 "är okänt av implementationen."
 
-#: camel/camel-sasl-gssapi.c:157
+#: camel/camel-sasl-gssapi.c:158
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Den angivna target_name-parametern var felaktigt utformad."
 
-#: camel/camel-sasl-gssapi.c:160
+#: camel/camel-sasl-gssapi.c:161
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -9638,7 +9723,7 @@ msgstr ""
 "Den angivna target_name-parametern innehöll en ogiltig namntyp eller en som "
 "inte stöds."
 
-#: camel/camel-sasl-gssapi.c:164
+#: camel/camel-sasl-gssapi.c:165
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -9646,7 +9731,7 @@ msgstr ""
 "input_token innehåller andra kanalbindningar än de som är angivna via "
 "parametern input_chan_bindings."
 
-#: camel/camel-sasl-gssapi.c:169
+#: camel/camel-sasl-gssapi.c:170
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -9654,7 +9739,7 @@ msgstr ""
 "input_token innehåller en ogiltig signatur, eller en signatur som inte kunde "
 "verifieras."
 
-#: camel/camel-sasl-gssapi.c:173
+#: camel/camel-sasl-gssapi.c:174
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -9662,50 +9747,45 @@ msgstr ""
 "De kreditiv som angavs var inte giltiga för sammanhangsinitiering, eller så "
 "refererade kreditivhandtaget inga kreditiv."
 
-#: camel/camel-sasl-gssapi.c:178
+#: camel/camel-sasl-gssapi.c:179
 msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 "Det angivna sammanhangshandtaget refererade inte till ett giltigt sammanhang."
 
-#: camel/camel-sasl-gssapi.c:181
+#: camel/camel-sasl-gssapi.c:182
 msgid "The consistency checks performed on the input_token failed."
 msgstr "Konsekvenskontrollerna som utfördes på input_token misslyckades."
 
-#: camel/camel-sasl-gssapi.c:184
+#: camel/camel-sasl-gssapi.c:185
 msgid "The consistency checks performed on the credential failed."
 msgstr "Konsekvenskontrollerna som utförts på kreditivet misslyckades."
 
-#: camel/camel-sasl-gssapi.c:187
+#: camel/camel-sasl-gssapi.c:188
 msgid "The referenced credentials have expired."
 msgstr "De refererade kreditiven har gått ut."
 
-#: camel/camel-sasl-gssapi.c:193 camel/camel-sasl-gssapi.c:242
+#: camel/camel-sasl-gssapi.c:194 camel/camel-sasl-gssapi.c:242
 #: camel/camel-sasl-gssapi.c:278 camel/camel-sasl-gssapi.c:293
-#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/camel-sasl-kerberos4.c:226
+#: camel/providers/imap/camel-imap-store.c:1213
 msgid "Bad authentication response from server."
 msgstr "Felaktigt autentiseringssvar från servern."
 
-#: camel/camel-sasl-gssapi.c:217
-#, c-format
-msgid "Failed to resolve host `%s': %s"
-msgstr "Misslyckades med att slå upp värden \"%s\": %s"
-
 #: camel/camel-sasl-gssapi.c:303
 msgid "Unsupported security layer."
 msgstr "Säkerhetslagret stöds inte."
 
-#: camel/camel-sasl-kerberos4.c:41
+#: camel/camel-sasl-kerberos4.c:42
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:43
+#: camel/camel-sasl-kerberos4.c:44
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Detta alternativ kommer att ansluta till servern med Kerberos 4-"
 "autentisering."
 
-#: camel/camel-sasl-kerberos4.c:162
+#: camel/camel-sasl-kerberos4.c:169
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -9714,24 +9794,24 @@ msgstr ""
 "Kunde inte få Kerberos-biljett:\n"
 "%s"
 
-#: camel/camel-sasl-login.c:32
+#: camel/camel-sasl-login.c:33
 msgid "Login"
 msgstr "Inloggning"
 
-#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:35 camel/camel-sasl-plain.c:35
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Detta alternativ ansluter till servern genom att använda ett enkelt lösenord."
 
-#: camel/camel-sasl-login.c:127
+#: camel/camel-sasl-login.c:128
 msgid "Unknown authentication state."
 msgstr "Okänt autentiseringstillstånd."
 
-#: camel/camel-sasl-ntlm.c:31
+#: camel/camel-sasl-ntlm.c:32
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: camel/camel-sasl-ntlm.c:33
+#: camel/camel-sasl-ntlm.c:34
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -9739,90 +9819,53 @@ msgstr ""
 "Detta alternativ kommer att ansluta till med NTLM / säker "
 "lösenordsautentisering (SPA)."
 
-#: camel/camel-sasl-plain.c:32
+#: camel/camel-sasl-plain.c:33
 msgid "PLAIN"
 msgstr "VANLIG"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:37
 msgid "POP before SMTP"
 msgstr "POP innan SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:38
+#: camel/camel-sasl-popb4smtp.c:39
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 "Detta alternativ kommer att auktorisera en POP-anslutning innan ett försök "
 "med SMTP görs"
 
-#: camel/camel-sasl-popb4smtp.c:103
+#: camel/camel-sasl-popb4smtp.c:104
 msgid "POP Source URI"
 msgstr "URI för POP-källa"
 
-#: camel/camel-sasl-popb4smtp.c:106
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "POP innan SMTP-auktorisering med en okänd förbindelse"
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP innan SMTP-auktorisering med en källa som inte är POP"
 
-#: camel/camel-search-private.c:114
+#: camel/camel-search-private.c:151
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Misslyckades med kompilering av reguljärt uttryck: %s: %s"
 
-#: camel/camel-service.c:271
+#: camel/camel-service.c:272
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL:en \"%s\" behöver ett användarnamn"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:276
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL:en \"%s\" behöver ett värdnamn"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:280
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL:en \"%s\" behöver en sökväg"
 
-#: camel/camel-service.c:729
-#, c-format
-msgid "Resolving: %s"
-msgstr "Slår upp: %s"
-
-#: camel/camel-service.c:760 camel/camel-service.c:884
-#, c-format
-msgid "Failure in name lookup: %s"
-msgstr "Namnuppslagning misslyckades: %s"
-
-#: camel/camel-service.c:781 camel/camel-service.c:905
-#, c-format
-msgid "Host lookup failed: cannot create thread: %s"
-msgstr "Uppslagning av värdnamn misslyckades: kan inte skapa tråd: %s"
-
-#: camel/camel-service.c:794
-#, 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:797
-#, c-format
-msgid "Host lookup failed: %s: unknown reason"
-msgstr "Uppslagning av värdnamn misslyckades: %s: okänd orsak"
-
-#: camel/camel-service.c:851
-msgid "Resolving address"
-msgstr "Slår upp adress"
-
-#: camel/camel-service.c:920
-msgid "Host lookup failed: host not found"
-msgstr "Uppslagning av värdnamn misslyckades: värden kunde inte hittas"
-
-#: camel/camel-service.c:923
-msgid "Host lookup failed: unknown reason"
-msgstr "Uppslagning av värdnamn misslyckades: okänd orsak"
-
-#: camel/camel-session.c:282
+#: camel/camel-session.c:283
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9831,306 +9874,280 @@ msgstr ""
 "Kunde inte skapa katalogen %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:104
-#, c-format
-msgid "Enter security pass-phrase for `%s'"
-msgstr "Ange säkerhetslösenfras för \"%s\""
-
-#: camel/camel-smime-context.c:261
+#: camel/camel-smime-context.c:231
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Kan inte hitta certifikat för \"%s\""
 
-#: camel/camel-smime-context.c:267
+#: camel/camel-smime-context.c:237
 msgid "Cannot create CMS message"
 msgstr "Kan inte skapa CMS-meddelande"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: camel/camel-smime-context.c:272
-msgid "Cannot create CMS signedData"
-msgstr "Kan inte skapa CMS-signeringsdata"
+#: camel/camel-smime-context.c:242
+msgid "Cannot create CMS signed data"
+msgstr "Kan inte skapa CMS-signerade data"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: camel/camel-smime-context.c:278
-msgid "Cannot attach CMS signedData"
-msgstr "Kan inte bifoga CMS-signeringsdata"
+#: camel/camel-smime-context.c:248
+msgid "Cannot attach CMS signed data"
+msgstr "Kan inte bifoga CMS-signerade data"
 
-#: camel/camel-smime-context.c:285
+#: camel/camel-smime-context.c:255
 msgid "Cannot attach CMS data"
 msgstr "Kan inte bifoga CMS-data"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: camel/camel-smime-context.c:291
-msgid "Cannot create CMS SignerInfo"
-msgstr "Kan inte skapa CMS-signeringsinformation"
+#: camel/camel-smime-context.c:261
+msgid "Cannot create CMS Signer information"
+msgstr "Kan inte skapa CMS-signerarinformation"
 
 # Detta kräver nog bättre formulering.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: camel/camel-smime-context.c:297
-msgid "Cannot find cert chain"
+#: camel/camel-smime-context.c:267
+msgid "Cannot find certificate chain"
 msgstr "Kan inte hitta certifikatkedja"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: camel/camel-smime-context.c:303
-msgid "Cannot add CMS SigningTime"
+#: camel/camel-smime-context.c:273
+msgid "Cannot add CMS Signing time"
 msgstr "Kan inte lägga till CMS-signeringstid"
 
 # Detta kräver nog en bättre formulering.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
+#: camel/camel-smime-context.c:295 camel/camel-smime-context.c:307
 #, c-format
-msgid "Encryption cert for '%s' does not exist"
+msgid "Encryption certificate for '%s' does not exist"
 msgstr "Krypteringscertifikatet för \"%s\" finns inte"
 
-#: camel/camel-smime-context.c:344
+#: camel/camel-smime-context.c:314
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Kan inte lägga till SMIMEEncKeyPrefs-attribut"
 
-#: camel/camel-smime-context.c:349
+#: camel/camel-smime-context.c:319
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Kan inte lägga till MS SMIMEEncKeyPrefs-attribut"
 
-#: camel/camel-smime-context.c:354
+#: camel/camel-smime-context.c:324
 msgid "Cannot add encryption certificate"
 msgstr "Kan inte lägga till krypteringscertifikat"
 
 # Detta kräver en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: camel/camel-smime-context.c:360
-msgid "Cannot add CMS SignerInfo"
-msgstr "Kan inte lägga till CMS-signeringsinformation"
+#: camel/camel-smime-context.c:330
+msgid "Cannot add CMS Signer information"
+msgstr "Kan inte lägga till CMS-signerarinformation"
 
-#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
+#: camel/camel-smime-context.c:400 camel/camel-smime-context.c:848
 msgid "Cannot create encoder context"
 msgstr "Kan inte skapa kodarsammanhang"
 
-#: camel/camel-smime-context.c:436
+#: camel/camel-smime-context.c:406
 msgid "Failed to add data to CMS encoder"
 msgstr "Misslyckades med att lägga till data till CMS-kodare"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
+#: camel/camel-smime-context.c:411 camel/camel-smime-context.c:865
 msgid "Failed to encode data"
 msgstr "Misslyckades med att koda data"
 
-#: camel/camel-smime-context.c:514
+#: camel/camel-smime-context.c:484
 msgid "Unverified"
 msgstr "Overifierad"
 
-#: camel/camel-smime-context.c:516
+#: camel/camel-smime-context.c:486
 msgid "Good signature"
 msgstr "Bra signatur"
 
-#: camel/camel-smime-context.c:518
+#: camel/camel-smime-context.c:488
 msgid "Bad signature"
 msgstr "Dålig signatur"
 
 # Osäker
-#: camel/camel-smime-context.c:520
+#: camel/camel-smime-context.c:490
 msgid "Content tampered with or altered in transit"
 msgstr "Innehållet fifflat med eller ändrat i överföringen"
 
-#: camel/camel-smime-context.c:522
+#: camel/camel-smime-context.c:492
 msgid "Signing certificate not found"
 msgstr "Signeringscertifikat hittades inte"
 
-#: camel/camel-smime-context.c:524
+#: camel/camel-smime-context.c:494
 msgid "Signing certificate not trusted"
 msgstr "Signeringscertifikatet opålitligt"
 
-#: camel/camel-smime-context.c:526
+#: camel/camel-smime-context.c:496
 msgid "Signature algorithm unknown"
 msgstr "Signaturalgoritmen okänd"
 
-#: camel/camel-smime-context.c:528
+#: camel/camel-smime-context.c:498
 msgid "Signature algorithm unsupported"
 msgstr "Signaturalgoritmen stöds inte"
 
-#: camel/camel-smime-context.c:530
+#: camel/camel-smime-context.c:500
 msgid "Malformed signature"
 msgstr "Felaktig signatur"
 
-#: camel/camel-smime-context.c:532
+#: camel/camel-smime-context.c:502
 msgid "Processing error"
 msgstr "Tolkningsfel"
 
 # Detta behöver bättre formulering.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: camel/camel-smime-context.c:569
-msgid "No signedData in signature"
-msgstr "Ingen signeringsdata i signatur"
+#: camel/camel-smime-context.c:539
+msgid "No signed data in signature"
+msgstr "Inga signerade data i signatur"
 
-#: camel/camel-smime-context.c:576
+#: camel/camel-smime-context.c:546
 msgid "Digests missing from enveloped data"
 msgstr ""
 
-#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
+#: camel/camel-smime-context.c:559 camel/camel-smime-context.c:569
 #, fuzzy
 msgid "Cannot calculate digests"
-msgstr "Kan inte få mapp: %s: %s"
+msgstr "Kan inte beräkna"
 
-#: camel/camel-smime-context.c:604
+#: camel/camel-smime-context.c:574
 #, fuzzy
 msgid "Cannot set message digests"
 msgstr "Kan inte hämta meddelande %s: %s"
 
-#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
+#: camel/camel-smime-context.c:584 camel/camel-smime-context.c:589
 msgid "Certificate import failed"
 msgstr "Certifikatimport misslyckades"
 
 # Detta kräver en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: camel/camel-smime-context.c:628
-msgid "Certificate only message, cannot verify certificates"
-msgstr ""
+#: camel/camel-smime-context.c:599
+msgid "Certificate is the only message, cannot verify certificates"
+msgstr "Certifikatet är enda meddelandet, kan inte verifiera certifikat"
 
 # Detta kräver en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: camel/camel-smime-context.c:631
-msgid "Certificate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:602
+msgid "Certificate is the only message, certificates imported and verified"
 msgstr ""
+"Certifikatet är det enda meddelandet, certifikat importerade och verifierade"
 
-#: camel/camel-smime-context.c:635
+#: camel/camel-smime-context.c:606
 #, fuzzy
 msgid "Cannot find signature digests"
-msgstr "Kan inte hämta meddelande %s: %s"
+msgstr "Kan inte hitta signatur"
 
-#: camel/camel-smime-context.c:651
+#: camel/camel-smime-context.c:622
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signerare: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:752
+#: camel/camel-smime-context.c:723
 msgid "Decoder failed"
 msgstr "Avkodaren misslyckades"
 
-#: camel/camel-smime-context.c:804
-#, fuzzy, c-format
+#: camel/camel-smime-context.c:775
+#, c-format
 msgid "Cannot find certificate for `%s'"
 msgstr "Kan inte hitta certifikat för \"%s\""
 
-# Detta borde nog vara "cannot".
-# http://bugzilla.ximian.com/show_bug.cgi?id=61090
-#: camel/camel-smime-context.c:811
-#, fuzzy
+#: camel/camel-smime-context.c:782
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Kan inte hitta gemensam algoritm för bulkkryptering"
 
-# Detta borde nog vara "cannot".
-# http://bugzilla.ximian.com/show_bug.cgi?id=61090
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:820
-#, fuzzy
+#: camel/camel-smime-context.c:791
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Kan inte allokera plats för bulknyckel för kryptering"
 
-#: camel/camel-smime-context.c:831
-#, fuzzy
+#: camel/camel-smime-context.c:802
 msgid "Cannot create CMS Message"
 msgstr "Kan inte skapa CMS-meddelande"
 
 # Detta borde nog omformuleras.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-# Detta borde nog vara "cannot".
-# http://bugzilla.ximian.com/show_bug.cgi?id=61090
-#: camel/camel-smime-context.c:837
-#, fuzzy
-msgid "Cannot create CMS EnvelopedData"
-msgstr "Kan inte skapa CMS-kuvertdata"
+#: camel/camel-smime-context.c:808
+msgid "Cannot create CMS Enveloped data"
+msgstr "Kan inte skapa CMS-kuverterade data"
 
 # Detta borde nog omformuleras.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-# Detta borde nog vara "cannot".
-# http://bugzilla.ximian.com/show_bug.cgi?id=61090
-#: camel/camel-smime-context.c:843
-#, fuzzy
-msgid "Cannot attach CMS EnvelopedData"
-msgstr "Kan inte bifoga CMS-kuvertdata"
+#: camel/camel-smime-context.c:814
+msgid "Cannot attach CMS Enveloped data"
+msgstr "Kan inte bifoga CMS-kuverterade data"
 
-# Detta borde nog vara "cannot".
-# http://bugzilla.ximian.com/show_bug.cgi?id=61090
-#: camel/camel-smime-context.c:849
-#, fuzzy
+#: camel/camel-smime-context.c:820
 msgid "Cannot attach CMS data object"
 msgstr "Kan inte bifoga CMS-dataobjekt"
 
-# Detta borde nog vara "cannot".
-# http://bugzilla.ximian.com/show_bug.cgi?id=61090
 # Detta borde nog omformuleras.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: camel/camel-smime-context.c:858
-#, fuzzy
-msgid "Cannot create CMS RecipientInfo"
+#: camel/camel-smime-context.c:829
+msgid "Cannot create CMS Recipient information"
 msgstr "Kan inte skapa CMS-mottagarinformation"
 
-# Detta borde nog vara "cannot".
-# http://bugzilla.ximian.com/show_bug.cgi?id=61090
 # Detta borde nog omformuleras.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: camel/camel-smime-context.c:863
-#, fuzzy
-msgid "Cannot add CMS RecipientInfo"
+#: camel/camel-smime-context.c:834
+msgid "Cannot add CMS Recipient information"
 msgstr "Kan inte lägga till CMS-mottagarinformation"
 
-#: camel/camel-smime-context.c:888
+#: camel/camel-smime-context.c:859
 msgid "Failed to add data to encoder"
 msgstr "Misslyckades med att lägga till data till kodare"
 
-#: camel/camel-smime-context.c:975
+#: camel/camel-smime-context.c:946
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr "Avkodare misslyckades, fel %d"
 
-#: camel/camel-smime-context.c:982
+#: camel/camel-smime-context.c:953
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME-dekryptering: Inget krypterat innehåll hittades"
 
-#: camel/camel-smime-context.c:1009
+#: camel/camel-smime-context.c:980
 msgid "import keys: unimplemented"
 msgstr "importera nycklar: inte implementerat"
 
-#: camel/camel-smime-context.c:1017
+#: camel/camel-smime-context.c:988
 msgid "export keys: unimplemented"
 msgstr "exportera nycklar: inte implementerat"
 
-#: camel/camel-store.c:213
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Kan inte få tag i mapp: Ogiltig åtgärd på detta lager"
+msgstr "Kan inte hämta mapp: Ogiltig åtgärd på detta lager"
 
-#: camel/camel-store.c:243
+#: camel/camel-store.c:244
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Kan inte skapa mappen \"%s\": mappen existerar"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:298
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan inte skapa mapp: Ogiltig åtgärd på detta lager"
 
-#: camel/camel-store.c:325
+#: camel/camel-store.c:326
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kan inte skapa mapp: %s: mappen existerar"
 
-#: camel/camel-store.c:389 camel/camel-vee-store.c:351
+#: camel/camel-store.c:390 camel/camel-vee-store.c:367
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan inte ta bort mapp: %s: Ogiltig åtgärd"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:388
-#: camel/providers/local/camel-maildir-store.c:232
+#: camel/camel-store.c:440 camel/camel-vee-store.c:404
+#: camel/providers/local/camel-maildir-store.c:233
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan inte byta namn på mapp: %s: Ogiltig åtgärd"
 
-#: camel/camel-store.c:777
+#: camel/camel-store.c:778
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
-#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:780 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:93 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Skräp"
 
@@ -10252,7 +10269,7 @@ msgstr "Nyckelanvändning stöder inte certifikatsignering"
 msgid "Error in application verification"
 msgstr "Fel i programverifiering"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:827
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -10265,11 +10282,11 @@ msgstr ""
 "Fingeravtryck:     %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833
 msgid "GOOD"
 msgstr "BRA"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833
 msgid "BAD"
 msgstr "DÅLIG"
 
@@ -10293,7 +10310,7 @@ msgstr ""
 "Vill du acceptera ändå?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:836
+#: camel/camel-tcp-stream-ssl.c:837
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -10308,7 +10325,7 @@ msgstr ""
 "\n"
 "Vill du acceptera?"
 
-#: camel/camel-tcp-stream-ssl.c:880
+#: camel/camel-tcp-stream-ssl.c:881
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -10317,7 +10334,7 @@ msgstr ""
 "Certifikatproblem: %s\n"
 "Utfärdare: %s"
 
-#: camel/camel-tcp-stream-ssl.c:932
+#: camel/camel-tcp-stream-ssl.c:933
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -10326,7 +10343,7 @@ msgstr ""
 "Felaktig certifikatdomän: %s\n"
 "Utfärdare: %s"
 
-#: camel/camel-tcp-stream-ssl.c:950
+#: camel/camel-tcp-stream-ssl.c:951
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -10335,7 +10352,7 @@ msgstr ""
 "Certifikatet har gått ut: %s\n"
 "Utfärdare: %s"
 
-#: camel/camel-tcp-stream-ssl.c:967
+#: camel/camel-tcp-stream-ssl.c:968
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -10344,143 +10361,129 @@ msgstr ""
 "Certifikatåterkallelselistan har gått ut: %s\n"
 "Utfärdare: %s"
 
-#: camel/camel-url.c:292
+#: camel/camel-url.c:293
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Kunde inte tolka URL:en \"%s\""
 
-#: camel/camel-vee-folder.c:633
+#: camel/camel-vee-folder.c:476
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Fel vid lagring av \"%s\": %s"
 
-#: camel/camel-vee-folder.c:675
+#: camel/camel-vee-folder.c:518
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Det finns inget sådant meddelande %s i %s"
 
-#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
+#: camel/camel-vee-folder.c:643 camel/camel-vee-folder.c:649
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan inte kopiera eller flytta meddelanden till en virtuell mapp"
 
-#: camel/camel-vee-store.c:374
+#: camel/camel-vee-store.c:390
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan inte ta bort mapp: %s: Det finns ingen sådan mapp"
 
-#: camel/camel-vee-store.c:396
+#: camel/camel-vee-store.c:412
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan inte byta namn på mapp: %s: Det finns ingen sådan mapp"
 
-#: camel/camel-vtrash-folder.c:44
+#: camel/camel-vtrash-folder.c:47
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Kan inte kopiera meddelanden till papperskorgsmappen"
 
-#: camel/camel-vtrash-folder.c:46
+#: camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Kan inte kopiera meddelanden till skräpmappen"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:53
-#: camel/providers/imap4/camel-imap4-provider.c:35
+#: camel/providers/groupwise/camel-groupwise-provider.c:54
+#: camel/providers/imap4/camel-imap4-provider.c:36
 msgid "Checking for new mail"
 msgstr "Kontroll av ny e-post"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap/camel-imap-provider.c:45
-#: camel/providers/imap4/camel-imap4-provider.c:37
+#: camel/providers/groupwise/camel-groupwise-provider.c:56
+#: camel/providers/imap4/camel-imap4-provider.c:38
 msgid "Check for new messages in all folders"
 msgstr "Kontrollera nya meddelanden i alla mappar"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:59
+#: camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Tillämpa filtren på nya meddelanden i inkorgen på denna server"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:61
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/groupwise/camel-groupwise-provider.c:63
+#: camel/providers/imap4/camel-imap4-provider.c:53
 msgid "Check new messages for Junk contents"
 msgstr "Kontrollera om nya meddelanden innehåller skräp"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:63
-#: camel/providers/imap/camel-imap-provider.c:68
+#: camel/providers/groupwise/camel-groupwise-provider.c:65
+#: camel/providers/imap4/camel-imap4-provider.c:55
 msgid "Only check for Junk messages in the INBOX folder"
 msgstr "Kontrollera endast om det finns skräpmeddelanden i INBOX-mappen"
 
 # Låter konstigt
-#: camel/providers/groupwise/camel-groupwise-provider.c:65
-#: camel/providers/imap/camel-imap-provider.c:70
-msgid "Automatically synchronize remote mail locally"
-msgstr "Synkronisera automatiskt fjärrpost lokalt"
+#: camel/providers/groupwise/camel-groupwise-provider.c:67
+msgid "Automatically synchronize account locally"
+msgstr "Synkronisera automatiskt konto lokalt"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:72
 msgid "Address Book and Calendar"
 msgstr "Adressbok och kalender"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-provider.c:75
 msgid "Post Office Agent:"
-msgstr "Inte inne-meddelande:"
+msgstr "Postkontorsagent:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:75
+#: camel/providers/groupwise/camel-groupwise-provider.c:78
 msgid "Post Office Agent SOAP Port:"
-msgstr ""
+msgstr "SOAP-port för postkontorsagent:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:78
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Use Secure Connection (SSL)"
-msgstr "_Använd säker anslutning (SSL):"
+msgstr "Använd säker anslutning (SSL)"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:92
+#: camel/providers/groupwise/camel-groupwise-provider.c:94
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:94
+#: camel/providers/groupwise/camel-groupwise-provider.c:96
 msgid "For accessing Novell Groupwise servers"
 msgstr "För åtkomst av Novell Groupwise-servrar"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:109
-#: camel/providers/imap/camel-imap-provider.c:93
-#: camel/providers/imap4/camel-imap4-provider.c:70
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
+#: camel/providers/groupwise/camel-groupwise-provider.c:111
+#: camel/providers/imap/camel-imap-provider.c:96
+#: camel/providers/imap4/camel-imap4-provider.c:81
+#: camel/providers/imapp/camel-imapp-provider.c:66
+#: camel/providers/nntp/camel-nntp-provider.c:72
+#: camel/providers/pop3/camel-pop3-provider.c:72
 msgid "Password"
 msgstr "Lösenord"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:111
-#: camel/providers/imap/camel-imap-provider.c:95
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/groupwise/camel-groupwise-provider.c:113
+#: camel/providers/imap/camel-imap-provider.c:98
+#: camel/providers/imapp/camel-imapp-provider.c:68
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Detta alternativ ansluter till IMAP-servern med ett lösenord i klartext."
 
-#: camel/providers/groupwise/camel-gw-listener.c:332
-#: camel/providers/groupwise/camel-gw-listener.c:362
+#: camel/providers/groupwise/camel-gw-listener.c:436
 msgid "Checklist"
 msgstr "Kontrollista"
 
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3191
+#: camel/providers/imap/camel-imap-store.c:3200
 msgid "Operation cancelled"
 msgstr "Åtgärden avbruten"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3203
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Servern kopplade ifrån oväntat: %s"
 
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/imap4/camel-imap4-store.c:283
-#: camel/providers/pop3/camel-pop3-store.c:543
-#: camel/providers/pop3/camel-pop3-store.c:550
-#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1220
-msgid "Unknown error"
-msgstr "Okänt fel"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10534,12 +10537,12 @@ 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:1938
+#: camel/providers/imap/camel-imap-folder.c:1939
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan inte hämta meddelande: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1975
+#: camel/providers/imap/camel-imap-folder.c:1979
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10548,199 +10551,219 @@ msgstr ""
 "Kan inte hämta meddelande: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1975
-#: camel/providers/local/camel-maildir-folder.c:244
-#: camel/providers/local/camel-mbox-folder.c:418
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/imap/camel-imap-folder.c:1979
+#: camel/providers/local/camel-maildir-folder.c:245
+#: camel/providers/local/camel-mbox-folder.c:403
+#: camel/providers/local/camel-mh-folder.c:203
 msgid "No such message"
 msgstr "Det finns inget sådant meddelande"
 
-#: camel/providers/imap/camel-imap-folder.c:2017
-#: camel/providers/imap/camel-imap-folder.c:2620
-#: camel/providers/nntp/camel-nntp-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:2021
+#: camel/providers/imap/camel-imap-folder.c:2623
+#: camel/providers/nntp/camel-nntp-folder.c:221
 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:2283
-#: camel/providers/imap/camel-imap-folder.c:2353
+#: camel/providers/imap/camel-imap-folder.c:2287
+#: camel/providers/imap/camel-imap-folder.c:2357
 msgid "Fetching summary information for new messages"
 msgstr "Hämtar meddelandeinformation för nya meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2464
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2469
+#: camel/providers/imap/camel-imap-folder.c:2472
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2482
+#: camel/providers/imap/camel-imap-folder.c:2485
 #, c-format
 msgid ""
 "Unexpected server response: Identical UIDs provided for messages %d and %d"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2658
+#: camel/providers/imap/camel-imap-folder.c:2661
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:156
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Kunde inte öppna cachekatalogen: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:252
-#: camel/providers/imap/camel-imap-message-cache.c:309
-#: camel/providers/imap/camel-imap-message-cache.c:340
-#: camel/providers/imap/camel-imap-message-cache.c:372
+#: camel/providers/imap/camel-imap-message-cache.c:253
+#: camel/providers/imap/camel-imap-message-cache.c:310
+#: camel/providers/imap/camel-imap-message-cache.c:341
+#: camel/providers/imap/camel-imap-message-cache.c:373
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Misslyckades med att cacha meddelande %s: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:417
+#: camel/providers/imap/camel-imap-message-cache.c:418
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "Misslyckades med att cacha %s: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43
+#: camel/providers/imap/camel-imap-provider.c:44
 msgid "Checking for New Mail"
 msgstr "Kontroll av ny e-post"
 
-#: camel/providers/imap/camel-imap-provider.c:48
+#: camel/providers/imap/camel-imap-provider.c:46
+msgid "C_heck for new messages in all folders"
+msgstr "_Kontrollera nya meddelanden i alla mappar"
+
+#: camel/providers/imap/camel-imap-provider.c:49
 msgid "Connection to Server"
 msgstr "Anslutning till server"
 
-#: camel/providers/imap/camel-imap-provider.c:50
-msgid "Use custom command to connect to server"
-msgstr "Använd anpassat kommando för att ansluta till servern"
+#: camel/providers/imap/camel-imap-provider.c:51
+msgid "_Use custom command to connect to server"
+msgstr "_Använd anpassat kommando för att ansluta till servern"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:53
 msgid "Command:"
 msgstr "Kommando:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/nntp/camel-nntp-provider.c:41
+#: camel/providers/imap/camel-imap-provider.c:56
+#: camel/providers/imap4/camel-imap4-provider.c:41
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "Folders"
 msgstr "Mappar"
 
-#: camel/providers/imap/camel-imap-provider.c:57
-#: camel/providers/imap4/camel-imap4-provider.c:42
-msgid "Show only subscribed folders"
-msgstr "Visa endast prenumererade mappar"
+#: camel/providers/imap/camel-imap-provider.c:58
+msgid "_Show only subscribed folders"
+msgstr "_Visa endast prenumererade mappar"
 
-#: camel/providers/imap/camel-imap-provider.c:59
-#: camel/providers/imap4/camel-imap4-provider.c:44
-msgid "Override server-supplied folder namespace"
-msgstr "Åsidosätt mappnamnrymden som servern tillhandahåller"
+#: camel/providers/imap/camel-imap-provider.c:60
+msgid "O_verride server-supplied folder namespace"
+msgstr "_Åsidosätt mappnamnrymden som servern tillhandahåller"
 
-#: camel/providers/imap/camel-imap-provider.c:61
-#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:62
+#: camel/providers/imap4/camel-imap4-provider.c:47
 msgid "Namespace"
 msgstr "Namnrymd"
 
-#: camel/providers/imap/camel-imap-provider.c:64
-msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Tillämpa filtren på nya meddelanden i INBOX på denna server"
+#: camel/providers/imap/camel-imap-provider.c:66
+msgid "_Apply filters to new messages in INBOX on this server"
+msgstr "_Tillämpa filtren på nya meddelanden i INBOX på denna server"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+msgid "Check new messages for _Junk contents"
+msgstr "Kontrollera om nya meddelanden innehåller _skräp"
+
+#: camel/providers/imap/camel-imap-provider.c:70
+msgid "Only check for Junk messa_ges in the INBOX folder"
+msgstr "Kontrollera endast om det finns skräpme_ddelanden i INBOX-mappen"
+
+# Låter konstigt
+#: camel/providers/imap/camel-imap-provider.c:72
+msgid "Automatically synchroni_ze remote mail locally"
+msgstr "S_ynkronisera automatiskt fjärrpost lokalt"
 
-#: camel/providers/imap/camel-imap-provider.c:76
+#: camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:78
+#: camel/providers/imap/camel-imap-provider.c:81
 msgid "For reading and storing mail on IMAP servers."
 msgstr "För läsande och lagrande av e-post på IMAP-servrar."
 
-#: camel/providers/imap/camel-imap-store.c:424
-#: camel/providers/imap4/camel-imap4-store.c:177
+#: camel/providers/imap/camel-imap-store.c:421
+#: camel/providers/imap4/camel-imap4-store.c:203
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-server %s"
 
-#: camel/providers/imap/camel-imap-store.c:426
-#: camel/providers/imap4/camel-imap4-store.c:179
+#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap4/camel-imap4-store.c:205
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjänst för %s på %s"
 
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imap4/camel-imap4-store.c:214
-#: camel/providers/imap4/camel-imap4-store.c:230
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Kunde inte ansluta till %s (port %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/imap4/camel-imap4-store.c:216
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/imap/camel-imap-store.c:533
+#: camel/providers/imap/camel-imap-store.c:548
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imap4/camel-imap4-store.c:250
+#: camel/providers/nntp/camel-nntp-store.c:198
+#: camel/providers/nntp/camel-nntp-store.c:213
+#: camel/providers/pop3/camel-pop3-store.c:167
+#: camel/providers/pop3/camel-pop3-store.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:270
+#, c-format
+msgid "Could not connect to %s: %s"
+msgstr "Kunde inte ansluta till %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:534
+#: camel/providers/imap4/camel-imap4-store.c:236
+#: camel/providers/nntp/camel-nntp-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:256
 msgid "SSL unavailable"
 msgstr "SSL är inte tillgängligt"
 
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:841
-#: camel/providers/imap4/camel-imap4-store.c:227
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
+#: camel/providers/imap/camel-imap-store.c:545
+#: camel/providers/imap/camel-imap-store.c:808
+#: camel/providers/imap4/camel-imap4-store.c:247
+#: camel/providers/imapp/camel-imapp-store.c:248
+#: camel/providers/nntp/camel-nntp-store.c:210
+#: camel/providers/nntp/camel-nntp-store.c:229
+#: camel/providers/pop3/camel-pop3-store.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:267
 msgid "Connection cancelled"
 msgstr "Anslutning avbruten"
 
-#: camel/providers/imap/camel-imap-store.c:675
-#: camel/providers/imap/camel-imap-store.c:706
-#: camel/providers/imap4/camel-imap4-store.c:282
+#: camel/providers/imap/camel-imap-store.c:652
+#: camel/providers/imap/camel-imap-store.c:674
+#: camel/providers/imap4/camel-imap4-store.c:274
+#: camel/providers/imap4/camel-imap4-store.c:287
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Misslyckades med att ansluta till IMAP-servern %s i säkert läge: %s"
 
-#: camel/providers/imap/camel-imap-store.c:676
-#: camel/providers/pop3/camel-pop3-store.c:233
-msgid "SSL/TLS extension not supported."
-msgstr "SSL/TLS-tillägg stöds inte."
+#: camel/providers/imap/camel-imap-store.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:323
+msgid "STARTTLS not supported"
+msgstr "STARTTLS stöds inte"
 
-#: camel/providers/imap/camel-imap-store.c:707
-#: camel/providers/pop3/camel-pop3-store.c:274
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap4/camel-imap4-store.c:275
+#: camel/providers/pop3/camel-pop3-store.c:243
 msgid "SSL negotiations failed"
 msgstr "SSL-förhandlingar misslyckades"
 
-#: camel/providers/imap/camel-imap-store.c:844
+#: camel/providers/imap/camel-imap-store.c:811
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kunde inte ansluta med kommandot \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1268
+#: camel/providers/imap/camel-imap-store.c:1245
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-servern %s stöder inte den begärda autentiseringstypen %s"
 
-#: camel/providers/imap/camel-imap-store.c:1278
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap/camel-imap-store.c:1255
+#: camel/providers/smtp/camel-smtp-transport.c:489
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Inget stöd för autentiseringstypen %s"
 
 # Borde finnas en kommentar som talar om vad det första %s blir.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61093
-#: camel/providers/imap/camel-imap-store.c:1301
-#: camel/providers/imapp/camel-imapp-store.c:344
+#: camel/providers/imap/camel-imap-store.c:1278
+#: camel/providers/imapp/camel-imapp-store.c:364
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sAnge IMAP-lösenordet för %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1315
+#: camel/providers/imap/camel-imap-store.c:1292
 msgid "You didn't enter a password."
 msgstr "Du angav inte något lösenord."
 
-#: camel/providers/imap/camel-imap-store.c:1344
+#: camel/providers/imap/camel-imap-store.c:1321
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10751,348 +10774,420 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1863
-#: camel/providers/imap/camel-imap-store.c:2053
+#: camel/providers/imap/camel-imap-store.c:1843
+#: camel/providers/imap/camel-imap-store.c:2033
 #, c-format
 msgid "No such folder %s"
 msgstr "Det finns ingen mapp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1881
-#: camel/providers/imap/camel-imap-store.c:2259
-#: camel/providers/imap4/camel-imap4-store.c:764
+#: camel/providers/imap/camel-imap-store.c:1861
+#: camel/providers/imap/camel-imap-store.c:2239
+#: camel/providers/imap4/camel-imap4-store.c:759
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Mappnamnet \"%s\" är ogiltigt eftersom det innehåller tecknet \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1939
-#: camel/providers/imap/camel-imap-store.c:2320
+#: camel/providers/imap/camel-imap-store.c:1919
+#: camel/providers/imap/camel-imap-store.c:2300
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Föräldermappen får inte innehålla undermappar"
 
-#: camel/providers/imap/camel-imap-store.c:1994
-#: camel/providers/local/camel-maildir-store.c:139
-#: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:236
+#: camel/providers/imap/camel-imap-store.c:1974
+#: camel/providers/local/camel-maildir-store.c:140
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mh-store.c:237
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kan inte skapa mappen \"%s\": mappen existerar."
 
-#: camel/providers/imap/camel-imap-store.c:2270
+#: camel/providers/imap/camel-imap-store.c:2250
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Okänd föräldermapp: %s"
 
-#: camel/providers/imap4/camel-imap4-command.c:550
-#: camel/providers/imap4/camel-imap4-command.c:557
+#: camel/providers/imap4/camel-imap4-command.c:551
+#: camel/providers/imap4/camel-imap4-command.c:558
 #, c-format
 msgid "Failed sending command to IMAP server %s: %s"
 msgstr "Misslyckades med att skicka kommando till IMAP-servern %s: %s"
 
-#: camel/providers/imap4/camel-imap4-command.c:656
+#: camel/providers/imap4/camel-imap4-command.c:661
 #, c-format
 msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr "Oväntat svar från IMAP4-servern %s: %s"
 
-#: camel/providers/imap4/camel-imap4-engine.c:230
+#: camel/providers/imap4/camel-imap4-engine.c:216
 #, c-format
 msgid "Unexpected greeting from IMAP server %s."
 msgstr "Oväntad hälsning från IMAP-servern %s."
 
-#: camel/providers/imap4/camel-imap4-engine.c:414
+#: camel/providers/imap4/camel-imap4-engine.c:410
 #, c-format
 msgid "Cannot select folder `%s': Invalid mailbox name"
 msgstr "Kan inte välja mappen \"%s\": Ogiltigt brevlådenamn"
 
-#: camel/providers/imap4/camel-imap4-engine.c:420
+#: camel/providers/imap4/camel-imap4-engine.c:416
 #, c-format
 msgid "Cannot select folder `%s': Bad command"
 msgstr "Kan inte välja mappen \"%s\": Felaktigt kommando"
 
-#: camel/providers/imap4/camel-imap4-engine.c:1401
-#: camel/providers/imap4/camel-imap4-engine.c:1431
-#: camel/providers/imap4/camel-imap4-engine.c:1463
-#: camel/providers/imap4/camel-imap4-engine.c:1505
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-engine.c:1464
+#: camel/providers/imap4/camel-imap4-engine.c:1503
+#: camel/providers/imap4/camel-imap4-engine.c:1548
+#: camel/providers/imap4/camel-imap4-engine.c:1604
+#, c-format
 msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Servern kopplade ifrån oväntat: %s"
+msgstr "IMAP4-servern %s kopplade ifrån oväntat: %s"
 
 #: camel/providers/imap4/camel-imap4-folder.c:359
-#, fuzzy, c-format
+#, c-format
+msgid "Cannot access folder `%s': %s"
+msgstr "Kan inte komma åt mappen \"%s\": %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:418
+#, c-format
 msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Kan inte få mapp: %s: %s"
+msgstr "Kan inte synkronisera flaggor till mappen \"%s\": Okänd"
 
-#: camel/providers/imap4/camel-imap4-folder.c:365
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-folder.c:424
+#, c-format
 msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr ""
-"Kunde inte skapa mappen \"%s\":\n"
-"%s"
+msgstr "Kan inte synkronisera flaggor till mappen \"%s\": Felaktigt kommando"
 
-#: camel/providers/imap4/camel-imap4-folder.c:502
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-folder.c:565
+#, c-format
 msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Kan inte få mapp: %s: %s"
+msgstr "Kan inte tömma mappen \"%s\": Okänd"
 
-#: camel/providers/imap4/camel-imap4-folder.c:507
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-folder.c:570
+#, c-format
 msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Kan inte få mapp: %s: %s"
+msgstr "Kan inte tömma mappen \"%s\": Felaktigt kommando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:749
+#: camel/providers/nntp/camel-nntp-folder.c:157
+#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/nntp/camel-nntp-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:431
+#: camel/providers/pop3/camel-pop3-folder.c:492
+#: camel/providers/pop3/camel-pop3-folder.c:510
+msgid "User cancelled"
+msgstr "Användaren avbröt"
 
-#: camel/providers/imap4/camel-imap4-folder.c:697
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-folder.c:754
+#: camel/providers/nntp/camel-nntp-folder.c:148
+#: camel/providers/nntp/camel-nntp-folder.c:150
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/nntp/camel-nntp-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:434
+#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:502
+#: camel/providers/pop3/camel-pop3-folder.c:513
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Kan inte hämta meddelande %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:772
+msgid "This message is not available in offline mode."
+msgstr "Detta meddelande är inte tillgängligt i frånkopplat läge."
+
+#: camel/providers/imap4/camel-imap4-folder.c:826
+#, c-format
 msgid "Cannot get message %s from folder `%s': No such message"
 msgstr ""
-"Kan inte hämta meddelande: %s från mappen %s\n"
-"  %s"
+"Kan inte hämta meddelandet %s från mappen \"%s\": Inget sådant meddelande"
 
-#: camel/providers/imap4/camel-imap4-folder.c:702
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-folder.c:831
+#, c-format
 msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Kan inte hämta meddelande: %s från mappen %s\n"
-"  %s"
+msgstr "Kan inte hämta meddelandet %s från mappen \"%s\": Felaktigt kommando"
 
-#: camel/providers/imap4/camel-imap4-folder.c:827
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-folder.c:873
+msgid "Cannot append messages to IMAP folders in offline mode."
+msgstr "Kan inte lägga till meddelanden i IMAP-mappar i frånkopplat läge."
+
+#: camel/providers/imap4/camel-imap4-folder.c:966
+#, c-format
 msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Kan inte lägga till meddelande i mh-mapp: %s: %s"
+msgstr "Kan inte lägga till meddelande i mappen \"%s\": Okänt fel"
 
-#: camel/providers/imap4/camel-imap4-folder.c:856
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-folder.c:995
+#, c-format
 msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Kan inte lägga till meddelande i mh-mapp: %s: %s"
+msgstr "Kan inte lägga till meddelandet i mappen \"%s\": Felaktigt kommando"
 
-#: camel/providers/imap4/camel-imap4-folder.c:935
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-folder.c:1038
+msgid "Cannot move messages to or from IMAP folders in offline mode."
+msgstr ""
+"Kan inte flytta meddelanden till eller från IMAP-mappar i frånkopplat läge."
+
+#: camel/providers/imap4/camel-imap4-folder.c:1041
+msgid "Cannot copy messages to or from IMAP folders in offline mode."
+msgstr ""
+"Kan inte kopiera meddelanden till eller från IMAP-mappar i frånkopplat läge."
+
+#: camel/providers/imap4/camel-imap4-folder.c:1086
+#, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
 msgstr ""
-"Kan inte hämta meddelande: %s från mappen %s\n"
-"  %s"
+"Kan inte flytta meddelanden från mappen \"%s\" till mappen \"%s\": Okänd"
 
-#: camel/providers/imap4/camel-imap4-folder.c:939
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-folder.c:1090
+#, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
 msgstr ""
-"Kan inte hämta meddelande: %s från mappen %s\n"
-"  %s"
+"Kan inte kopiera meddelanden från mappen \"%s\" till mappen \"%s\": Okänd"
 
-#: camel/providers/imap4/camel-imap4-folder.c:947
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-folder.c:1098
+#, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
-"Kan inte hämta meddelande: %s från mappen %s\n"
-"  %s"
+"Kan inte flytta meddelanden från mappen \"%s\" till mappen \"%s\": Felaktigt "
+"kommando"
 
-#: camel/providers/imap4/camel-imap4-folder.c:951
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-folder.c:1102
+#, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
-"Kan inte hämta meddelande: %s från mappen %s\n"
-"  %s"
+"Kan inte kopiera meddelanden från mappen \"%s\" till mappen \"%s\": "
+"Felaktigt kommando"
 
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-provider.c:43
+msgid "Show only subscribed folders"
+msgstr "Visa endast prenumererade mappar"
+
+#: camel/providers/imap4/camel-imap4-provider.c:45
+msgid "Override server-supplied folder namespace"
+msgstr "Åsidosätt mappnamnrymden som servern tillhandahåller"
+
+#: camel/providers/imap4/camel-imap4-provider.c:51
+msgid "Apply filters to new messages in INBOX on this server"
+msgstr "Tillämpa filtren på nya meddelanden i INBOX på denna server"
+
+# Låter konstigt
+#: camel/providers/imap4/camel-imap4-provider.c:57
+msgid "Automatically synchronize remote mail locally"
+msgstr "Synkronisera automatiskt fjärrpost lokalt"
+
+#: camel/providers/imap4/camel-imap4-provider.c:64
 msgid "IMAPv4rev1"
-msgstr "IMAPv4"
+msgstr "IMAPv4rev1"
 
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-provider.c:66
 msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "För läsande och lagrande av e-post på IMAP-servrar."
+msgstr ""
+"För läsande och lagrande av e-post på IMAPv4rev1-servrar. EXPERIMENTELLT!!"
 
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-provider.c:83
 msgid ""
 "This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr ""
-"Detta alternativ ansluter till IMAP-servern med ett lösenord i klartext."
-
-#: camel/providers/imap4/camel-imap4-store.c:257
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Misslyckades med att ansluta till IMAP-servern %s i säkert läge: %s"
+"Detta alternativ ansluter till IMAPv4rev1-servern med ett lösenord i "
+"klartext."
 
-#: camel/providers/imap4/camel-imap4-store.c:363
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:378
+#, c-format
 msgid ""
 "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 msgstr ""
-"Kan inte ansluta till POP-servern %s: Inget stöd för begärd "
-"autentiseringsmekanism."
+"Kan inte autentisera till IMAP-servern %s med hjälp av "
+"autentiseringsmekanismen %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:408
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:423
+#, c-format
 msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sAnge SMTP-lösenordet för %s@%s"
+msgstr "%sAnge IMAP-lösenordet för %s på värden %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:478
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:493
+#, c-format
 msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Misslyckades med autentisering för POP-servern %s: %s"
+msgstr "Kan inte autentisera till IMAP-servern %s med hjälp av %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:701
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:656
+#: camel/providers/imap4/camel-imap4-store.c:769
+msgid "Cannot create IMAP folders in offline mode."
+msgstr "Kan inte skapa IMAP-mappar i frånkopplat läge."
+
+#: camel/providers/imap4/camel-imap4-store.c:695
+#, c-format
 msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Kan inte få mapp: %s: %s"
+msgstr "Kan inte hämta mappen \"%s\" på IMAP-servern %s: Okänd"
 
-#: camel/providers/imap4/camel-imap4-store.c:815
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:817
+#, c-format
 msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Kan inte byta namn på mapp: %s: Ogiltig åtgärd"
+msgstr "Kan inte skapa mappen \"%s\": Ogiltigt namn på brevlåda"
 
-#: camel/providers/imap4/camel-imap4-store.c:821
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:823
+#, c-format
 msgid "Cannot create folder `%s': Bad command"
-msgstr ""
-"Kunde inte skapa mappen \"%s\":\n"
-"%s"
+msgstr "Kan inte skapa mappen \"%s\": Felaktigt kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:852
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:855
+#, c-format
 msgid "Cannot delete folder `%s': Special folder"
-msgstr "Kan inte ta bort mapp: %s: Det finns ingen sådan mapp"
+msgstr "Kan inte ta bort mappen \"%s\": Specialmapp"
 
-#: camel/providers/imap4/camel-imap4-store.c:911
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:862
+msgid "Cannot delete IMAP folders in offline mode."
+msgstr "Kan inte ta bort IMAP-mappar i frånkopplat läge."
+
+#: camel/providers/imap4/camel-imap4-store.c:921
+#, c-format
 msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Kan inte ta bort mapp: %s: Ogiltig åtgärd"
+msgstr "Kan inte ta bort mappen \"%s\": Ogiltigt namn på brevlåda"
 
-#: camel/providers/imap4/camel-imap4-store.c:916
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:926
+#, c-format
 msgid "Cannot delete folder `%s': Bad command"
-msgstr "Kan inte ta bort mapp: %s: Ogiltig åtgärd"
+msgstr "Kan inte ta bort mappen \"%s\": Felaktigt kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:936
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:947
+#, c-format
 msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "Kan inte ta bort mapp: %s: Det finns ingen sådan mapp"
+msgstr "Kan inte byta namn på mappen \"%s\" till \"%s\": Specialmapp"
 
-#: camel/providers/imap4/camel-imap4-store.c:968
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:954
+msgid "Cannot rename IMAP folders in offline mode."
+msgstr "Kan inte byta namn på IMAP-mappar i frånkopplat läge."
+
+#: camel/providers/imap4/camel-imap4-store.c:985
+#, c-format
 msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "Kan inte byta namn på mapp: %s: Ogiltig åtgärd"
+msgstr ""
+"Kan inte byta namn på mappen \"%s\" till \"%s\": Ogiltigt namn på brevlåda"
 
-#: camel/providers/imap4/camel-imap4-store.c:973
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:990
+#, c-format
 msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr ""
-"Kunde inte skapa mappen \"%s\":\n"
-"%s"
+msgstr "Kan inte byta namn på mappen \"%s\" till \"%s\": Felaktigt kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:1221
+#: camel/providers/imap4/camel-imap4-store.c:1239
 #, c-format
 msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr ""
+"Kan inte hämta %s-information för mönstret \"%s\" på IMAP-servern %s: %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:1223
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-store.c:1241
 msgid "Bad command"
-msgstr "Kommando"
+msgstr "Felaktigt kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:1299
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:1280
+msgid "Cannot subscribe to IMAP folders in offline mode."
+msgstr "Kan inte prenumerera på IMAP-mappar i frånkopplat läge."
+
+#: camel/providers/imap4/camel-imap4-store.c:1325
+#, c-format
 msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Kan inte ta bort mapp: %s: Ogiltig åtgärd"
+msgstr "Kan inte prenumerera på mappen \"%s\": Ogiltigt namn på brevlåda"
 
-#: camel/providers/imap4/camel-imap4-store.c:1304
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:1330
+#, c-format
 msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr ""
-"Kunde inte skapa mappen \"%s\":\n"
-"%s"
+msgstr "Kan inte prenumerera på mappen \"%s\": Felaktigt kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:1364
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:1353
+msgid "Cannot unsubscribe from IMAP folders in offline mode."
+msgstr "Kan inte säga upp prenumeration på IMAP-mappar i frånkopplat läge."
+
+#: camel/providers/imap4/camel-imap4-store.c:1398
+#, c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Kan inte byta namn på mapp: %s: Ogiltig åtgärd"
+msgstr ""
+"Kan inte säga upp prenumeration på mappen \"%s\": Ogiltigt namn på brevlåda"
 
-#: camel/providers/imap4/camel-imap4-store.c:1369
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:1403
+#, c-format
 msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Säg upp prenumeration på mappen \"%s\""
+msgstr "Kan inte säga upp prenumeration på mappen \"%s\": Felaktigt kommando"
 
-#: camel/providers/imap4/camel-imap4-utils.c:250
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-utils.c:368
+#, c-format
 msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Oväntat svar från IMAP-servern: %s"
+msgstr "Oväntad flagga i svar från IMAP-servern %s: "
 
-#: camel/providers/imap4/camel-imap4-utils.c:273
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-utils.c:391
 msgid "No data"
-msgstr "Inga uppgifter"
+msgstr "Inga data"
 
-#: camel/providers/imap4/camel-imap4-utils.c:456
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-utils.c:574
+#, c-format
 msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Servern kopplade ifrån oväntat: %s"
+msgstr "IMAP-servern %s kopplade ifrån oväntat: %s"
 
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/imapp/camel-imapp-provider.c:40
+#: camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
 msgstr "Meddelandelager"
 
-#: camel/providers/imapp/camel-imapp-provider.c:47
-#, fuzzy
+#: camel/providers/imapp/camel-imapp-provider.c:48
 msgid "IMAP+"
-msgstr "IMAP"
+msgstr "IMAP+"
 
-#: camel/providers/imapp/camel-imapp-provider.c:49
+#: camel/providers/imapp/camel-imapp-provider.c:50
 msgid ""
 "Experimental IMAP 4(.1) client\n"
 "This is untested and unsupported code, you want to use plain imap instead.\n"
 "\n"
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
+"Experimentell IMAP 4(.1)-klient\n"
+"Detta är otestad kod som inte stöds. Du vill nog använda den vanlig imap\n"
+"istället.\n"
+" !!! ANVÄND INTE DETTA FÖR SKARP E-POST  !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:328
-#, fuzzy, c-format
+#: camel/providers/imapp/camel-imapp-store.c:251
+#, c-format
+msgid "Could not connect to %s (port %s): %s"
+msgstr "Kunde inte ansluta till %s (port %s): %s"
+
+#: camel/providers/imapp/camel-imapp-store.c:348
+#, c-format
 msgid "Could not connect to POP server on %s"
-msgstr "Kunde inte ansluta till POP-servern %s"
+msgstr "Kunde inte ansluta till POP-servern på %s"
 
 #: camel/providers/local/camel-local-folder.c:179
-#, fuzzy
 msgid "Index message body data"
-msgstr "Skicka meddelande till kontakt"
+msgstr "Indexera data i meddelandetext"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:388
+#: camel/providers/local/camel-local-folder.c:391
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:392
 #: camel/providers/local/camel-local-folder.c:395
+#: camel/providers/local/camel-local-folder.c:398
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "brevlåda:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:399
+#: camel/providers/local/camel-local-folder.c:402
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:45
 msgid "Use the `.folders' folder summary file (exmh)"
 msgstr "Använd mappsammanfattningsfilen \".folders\" (exmh)"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:52
 msgid "MH-format mail directories"
 msgstr "Brevlådekataloger i MH-format"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For storing local mail in MH-like mail directories."
 msgstr "För lagrande av lokal e-post i MH-liknande brevlådekataloger."
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:68
 msgid "Local delivery"
 msgstr "Lokal leverans"
 
-#: camel/providers/local/camel-local-provider.c:66
+#: camel/providers/local/camel-local-provider.c:69
 msgid ""
 "For retrieving (moving) local mail from standard mbox formated spools into "
 "folders managed by Evolution."
@@ -11100,28 +11195,28 @@ msgstr ""
 "För hämtande (flytt) av lokal e-post från mbox-standardformaterade brevlådor "
 "till mappar som hanteras av Evolution."
 
-#: camel/providers/local/camel-local-provider.c:77
-#: camel/providers/local/camel-local-provider.c:94
+#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Apply filters to new messages in INBOX"
 msgstr "Tillämpa filtren på nya meddelanden i INBOX"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:88
 msgid "Maildir-format mail directories"
 msgstr "Brevlådekataloger i maildir-format"
 
-#: camel/providers/local/camel-local-provider.c:84
+#: camel/providers/local/camel-local-provider.c:89
 msgid "For storing local mail in maildir directories."
 msgstr "För lagrande av lokal e-post i maildir-kataloger."
 
-#: camel/providers/local/camel-local-provider.c:95
+#: camel/providers/local/camel-local-provider.c:101
 msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr "Lagra statushuvuden i Elm/Pine/Mutt-format"
 
-#: camel/providers/local/camel-local-provider.c:101
+#: camel/providers/local/camel-local-provider.c:108
 msgid "Standard Unix mbox spool or directory"
 msgstr "Unix mbox-standardbrevlåda eller -katalog"
 
-#: camel/providers/local/camel-local-provider.c:102
+#: camel/providers/local/camel-local-provider.c:109
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -11130,64 +11225,64 @@ msgstr ""
 "Kan också användas för läsande av ett träd i mappar av Elm-, Pine- eller "
 "Mutt-typ."
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:355
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-local-store.c:143
+#: camel/providers/local/camel-local-store.c:254
+#: camel/providers/local/camel-mbox-store.c:353
+#: camel/providers/local/camel-spool-store.c:117
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagringsroten %s är inte en absolut sökväg"
 
-#: camel/providers/local/camel-local-store.c:149
+#: camel/providers/local/camel-local-store.c:150
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Lagringsroten %s är ingen vanlig katalog"
 
-#: camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-local-store.c:166
-#: camel/providers/local/camel-local-store.c:264
+#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:167
+#: camel/providers/local/camel-local-store.c:265
 #, c-format
 msgid "Cannot get folder: %s: %s"
-msgstr "Kan inte få mapp: %s: %s"
+msgstr "Kan inte hämta mapp: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:179
 msgid "Local stores do not have an inbox"
 msgstr "Lokala lager har ingen inkorg"
 
-#: camel/providers/local/camel-local-store.c:224
+#: camel/providers/local/camel-local-store.c:225
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal brevlådefil %s"
 
-#: camel/providers/local/camel-local-store.c:333
+#: camel/providers/local/camel-local-store.c:334
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunde inte byta namn på mappen %s till %s: %s"
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:399
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunde inte byta namn på \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:423
-#: camel/providers/local/camel-mbox-store.c:284
+#: camel/providers/local/camel-local-store.c:424
+#: camel/providers/local/camel-mbox-store.c:282
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kunde inte ta bort mappsammanfattningsfilen \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:433
-#: camel/providers/local/camel-mbox-store.c:296
+#: camel/providers/local/camel-local-store.c:434
+#: camel/providers/local/camel-mbox-store.c:294
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunde inte ta bort mappindexfilen \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:456
-#: camel/providers/local/camel-mbox-store.c:320
-#, fuzzy, c-format
+#: camel/providers/local/camel-local-store.c:457
+#: camel/providers/local/camel-mbox-store.c:318
+#, c-format
 msgid "Could not delete folder meta file `%s': %s"
-msgstr "Kunde inte ta bort mappsammanfattningsfilen \"%s\": %s"
+msgstr "Kunde inte ta bort mappmetafilen \"%s\": %s"
 
-#: camel/providers/local/camel-local-summary.c:405
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Kunde inte spara sammanfattningen: %s: %s"
@@ -11197,32 +11292,35 @@ msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunde inte lägga till meddelandet i sammanfattningen: okänd orsak"
 
 #. Inbox is always first
-#: camel/providers/local/camel-maildir-folder.c:74
-#: camel/providers/local/camel-maildir-store.c:232
-#: camel/providers/local/camel-maildir-store.c:248
+#. translators: standard local mailbox names
+#: camel/providers/local/camel-maildir-folder.c:75
+#: camel/providers/local/camel-maildir-store.c:233
+#: camel/providers/local/camel-maildir-store.c:249
+#: camel/providers/local/camel-spool-store.c:452
 #: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+#: mail/mail-component.c:138
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: camel/providers/local/camel-maildir-folder.c:214
+#: camel/providers/local/camel-maildir-folder.c:215
 msgid "Maildir append message cancelled"
 msgstr "Tillägg av meddelande i brevlådekatalog avbröts"
 
-#: camel/providers/local/camel-maildir-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:218
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan inte lägga till meddelande i mapp för brevlådekatalog: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:243
-#: camel/providers/local/camel-maildir-folder.c:257
-#: camel/providers/local/camel-maildir-folder.c:266
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mbox-folder.c:436
-#: camel/providers/local/camel-mbox-folder.c:467
-#: camel/providers/local/camel-mbox-folder.c:475
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:212
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:244
+#: camel/providers/local/camel-maildir-folder.c:258
+#: camel/providers/local/camel-maildir-folder.c:267
+#: camel/providers/local/camel-mbox-folder.c:402
+#: camel/providers/local/camel-mbox-folder.c:421
+#: camel/providers/local/camel-mbox-folder.c:452
+#: camel/providers/local/camel-mbox-folder.c:460
+#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:222
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -11231,122 +11329,118 @@ msgstr ""
 "Kan inte hämta meddelande: %s från mappen %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:267
+#: camel/providers/local/camel-maildir-folder.c:268
 msgid "Invalid message contents"
 msgstr "Ogiltigt meddelandeinnehåll"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:204
-#, fuzzy, c-format
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:152
+#: camel/providers/local/camel-mh-store.c:205
+#, c-format
 msgid "Cannot get folder `%s': %s"
-msgstr "Kan inte få mapp: %s: %s"
+msgstr "Kan inte hämta mappen \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:211
-#, fuzzy, c-format
+#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mh-store.c:212
+#, c-format
 msgid "Cannot get folder `%s': folder does not exist."
-msgstr "Mappen \"%s\" finns inte."
+msgstr "Kan inte hämta mappen \"%s\": mappen finns inte."
 
-#: camel/providers/local/camel-maildir-store.c:121
-#: camel/providers/local/camel-mbox-store.c:184
-#: camel/providers/local/camel-mbox-store.c:196
-#, fuzzy, c-format
+#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:194
+#, c-format
 msgid "Cannot create folder `%s': %s"
-msgstr ""
-"Kunde inte skapa mappen \"%s\":\n"
-"%s"
+msgstr "Kan inte skapa mappen \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:136
-#, fuzzy, c-format
+#: camel/providers/local/camel-maildir-store.c:137
+#, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
-msgstr "\"%s\" är inte en brevlådekatalog."
+msgstr "Kan inte skapa mappen \"%s\": inte en maildir-katalog."
 
-#: camel/providers/local/camel-maildir-store.c:175
-#: camel/providers/local/camel-maildir-store.c:213
-#: camel/providers/local/camel-mh-store.c:260
+#: camel/providers/local/camel-maildir-store.c:176
+#: camel/providers/local/camel-maildir-store.c:214
+#: camel/providers/local/camel-mh-store.c:261
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunde inte ta bort mappen \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:177
+#: camel/providers/local/camel-maildir-store.c:178
 msgid "not a maildir directory"
-msgstr "är inte en brevlådekatalog"
+msgstr "är inte en maildir-katalog"
 
-#: camel/providers/local/camel-maildir-store.c:355
-#: camel/providers/local/camel-spool-store.c:284
-#: camel/providers/local/camel-spool-store.c:314
+#: camel/providers/local/camel-maildir-store.c:356
+#: camel/providers/local/camel-spool-store.c:319
+#: camel/providers/local/camel-spool-store.c:333
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunde inte genomsöka mappen \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-summary.c:419
-#: camel/providers/local/camel-maildir-summary.c:550
+#: camel/providers/local/camel-maildir-summary.c:425
+#: camel/providers/local/camel-maildir-summary.c:556
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr "Kan inte öppna sökvägen till brevlådekatalogen: %s: %s"
+msgstr "Kan inte öppna sökvägen till maildir-katalogen: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:543
+#: camel/providers/local/camel-maildir-summary.c:549
 msgid "Checking folder consistency"
 msgstr "Kontrollerar mappkonsekvens"
 
-#: camel/providers/local/camel-maildir-summary.c:646
+#: camel/providers/local/camel-maildir-summary.c:652
 msgid "Checking for new messages"
 msgstr "Kontrollerar nya meddelanden"
 
-#: camel/providers/local/camel-maildir-summary.c:735
-#: camel/providers/local/camel-mbox-summary.c:369
-#: camel/providers/local/camel-mbox-summary.c:542
-#: camel/providers/local/camel-mbox-summary.c:633
-#: camel/providers/local/camel-spool-summary.c:137
+#: camel/providers/local/camel-maildir-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:416
+#: camel/providers/local/camel-mbox-summary.c:589
+#: camel/providers/local/camel-mbox-summary.c:680
+#: camel/providers/local/camel-spool-summary.c:140
 msgid "Storing folder"
 msgstr "Lagrar mapp"
 
-#: camel/providers/local/camel-mbox-folder.c:225
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:210
+#: camel/providers/local/camel-spool-folder.c:176
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan inte skapa mapplås på %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:284
+#: camel/providers/local/camel-mbox-folder.c:269
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan inte öppna brevlåda: %s %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:329
 msgid "Mail append cancelled"
 msgstr "E-posttillägg avbrutet"
 
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:332
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan inte lägga till meddelande till mbox-fil: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:468
+#: camel/providers/local/camel-mbox-folder.c:453
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen verkar vara obotligt skadad."
 
-#: camel/providers/local/camel-mbox-folder.c:476
-#: camel/providers/local/camel-mh-folder.c:222
-#, fuzzy
+#: camel/providers/local/camel-mbox-folder.c:461
+#: camel/providers/local/camel-mh-folder.c:223
 msgid "Message construction failed."
-msgstr "Meddelandebyggande misslyckades: Trasig brevlåda?"
+msgstr "Meddelandebyggande misslyckades."
 
-#: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
-#, fuzzy
+#: camel/providers/local/camel-mbox-store.c:174
+#: camel/providers/local/camel-mbox-store.c:359
 msgid "Cannot create a folder by this name."
-msgstr "Kan inte skapa en mapp med det namnet"
+msgstr "Kan inte skapa en mapp med detta namn."
 
-#: camel/providers/local/camel-mbox-store.c:206
-#, fuzzy, c-format
+#: camel/providers/local/camel-mbox-store.c:204
+#, c-format
 msgid "Cannot get folder `%s': not a regular file."
-msgstr "Kan inte bifoga filen %s: inte en vanlig fil"
+msgstr "Kan inte hämta mappen \"%s\": inte en vanlig fil."
 
-#: camel/providers/local/camel-mbox-store.c:236
-#: camel/providers/local/camel-mbox-store.c:247
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-mbox-store.c:234
+#: camel/providers/local/camel-mbox-store.c:245
+#: camel/providers/local/camel-mbox-store.c:268
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -11355,161 +11449,157 @@ msgstr ""
 "Kunde inte ta bort mappen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:255
+#: camel/providers/local/camel-mbox-store.c:253
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" är ingen vanlig fil."
 
-#: camel/providers/local/camel-mbox-store.c:262
+#: camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen \"%s\" är inte tom. Den togs inte bort."
 
-#: camel/providers/local/camel-mbox-store.c:374
-#, fuzzy, c-format
+#: camel/providers/local/camel-mbox-store.c:372
+#, c-format
 msgid "Cannot create directory `%s': %s."
-msgstr "Kunde inte skapa katalogen %s: %s"
+msgstr "Kan inte skapa katalogen \"%s\": %s."
 
-#: camel/providers/local/camel-mbox-store.c:388
-#, fuzzy, c-format
+#: camel/providers/local/camel-mbox-store.c:386
+#, c-format
 msgid "Cannot create folder: %s: %s"
-msgstr "Kan inte få mapp: %s: %s"
+msgstr "Kan inte skapa mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
-#, fuzzy
+#: camel/providers/local/camel-mbox-store.c:388
 msgid "Folder already exists"
-msgstr "Kort-ID finns redan"
+msgstr "Mappen finns redan"
 
-#: camel/providers/local/camel-mbox-store.c:472
-#, fuzzy
+#: camel/providers/local/camel-mbox-store.c:470
 msgid "The new folder name is illegal."
-msgstr "Det angivna mappnamnet är inte giltigt: %s"
+msgstr "Det nya mappnamnet är inte tillåtet."
 
-#: camel/providers/local/camel-mbox-store.c:485
-#, fuzzy, c-format
+#: camel/providers/local/camel-mbox-store.c:483
+#, c-format
 msgid "Could not rename `%s': `%s': %s"
-msgstr "Kunde inte byta namn på \"%s\": %s"
+msgstr "Kunde inte byta namn på \"%s\": \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
-#, fuzzy, c-format
+#: camel/providers/local/camel-mbox-store.c:558
+#, c-format
 msgid "Could not rename '%s' to %s: %s"
-msgstr "Kunde inte byta namn på \"%s\": %s"
+msgstr "Kunde inte byta namn på \"%s\" till \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-summary.c:375
+#: camel/providers/local/camel-mbox-summary.c:422
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunde inte öppna mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:423
+#: camel/providers/local/camel-mbox-summary.c:470
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Ödesdigert e-posttolkningsfel nära position %ld i mappen %s"
 
-#: camel/providers/local/camel-mbox-summary.c:479
+#: camel/providers/local/camel-mbox-summary.c:526
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan inte kontrollera mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:547
-#: camel/providers/local/camel-mbox-summary.c:638
-#: camel/providers/local/camel-spool-summary.c:142
+#: camel/providers/local/camel-mbox-summary.c:594
+#: camel/providers/local/camel-mbox-summary.c:685
+#: camel/providers/local/camel-spool-summary.c:145
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunde inte öppna fil: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:559
-#: camel/providers/local/camel-spool-summary.c:162
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:165
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan inte öppna temporär brevlåda: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:572
-#: camel/providers/local/camel-mbox-summary.c:736
+#: camel/providers/local/camel-mbox-summary.c:619
+#: camel/providers/local/camel-mbox-summary.c:783
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunde inte stänga källmappen %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:581
+#: camel/providers/local/camel-mbox-summary.c:628
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunde inte stänga temporära mapp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunde inte byta namn på mapp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:676
-#: camel/providers/local/camel-mbox-summary.c:684
-#: camel/providers/local/camel-mbox-summary.c:877
-#: camel/providers/local/camel-mbox-summary.c:885
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:731
+#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:933
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Summeringen stämmer inte överens, även efter en synk"
 
-#: camel/providers/local/camel-mbox-summary.c:811
-#: camel/providers/local/camel-spool-summary.c:334
+#: camel/providers/local/camel-mbox-summary.c:859
+#: camel/providers/local/camel-spool-summary.c:337
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Okänt fel: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:846
+#: camel/providers/local/camel-mbox-summary.c:894
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kunde inte lagra mapp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:940
-#: camel/providers/local/camel-mbox-summary.c:966
+#: camel/providers/local/camel-mbox-summary.c:988
+#: camel/providers/local/camel-mbox-summary.c:1014
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fel vid skrivning av temporär brevlåda: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:957
+#: camel/providers/local/camel-mbox-summary.c:1005
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fel vid skrivning till temporär brevlåda: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:174
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "MH-meddelandetillägg avbrutet"
 
-#: camel/providers/local/camel-mh-folder.c:177
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan inte lägga till meddelande i mh-mapp: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:219
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:220
+#, c-format
 msgid "Could not create folder `%s': %s"
-msgstr ""
-"Kunde inte skapa mappen \"%s\":\n"
-"%s"
+msgstr "Kunde inte skapa mappen \"%s\": %s"
 
-#: camel/providers/local/camel-mh-store.c:231
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:232
+#, c-format
 msgid "Cannot get folder `%s': not a directory."
-msgstr "Kan inte få mapp: %s: %s"
+msgstr "Kan inte hämta mappen \"%s\": inte en katalog."
 
-#: camel/providers/local/camel-mh-summary.c:244
+#: camel/providers/local/camel-mh-summary.c:247
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan inte öppna sökvägen till MH-katalogen: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:122
+#: camel/providers/local/camel-spool-store.c:123
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Spoolen \"%s\" kan inte öppnas: %s"
 
-#: camel/providers/local/camel-spool-store.c:134
+#: camel/providers/local/camel-spool-store.c:135
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Spoolen \"%s\" är ingen vanlig fil eller katalog"
 
-#: camel/providers/local/camel-spool-store.c:153
+#: camel/providers/local/camel-spool-store.c:154
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen \"%s/%s\" finns inte."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -11518,12 +11608,12 @@ msgstr ""
 "Kunde inte öppna mappen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-spool-store.c:167
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen \"%s\" finns inte."
 
-#: camel/providers/local/camel-spool-store.c:172
+#: camel/providers/local/camel-spool-store.c:173
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -11532,48 +11622,48 @@ msgstr ""
 "Kunde inte skapa mappen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-spool-store.c:180
+#: camel/providers/local/camel-spool-store.c:181
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "\"%s\" är ingen brevlådefil."
 
-#: camel/providers/local/camel-spool-store.c:197
+#: camel/providers/local/camel-spool-store.c:198
 msgid "Store does not support an INBOX"
 msgstr "Lagret stöder inte en INKORG"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:210
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool-brevlådefil %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:210
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool-mappträd %s"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mappar kan inte bytas namn på"
 
-#: camel/providers/local/camel-spool-store.c:225
+#: camel/providers/local/camel-spool-store.c:226
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-mappar kan inte tas bort"
 
-#: camel/providers/local/camel-spool-summary.c:175
-#: camel/providers/local/camel-spool-summary.c:185
-#: camel/providers/local/camel-spool-summary.c:195
+#: camel/providers/local/camel-spool-summary.c:178
+#: camel/providers/local/camel-spool-summary.c:188
+#: camel/providers/local/camel-spool-summary.c:198
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Kunde inte synkronisera temporära mappen %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:211
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Kunde inte synkronisera spool-mappen %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:242
-#: camel/providers/local/camel-spool-summary.c:261
-#: camel/providers/local/camel-spool-summary.c:274
+#: camel/providers/local/camel-spool-summary.c:245
+#: camel/providers/local/camel-spool-summary.c:264
+#: camel/providers/local/camel-spool-summary.c:277
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -11583,7 +11673,7 @@ msgstr ""
 "Mappen kan vara skadad, kopia sparad i \"%s\""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:1126
+#: camel/providers/nntp/camel-nntp-store.c:1144
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Ange NNTP-lösenordet för %s@%s"
@@ -11600,50 +11690,27 @@ msgstr "Misslyckades med att skicka användarnamnet till servern"
 msgid "Server rejected username/password"
 msgstr "Servern avvisade användarnamnet/lösenordet"
 
-#: camel/providers/nntp/camel-nntp-folder.c:147
-#: camel/providers/nntp/camel-nntp-folder.c:149
-#: camel/providers/nntp/camel-nntp-folder.c:158
-#: camel/providers/nntp/camel-nntp-folder.c:234
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Kan inte hämta meddelande %s: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:156
-#: camel/providers/nntp/camel-nntp-folder.c:232
-#: camel/providers/nntp/camel-nntp-folder.c:371
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Användaren avbröt"
-
-#: camel/providers/nntp/camel-nntp-folder.c:176
-#: camel/providers/nntp/camel-nntp-folder.c:208
+#: camel/providers/nntp/camel-nntp-folder.c:177
+#: camel/providers/nntp/camel-nntp-folder.c:209
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Internt fel: uid är i ogiltigt format: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:328
-#: camel/providers/nntp/camel-nntp-folder.c:331
-#: camel/providers/nntp/camel-nntp-folder.c:373
-#: camel/providers/nntp/camel-nntp-folder.c:375
-#, fuzzy, c-format
+#: camel/providers/nntp/camel-nntp-folder.c:329
+#: camel/providers/nntp/camel-nntp-folder.c:332
+#: camel/providers/nntp/camel-nntp-folder.c:374
+#: camel/providers/nntp/camel-nntp-folder.c:376
+#, c-format
 msgid "Posting failed: %s"
-msgstr "Åtgärden misslyckades: %s"
+msgstr "Postande misslyckades: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:393
+#: camel/providers/nntp/camel-nntp-folder.c:394
 msgid "You cannot post NNTP messages while working offline!"
-msgstr ""
+msgstr "Du kan inte posta NNTP-meddelande medan du är frånkopplad!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:404
-#, fuzzy
+#: camel/providers/nntp/camel-nntp-folder.c:405
 msgid "You cannot copy messages from a NNTP folder!"
-msgstr "Du kan inte kopiera meddelanden från denna papperskorgsmapp."
+msgstr "Du kan inte kopiera meddelanden från en NNTP-mapp!"
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
@@ -11660,26 +11727,26 @@ msgstr "Kan inte läsa in grupplistefilen för %s: %s"
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Kan inte spara grupplistefilen för %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:43
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
 "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:45
+#: camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription dialog, show relative folder names"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:52
+#: camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "USENET-diskussionsgrupper"
 
-#: camel/providers/nntp/camel-nntp-provider.c:54
+#: camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Det här är en leverantör för läsning och postning till USENET-"
 "diskussionsgrupper."
 
-#: camel/providers/nntp/camel-nntp-provider.c:73
+#: camel/providers/nntp/camel-nntp-provider.c:74
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -11687,163 +11754,169 @@ msgstr ""
 "Detta alternativ kommer att autentisera med NNTP-servern genom att använda "
 "ett klartextlösenord."
 
-#: camel/providers/nntp/camel-nntp-store.c:118
-#: camel/providers/nntp/camel-nntp-store.c:1233
-#: camel/providers/nntp/camel-nntp-store.c:1331
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP-kommandot misslyckades: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:227
+#: camel/providers/nntp/camel-nntp-store.c:232
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Kunde inte skapa hälsning från %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:239
+#: camel/providers/nntp/camel-nntp-store.c:244
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-servern %s returnerade felkoden %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:403
+#: camel/providers/nntp/camel-nntp-store.c:420
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-diskussionsgrupper via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:777
-#, fuzzy, c-format
+#: camel/providers/nntp/camel-nntp-store.c:799
+#, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
 "\n"
 "%s"
 msgstr ""
-"Fel vid sparande av meddelanden till: %s\n"
-" %s"
+"Fel vid hämtande av nya diskussionsgrupper:\n"
+"\n"
+"%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:872
+#: camel/providers/nntp/camel-nntp-store.c:893
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
+"Du kan inte prenumerera på denna diskussionsgrupp:\n"
+"\n"
+"Diskussionsgruppen finns inte. Det markerade objektet är troligtvis en "
+"föräldermapp."
 
-#: camel/providers/nntp/camel-nntp-store.c:904
+#: camel/providers/nntp/camel-nntp-store.c:925
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
+"Du kan inte säga upp prenumerationen på denna diskussionsgrupp:\n"
+"\n"
+"diskussionsgruppen finns inte!"
 
-#: camel/providers/nntp/camel-nntp-store.c:929
+#: camel/providers/nntp/camel-nntp-store.c:950
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
+"Du kan inte skapa en mapp i ett diskussionsgruppslager: prenumerera istället."
 
-#: camel/providers/nntp/camel-nntp-store.c:937
-#, fuzzy
+#: camel/providers/nntp/camel-nntp-store.c:958
 msgid "You cannot rename a folder in a News store."
-msgstr "Kunde inte byta namn på mappen %s till %s: %s"
+msgstr "Du kan inte byta namn på en mapp i ett diskussionsgruppslager."
 
-#: camel/providers/nntp/camel-nntp-store.c:945
-#, fuzzy
+#: camel/providers/nntp/camel-nntp-store.c:966
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "Kan inte flytta en mapp till en av dess undermappar."
+msgstr ""
+"Du kan inte flytta en mapp i ett diskussionsgruppslager: säg upp "
+"prenumerationen istället."
 
-#: camel/providers/nntp/camel-nntp-store.c:1118
-#, fuzzy
-msgid "Authentication requested but not username provided"
-msgstr "Autentisering krävs"
+#: camel/providers/nntp/camel-nntp-store.c:1136
+msgid "Authentication requested but no username provided"
+msgstr "Autentisering begärd men inget användarnamn angivet"
 
-#: camel/providers/nntp/camel-nntp-store.c:1146
-#, fuzzy, c-format
+#: camel/providers/nntp/camel-nntp-store.c:1148
+#, c-format
 msgid "Cannot authenticate to server: %s"
-msgstr "Misslyckades med autentisering för POP-servern %s: %s"
+msgstr "Kan inte autentisera till servern: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:1262
-#, fuzzy
+#: camel/providers/nntp/camel-nntp-store.c:1264
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP-kommandot misslyckades: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:1320
 msgid "Not connected."
-msgstr "Ny kontakt"
+msgstr "Inte ansluten."
 
-#: camel/providers/nntp/camel-nntp-store.c:1311
+#: camel/providers/nntp/camel-nntp-store.c:1373
 #, c-format
 msgid "No such folder: %s"
 msgstr "Det finns ingen sådan mapp: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:218
-#: camel/providers/nntp/camel-nntp-summary.c:314
+#: camel/providers/nntp/camel-nntp-summary.c:221
+#: camel/providers/nntp/camel-nntp-summary.c:317
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Letar efter nya meddelanden"
 
-#: camel/providers/nntp/camel-nntp-summary.c:225
-#, fuzzy, c-format
+#: camel/providers/nntp/camel-nntp-summary.c:228
+#, c-format
 msgid "Unexpected server response from xover: %s"
-msgstr "Oväntat svar från IMAP-servern: %s"
+msgstr "Oväntat serversvar från xover: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:328
-#, fuzzy, c-format
+# Osäker.
+#: camel/providers/nntp/camel-nntp-summary.c:331
+#, c-format
 msgid "Unexpected server response from head: %s"
-msgstr "Oväntat svar från GnuPG: %s"
+msgstr "Oväntat serversvar från head: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:368
+#: camel/providers/nntp/camel-nntp-summary.c:371
 msgid "Use cancel"
 msgstr "Använd avbryt"
 
-#: camel/providers/nntp/camel-nntp-summary.c:370
+#: camel/providers/nntp/camel-nntp-summary.c:373
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Åtgärden misslyckades: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:246
+#: camel/providers/pop3/camel-pop3-folder.c:247
 msgid "Retrieving POP summary"
 msgstr "Hämtar POP-sammanfattning"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:266
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Kan inte hämta POP-sammanfattning: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:308
+#: camel/providers/pop3/camel-pop3-folder.c:309
 msgid "Expunging deleted messages"
 msgstr "Tömmer borttagna meddelanden"
 
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:405
 #, c-format
 msgid "No message with uid %s"
 msgstr "Inget meddelande med uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:412
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Hämtar POP-meddelande %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1210
-#: composer/e-msg-composer.c:1231
+#: camel/providers/pop3/camel-pop3-folder.c:502 composer/e-msg-composer.c:1226
+#: composer/e-msg-composer.c:1247
 msgid "Unknown reason"
 msgstr "Okänd anledning"
 
-#: camel/providers/pop3/camel-pop3-provider.c:40
+#: camel/providers/pop3/camel-pop3-provider.c:41
 msgid "Leave messages on server"
 msgstr "Lämna meddelanden på servern"
 
-#: camel/providers/pop3/camel-pop3-provider.c:43
+#: camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Ta bort efter %s dag(ar)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:46
+#: camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Disable support for all POP3 extensions"
 msgstr "Inaktivera stöd för alla POP3-tillägg"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
+#: camel/providers/pop3/camel-pop3-provider.c:55
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:56
+#: camel/providers/pop3/camel-pop3-provider.c:57
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "För anslutning till och hämtande av e-post från POP-servrar."
 
-#: camel/providers/pop3/camel-pop3-provider.c:73
+#: camel/providers/pop3/camel-pop3-provider.c:74
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -11852,7 +11925,7 @@ msgstr ""
 "klartextlösenord. Det här är det enda alternativet som stöds hos många POP-"
 "servrar."
 
-#: camel/providers/pop3/camel-pop3-provider.c:83
+#: camel/providers/pop3/camel-pop3-provider.c:84
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -11862,30 +11935,29 @@ msgstr ""
 "krypterat lösenord via APOP-protokollet. Det här kanske inte fungerar för "
 "alla användare även med servrar som sägs stöda detta."
 
-#: camel/providers/pop3/camel-pop3-store.c:195
+#: camel/providers/pop3/camel-pop3-store.c:202
 #, c-format
-msgid "Could not connect to POP server %s (port %d): %s"
-msgstr "Kunde inte ansluta till POP-servern %s (port %d): %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:214
-#, fuzzy, c-format
-msgid "Failed to read a valid greeting from POP server %s (port %d)"
-msgstr "Misslyckades med autentisering för POP-servern %s: %s"
+msgid "Failed to read a valid greeting from POP server %s"
+msgstr "Misslyckades med att läsa en giltig hälsning från POP-servern %s"
 
+#: camel/providers/pop3/camel-pop3-store.c:215
 #: camel/providers/pop3/camel-pop3-store.c:232
-#: camel/providers/pop3/camel-pop3-store.c:261
-#: camel/providers/pop3/camel-pop3-store.c:273
+#: camel/providers/pop3/camel-pop3-store.c:242
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Misslyckades med att ansluta till POP-servern %s i säkert läge: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:371
+#: camel/providers/pop3/camel-pop3-store.c:216
+msgid "STLS not supported"
+msgstr "STLS stöds inte"
+
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Kunde inte ansluta till POP-servern %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:412
-#: camel/providers/pop3/camel-pop3-store.c:526
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:509
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11894,28 +11966,28 @@ msgstr ""
 "Kan inte ansluta till POP-servern %s: Inget stöd för begärd "
 "autentiseringsmekanism."
 
-#: camel/providers/pop3/camel-pop3-store.c:428
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL \"%s\"-inloggning misslyckades för POP-servern %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Kan inte logga in på POP-servern %s: SASL-protokollfel"
 
-#: camel/providers/pop3/camel-pop3-store.c:459
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Misslyckades med autentisering för POP-servern %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:485
-#, fuzzy, c-format
+#: camel/providers/pop3/camel-pop3-store.c:468
+#, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
-msgstr "%sAnge POP-lösenordet för %s@%s"
+msgstr "%sAnge POP-lösenordet för %s på värden %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:540
-#: camel/providers/pop3/camel-pop3-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:523
+#: camel/providers/pop3/camel-pop3-store.c:536
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11924,26 +11996,25 @@ msgstr ""
 "Kan inte ansluta till POP-servern %s.\n"
 "Fel vid skickande av lösenord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:547
-#, fuzzy, c-format
+#: camel/providers/pop3/camel-pop3-store.c:530
+#, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending username: %s"
 msgstr ""
 "Kan inte ansluta till POP-servern %s.\n"
-"Fel vid skickande av lösenord: %s"
+"Fel vid skickande av användarnamn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:652
+#: camel/providers/pop3/camel-pop3-store.c:635
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:132
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:38
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -11951,194 +12022,188 @@ msgstr ""
 "För leverans av e-post genom att skicka det till programmet \"sendmail\" på "
 "det lokala systemet."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:113
+#: camel/providers/sendmail/camel-sendmail-transport.c:114
 msgid "Could not parse recipient list"
 msgstr "Kunde inte tolka mottagarlistan"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:144
+#: camel/providers/sendmail/camel-sendmail-transport.c:145
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Kunde inte skapa rör till sendmail: %s: brevet skickades inte"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:166
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kunde inte grena sendmail: %s: brevet skickades inte"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:205
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Kunde inte skicka meddelande: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:233
+#: camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail avslutade med signal %s: brevet skickades inte."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:240
+#: camel/providers/sendmail/camel-sendmail-transport.c:241
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Kunde inte köra %s: brevet skickades inte."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail avslutade med status %d: brevet skickades inte."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:259
+#: camel/providers/sendmail/camel-sendmail-transport.c:260
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:262
 msgid "Mail delivery via the sendmail program"
 msgstr "E-postleverans via programmet sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
+#: camel/providers/smtp/camel-smtp-provider.c:38
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:39
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "För leverans av e-post genom anslutning till ett fjärr-epostnav som använder "
-"SMTP.\n"
+"SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfel, okänt kommando"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfel i parametrar eller argument"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr "Kommandot inte implementerat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter inte implementerad"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar från systemhjälp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Help message"
 msgstr "Hjälpmeddelande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Service ready"
 msgstr "Tjänsten klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr "Tjänsten stänger överföringskanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service not available, closing transmission channel"
 msgstr "Tjänsten inte tillgänglig, stänger överföringskanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
 msgstr "Efterfrågad e-poståtgärd okej, färdig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "User not local; will forward to <forward-path>"
 msgstr "Användaren inte lokal; vidarebefordrar till <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Efterfrågad e-poståtgärd inte utförd: brevlådan inte tillgänglig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Efterfrågad åtgärd inte utförd: brevlådan inte tillgänglig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr "Efterfrågad åtgärd avbruten: fel i behandling"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr "Användaren inte lokal; försök med <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Efterfrågad åtgärd inte utförd: otillräckligt systemutrymme"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Efterfrågad åtgärd avbruten: överskriden utrymmesallokering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Efterfrågad åtgärd inte utförd: brevlådenamn inte tillåtet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Börja skriva in brevet, avsluta med <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr "Transaktionen misslyckades"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "A password transition is needed"
 msgstr "En lösenordsöverföring behövs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen är för svag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering behövs för begärd autentiseringsmekanism"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Temporary authentication failure"
 msgstr "Tillfälligt autentiseringsmisslyckande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication required"
 msgstr "Autentisering krävs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:308
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid "Welcome response error"
 msgstr "Fel i välkomstsvar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Misslyckades med att ansluta till SMTP-servern %s i säkert läge: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
-msgid "server does not appear to support SSL"
-msgstr "servern verkar inte stöda SSL"
-
-#: camel/providers/smtp/camel-smtp-transport.c:358
-#, fuzzy, c-format
+#: camel/providers/smtp/camel-smtp-transport.c:331
+#, c-format
 msgid "STARTTLS command failed: %s"
-msgstr "IMAP-kommandot misslyckades: %s"
+msgstr "STARTTLS-kommandot misslyckades: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-transport.c:346
 msgid "STARTTLS command failed"
-msgstr "IMAP-kommandot misslyckades: %s"
+msgstr "STARTTLS-kommandot misslyckades"
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:479
 #, 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:514
-#, fuzzy, c-format
+#: camel/providers/smtp/camel-smtp-transport.c:517
+#, c-format
 msgid "%sPlease enter the SMTP password for %s on host %s"
-msgstr "%sAnge SMTP-lösenordet för %s@%s"
+msgstr "%sAnge SMTP-lösenordet för %s på värden %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -12149,34 +12214,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:657
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:659
+#: camel/providers/smtp/camel-smtp-transport.c:662
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-epostleverans via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:677
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-transport.c:680
 msgid "Cannot send message: service not connected."
-msgstr "Kan inte skicka meddelande: avsändaradressen är inte angiven."
+msgstr "Kan inte skicka meddelande: tjänsten är inte ansluten."
 
-#: camel/providers/smtp/camel-smtp-transport.c:683
+#: camel/providers/smtp/camel-smtp-transport.c:686
 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:687
+#: camel/providers/smtp/camel-smtp-transport.c:690
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:702
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan inte skicka meddelande: inga mottagare är angivna."
 
-#: camel/providers/smtp/camel-smtp-transport.c:713
+#: camel/providers/smtp/camel-smtp-transport.c:716
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan inte skicka meddelande: en eller flera ogiltiga mottagare"
 
@@ -12184,133 +12248,124 @@ msgstr "Kan inte skicka meddelande: en eller flera ogiltiga mottagare"
 msgid "SMTP Greeting"
 msgstr "SMTP-hälsning"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
-#, fuzzy, c-format
+#: camel/providers/smtp/camel-smtp-transport.c:911
+#, c-format
 msgid "HELO command failed: %s"
-msgstr "IMAP-kommandot misslyckades: %s"
+msgstr "HELO-kommandot misslyckades: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-transport.c:928
 msgid "HELO command failed"
-msgstr "IMAP-kommandot misslyckades: %s"
+msgstr "HELO-kommandot misslyckades"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1017
+#: camel/providers/smtp/camel-smtp-transport.c:994
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1000
 msgid "Error creating SASL authentication object."
 msgstr "Fel vid skapande av SASL-autentiseringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1040
-#: camel/providers/smtp/camel-smtp-transport.c:1051
-#, fuzzy, c-format
+#: camel/providers/smtp/camel-smtp-transport.c:1017
+#: camel/providers/smtp/camel-smtp-transport.c:1028
+#, c-format
 msgid "AUTH command failed: %s"
-msgstr "IMAP-kommandot misslyckades: %s"
+msgstr "AUTH-kommandot misslyckades: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1057
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-transport.c:1034
 msgid "AUTH command failed"
-msgstr "IMAP-kommandot misslyckades: %s"
+msgstr "AUTH-kommandot misslyckades"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1119
+#: camel/providers/smtp/camel-smtp-transport.c:1096
 msgid "Bad authentication response from server.\n"
 msgstr "Felaktigt autentiseringssvar från servern.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1144
-#, fuzzy, c-format
+#: camel/providers/smtp/camel-smtp-transport.c:1121
+#, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM-begäran gjorde time-out: %s: brevet skickades inte"
+msgstr "MAIL FROM-kommandot misslyckades: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1161
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-transport.c:1138
 msgid "MAIL FROM command failed"
-msgstr "IMAP-kommandot misslyckades: %s"
+msgstr "MAIL FROM-kommandot misslyckades"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1185
-#, fuzzy, c-format
+#: camel/providers/smtp/camel-smtp-transport.c:1162
+#, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "Fel i RCPT TO-svar: %s: brevet skickades inte"
+msgstr "RCPT TO-kommandot misslyckades: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1204
+#: camel/providers/smtp/camel-smtp-transport.c:1181
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> misslyckades"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
-#: camel/providers/smtp/camel-smtp-transport.c:1301
-#: camel/providers/smtp/camel-smtp-transport.c:1320
-#, fuzzy, c-format
+#: camel/providers/smtp/camel-smtp-transport.c:1220
+#: camel/providers/smtp/camel-smtp-transport.c:1278
+#: camel/providers/smtp/camel-smtp-transport.c:1297
+#, c-format
 msgid "DATA command failed: %s: mail not sent"
-msgstr "Fel i DATA-svar: %s: brevet skickades inte"
+msgstr "DATA-kommandot misslyckades: %s: brevet skickades inte"
 
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1260
-#: camel/providers/smtp/camel-smtp-transport.c:1336
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-transport.c:1237
+#: camel/providers/smtp/camel-smtp-transport.c:1313
 msgid "DATA command failed"
-msgstr "IMAP-kommandot misslyckades: %s"
+msgstr "DATA-kommandot misslyckades"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1359
-#, fuzzy, c-format
+#: camel/providers/smtp/camel-smtp-transport.c:1336
+#, c-format
 msgid "RSET command failed: %s"
-msgstr "IMAP-kommandot misslyckades: %s"
+msgstr "RSET-kommandot misslyckades: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1375
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-transport.c:1352
 msgid "RSET command failed"
-msgstr "IMAP-kommandot misslyckades: %s"
+msgstr "RSET-kommandot misslyckades"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
-#, fuzzy, c-format
+#: camel/providers/smtp/camel-smtp-transport.c:1375
+#, c-format
 msgid "QUIT command failed: %s"
-msgstr "IMAP-kommandot misslyckades: %s"
+msgstr "QUIT-kommandot misslyckades: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1412
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-transport.c:1389
 msgid "QUIT command failed"
-msgstr "IMAP-kommandot misslyckades: %s"
+msgstr "QUIT-kommandot misslyckades"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:101
 #, c-format
 msgid "%.0fK"
 msgstr "%.0f k"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fM"
 msgstr "%.0f M"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:436
+#: composer/e-msg-composer-attachment-bar.c:293 mail/em-utils.c:436
 msgid "attachment"
 msgstr "bilaga"
 
-#: composer/e-msg-composer-attachment-bar.c:454
-msgid "Remove selected items from the attachment list"
-msgstr "Ta bort markerade objekt från bifogningslistan"
-
-#: composer/e-msg-composer-attachment-bar.c:494
-msgid "Add attachment..."
-msgstr "Lägg till bilaga..."
+#: composer/e-msg-composer-attachment-bar.c:441 mail/em-folder-tree.c:2746
+#: ui/evolution-mail-list.xml.h:27
+msgid "_Properties"
+msgstr "_Egenskaper"
 
-#: composer/e-msg-composer-attachment-bar.c:495
-msgid "Attach a file to the message"
-msgstr "Bifoga en fil till meddelandet"
+#: composer/e-msg-composer-attachment-bar.c:443
+msgid "_Add attachment..."
+msgstr "_Lägg till bilaga..."
 
-#: composer/e-msg-composer-attachment.c:173
-#: composer/e-msg-composer-attachment.c:189
+#: composer/e-msg-composer-attachment.c:174
+#: composer/e-msg-composer-attachment.c:190
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Kan inte bifoga filen %s: %s"
 
-#: composer/e-msg-composer-attachment.c:181
+#: composer/e-msg-composer-attachment.c:182
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Kan inte bifoga filen %s: inte en vanlig fil"
@@ -12328,21 +12383,20 @@ msgid "MIME type:"
 msgstr "MIME-typ:"
 
 #: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:92
-#: composer/e-msg-composer-select-file.c:111
+#: composer/e-msg-composer-select-file.c:93
+#: composer/e-msg-composer-select-file.c:112
 msgid "Suggest automatic display of attachment"
 msgstr "Föreslå automatisk visning av bilaga"
 
-#: composer/e-msg-composer-hdrs.c:512
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Posting destination"
 msgstr "Postdestination"
 
-#: composer/e-msg-composer-hdrs.c:513
-#, fuzzy
+#: composer/e-msg-composer-hdrs.c:514
 msgid "Choose folders to post the message to."
-msgstr "Denna mapp kan inte innehålla meddelanden."
+msgstr "Välj mappar att posta meddelandet till."
 
-#: composer/e-msg-composer-hdrs.c:547
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Click here for the address book"
 msgstr "Klicka här för att ta fram adressboken"
 
@@ -12353,45 +12407,45 @@ msgstr "Klicka här för att ta fram adressboken"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:577
-msgid "Reply-To:"
-msgstr "Svara till:"
+#: composer/e-msg-composer-hdrs.c:578
+msgid "_Reply-To:"
+msgstr "_Svara till:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:583
-msgid "From:"
-msgstr "Från:"
+#: composer/e-msg-composer-hdrs.c:585
+msgid "Fr_om:"
+msgstr "_Från:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:589
-msgid "Subject:"
-msgstr "Ämne:"
+#: composer/e-msg-composer-hdrs.c:592
+msgid "S_ubject:"
+msgstr "_Ämne:"
 
-#: composer/e-msg-composer-hdrs.c:598
-msgid "To:"
-msgstr "Till:"
+#: composer/e-msg-composer-hdrs.c:602
+msgid "_To:"
+msgstr "_Till:"
 
-#: composer/e-msg-composer-hdrs.c:599
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: composer/e-msg-composer-hdrs.c:602
-msgid "Cc:"
-msgstr "Kopia:"
+#: composer/e-msg-composer-hdrs.c:606
+msgid "_Cc:"
+msgstr "_Kopia:"
 
-#: composer/e-msg-composer-hdrs.c:603
+#: composer/e-msg-composer-hdrs.c:607
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Ange adresserna som ska få en kopia av meddelandet"
 
-#: composer/e-msg-composer-hdrs.c:606
-msgid "Bcc:"
-msgstr "Blindkopia:"
+#: composer/e-msg-composer-hdrs.c:610
+msgid "_Bcc:"
+msgstr "_Blindkopia:"
 
-#: composer/e-msg-composer-hdrs.c:607
+#: composer/e-msg-composer-hdrs.c:611
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -12402,93 +12456,106 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:614
-msgid "Post To:"
-msgstr "Posta till:"
+#: composer/e-msg-composer-hdrs.c:618
+msgid "_Post To:"
+msgstr "_Posta till:"
 
-#: composer/e-msg-composer-hdrs.c:619
-#, fuzzy
+#: composer/e-msg-composer-hdrs.c:623
 msgid "Click here to select folders to post to"
-msgstr "<klicka här för att välja en mapp>"
+msgstr "Klicka här för att välja mappar att posta till"
 
-#: composer/e-msg-composer-select-file.c:186
+#: composer/e-msg-composer-hdrs.c:629
+msgid "Post To:"
+msgstr "Posta till:"
+
+#: composer/e-msg-composer-select-file.c:187
 msgid "Attach file(s)"
 msgstr "Bifoga fil(er)"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
+#: composer/e-msg-composer.c:720
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "S_ignera alltid utgående meddelanden när detta konto används"
+msgstr ""
+"Kan inte signera utgående meddelande: Inget signeringscertifikat angivet för "
+"detta konto"
 
-#: composer/e-msg-composer.c:711
-#, fuzzy
+#: composer/e-msg-composer.c:727
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
-msgstr "Kan inte kryptera detta meddelande: ingen klartext att kryptera"
+msgstr ""
+"Kan inte kryptera utgående meddelande: Inget krypteringscertifikat angivet "
+"för detta konto"
 
-#: composer/e-msg-composer.c:1268
-#, fuzzy
+#: composer/e-msg-composer.c:1284
 msgid "Could not open file"
-msgstr ""
-"Kunde inte öppna filen %s:\n"
-"%s"
+msgstr "Kunde inte öppna fil"
 
-#: composer/e-msg-composer.c:1276
+#: composer/e-msg-composer.c:1292
 msgid "Unable to retrieve message from editor"
 msgstr "Kunde inte hämta meddelande från redigeraren"
 
-#: composer/e-msg-composer.c:1546
+#: composer/e-msg-composer.c:1562
 msgid "Untitled Message"
 msgstr "Namnlöst meddelande"
 
-#: composer/e-msg-composer.c:1576
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:1983 mail/mail-account-gui.c:1491
+#: composer/e-msg-composer.c:1999
 msgid "Autogenerated"
 msgstr "Automatiskt genererad"
 
-#: composer/e-msg-composer.c:2082
-msgid "Signature:"
-msgstr "Signatur:"
+#: composer/e-msg-composer.c:2098
+msgid "Si_gnature:"
+msgstr "Si_gnatur:"
 
-#: composer/e-msg-composer.c:2283
+#: composer/e-msg-composer.c:2301
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "<b>%d</b> fil bifogad"
+msgstr[1] "<b>%d</b> filer bifogade"
 
-#: composer/e-msg-composer.c:2312
+#: composer/e-msg-composer.c:2330
 msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
+msgstr "Dölj _bilageraden (släpp bilagor här)"
 
-#: composer/e-msg-composer.c:2315 composer/e-msg-composer.c:3271
+#: composer/e-msg-composer.c:2333 composer/e-msg-composer.c:3440
 msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
+msgstr "Visa _bilageraden (släpp bilagor här)"
 
-#: composer/e-msg-composer.c:2332 composer/e-msg-composer.c:3163
-#: composer/e-msg-composer.c:3164
+#: composer/e-msg-composer.c:2350 composer/e-msg-composer.c:3329
+#: composer/e-msg-composer.c:3330
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:2634
-#, fuzzy, c-format
+#: composer/e-msg-composer.c:2652
+#, c-format
 msgid "Attached message - %s"
-msgstr "Bifoga meddelanden i \"%s\""
+msgstr "Bifogat meddelande - %s"
 
 #. translators, this count will always be >1
-#: composer/e-msg-composer.c:2639 composer/e-msg-composer.c:2783
-#, fuzzy, c-format
+#: composer/e-msg-composer.c:2657 composer/e-msg-composer.c:2820
+#, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
-msgstr[0] "Bifoga originalmeddelandet"
-msgstr[1] "Bifoga originalmeddelandet"
+msgstr[0] "Bifogat meddelande"
+msgstr[1] "%d bifogade meddelanden"
 
-#: composer/e-msg-composer.c:4341
+#: composer/e-msg-composer.c:2883 mail/em-folder-tree.c:1025
+#: mail/em-folder-tree.c:2243 mail/em-folder-view.c:823
+#: mail/message-list.c:1713
+msgid "_Move"
+msgstr "_Flytta"
+
+#: composer/e-msg-composer.c:2885 mail/em-folder-tree.c:1027
+#: mail/message-list.c:1715
+msgid "Cancel _Drag"
+msgstr "Avbryt _dragning"
+
+#: composer/e-msg-composer.c:4510
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12498,19 +12565,19 @@ msgstr ""
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
-#, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
-msgstr "Bifoga en fil till meddelandet"
+msgstr "Du kan inte bifoga filen \"{0}\" till detta meddelande."
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
+"Filen \"{0}\" är ingen vanlig fil och kan inte skickas i ett meddelande."
 
 #. mail-composer:attach-directory primary
 #: composer/mail-composer-errors.xml.h:8
 msgid "Directories can not be attached to Messages."
-msgstr ""
+msgstr "Kataloger kan inte bifogas med meddelanden."
 
 #. mail-composer:attach-directory secondary
 #: composer/mail-composer-errors.xml.h:10
@@ -12518,13 +12585,15 @@ msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
+"För att bifoga innehållet i denna katalog kan du antingen bifoga filerna i "
+"katalogen en och en, eller skapa ett arkiv av katalogen och bifoga den."
 
 #. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
-#, fuzzy
 msgid "Could not retrieve messages to attach from {0}."
-msgstr "Kunde inte hämta meddelande från POP-servern %s: %s"
+msgstr "Kunde inte hämta meddelanden att bifoga från {0}."
 
+# Mycket konstigt meddelande...
 #. mail-composer:attach-nomessages secondary
 #. mail-composer:no-sig-file secondary
 #. mail:no-create-tmp-path secondary
@@ -12536,19 +12605,17 @@ msgstr "Kunde inte hämta meddelande från POP-servern %s: %s"
 #: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
 #: widgets/misc/e-system-errors.xml.h:15
 msgid "Because \"{1}\"."
-msgstr ""
+msgstr "Eftersom \"{1}\"."
 
 #. mail-composer:recover-autosave title
 #: composer/mail-composer-errors.xml.h:16
-#, fuzzy
 msgid "Unfinished messages found"
-msgstr "Tråda meddelandelista"
+msgstr "Ofärdiga meddelanden hittades"
 
 #. mail-composer:recover-autosave primary
 #: composer/mail-composer-errors.xml.h:18
-#, fuzzy
 msgid "Do you want to recover unfinished messages?"
-msgstr "Vill du spara ändringar?"
+msgstr "Vill du återställa ofärdiga meddelanden?"
 
 #. mail-composer:recover-autosave secondary
 #: composer/mail-composer-errors.xml.h:20
@@ -12556,28 +12623,28 @@ msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
+"Evolution avslutades oväntat under tiden du höll på att skapa ett nytt "
+"meddelande. Att återställa meddelandet kommer att låta dig fortsätta där du "
+"slutade."
 
 #: composer/mail-composer-errors.xml.h:21
-#, fuzzy
 msgid "Don't Recover"
-msgstr "Ta inte bort"
+msgstr "Återställ inte"
 
 #: composer/mail-composer-errors.xml.h:22
-#, fuzzy
 msgid "Recover"
-msgstr "Ta bort"
+msgstr "Återställ"
 
 #. mail-composer:no-autosave primary
 #: composer/mail-composer-errors.xml.h:24
-#, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
-msgstr "Kunde inte spara signaturfilen: %s"
+msgstr "Kunde inte spara till automatsparandefilen \"{0}\"."
 
+# Helsjuk meddelandekonstruktion...
 #. mail-composer:no-autosave secondary
 #: composer/mail-composer-errors.xml.h:26
-#, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
-msgstr "Fel vid sparande av genvägar."
+msgstr "Fel vid sparande till automatsparande eftersom \"{1}\"."
 
 #. mail-composer:exit-unsaved title
 #: composer/mail-composer-errors.xml.h:28
@@ -12586,11 +12653,12 @@ msgstr "Varning: Ändrat meddelande"
 
 #. mail-composer:exit-unsaved primary
 #: composer/mail-composer-errors.xml.h:30
-#, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "Är du säker på att du vill ta bort detta namnlösa möte?"
+msgstr ""
+"Är du säker på att du vill kasta bort det meddelande med namnet \"{0}\" som "
+"du håller på att skapa?"
 
 #. mail-composer:exit-unsaved secondary
 #: composer/mail-composer-errors.xml.h:32
@@ -12599,34 +12667,38 @@ msgid ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
+"Att stänga detta fönster för meddelanderedigering kommer att permanent kasta "
+"bort meddelandet, såvida du inte väljer att spara meddelandet i din "
+"utkastmapp. Detta kommer att tillåta dig att fortsätta med meddelandet vid "
+"en senare tidpunkt."
+
+#: composer/mail-composer-errors.xml.h:33
+msgid "_Discard Changes"
+msgstr "_Förkasta ändringar"
 
 #: composer/mail-composer-errors.xml.h:34
-#, fuzzy
-msgid "Save Message"
-msgstr "Spara meddelande som..."
+msgid "_Save Message"
+msgstr "_Spara meddelande"
 
 #. mail-composer:no-build-message primary
 #: composer/mail-composer-errors.xml.h:36
-#, fuzzy
 msgid "Could not create message."
-msgstr "Kunde inte skapa sammanfattning"
+msgstr "Kunde inte skapa meddelande."
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
-msgstr ""
+msgstr "Du kan behöva välja andra e-postalternativ på grund av \"{0}\"."
 
 #. mail-composer:no-sig-file primary
 #: composer/mail-composer-errors.xml.h:40
-#, fuzzy
 msgid "Could not read signature file \"{0}\"."
-msgstr "Kunde inte spara signaturfilen: %s"
+msgstr "Kunde inte läsa signaturfilen \"{0}\"."
 
 #. mail-composer:all-accounts-deleted primary
 #: composer/mail-composer-errors.xml.h:44
-#, fuzzy
 msgid "All accounts have been removed."
-msgstr "Varje konto måste ha ett unikt namn."
+msgstr "Alla konton har tagits bort."
 
 #. mail-composer:all-accounts-deleted secondary
 #: composer/mail-composer-errors.xml.h:46
@@ -12637,40 +12709,34 @@ msgstr "Du måste konfigurera ett konto innan du kan skriva brev."
 #. mail-composer:no-editor-control primary
 #: composer/mail-composer-errors.xml.h:48
 #: composer/mail-composer-errors.xml.h:52
-#, fuzzy
 msgid "Could not create composer window."
-msgstr "Kunde inte skapa sammanfattning"
+msgstr "Kunde inte skapa redigerarfönstret."
 
 #. mail-composer:no-address-control secondary
 #: composer/mail-composer-errors.xml.h:50
-#, fuzzy
 msgid "Unable to activate the address selector control."
-msgstr ""
-"Kan inte skapa redigerarfönstret:\n"
-"Kan inte aktivera adressväljarkontrollen."
+msgstr "Kan inte aktivera adressväljarkontrollen."
 
 #. mail-composer:no-editor-control secondary
 #: composer/mail-composer-errors.xml.h:54
-#, fuzzy
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
 "Please make sure that you have the correct version of gtkhtml and libgtkhtml "
 "installed."
 msgstr ""
-"Kunde inte skapa redigerarfönstret:\n"
 "Kan inte aktivera HTML-redigerarkomponenten.\n"
-"Försäkra dig om att du har rätt versioner av\n"
-"gtkhtml och libgtkhtml installerade.\n"
+"\n"
+"Försäkra dig om att du har rätt versioner av gtkhtml och libgtkhtml "
+"installerade."
 
-#: data/evolution.desktop.in.in.h:1 shell/main.c:503
+#: data/evolution.desktop.in.in.h:1 shell/main.c:520
 msgid "Evolution"
 msgstr "Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-#, fuzzy
 msgid "The Evolution Groupware Suite"
-msgstr "Grupprogramvaran Evolution"
+msgstr "Grupprogramvarusviten Evolution"
 
 #: data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -12786,7 +12852,7 @@ msgstr ""
 "Vad ska Evolution göra när du får ett e-brev med en begäran av kvitto över "
 "läsning?"
 
-#: e-util/e-dialog-utils.c:265
+#: e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -12795,15 +12861,15 @@ msgstr ""
 "Ska den skrivas över?"
 
 #. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:267 widgets/misc/e-system-errors.xml.h:2
+#: e-util/e-dialog-utils.c:269 widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: e-util/e-passwords.c:460
+#: e-util/e-passwords.c:468
 msgid "_Remember this password"
 msgstr "_Kom ihåg detta lösenord"
 
-#: e-util/e-passwords.c:461
+#: e-util/e-passwords.c:469
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Kom ihåg detta lösenord för resten av denna session"
 
@@ -12887,7 +12953,7 @@ msgstr "%H.%M.%S"
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1431 widgets/misc/e-dateedit.c:1697
 msgid "%I:%M %p"
 msgstr "%H.%M %p"
 
@@ -12896,7 +12962,7 @@ msgstr "%H.%M %p"
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
+#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1694
 msgid "%H:%M"
 msgstr "%H.%M"
 
@@ -12906,53 +12972,53 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:73
-#, fuzzy, c-format
+#, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekund sedan"
-msgstr[1] "1 sekund sedan"
+msgstr[1] "%d sekunder sedan"
 
 #: filter/filter-datespec.c:74
-#, fuzzy, c-format
+#, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minut sedan"
-msgstr[1] "1 minut sedan"
+msgstr[1] "%d minuter sedan"
 
 #: filter/filter-datespec.c:75
-#, fuzzy, c-format
+#, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 timme sedan"
-msgstr[1] "1 timme sedan"
+msgstr[1] "%d timmar sedan"
 
 #: filter/filter-datespec.c:76
-#, fuzzy, c-format
+#, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 dag sedan"
-msgstr[1] "1 dag sedan"
+msgstr[1] "%d dagar sedan"
 
 #: filter/filter-datespec.c:77
-#, fuzzy, c-format
+#, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 vecka sedan"
-msgstr[1] "1 vecka sedan"
+msgstr[1] "%d veckor sedan"
 
 #: filter/filter-datespec.c:78
-#, fuzzy, c-format
+#, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 månad sedan"
-msgstr[1] "1 månad sedan"
+msgstr[1] "%d månader sedan"
 
 #: filter/filter-datespec.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 år sedan"
-msgstr[1] "1 år sedan"
+msgstr[1] "%d år sedan"
 
 #: filter/filter-datespec.c:280
 msgid "<click here to select a date>"
@@ -12973,9 +13039,8 @@ msgstr "Välj en tid att jämföra med"
 
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
-#, fuzzy
 msgid "Missing date."
-msgstr "Sammanträdesuppdatering"
+msgstr "Datum saknas."
 
 #. filter:no-date secondary
 #: filter/filter-errors.xml.h:4
@@ -12984,9 +13049,8 @@ msgstr "Du måste välja ett datum."
 
 #. filter:no-file primary
 #: filter/filter-errors.xml.h:6
-#, fuzzy
 msgid "Missing file name."
-msgstr "Distinguished _name:"
+msgstr "Filnamn saknas."
 
 #. filter:no-file secondary
 #. filter:bad-file secondary
@@ -12996,29 +13060,24 @@ msgstr "Du måste ange ett filnamn."
 
 #. filter:bad-file primary
 #: filter/filter-errors.xml.h:10
-#, fuzzy
 msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Filen \"%s\" finns inte eller är ingen vanlig fil."
+msgstr "Filen \"{0}\" finns inte eller är ingen vanlig fil."
 
 #. filter:bad-regexp primary
 #: filter/filter-errors.xml.h:14
-#, fuzzy
 msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Fel i reguljära uttrycket \"%s\":\n"
-"%s"
+msgstr "Fel i reguljära uttrycket \"{0}\"."
 
 #. filter:bad-regexp secondary
 #: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
+msgstr "Kunde inte kompilera reguljära uttrycket \"{1}\"."
 
 #. filter:no-name primary
 #. mail:no-name-vfolder primary
 #: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
-#, fuzzy
 msgid "Missing name."
-msgstr "Tilldelning"
+msgstr "Namn saknas."
 
 #. filter:no-name secondary
 #: filter/filter-errors.xml.h:20
@@ -13028,31 +13087,31 @@ msgstr "Du måste ge detta filter ett namn."
 #. filter:bad-name-notunique primary
 #: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
-msgstr ""
+msgstr "Namnet \"{0}\" används redan."
 
 #. filter:bad-name-notunique secondary
 #: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
-msgstr ""
+msgstr "Välj ett annat namn."
 
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Välj en fil"
 
 #: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+#: mail/mail-config.c:76 mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "viktigt"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:139
 msgid "To Do"
 msgstr "Att-göra"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Senare"
 
@@ -13061,69 +13120,62 @@ msgid "Test"
 msgstr "Test"
 
 #: filter/filter-rule.c:790
-#, fuzzy
-msgid "Rule name:"
-msgstr "Regelnamn: "
+msgid "_Rule name:"
+msgstr "_Regelnamn:"
 
-#: filter/filter-rule.c:817
-#, fuzzy
+#: filter/filter-rule.c:818
 msgid "<b>If</b>"
-msgstr "<b>Ska utföras:</b> "
+msgstr "<b>Om</b>"
 
-#: filter/filter-rule.c:854
+#: filter/filter-rule.c:855
 msgid "if all criteria are met"
 msgstr "om alla villkor uppfylls"
 
-#: filter/filter-rule.c:854
+#: filter/filter-rule.c:855
 msgid "if any criteria are met"
 msgstr "om några villkor uppfylls"
 
-#: filter/filter-rule.c:856
+#: filter/filter-rule.c:857
 msgid "Execute actions"
 msgstr "Utför åtgärder"
 
-#: filter/filter-rule.c:877
-#, fuzzy
+#: filter/filter-rule.c:878
 msgid "All related"
-msgstr "Delegerat"
+msgstr "Alla relaterade"
 
-#: filter/filter-rule.c:877
-#, fuzzy
+#: filter/filter-rule.c:878
 msgid "Replies"
-msgstr "Ersätt"
+msgstr "Svar"
 
-#: filter/filter-rule.c:877
-#, fuzzy
+#: filter/filter-rule.c:878
 msgid "Replies and parents"
-msgstr "besvarad"
+msgstr "Svar och föräldrar"
 
-#: filter/filter-rule.c:879
-#, fuzzy
+#: filter/filter-rule.c:880
 msgid "Include threads"
-msgstr "Inkludera:"
+msgstr "Inkludera trådar"
 
-#: filter/filter-rule.c:974
-msgid "incoming"
-msgstr "inkommande"
+#: filter/filter-rule.c:975 filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Inkommande"
 
-#: filter/filter-rule.c:974
-msgid "outgoing"
-msgstr "utgående"
+#: filter/filter-rule.c:975
+msgid "Outgoing"
+msgstr "Utgående"
 
 #: filter/filter.glade.h:1
-#, fuzzy
 msgid "<b>_Filter Rules</b>"
-msgstr "Filterregler"
+msgstr "<b>_Filterregler</b>"
 
 #: filter/filter.glade.h:2
 msgid "Compare against"
 msgstr "Jämför med"
 
-#: filter/filter.glade.h:3
-msgid "Incoming"
-msgstr "Inkommande"
-
 #: filter/filter.glade.h:4
+msgid "Show filters for mail:"
+msgstr "Visa filter för e-post:"
+
+#: filter/filter.glade.h:5
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -13131,7 +13183,7 @@ msgstr ""
 "Meddelandedatumet kommer att jämföras med\n"
 "klockan 12.00 av datumet som anges."
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -13140,7 +13192,7 @@ msgstr ""
 "en tid som är relativ till den då filtret\n"
 "körs."
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:9
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -13148,31 +13200,31 @@ msgstr ""
 "Meddelandedatumet kommer att jämföras med\n"
 "den aktuella tiden då filtreringen körs."
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:12
 msgid "a time relative to the current time"
 msgstr "en tid som är relativ till aktuell tid"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:13
 msgid "ago"
 msgstr "sedan"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:17
 msgid "months"
 msgstr "månader"
 
-#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+#: filter/filter.glade.h:18 mail/mail-config.glade.h:173
 msgid "seconds"
 msgstr "sekunder"
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:19
 msgid "the current time"
 msgstr "aktuell tid"
 
-#: filter/filter.glade.h:19
+#: filter/filter.glade.h:20
 msgid "the time you specify"
 msgstr "den tid du anger"
 
-#: filter/filter.glade.h:21
+#: filter/filter.glade.h:22
 msgid "years"
 msgstr "år"
 
@@ -13189,128 +13241,122 @@ msgid "Rule name"
 msgstr "Regelnamn"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Composer Preferences"
 msgstr "Redigerarinställningar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Konfigurera e-postinställningar, inklusive säkerhet och meddelandevisning, "
 "här"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 "Konfigurera stavningskontroll, signaturer, och meddelanderedigeraren här"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
 msgstr "Konfigurera dina e-postkonton här"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Evolution Mail"
 msgstr "Evolutions e-post"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail accounts configuration control"
 msgstr "Evolutions e-posts konfigurationskontroll för konton"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail component"
 msgstr "Evolutions e-postkomponent"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail composer"
 msgstr "Evolutions e-postredigerare"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer configuration control"
 msgstr "Evolutions e-postredigerarkonfigurationskontroll"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail preferences control"
 msgstr "Evolutions e-postinställningskontroll"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:419
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:426
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
-#: mail/mail-component.c:557
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:531
+#: mail/mail-component.c:582
 msgid "Mail"
 msgstr "E-post"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
 msgid "Mail Accounts"
 msgstr "E-postkonton"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "E-postinställningar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
 msgid "_Mail"
 msgstr "_E-post"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:418
+#: mail/em-account-prefs.c:432
 msgid "[Default]"
 msgstr "[Standard]"
 
-#: mail/em-account-prefs.c:472
+#: mail/em-account-prefs.c:486
 msgid "Account name"
 msgstr "Kontonamn"
 
-#: mail/em-account-prefs.c:474
+#: mail/em-account-prefs.c:488
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1045
+#: mail/em-composer-prefs.c:306 mail/em-composer-prefs.c:425
+#: mail/mail-config.c:935
 msgid "Unnamed"
 msgstr "Namnlös"
 
-#: mail/em-composer-prefs.c:909
+#: mail/em-composer-prefs.c:949
 msgid "Language(s)"
 msgstr "Språk"
 
-#: mail/em-composer-prefs.c:955
-#, fuzzy
+#: mail/em-composer-prefs.c:995
 msgid "Add signature script"
-msgstr "Välj ett signaturskript"
+msgstr "Lägg till signaturskript"
 
-#: mail/em-composer-prefs.c:975
+#: mail/em-composer-prefs.c:1015
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: mail/em-composer-utils.c:889
-#, fuzzy
+#: mail/em-composer-utils.c:897
 msgid "-------- Forwarded Message --------"
-msgstr "Vidarebefordrat meddelande"
+msgstr "-------- Vidarebefordrat meddelande --------"
 
-#: mail/em-composer-utils.c:1502
+#: mail/em-composer-utils.c:1513
 msgid "an unknown sender"
 msgstr "en okänd avsändare"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: mail/em-composer-utils.c:1549
+#: mail/em-composer-utils.c:1560
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
+"${AbbrevWeekdayName} ${Year}-${Month}-${Day} klockan ${24Hour}:${Minute} "
+"${TimeZone} skrev ${Sender}:"
 
 #: mail/em-filter-editor.c:147
-#, fuzzy
 msgid "_Filter Rules"
-msgstr "Filterregler"
+msgstr "_Filterregler"
 
 #: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
-#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Välj mapp"
 
@@ -13440,11 +13486,10 @@ msgid "is not Flagged"
 msgstr "är inte flaggad"
 
 #: mail/em-filter-i18n.h:36
-#, fuzzy
 msgid "Junk Test"
-msgstr "juni"
+msgstr "Skräptest"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:932
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:960
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etikett"
@@ -13454,148 +13499,145 @@ msgid "Mailing list"
 msgstr "Sändlista"
 
 #: mail/em-filter-i18n.h:39
+msgid "Match All"
+msgstr "Matcha alla"
+
+#: mail/em-filter-i18n.h:40
 msgid "Message Body"
 msgstr "meddelandetext"
 
-#: mail/em-filter-i18n.h:40
+#: mail/em-filter-i18n.h:41
 msgid "Message Header"
 msgstr "meddelandehuvud"
 
-#: mail/em-filter-i18n.h:41
-#, fuzzy
+#: mail/em-filter-i18n.h:42
 msgid "Message is Junk"
-msgstr "Meddelandet skickades"
+msgstr "Meddelandet är skräp"
 
-#: mail/em-filter-i18n.h:42
-#, fuzzy
+#: mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
-msgstr "Meddelandet %s hittades inte."
+msgstr "Meddelandet är inte skräp"
 
-#: mail/em-filter-i18n.h:43
+#: mail/em-filter-i18n.h:44
 msgid "Move to Folder"
 msgstr "Flytta till mapp"
 
-#: mail/em-filter-i18n.h:44
-#, fuzzy
+# Osäker.
+#: mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
-msgstr "Avsluta programmet"
+msgstr "Skicka till program"
 
-#: mail/em-filter-i18n.h:45
+#: mail/em-filter-i18n.h:46
 msgid "Play Sound"
 msgstr "Spela ljud"
 
 # [Status] [är] [Läst]
-#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+#: mail/em-filter-i18n.h:47 mail/message-tag-followup.c:80
 msgid "Read"
 msgstr "Läst"
 
-#: mail/em-filter-i18n.h:47
+#: mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Mottagare"
 
-#: mail/em-filter-i18n.h:48
+#: mail/em-filter-i18n.h:49
 msgid "Regex Match"
 msgstr "Reguljärt uttryck matchar"
 
-#: mail/em-filter-i18n.h:49
+#: mail/em-filter-i18n.h:50
 msgid "Replied to"
 msgstr "besvarad"
 
-#: mail/em-filter-i18n.h:50
+#: mail/em-filter-i18n.h:51
 msgid "returns"
 msgstr "returnerar"
 
-#: mail/em-filter-i18n.h:51
+#: mail/em-filter-i18n.h:52
 msgid "returns greater than"
 msgstr "returnerar större än"
 
-#: mail/em-filter-i18n.h:52
+#: mail/em-filter-i18n.h:53
 msgid "returns less than"
 msgstr "returnerar mindre än"
 
-#: mail/em-filter-i18n.h:53
-#, fuzzy
+#: mail/em-filter-i18n.h:54
 msgid "Run Program"
-msgstr "Kör program:"
+msgstr "Kör program"
 
-#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+#: mail/em-filter-i18n.h:55 mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Poäng"
 
-#: mail/em-filter-i18n.h:55
+#: mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Avsändare"
 
-#: mail/em-filter-i18n.h:56
+#: mail/em-filter-i18n.h:57
 msgid "Set Status"
 msgstr "Ställ in status"
 
-#: mail/em-filter-i18n.h:57
+#: mail/em-filter-i18n.h:58
 msgid "Size (kB)"
 msgstr "Storlek (kB)"
 
-#: mail/em-filter-i18n.h:58
+#: mail/em-filter-i18n.h:59
 msgid "sounds like"
 msgstr "låter som"
 
-#: mail/em-filter-i18n.h:59
+#: mail/em-filter-i18n.h:60
 msgid "Source Account"
 msgstr "Källkonto"
 
-#: mail/em-filter-i18n.h:60
+#: mail/em-filter-i18n.h:61
 msgid "Specific header"
 msgstr "Specifikt huvud"
 
-#: mail/em-filter-i18n.h:61
+#: mail/em-filter-i18n.h:62
 msgid "starts with"
 msgstr "börjar med"
 
-#: mail/em-filter-i18n.h:63
+#: mail/em-filter-i18n.h:64
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1550
-#: mail/em-format-quote.c:305 mail/em-format.c:805 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: mail/em-filter-i18n.h:65 mail/em-format-html.c:1534
+#: mail/em-format-quote.c:306 mail/em-format.c:853 mail/em-mailer-prefs.c:88
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:330
 #: smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Ämne"
 
-#: mail/em-filter-i18n.h:65
+#: mail/em-filter-i18n.h:66
 msgid "Unset Status"
 msgstr "Töm status"
 
 #. and now for the action area
 #: mail/em-filter-rule.c:488
-#, fuzzy
 msgid "<b>Then</b>"
-msgstr "<b>Ska utföras:</b> "
+msgstr "<b>Då</b>"
 
-#: mail/em-folder-browser.c:129
+#: mail/em-folder-browser.c:133
 msgid "Create _Virtual Folder From Search..."
 msgstr "Skapa _virtuell mapp från sökning..."
 
-#: mail/em-folder-properties.c:122
-#, fuzzy
-msgid "Folder Properties"
-msgstr "Typsnittsegenskaper"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:161
-#, fuzzy
+#: mail/em-folder-properties.c:143
 msgid "Total message:"
 msgid_plural "Total messages:"
-msgstr[0] "_E-postmeddelande"
-msgstr[1] "_E-postmeddelande"
+msgstr[0] "Totalt antal meddelande:"
+msgstr[1] "Totalt antal meddelanden:"
 
-#: mail/em-folder-properties.c:173
-#, fuzzy
+#: mail/em-folder-properties.c:155
 msgid "Unread message:"
 msgid_plural "Unread messages:"
-msgstr[0] "Tråda meddelandelista"
-msgstr[1] "Tråda meddelandelista"
+msgstr[0] "Oläst meddelande:"
+msgstr[1] "Olästa meddelanden:"
+
+#: mail/em-folder-properties.c:269
+msgid "Folder Properties"
+msgstr "Mappegenskaper"
 
-#: mail/em-folder-selection-button.c:120
+#: mail/em-folder-selection-button.c:121
 msgid "<click here to select a folder>"
 msgstr "<klicka här för att välja en mapp>"
 
@@ -13603,576 +13645,551 @@ msgstr "<klicka här för att välja en mapp>"
 msgid "Create New Folder"
 msgstr "Skapa ny mapp"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
-#: mail/mail-component.c:707
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2459
+#: mail/mail-component.c:732
 msgid "Specify where to create the folder:"
 msgstr "Ange var mappen ska skapas:"
 
-#: mail/em-folder-selector.c:300
-#, fuzzy
+#: mail/em-folder-selector.c:304
 msgid "Create"
-msgstr "Skapa regel"
+msgstr "Skapa"
 
-#: mail/em-folder-selector.c:304
+#: mail/em-folder-selector.c:308
 msgid "Folder _name:"
 msgstr "Mapp_namn:"
 
 #: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
-#: mail/mail-vfolder.c:872
+#: mail/mail-vfolder.c:880
 msgid "VFolders"
 msgstr "Virtuella mappar"
 
 #. UNMATCHED is always last
 #: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
-msgstr ""
+msgstr "OMATCHADE"
 
-#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+#: mail/em-folder-tree-model.c:491 mail/em-folder-tree-model.c:795
 msgid "Loading..."
 msgstr "Läser in..."
 
-#: mail/em-folder-tree.c:846
-#, fuzzy, c-format
+#: mail/em-folder-tree.c:899
+#, c-format
 msgid "Moving folder %s"
-msgstr "Byter namn på mappen %s"
+msgstr "Flyttar mappen %s"
 
-#: mail/em-folder-tree.c:848
-#, fuzzy, c-format
+#: mail/em-folder-tree.c:901
+#, c-format
 msgid "Copying folder %s"
-msgstr "Öppnar mappen %s"
+msgstr "Kopierar mappen %s"
 
-#: mail/em-folder-tree.c:855 mail/message-list.c:1613
-#, fuzzy, c-format
+#: mail/em-folder-tree.c:908 mail/message-list.c:1617
+#, c-format
 msgid "Moving messages into folder %s"
-msgstr "Flyttar meddelanden till %s"
+msgstr "Flyttar meddelanden till mappen %s"
 
-#: mail/em-folder-tree.c:857 mail/message-list.c:1615
-#, fuzzy, c-format
+#: mail/em-folder-tree.c:910 mail/message-list.c:1619
+#, c-format
 msgid "Copying messages into folder %s"
-msgstr "Kopierar meddelanden till %s"
+msgstr "Kopierar meddelanden till mappen %s"
 
-#: mail/em-folder-tree.c:873
-#, fuzzy
+#: mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
-msgstr "Kan inte kopiera eller flytta meddelanden till en virtuell mapp"
+msgstr "Kan inte släppa meddelanden i ett lager på översta nivån"
 
-#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:1022 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiera till mapp"
 
-#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:1023 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Flytta till mapp"
 
-#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
-#: mail/em-folder-view.c:803 mail/message-list.c:1703
-#, fuzzy
-msgid "_Move"
-msgstr "Flytta"
-
-#: mail/em-folder-tree.c:968 mail/message-list.c:1705
-#, fuzzy
-msgid "Cancel _Drag"
-msgstr "Avboka uppgift"
+#: mail/em-folder-tree.c:1722 mail/mail-ops.c:1015
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "Genomsöker mappar i \"%s\""
 
-#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
-#: mail/em-folder-view.c:803 mail/em-folder-view.c:817
-#: mail/importers/evolution-mbox-importer.c:119
-#: mail/importers/evolution-outlook-importer.c:133
+#: mail/em-folder-tree.c:2229 mail/em-folder-tree.c:2243
+#: mail/em-folder-view.c:823 mail/em-folder-view.c:838
+#: mail/importers/evolution-mbox-importer.c:120
+#: mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:817
-#, fuzzy
+#: mail/em-folder-tree.c:2229 mail/em-folder-view.c:838
 msgid "C_opy"
-msgstr "Kopiera"
+msgstr "_Kopiera"
 
-#: mail/em-folder-tree.c:2144
-#, fuzzy, c-format
+#: mail/em-folder-tree.c:2270
+#, c-format
 msgid "Creating folder `%s'"
-msgstr "Lagrar mappen \"%s\""
+msgstr "Skapar mappen \"%s\""
 
-#: mail/em-folder-tree.c:2330 mail/mail-component.c:707
-#, fuzzy
+#: mail/em-folder-tree.c:2459 mail/mail-component.c:732
 msgid "Create folder"
-msgstr "Skapa en ny mapp"
+msgstr "Skapa mapp"
 
-#: mail/em-folder-tree.c:2526
+#: mail/em-folder-tree.c:2652
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Byt namn på mappen \"%s\" till:"
 
-#: mail/em-folder-tree.c:2528
+#: mail/em-folder-tree.c:2654
 msgid "Rename Folder"
 msgstr "Byt namn på mapp"
 
-#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2730 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:38
 msgid "_View"
 msgstr "_Visa"
 
-#: mail/em-folder-tree.c:2604
-#, fuzzy
+#: mail/em-folder-tree.c:2731
 msgid "Open in _New Window"
-msgstr "Öppna i nytt fönster"
+msgstr "Öppna i _nytt fönster"
 
-#: mail/em-folder-tree.c:2608
+#: mail/em-folder-tree.c:2735
 msgid "_Copy..."
 msgstr "_Kopiera..."
 
-#: mail/em-folder-tree.c:2609
+#: mail/em-folder-tree.c:2736
 msgid "_Move..."
 msgstr "_Flytta..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2613
+#: mail/em-folder-tree.c:2740
 msgid "_New Folder..."
 msgstr "_Ny mapp..."
 
-#: mail/em-folder-tree.c:2616
+#: mail/em-folder-tree.c:2743
 msgid "_Rename..."
 msgstr "_Byt namn..."
 
-#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
-#, fuzzy
-msgid "_Properties"
-msgstr "Egenskaper"
-
-#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:900 mail/em-popup.c:690
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:928 ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
 
-#: mail/em-folder-view.c:902
+#: mail/em-folder-view.c:930
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: mail/em-folder-view.c:905 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:933 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsändaren"
 
-#: mail/em-folder-view.c:906 mail/em-popup.c:811
+#: mail/em-folder-view.c:934 mail/em-popup.c:502
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: mail/em-folder-view.c:907 mail/em-popup.c:812
+#: mail/em-folder-view.c:935 mail/em-popup.c:503
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: mail/em-folder-view.c:908 mail/em-popup.c:814
+#: mail/em-folder-view.c:936 mail/em-popup.c:505
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: mail/em-folder-view.c:911
+#: mail/em-folder-view.c:939
 msgid "Follo_w Up..."
 msgstr "Föl_j upp..."
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:940
 msgid "Fla_g Completed"
 msgstr "Fla_gga färdig"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:941
 msgid "Cl_ear Flag"
 msgstr "T_öm flagga"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:944 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "_Markera som läst"
 
-#: mail/em-folder-view.c:917
+#: mail/em-folder-view.c:945
 msgid "Mark as _Unread"
 msgstr "Markera som _oläst"
 
-#: mail/em-folder-view.c:918
+#: mail/em-folder-view.c:946
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: mail/em-folder-view.c:919
+#: mail/em-folder-view.c:947
 msgid "_Mark as Unimportant"
 msgstr "Markera som ovi_ktigt"
 
-#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:54
-#, fuzzy
+#: mail/em-folder-view.c:948 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
-msgstr "Markera som _oläst"
+msgstr "Markera som _skräp"
 
-#: mail/em-folder-view.c:921 ui/evolution-mail-message.xml.h:55
-#, fuzzy
+#: mail/em-folder-view.c:949 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
-msgstr "Markera som _viktigt"
+msgstr "Markera som _inte skräp"
 
-#: mail/em-folder-view.c:925
+#: mail/em-folder-view.c:953
 msgid "U_ndelete"
 msgstr "_Ångra borttagning"
 
-#: mail/em-folder-view.c:928
+#: mail/em-folder-view.c:956
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytta till mapp..."
 
-#: mail/em-folder-view.c:929 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:957 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: mail/em-folder-view.c:937
+#: mail/em-folder-view.c:965
 msgid "Add Sender to Address_book"
 msgstr "Lägg till avsändaren i adress_boken"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:968
 msgid "Appl_y Filters"
 msgstr "Till_ämpa filter"
 
-#: mail/em-folder-view.c:941
-#, fuzzy
+#: mail/em-folder-view.c:969
 msgid "F_ilter Junk"
-msgstr "Filterregler"
+msgstr "F_iltrera skräp"
 
-#: mail/em-folder-view.c:944
+#: mail/em-folder-view.c:972
 msgid "Crea_te Rule From Message"
 msgstr "Ska_pa regel från meddelande"
 
-#: mail/em-folder-view.c:945
+#: mail/em-folder-view.c:973
 msgid "VFolder on _Subject"
 msgstr "Virtuell mapp på _ämne"
 
-#: mail/em-folder-view.c:946
+#: mail/em-folder-view.c:974
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på _avsändare"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:975
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på _mottagare"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:976
 msgid "VFolder on Mailing _List"
 msgstr "Virtuell mapp på sänd_lista"
 
-#: mail/em-folder-view.c:952
+#: mail/em-folder-view.c:980
 msgid "Filter on Sub_ject"
 msgstr "Filtrera på _ämne"
 
-#: mail/em-folder-view.c:953
+#: mail/em-folder-view.c:981
 msgid "Filter on Sen_der"
 msgstr "Filtrera på _avsändare"
 
-#: mail/em-folder-view.c:954
+#: mail/em-folder-view.c:982
 msgid "Filter on Re_cipients"
 msgstr "Filtrera på _mottagare"
 
-#: mail/em-folder-view.c:955
+#: mail/em-folder-view.c:983
 msgid "Filter on _Mailing List"
 msgstr "Filtrera på sä_ndlista"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1711 mail/em-folder-view.c:1751
-#: mail/mail-config.glade.h:68
+#: mail/em-folder-view.c:1760 mail/em-folder-view.c:1803
 msgid "Default"
 msgstr "Standard"
 
-#: mail/em-folder-view.c:1848
+#: mail/em-folder-view.c:1900
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/em-folder-view.c:2115
-#, fuzzy
+#: mail/em-folder-view.c:2179
 msgid "_Copy Link Location"
-msgstr "Kopiera länkplats"
+msgstr "_Kopiera länkplats"
 
-#: mail/em-folder-view.c:2380
-#, fuzzy, c-format
+#: mail/em-folder-view.c:2462
+#, c-format
 msgid "Click to mail %s"
-msgstr "Klicka för att lägga till en uppgift"
+msgstr "Klicka för att skicka e-post till %s"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
+#: mail/em-format-html-display.c:405
+#, c-format
 msgid "Matches: %d"
-msgstr "Träffar:"
+msgstr "Träffar: %d"
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:582
-#, fuzzy
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:580
 msgid "Unsigned"
-msgstr "Tilldelad"
+msgstr "Osignerat"
 
-#: mail/em-format-html-display.c:641
-#, fuzzy
+#: mail/em-format-html-display.c:638
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr "Detta meddelande är digitalt signerat och har befunnits äkta."
+msgstr ""
+"Detta meddelande är inte signerat. Det finns ingen garanti att detta "
+"meddelande är autentiskt."
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:583
-#, fuzzy
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:581
 msgid "Valid signature"
-msgstr "Spara signatur"
+msgstr "Giltig signatur"
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:639
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr ""
+"Detta meddelande är signerat och giltigt, vilket betyder att det är mycket "
+"sannolikt att meddelandet är autentiskt."
 
-#: mail/em-format-html-display.c:643 mail/em-format-html.c:584
-#, fuzzy
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:582
 msgid "Invalid signature"
-msgstr "Spara signatur"
+msgstr "Ogiltig signatur"
 
-#: mail/em-format-html-display.c:643
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
+"Signaturen för detta meddelande kan inte verifieras. Den kan ha ändrats "
+"under överföringen."
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641
 msgid "Valid signature, cannot verify sender"
-msgstr ""
+msgstr "Giltig signatur, kan inte verifiera avsändaren"
 
-#: mail/em-format-html-display.c:644
-#, fuzzy
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
-"input_token innehåller en ogiltig signatur, eller en signatur som inte kunde "
-"verifieras."
+"Detta meddelande är signerat med en giltig signatur, men meddelandets "
+"avsändare kan inte verifieras."
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:591
-#, fuzzy
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:589
 msgid "Unencrypted"
-msgstr "kryptera"
+msgstr "Okrypterat"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
+"Detta meddelande är inte krypterat. Dess innehåll kan ses i överföringen på "
+"Internet."
 
-#: mail/em-format-html-display.c:651 mail/em-format-html.c:592
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:590
 msgid "Encrypted, weak"
-msgstr ""
+msgstr "Krypterat, svagt"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
+"Detta meddelande är krypterat, men med en svag krypteringsalgoritm. Det "
+"skulle vara svårt men inte omöjligt för en utomstående att se innehållet i "
+"detta meddelande inom en rimlig tid."
 
-#: mail/em-format-html-display.c:652 mail/em-format-html.c:593
-#, fuzzy
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:591
 msgid "Encrypted"
-msgstr "kryptera"
+msgstr "Krypterat"
 
-#: mail/em-format-html-display.c:652
+#: mail/em-format-html-display.c:649
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
+"Detta meddelande är krypterat. Det skulle vara svårt för en utomstående att "
+"se innehållet i detta meddelande."
 
-#: mail/em-format-html-display.c:653 mail/em-format-html.c:594
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:592
 msgid "Encrypted, strong"
-msgstr ""
+msgstr "Krypterat, starkt"
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
+"Detta meddelande är krypterat med en stark krypteringsalgoritm. Det skulle "
+"vara mycket svårt för en utomstående att se innehållet i detta meddelande "
+"inom en rimlig tid."
 
-#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
-#, fuzzy
+#: mail/em-format-html-display.c:751 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
-msgstr "_Certifikat-ID:"
+msgstr "_Visa certifikat"
 
-#: mail/em-format-html-display.c:769
-#, fuzzy
+#: mail/em-format-html-display.c:766
 msgid "This certificate is not viewable"
-msgstr "Certifikatet är inte giltigt ännu"
+msgstr "Detta certifikatet är inte visningsbart"
 
-#: mail/em-format-html-display.c:1004
-#, fuzzy
+#: mail/em-format-html-display.c:995
 msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "den %d %B %Y %k.%M"
+msgstr "Färdigställt den %d %B %Y %k.%M"
 
-#: mail/em-format-html-display.c:1012
+#: mail/em-format-html-display.c:1003
 msgid "Overdue:"
 msgstr "Skulle ha utförts:"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1006
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "den %d %B %Y %k.%M"
 
-#: mail/em-format-html-display.c:1054
-#, fuzzy
+#: mail/em-format-html-display.c:1053
 msgid "_View Inline"
-msgstr "Visa inuti"
+msgstr "_Visa inuti"
 
-#: mail/em-format-html-display.c:1055
-#, fuzzy
+#: mail/em-format-html-display.c:1054
 msgid "_Hide"
-msgstr "Dölj"
+msgstr "_Dölj"
+
+#: mail/em-format-html-display.c:1298
+msgid "Attachment Button"
+msgstr "Bilageknapp"
 
 #: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sida %d av %d"
 
-#: mail/em-format-html.c:475 mail/em-format-html.c:477
-#, fuzzy, c-format
+#: mail/em-format-html.c:473 mail/em-format-html.c:475
+#, c-format
 msgid "Retrieving `%s'"
-msgstr "Hämtar meddelande %s"
+msgstr "Hämtar \"%s\""
 
-#: mail/em-format-html.c:585
+#: mail/em-format-html.c:583
 msgid "Valid signature but cannot verify sender"
-msgstr ""
+msgstr "Giltig signatur men kan inte verifiera avsändaren"
 
-#: mail/em-format-html.c:848
+#: mail/em-format-html.c:841
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
-#: mail/em-format-html.c:878
+#: mail/em-format-html.c:871
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/em-format-html.c:889
+#: mail/em-format-html.c:882
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pekare till lokal fil (%s) giltig på platsen \"%s\""
 
-#: mail/em-format-html.c:891
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/em-format-html.c:912
+#: mail/em-format-html.c:905
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pekare till fjärrdata (%s)"
 
-#: mail/em-format-html.c:923
+#: mail/em-format-html.c:916
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okänd extern data (typen \"%s\")"
 
-#: mail/em-format-html.c:1165
-#, fuzzy
+#: mail/em-format-html.c:1138
 msgid "Formatting message"
-msgstr "Flyttar meddelanden"
+msgstr "Formaterar meddelande"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:800
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
+#: mail/em-format-html.c:1425 mail/em-format-quote.c:193 mail/em-format.c:848
+#: mail/em-mailer-prefs.c:83 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:326
 msgid "From"
 msgstr "Från"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:801
-#: mail/em-mailer-prefs.c:83
+#: mail/em-format-html.c:1425 mail/em-format-quote.c:193 mail/em-format.c:849
+#: mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:802
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1425 mail/em-format-quote.c:193 mail/em-format.c:850
+#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Till"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:803
-#: mail/em-mailer-prefs.c:85
+#: mail/em-format-html.c:1425 mail/em-format-quote.c:193 mail/em-format.c:851
+#: mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Kopia"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:804
-#: mail/em-mailer-prefs.c:86
+#: mail/em-format-html.c:1425 mail/em-format-quote.c:193 mail/em-format.c:852
+#: mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Blindkopia"
 
 #. pseudo-header
-#: mail/em-format-html.c:1554 mail/em-format-quote.c:314
-#: mail/em-mailer-prefs.c:939
+#: mail/em-format-html.c:1538 mail/em-format-quote.c:315
+#: mail/em-mailer-prefs.c:984
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1581
+#: mail/em-format-html.c:1565
 msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
+msgstr "<I> (%a %H.%M %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1584
+#: mail/em-format-html.c:1568
 msgid "<I> (%R %Z)</I>"
-msgstr ""
+msgstr "<I> (%H.%M %Z)</I>"
 
-#: mail/em-format-html.c:1594 mail/em-format-quote.c:321 mail/em-format.c:806
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1578 mail/em-format-quote.c:322 mail/em-format.c:854
+#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format-html.c:1617 mail/em-format.c:807 mail/em-mailer-prefs.c:89
-#, fuzzy
+#: mail/em-format-html.c:1601 mail/em-format.c:855 mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
-msgstr "Diskussionsgruppskällor"
+msgstr "Diskussionsgrupper"
 
-#: mail/em-format.c:1056
+#: mail/em-format.c:1104
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/em-format.c:1095 mail/em-format.c:1228
-#, fuzzy
+#: mail/em-format.c:1143 mail/em-format.c:1276
 msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
+msgstr "Kunde inte tolka S/MIME-meddelande: Okänt fel"
 
-#: mail/em-format.c:1218
+#: mail/em-format.c:1266
 msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
+msgstr "Krypteringstypen stöds inte för multipart/encrypted"
 
-#: mail/em-format.c:1379
+#: mail/em-format.c:1414
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
 
-#: mail/em-format.c:1398
-#, fuzzy
+#: mail/em-format.c:1433
 msgid "Unsupported signature format"
-msgstr "Schemat stöds inte"
+msgstr "Signaturformatet stöds inte"
 
-#: mail/em-format.c:1406
-#, fuzzy
+#: mail/em-format.c:1441
 msgid "Error verifying signature"
-msgstr "Fel vid sökning"
+msgstr "Fel vid verifiering av signatur"
 
-#: mail/em-format.c:1406
-#, fuzzy
+#: mail/em-format.c:1441
 msgid "Unknown error verifying signature"
-msgstr "Kan inte verifiera lövsignatur"
+msgstr "Oknt fel vid verifiering av signatur"
 
-#: mail/em-junk-filter.c:86
+#: mail/em-junk-filter.c:110
 msgid "Spamassassin (built-in)"
-msgstr ""
+msgstr "Spamassassin (inbyggd)"
 
-#: mail/em-mailer-prefs.c:100
-#, fuzzy
+#: mail/em-mailer-prefs.c:101
 msgid "Every time"
-msgstr "Varje vecka"
+msgstr "Varje gång"
 
-#: mail/em-mailer-prefs.c:101
-#, fuzzy
+#: mail/em-mailer-prefs.c:102
 msgid "Once per day"
-msgstr "_En dag"
+msgstr "En gång per dag"
 
-#: mail/em-mailer-prefs.c:102
-#, fuzzy
+#: mail/em-mailer-prefs.c:103
 msgid "Once per week"
-msgstr "En _vecka"
+msgstr "En gång per vecka"
 
-#: mail/em-mailer-prefs.c:103
-#, fuzzy
+#: mail/em-mailer-prefs.c:104
 msgid "Once per month"
-msgstr "En _månad"
+msgstr "En gång per månad"
 
 #: mail/em-migrate.c:1168
 msgid ""
@@ -14181,121 +14198,116 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"Platsen och hierarkin för Evolution-brevlådemapparna har ändrats sedan "
+"Evolution 1.x.\n"
+"\n"
+"Vänta medan Evolution migrerar dina mappar..."
 
 #: mail/em-migrate.c:1602
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create new folder `%s': %s"
-msgstr ""
-"Kunde inte skapa mappen \"%s\":\n"
-"%s"
+msgstr "Kan inte skapa nya mappen \"%s\": %s"
 
 #: mail/em-migrate.c:1628
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr ""
-"Kan inte kopiera filhandtag: %s\n"
-"%s"
+msgstr "Kan inte kopiera mappen \"%s\" till \"%s\": %s"
 
 #: mail/em-migrate.c:1813
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Kan inte spara grupplistefilen för %s: %s"
+msgstr "Kan inte söka efter befintliga brevlådor på \"%s\": %s"
 
 #: mail/em-migrate.c:2017
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Kan inte öppna eller skapa .newsrc-fil för %s: %s"
+msgstr "Kan inte öppna gamla POP-behåll-på-server-data \"%s\": %s"
 
 #: mail/em-migrate.c:2031
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Misslyckades med att skapa rör till \"%s\": %s"
+msgstr "Kan inte skapa katalog för POP3-behåll-på-server-data \"%s\": %s"
 
 #: mail/em-migrate.c:2060
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr ""
+msgstr "Kan inte kopiera POP3-behåll-på-server-data \"%s\": %s"
 
-#: mail/em-migrate.c:2415 mail/em-migrate.c:2427
-#, fuzzy, c-format
+#: mail/em-migrate.c:2494 mail/em-migrate.c:2506
+#, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr "Misslyckades med att skapa rör till \"%s\": %s"
+msgstr "Misslyckades med att skapa lokalt e-postlager \"%s\": %s"
 
-#: mail/em-migrate.c:2578
-#, fuzzy, c-format
+#: mail/em-migrate.c:2657
+#, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr ""
-"Kan inte spara utdatafilen: %s\n"
-" %s"
+msgstr "Kan inte skapa lokala brevlådemappar på \"%s\": %s"
 
-#: mail/em-migrate.c:2596
+#: mail/em-migrate.c:2675
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
+"Kan inte läsa inställningar från tidigare Evolution-installation, "
+"\"evolution/config.xmldb\" finns inte eller är skadad."
 
-#: mail/em-popup.c:700
+#: mail/em-popup.c:386
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: mail/em-popup.c:718
-#, fuzzy, c-format
+#: mail/em-popup.c:405
+#, c-format
 msgid "untitled_image.%s"
-msgstr "Namnlöst meddelande"
+msgstr "namnlös_bild.%s"
 
-#: mail/em-popup.c:808
-#, fuzzy
+#: mail/em-popup.c:499
 msgid "Set as _Background"
-msgstr "Bakgrund:"
+msgstr "Spara som _bakgrund"
 
-#: mail/em-popup.c:810
-#, fuzzy
+#: mail/em-popup.c:501
 msgid "_Reply to sender"
-msgstr "Svara till avsändaren"
+msgstr "_Svara till avsändaren"
 
-#: mail/em-popup.c:859
-#, fuzzy
+#: mail/em-popup.c:553
 msgid "_Open Link in Browser"
-msgstr "Öppna länk i webbläsare"
+msgstr "_Öppna länk i webbläsare"
 
-#: mail/em-popup.c:860
-#, fuzzy
+#: mail/em-popup.c:554
 msgid "Se_nd message to..."
-msgstr "Skicka _meddelande till lista..."
+msgstr "Ski_cka meddelande till..."
 
-#: mail/em-popup.c:861
-#, fuzzy
+#: mail/em-popup.c:555
 msgid "_Add to Addressbook"
-msgstr "Lägg till adressbok"
+msgstr "_Lägg till i adressbok"
 
-#: mail/em-popup.c:985
+#: mail/em-popup.c:686
 #, c-format
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:613
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
+"Detta lager stöder inte prenumerationer, eller så är de inte aktiverade."
 
-#: mail/em-subscribe-editor.c:635
-#, fuzzy
+#: mail/em-subscribe-editor.c:642
 msgid "Subscribed"
-msgstr "Prenumerera"
+msgstr "Prenumererar"
 
-#: mail/em-subscribe-editor.c:639
+#: mail/em-subscribe-editor.c:646
 msgid "Folder"
 msgstr "Mapp"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:852
+#: mail/em-subscribe-editor.c:861
 msgid "Please select a server."
 msgstr "Välj en server."
 
-#: mail/em-subscribe-editor.c:873
+#: mail/em-subscribe-editor.c:882
 msgid "No server has been selected"
 msgstr "Ingen server har valts"
 
-#: mail/em-utils.c:104
+#: mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "Visa inte detta meddelande igen."
 
@@ -14304,158 +14316,134 @@ msgid "Filters"
 msgstr "Filter"
 
 #: mail/em-utils.c:434
-#, fuzzy
 msgid "message"
-msgstr "Meddelande"
+msgstr "meddelande"
 
 #: mail/em-utils.c:543
-#, fuzzy
 msgid "Save Message..."
-msgstr "Spara meddelande som..."
+msgstr "Spara meddelande..."
 
 #: mail/em-utils.c:592
-#, fuzzy
 msgid "Add address"
-msgstr "Adress"
+msgstr "Lägg till adress"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1053
-#, fuzzy, c-format
+#: mail/em-utils.c:1055
+#, c-format
 msgid "Messages from %s"
-msgstr "Öppnar meddelanden från \"%s\""
+msgstr "Meddelanden från %s"
 
 #: mail/em-vfolder-editor.c:104
-#, fuzzy
 msgid "Virtual _Folders"
-msgstr "Virtuella mappar"
-
-#: mail/em-vfolder-rule.c:494
-msgid "_Add"
-msgstr "_Lägg till"
+msgstr "Virtuella _mappar"
 
 #: mail/em-vfolder-rule.c:574
 msgid "VFolder source"
 msgstr "Källa för virtuell mapp"
 
 #: mail/evolution-mail.schemas.in.in.h:1
-#, fuzzy
 msgid "Automatic link recognition"
-msgstr "_Detektera automatiskt länkar"
+msgstr "Automatisk detektering av länkar"
 
 #: mail/evolution-mail.schemas.in.in.h:2
-#, fuzzy
 msgid "Automatic smiley recognition"
-msgstr "_Detektera automatiskt länkar"
+msgstr "Automatisk detektering av smilisar"
 
 #: mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
-msgstr ""
+msgstr "Kontrollera om inkommande e-post är skräp"
 
 #: mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight color"
-msgstr ""
+msgstr "Färgmarkeringsfärg för citat"
 
 #: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight color."
-msgstr ""
+msgstr "Färgmarkeringsfärg för citat."
 
 #: mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
-msgstr ""
+msgstr "Standardhöjd för redigerarfönstret"
 
 #: mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
-msgstr ""
+msgstr "Standardbredd för redigerarfönstret"
 
 #: mail/evolution-mail.schemas.in.in.h:8
-#, fuzzy
 msgid "Default charset in which to compose messages"
-msgstr "Standardämne för meddelandet."
+msgstr "Standardteckentabell som ska användas vid skapande av meddelanden"
 
 #: mail/evolution-mail.schemas.in.in.h:9
-#, fuzzy
 msgid "Default charset in which to compose messages."
-msgstr "Standardämne för meddelandet."
+msgstr "Standardteckentabell som ska användas vid skapande av meddelanden."
 
 #: mail/evolution-mail.schemas.in.in.h:10
-#, fuzzy
 msgid "Default charset in which to display messages"
-msgstr "Sök efter text i meddelandetexten på det visade meddelandet"
+msgstr "Standardteckentabell som ska användas vid visning av meddelanden"
 
 #: mail/evolution-mail.schemas.in.in.h:11
-#, fuzzy
 msgid "Default charset in which to display messages."
-msgstr "Sök efter text i meddelandetexten på det visade meddelandet"
+msgstr "Standardteckentabell som ska användas vid visning av meddelanden."
 
 #: mail/evolution-mail.schemas.in.in.h:12
-#, fuzzy
 msgid "Default forward style"
-msgstr "Standardstil för vidarebefordran är: "
+msgstr "Standardstil för vidarebefordran"
 
 #: mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
-msgstr ""
+msgstr "Standardhöjd för redigerarfönstret"
 
 #: mail/evolution-mail.schemas.in.in.h:14
-#, fuzzy
 msgid "Default height of the Message Window"
-msgstr "Standardämne för meddelandet."
+msgstr "Standardhöjd för meddelandefönstret"
 
 #: mail/evolution-mail.schemas.in.in.h:15
-#, fuzzy
 msgid "Default height of the Subscribe dialog"
-msgstr "Standardämne för meddelandet."
+msgstr "Standardhöjd för prenumerationsdialogfönstret"
 
 #: mail/evolution-mail.schemas.in.in.h:16
-#, fuzzy
 msgid "Default reply style"
-msgstr "Standardstil för vidarebefordran är: "
+msgstr "Standardstil för svar"
 
 #: mail/evolution-mail.schemas.in.in.h:17
-#, fuzzy
 msgid "Default width of the Composer Window"
-msgstr "Kunde inte skapa fönster för meddelanderedigering."
+msgstr "Standardbredd för fönstret för meddelanderedigering"
 
 #: mail/evolution-mail.schemas.in.in.h:18
-#, fuzzy
 msgid "Default width of the Message Window"
-msgstr "Standardämne för meddelandet."
+msgstr "Standardbredd för meddelandefönstret"
 
 #: mail/evolution-mail.schemas.in.in.h:19
-#, fuzzy
 msgid "Default width of the Subscribe dialog"
-msgstr "Standardämne för meddelandet."
+msgstr "Standardbredd för prenumerationsdialogfönstret"
 
 #: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
-msgstr ""
+msgstr "Rita stavfelsindikatorer på ord efterhand som du skriver."
 
 #: mail/evolution-mail.schemas.in.in.h:21
-#, fuzzy
 msgid "Empty Trash folders on exit"
-msgstr "Töm _papperskorgsmappar vid avslut"
+msgstr "Töm papperskorgsmappar vid avslut"
 
 #: mail/evolution-mail.schemas.in.in.h:22
-#, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
-msgstr "Töm _papperskorgsmappar vid avslut"
+msgstr "Töm alla papperskorgsmappar vid avslutande av Evolution."
 
 #: mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
+msgstr "Aktivera markörläge, så att du ser en markör när du läser e-post."
 
 #: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
-msgstr ""
+msgstr "Aktivera/inaktivera markörläge"
 
 #: mail/evolution-mail.schemas.in.in.h:25
-#, fuzzy
 msgid "Height of the message-list pane"
-msgstr "Skicka meddelandet senare"
+msgstr "Höjd för meddelandelistpanelen"
 
 #: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
-msgstr ""
+msgstr "Höjd för meddelandelistpanelen."
 
 #: mail/evolution-mail.schemas.in.in.h:27
 msgid ""
@@ -14463,24 +14451,26 @@ msgid ""
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
+"Om det inte finns en inbyggd visare för en viss mime-typ i Evolution kommer "
+"alla mime-typer som finns i denna lista och som mappas till en bonobo-"
+"komponentvisare i GNOME:s databas över mime-typer att kunna användas för att "
+"visa innehåll."
 
 #: mail/evolution-mail.schemas.in.in.h:28
 msgid "Last time empty trash was run"
-msgstr ""
+msgstr "Senaste tid då tömning av papperskorgen kördes"
 
 #: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colors"
-msgstr ""
+msgstr "Lista med etiketter och deras associerade färger"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-#, fuzzy
 msgid "List of accepted licenses"
-msgstr "Lista med signaturer"
+msgstr "Lista med godtagna licenser"
 
 #: mail/evolution-mail.schemas.in.in.h:31
-#, fuzzy
 msgid "List of accounts"
-msgstr "Lista med signaturer"
+msgstr "Lista med konton"
 
 #: mail/evolution-mail.schemas.in.in.h:32
 msgid ""
@@ -14518,24 +14508,20 @@ msgid ""
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:39
-#, fuzzy
 msgid "Log filter actions"
-msgstr "_Logga filteråtgärder i:"
+msgstr "Logga filteråtgärder"
 
 #: mail/evolution-mail.schemas.in.in.h:40
-#, fuzzy
 msgid "Log filter actions to the specified log file."
-msgstr "_Logga filteråtgärder i:"
+msgstr "Logga filteråtgärder i den angivna loggfilen."
 
 #: mail/evolution-mail.schemas.in.in.h:41
-#, fuzzy
 msgid "Logfile to log filter actions"
-msgstr "_Logga filteråtgärder i:"
+msgstr "Loggfil att logga filteråtgärder i"
 
 #: mail/evolution-mail.schemas.in.in.h:42
-#, fuzzy
 msgid "Logfile to log filter actions."
-msgstr "_Logga filteråtgärder i:"
+msgstr "Loggfil att logga filteråtgärder i"
 
 #: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
@@ -14635,24 +14621,20 @@ msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
-#, fuzzy
 msgid "Send HTML mail by default"
-msgstr "_Skicka brev i HTML-format som standard."
+msgstr "Skicka HTML-brev som standard"
 
 #: mail/evolution-mail.schemas.in.in.h:66
-#, fuzzy
 msgid "Send HTML mail by default."
-msgstr "_Skicka brev i HTML-format som standard."
+msgstr "Skicka HTML-brev som standard."
 
 #: mail/evolution-mail.schemas.in.in.h:67
-#, fuzzy
 msgid "Show Animations"
-msgstr "_Visa animerade bilder"
+msgstr "Visa animationer"
 
 #: mail/evolution-mail.schemas.in.in.h:68
-#, fuzzy
 msgid "Show animated images as animations."
-msgstr "_Visa animerade bilder"
+msgstr "Visa animerade bilder som animationer."
 
 #: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
@@ -14663,15 +14645,6 @@ msgstr ""
 msgid "Show deleted messages in the message-list"
 msgstr "Visa meddelanden i normal stil"
 
-#: mail/evolution-mail.schemas.in.in.h:71
-#, fuzzy
-msgid "Show the \"Preview\" pane"
-msgstr "F_örhandsgranskningspanel"
-
-#: mail/evolution-mail.schemas.in.in.h:72
-msgid "Show the \"Preview\" pane."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
@@ -14696,9 +14669,8 @@ msgid "Subscribe dialog default width"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:78
-#, fuzzy
 msgid "Terminal font"
-msgstr "_Terminaltypsnitt:"
+msgstr "Terminaltypsnitt"
 
 #: mail/evolution-mail.schemas.in.in.h:79
 msgid "The last time empty trash was run, in days since the epoch."
@@ -14722,19 +14694,16 @@ msgid ""
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:83
-#, fuzzy
 msgid "Thread the message list."
-msgstr "Tråda meddelandelista"
+msgstr "Tråda meddelandelistan."
 
 #: mail/evolution-mail.schemas.in.in.h:84
-#, fuzzy
 msgid "Thread the message-list"
-msgstr "Tråda meddelandelista"
+msgstr "Tråda meddelandelistan"
 
 #: mail/evolution-mail.schemas.in.in.h:85
-#, fuzzy
 msgid "Thread the message-list based on Subject"
-msgstr "Tråda meddelandelista"
+msgstr "Tråda meddelandelistan baserat på ämnet"
 
 #: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
@@ -14745,9 +14714,8 @@ msgid "Timeout for marking message as Seen."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:88
-#, fuzzy
 msgid "UID string of the default account."
-msgstr "_Gör detta till mitt standardkonto"
+msgstr "UID-sträng för standardkontot."
 
 #: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
@@ -14759,7 +14727,7 @@ msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
-msgstr ""
+msgstr "Använd anpassade typsnitt"
 
 #: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
@@ -14774,9 +14742,8 @@ msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:95
-#, fuzzy
 msgid "Variable width font"
-msgstr "V_ariabelt breddsteg:"
+msgstr "Typsnitt med variabelt breddsteg"
 
 #: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
@@ -14829,9 +14796,8 @@ msgid "port for starting user runned spamd"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:108
-#, fuzzy
 msgid "spamd port"
-msgstr "Importera"
+msgstr "spamd-port"
 
 #: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
@@ -14866,23 +14832,22 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerar din gamla Elm-epost"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:221
-#: mail/importers/evolution-outlook-importer.c:255
+#: mail/importers/evolution-mbox-importer.c:225
+#: mail/importers/evolution-outlook-importer.c:259
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importerar..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:223
-#: mail/importers/evolution-outlook-importer.c:257
+#: mail/importers/evolution-mbox-importer.c:227
+#: mail/importers/evolution-outlook-importer.c:261
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Var vänlig vänta"
 
 #: mail/importers/elm-importer.c:244
-#, fuzzy
 msgid "Importing Elm data"
-msgstr "Importerar data"
+msgstr "Importerar Elm-data"
 
 #: mail/importers/elm-importer.c:436
 msgid ""
@@ -14896,32 +14861,29 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:116
-#: mail/importers/evolution-outlook-importer.c:130
-#, fuzzy
+#: mail/importers/evolution-mbox-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:131
 msgid "Destination folder:"
-msgstr "Ta bort denna mapp"
+msgstr "Målmapp:"
 
-#: mail/importers/evolution-mbox-importer.c:119
-#: mail/importers/evolution-outlook-importer.c:133
-#, fuzzy
+#: mail/importers/evolution-mbox-importer.c:120
+#: mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder to import into"
-msgstr "Välj mapp"
+msgstr "Välj mapp att importera till"
 
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:254
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/mail-importer.c:226
-#, fuzzy, c-format
+#, c-format
 msgid "Importing `%s'"
-msgstr "Importerar"
+msgstr "Importerar \"%s\""
 
-#: mail/importers/evolution-outlook-importer.c:301
+#: mail/importers/evolution-outlook-importer.c:305
 #: mail/importers/mail-importer.c:140
-#, fuzzy
 msgid "Importing mailbox"
-msgstr "Viktig post"
+msgstr "Importerar brevlåda"
 
-#: mail/importers/mail-importer.c:360
+#: mail/importers/mail-importer.c:363
 #, c-format
 msgid "Scanning %s"
 msgstr "Genomsöker %s"
@@ -14988,9 +14950,8 @@ msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerar din gamla Netscape-data"
 
 #: mail/importers/netscape-importer.c:1707
-#, fuzzy
 msgid "Importing Netscape data"
-msgstr "Importerar data"
+msgstr "Importerar Netscape-data"
 
 #: mail/importers/netscape-importer.c:1907
 msgid "Settings"
@@ -15013,13 +14974,8 @@ msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importerar din gamla Pine-data"
 
 #: mail/importers/pine-importer.c:314
-#, fuzzy
 msgid "Importing Pine data"
-msgstr "Importerar data"
-
-#: mail/importers/pine-importer.c:479
-msgid "Addressbook"
-msgstr "Adressbok"
+msgstr "Importerar Pine-data"
 
 #: mail/importers/pine-importer.c:498
 msgid ""
@@ -15033,37 +14989,6 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
-msgid "Evolution Account Editor"
-msgstr "Evolutions kontoredigerare"
-
-#: mail/mail-account-gui.c:246
-#, c-format
-msgid ""
-"\n"
-"Please read carefully the license agreement\n"
-"for %s displayed below\n"
-"and tick the check box for accepting it\n"
-msgstr ""
-
-#: mail/mail-account-gui.c:252
-#, c-format
-msgid "%s License Agreement"
-msgstr ""
-
-#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
-msgid "_Host:"
-msgstr "_Värd:"
-
-#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
-msgid "User_name:"
-msgstr "Användar_namn:"
-
-#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
-msgid "_Path:"
-msgstr "_Sökväg:"
-
 #: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
@@ -15088,158 +15013,98 @@ msgstr "Sändlistan %s"
 msgid "Add Filter Rule"
 msgstr "Lägg till filterregel"
 
-#: mail/mail-component.c:459
-#, fuzzy, c-format
+#: mail/mail-component.c:139
+msgid "Drafts"
+msgstr "Utkast"
+
+#: mail/mail-component.c:140
+msgid "Outbox"
+msgstr "Utkorg"
+
+#: mail/mail-component.c:141
+msgid "Sent"
+msgstr "Skickat"
+
+#: mail/mail-component.c:484
+#, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
-msgstr[0] "%d markerade"
-msgstr[1] "%d markerade"
+msgstr[0] "%d borttaget"
+msgstr[1] "%d borttagna"
 
-#: mail/mail-component.c:461
-#, fuzzy, c-format
+#: mail/mail-component.c:486
+#, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
-msgstr[0] "%d oskickade"
-msgstr[1] "%d oskickade"
+msgstr[0] "%d skräp"
+msgstr[1] "%d skräp"
 
-#: mail/mail-component.c:484
-#, fuzzy, c-format
+#: mail/mail-component.c:509
+#, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
-msgstr[0] "Utkast"
-msgstr[1] "Utkast"
+msgstr[0] "%d utkast"
+msgstr[1] "%d utkast"
 
-#: mail/mail-component.c:486
-#, fuzzy, c-format
+#: mail/mail-component.c:511
+#, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
-msgstr[0] "%d skickade"
+msgstr[0] "%d skickat"
 msgstr[1] "%d skickade"
 
-#: mail/mail-component.c:488
-#, fuzzy, c-format
+#: mail/mail-component.c:513
+#, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
-msgstr[0] "%d oskickade"
+msgstr[0] "%d oskickat"
 msgstr[1] "%d oskickade"
 
-#: mail/mail-component.c:492
-#, fuzzy, c-format
+#: mail/mail-component.c:517
+#, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: mail/mail-component.c:494
-#, fuzzy, c-format
+#: mail/mail-component.c:519
+#, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
-msgstr[0] " (XXX olästa)"
-msgstr[1] " (XXX olästa)"
+msgstr[0] ", %d oläst"
+msgstr[1] ", %d olästa"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:684
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:685
 msgid "_Mail Message"
 msgstr "_E-postmeddelande"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:686
 msgid "Compose a new mail message"
 msgstr "Skriv ett nytt e-postmeddelande"
 
-#: mail/mail-component.c:667
-#, fuzzy
+#: mail/mail-component.c:692
 msgid "New Mail Folder"
-msgstr "Ny virtuell mapp"
+msgstr "Ny e-postmapp"
 
-#: mail/mail-component.c:668
-#, fuzzy
+#: mail/mail-component.c:693
 msgid "Mail _Folder"
-msgstr "E-postfilter"
+msgstr "E-post_mapp"
 
-#: mail/mail-component.c:669
-#, fuzzy
+#: mail/mail-component.c:694
 msgid "Create a new mail folder"
-msgstr "Skapa en ny mapp"
+msgstr "Skapa en ny e-postmapp"
 
-#: mail/mail-component.c:801
+#: mail/mail-component.c:826
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
-msgid "Identity"
-msgstr "Identitet"
-
-#: mail/mail-config-druid.c:364
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Ange ditt namn och din e-postadress nedan. De \"valfria\" fälten nedan "
-"behöver du inte fylla i, såvida du inte vill inkludera denna information i "
-"den e-post du skickar."
-
-#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:119
-msgid "Receiving Mail"
-msgstr "Mottagande av post"
-
-#: mail/mail-config-druid.c:372
-msgid ""
-"Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Ange information om din server för inkommande e-post nedan. Om du inte är "
-"säker bör du fråga din systemadministratör eller Internetleverantör."
-
-#: mail/mail-config-druid.c:379
-msgid "Please select among the following options"
-msgstr "Välj mellan följande alternativ"
-
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
-msgid "Sending Mail"
-msgstr "Skickande av post"
-
-#: mail/mail-config-druid.c:384
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Ange information om hur du vill skicka e-post. Om du inte är säker bör du "
-"fråga din systemadministratör eller Internetleverantör."
-
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
-msgid "Account Management"
-msgstr "Kontohantering"
-
-#: mail/mail-config-druid.c:391
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
-"Du är nästan färdig med din e-postkonfiguration. Identiteten, den inkommande "
-"e-postservern och transportmetoden för utgående e-post som du angav kommer "
-"att sammanställas för att skapa ett Evolution-epostkonto. Ange ett namn för "
-"detta konto nedan. Detta namn kommer endast att användas för visning."
-
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Kontrollerar tjänst"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Ansluter till server..."
-
 #: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
-#, fuzzy
 msgid "    "
-msgstr "      "
+msgstr "    "
 
 #: mail/mail-config.glade.h:2
 #, fuzzy
@@ -15250,18 +15115,16 @@ msgstr " _Kontrollera vilka typer som stöds "
 # http://bugzilla.ximian.com/show_bug.cgi?id=61065
 #: mail/mail-config.glade.h:5
 #, fuzzy
-msgid "<b>SSL is not supported in this build of evolution</b>"
+msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "(SSL stöds inte i detta bygge av Evolution)"
 
 #: mail/mail-config.glade.h:6
-#, fuzzy
 msgid "<b>S_ignatures</b>"
-msgstr "<b>Status:</b>"
+msgstr "<b>S_ignaturer</b>"
 
 #: mail/mail-config.glade.h:7
-#, fuzzy
 msgid "<b>_Languages</b>"
-msgstr "Språk"
+msgstr "<b>_Språk</b>"
 
 #: mail/mail-config.glade.h:8
 msgid "<small>This will make the the filter more reliable, but slower</small>"
@@ -15284,208 +15147,209 @@ msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:13
-#, fuzzy
-msgid "<span weight=\"bold\">Checking for New Mail</span>"
-msgstr "Kontrollerar ny e-post"
-
-#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Notifiering om ny post"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Skickade meddelanden och utkast"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Kontoredigerare"
+
 #: mail/mail-config.glade.h:35
-#, fuzzy
-msgid "A_lso encrypt to self when sending encrypted mail"
-msgstr "Kryptera a_lltid till mig själv när krypterad post skickas"
+msgid "Account Management"
+msgstr "Kontohantering"
 
 #: mail/mail-config.glade.h:36
-msgid "Account Editor"
-msgstr "Kontoredigerare"
+msgid "Add Ne_w Signature..."
+msgstr "Lägg till n_y signatur..."
+
+#: mail/mail-config.glade.h:37
+msgid "Add _Script"
+msgstr "Lägg till _skript"
 
 #: mail/mail-config.glade.h:38
 #, fuzzy
-msgid "Add Ne_w Signature..."
-msgstr "Lägg till ny signatur..."
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "S_ignera alltid utgående meddelanden när detta konto används"
 
 #: mail/mail-config.glade.h:39
 #, fuzzy
-msgid "Add _Script"
-msgstr "Lägg till sk_ript"
-
-#: mail/mail-config.glade.h:40
-msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "Kryptera a_lltid till mig själv när krypterad post skickas"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Skicka alltid _kopia (Cc) till:"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Skicka alltid _blindkopia (Bcc) till:"
 
-#: mail/mail-config.glade.h:44
-#, fuzzy
-msgid "Always _sign outgoing messages when using this account"
-msgstr "S_ignera alltid utgående meddelanden när detta konto används"
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Lita alltid på nycklar i min nyckelring vid kryptering"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Always encrypt to _myself when sending encrypted mail"
+msgstr "Kryptera a_lltid till mig själv när krypterad post skickas"
+
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Bifoga originalmeddelandet"
 
-#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bilaga"
 
-#: mail/mail-config.glade.h:48
-#, fuzzy
+#: mail/mail-config.glade.h:46
 msgid "Automatically _insert smiley images"
-msgstr "Infoga _automatiskt smilisbilder"
-
-# Låter konstigt
-#: mail/mail-config.glade.h:49
-#, fuzzy
-msgid "Automatically check for _new mail every"
-msgstr "Kontrollera _automatiskt ny e-post var"
+msgstr "_Infoga automatiskt smilisbilder"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "_Pip då ny post anländer"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "Te_ckenkodning:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr " _Kontrollera vilka typer som stöds "
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Check _incoming mail for junk"
 msgstr "Server för inkommande post"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Kontrollera stavning medan jag skri_ver"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Cle_ar"
+msgstr "Töm"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Clea_r"
+msgstr "Töm"
+
+#: mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "Färg för _felstavade ord:"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Colors"
 msgstr "F_ärger"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Bekräfta vid tömning av mapp"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15500,120 +15364,122 @@ msgstr ""
 "\n"
 "Klicka på \"Verkställ\" för att spara dina inställningar."
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Standardtecken_kodning: "
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Defaults"
 msgstr "_Standardvärden"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Digitally _sign outgoing messages (by default)"
+msgstr "Signera _alltid utgående meddelanden när detta konto används"
+
+#: mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Citera inte originalmeddelandet"
 
-#: mail/mail-config.glade.h:73
-msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr "Signera inte _sammanträdesbegäran (för kompatibilitet med Outlook)"
-
-#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:72 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Klar"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Utkast_mapp:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "E-postkonton"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Email _Address:"
 msgstr "E-postadress:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Töm _papperskorgsmappar vid avslut"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
+#, fuzzy
+msgid "Encrypt out_going messages (by default)"
+msgstr "Signera _alltid utgående meddelanden när detta konto används"
+
+#: mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoassistent"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:81
 msgid "Execute Command..."
 msgstr "Kör kommando..."
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Fast _breddsteg:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Typsnittsegenskaper"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Formatera meddelanden med _HTML"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:86
 #, fuzzy
 msgid "HTML Mail"
 msgstr "_HTML-brev"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Headers"
 msgstr "Rubrik"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:88
 msgid "Highlight _quotations with"
 msgstr "Markera _citat med"
 
-#: mail/mail-config.glade.h:90
-msgid "IMAPv4 "
-msgstr "IMAPv4 "
-
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "I_nclude remote tests"
 msgstr "Inkludera:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:90
+msgid "Identity"
+msgstr "Identitet"
+
+#: mail/mail-config.glade.h:92
 msgid "Inline"
 msgstr "Inuti"
 
-#: mail/mail-config.glade.h:96
-msgid "Kerberos "
-msgstr "Kerberos "
-
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Brevlådeplats"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Meddelanderedigerare"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:99
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -15621,143 +15487,161 @@ msgstr ""
 "Observera: du kommer inte att efterfrågas ett lösenord innan du ansluter för "
 "första gången"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:100
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:101
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_nyckelid:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Spela ljudfil då ny post anländer"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:105
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Ange information om hur du vill skicka e-post. Om du inte är säker bör du "
+"fråga din systemadministratör eller Internetleverantör."
+
+#: mail/mail-config.glade.h:106
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Ange ditt namn och din e-postadress nedan. De \"valfria\" fälten nedan "
+"behöver du inte fylla i, såvida du inte vill inkludera denna information i "
+"den e-post du skickar."
+
+#: mail/mail-config.glade.h:107
+msgid "Please select among the following options"
+msgstr "Välj mellan följande alternativ"
+
+#: mail/mail-config.glade.h:108
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Fr_åga då meddelanden skickas med endast blindkopiemottagare angivna"
 
-#: mail/mail-config.glade.h:113
-msgid "Qmail maildir "
-msgstr "Qmail-epostkatalog "
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:109
 msgid "Quote original message"
 msgstr "Citera originalmeddelande"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:110
 msgid "Quoted"
 msgstr "Citerad"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Re_member password"
 msgstr "Kom ihåg mitt lösenord"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:112
 msgid "Re_ply-To:"
 msgstr "Sva_ra till:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:113
 msgid "Receiving Email"
 msgstr "Mottagande av e-post"
 
-#: mail/mail-config.glade.h:120
-#, fuzzy
-msgid "Receiving Options"
-msgstr "_Alternativ för mottagning"
-
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Remember _password"
 msgstr "Kom ihåg mitt lösenord"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "S_elect..."
+msgstr "Markera"
+
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "_Standardtypsnitt:"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Se_lect..."
+msgstr "Markera"
+
+#: mail/mail-config.glade.h:118
 msgid "Security"
 msgstr "Säkerhet"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:119
 msgid "Select HTML fixed width font"
 msgstr "Välj HTML-typsnitt med fast breddsteg"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:120
 msgid "Select HTML fixed width font for printing"
 msgstr "Välj HTML-typsnitt med fast breddsteg för utsnitt"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:121
 msgid "Select HTML variable width font"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:122
 msgid "Select HTML variable width font for printing"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg för utskrift"
 
-#: mail/mail-config.glade.h:129
-#, fuzzy
-msgid "Select..."
-msgstr "Markera"
-
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:123
 msgid "Sending Email"
 msgstr "Skickande av e-post"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:124
+msgid "Sending Mail"
+msgstr "Skickande av post"
+
+#: mail/mail-config.glade.h:125
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Mapp för skickade _meddelanden:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:126
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vern kräver autentisering"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:127
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:128
 #, fuzzy
-msgid "Si_gning certificate:"
+msgid "Sig_ning certificate:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Signatur:"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:130
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:131
 msgid "Specify _filename:"
 msgstr "Ange _filnamn:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:132
 #, fuzzy
 msgid "Spell Checking"
 msgstr "Stavnings_kontroll"
 
-#: mail/mail-config.glade.h:141
-msgid "Standard Unix mbox"
-msgstr "Standard Unix-brevlåda"
-
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "_Terminaltypsnitt:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "T_ype: "
 msgstr "Typ:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:135
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15767,7 +15651,7 @@ msgstr ""
 "din signatur. Namnet du anger kommer att endast\n"
 "användas för visning."
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:138
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15776,7 +15660,7 @@ msgstr ""
 "Denna sida låter dig konfigurera stavningskontroll och språk. Listan med "
 "språk här återspeglar endast de språk för vilka en ordbok är installerad."
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:140
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15784,11 +15668,15 @@ msgstr ""
 "Skriv in namnet som du vill använda för att referera till detta konto.\n"
 "Till exempel: \"Jobb\" eller \"Personligt\"."
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:142
+msgid "User_name:"
+msgstr "Användar_namn:"
+
+#: mail/mail-config.glade.h:143
 msgid "V_ariable-width:"
 msgstr "V_ariabelt breddsteg:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:144
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15798,88 +15686,105 @@ msgstr ""
 "\n"
 "Klicka på \"Framåt\" för att börja. "
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:148
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+"Du är nästan färdig med din e-postkonfiguration. Identiteten, den inkommande "
+"e-postservern och transportmetoden för utgående e-post som du angav kommer "
+"att sammanställas för att skapa ett Evolution-epostkonto. Ange ett namn för "
+"detta konto nedan. Detta namn kommer endast att användas för visning."
+
+#: mail/mail-config.glade.h:149
 msgid "_Add Signature"
 msgstr "_Lägg till signatur"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "Läs alltid in _bilder från nätet"
 
-#: mail/mail-config.glade.h:160
-#, fuzzy
-msgid "_Digitally sign outgoing messages (by default)"
-msgstr "Signera _alltid utgående meddelanden när detta konto används"
-
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Notifiera inte mig när ny post anländer"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Don't sign meeting requests (for Outlook compatibility)"
+msgstr "Signera inte _sammanträdesbegäran (för kompatibilitet med Outlook)"
+
+#: mail/mail-config.glade.h:154
 msgid "_Enable"
 msgstr "_Aktivera"
 
-#: mail/mail-config.glade.h:164
-msgid "_Encrypt outgoing messages (by default)"
-msgstr ""
-
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:155
 msgid "_Forward style:"
 msgstr "Stil för _vidarebefordran:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:157
+msgid "_Host:"
+msgstr "_Värd:"
+
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "Läs _in bilder om avsändaren finns i adressboken"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "_Gör detta till mitt standardkonto"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "_Markera meddelanden som lästa efter"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_Läs aldrig in bilder från nätet"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:163
+msgid "_Path:"
+msgstr "_Sökväg:"
+
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Fråga då HTML-meddelanden skickas till kontakter som inte vill ha dem"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Fråga då meddelanden skickas med en _tom ämnesrad"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:166
 msgid "_Reply style:"
 msgstr "_Svarsstil:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:167
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:168
 msgid "_Show animated images"
 msgstr "_Visa animerade bilder"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:169
 #, fuzzy
-msgid "_Use Secure Connection (SSL):"
-msgstr "_Använd säker anslutning (SSL):"
+msgid "_Use Secure Connection:"
+msgstr "_Använd säker anslutning:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:170
 msgid "_Use the same fonts as other applications"
 msgstr "_Använd samma typsnitt som andra program"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:171
 msgid "color"
 msgstr "färg"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "beskrivning"
 
@@ -15905,52 +15810,50 @@ msgstr ""
 
 #: mail/mail-dialogs.glade.h:10
 #, fuzzy
-msgid "Accept License"
-msgstr "Godtaget"
+msgid "Case _Sensitive"
+msgstr "Gör skillnad på gemener/VERSALER"
 
 #: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "F_ärdigt"
+#, fuzzy
+msgid "Co_mpleted"
+msgstr "Färdigt"
 
-#: mail/mail-dialogs.glade.h:12
-msgid "Case Sensitive"
-msgstr "Gör skillnad på gemener/VERSALER"
+#: mail/mail-dialogs.glade.h:13
+#, fuzzy
+msgid "F_ind:"
+msgstr "Sök:"
 
 #: mail/mail-dialogs.glade.h:14
 msgid "Find in Message"
 msgstr "Sök i meddelande"
 
-#: mail/mail-dialogs.glade.h:15
-msgid "Find:"
-msgstr "Sök:"
-
-#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/mail-dialogs.glade.h:15 mail/message-tag-followup.c:295
 #: mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Flagga att följa upp"
 
-#: mail/mail-dialogs.glade.h:17
+#: mail/mail-dialogs.glade.h:16
 msgid "Folder Subscriptions"
 msgstr "Mapprenumerationer"
 
-#: mail/mail-dialogs.glade.h:18
+#: mail/mail-dialogs.glade.h:17
 msgid "License Agreement"
 msgstr ""
 
-#: mail/mail-dialogs.glade.h:19
+#: mail/mail-dialogs.glade.h:18
 msgid "None Selected"
 msgstr "Inga markerade"
 
-#: mail/mail-dialogs.glade.h:20
+#: mail/mail-dialogs.glade.h:19
 msgid "S_erver:"
 msgstr "S_erver:"
 
-#: mail/mail-dialogs.glade.h:21
+#: mail/mail-dialogs.glade.h:20
 #, fuzzy
 msgid "Security Information"
 msgstr "Källinformation"
 
-#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+#: mail/mail-dialogs.glade.h:22 mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -15958,24 +15861,29 @@ msgstr ""
 "De meddelanden du har valt för uppföljning listas nedan.\n"
 "Välj en uppföljningsåtgärd från menyn \"Flagga\"."
 
-#: mail/mail-dialogs.glade.h:25
+#: mail/mail-dialogs.glade.h:24
 #, fuzzy
-msgid "Tick this to accept the license agreement"
-msgstr "Lista med signaturer"
+msgid "_Accept License"
+msgstr "Godtaget"
 
-#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#: mail/mail-dialogs.glade.h:25 mail/message-tags.glade.h:6
 #, fuzzy
 msgid "_Due By:"
 msgstr "_Ska utföras den:"
 
-#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Flagga:"
 
-#: mail/mail-dialogs.glade.h:28
+#: mail/mail-dialogs.glade.h:27
 msgid "_Subscribe"
 msgstr "_Prenumerera"
 
+#: mail/mail-dialogs.glade.h:28
+#, fuzzy
+msgid "_Tick this to accept the license agreement"
+msgstr "Lista med signaturer"
+
 #: mail/mail-dialogs.glade.h:29
 msgid "_Unsubscribe"
 msgstr "_Säg upp prenumeration"
@@ -16044,12 +15952,6 @@ msgstr ""
 "Du skickar ett HTML-formaterat brev. Försäkra dig om att följande\n"
 "mottagare vill ha, och kan ta emot, HTML-formaterad e-post:\n"
 
-#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
-#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
-#, fuzzy
-msgid "_Send"
-msgstr "Skicka"
-
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
 #, fuzzy
@@ -16284,21 +16186,21 @@ msgstr ""
 "Kan inte ta bort mapp:\n"
 "%s"
 
-#. mail:no-delete-spethal-folder primary
+#. mail:no-delete-special-folder primary
 #: mail/mail-errors.xml.h:114
 #, fuzzy
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Kan inte ta bort mapp: %s: Det finns ingen sådan mapp"
 
-#. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
+#. mail:no-delete-special-folder secondary
+#. mail:no-rename-special-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
 msgstr ""
 
-#. mail:no-rename-spethal-folder primary
+#. mail:no-rename-special-folder primary
 #: mail/mail-errors.xml.h:118
 #, fuzzy
 msgid "Cannot rename or move system folder \"{0}\"."
@@ -16337,10 +16239,12 @@ msgstr "Kan inte flytta mapp: %s"
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "En mapp med namnet \"%s\" finns redan. Använd ett annat namn."
 
+# Mycket konstigt meddelande...
 #. mail:no-rename-folder secondary
 #: mail/mail-errors.xml.h:134
+#, fuzzy
 msgid "Because \"{2}\"."
-msgstr ""
+msgstr "Eftersom \"{1}\"."
 
 #. mail:no-move-folder-nostore primary
 #. mail:no-move-folder-to-nostore primary
@@ -16378,16 +16282,14 @@ msgstr "Kan inte få mapp: %s: %s"
 
 #. mail:no-create-folder-nostore secondary
 #: mail/mail-errors.xml.h:154
-#, fuzzy
 msgid "Cannot open source \"{1}\""
-msgstr "Kunde inte uppdatera objekt"
+msgstr "Kan inte öppna källan \"{1}\""
 
 #. mail:account-incomplete primary
 #. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
-#, fuzzy
 msgid "Cannot save changes to account."
-msgstr "Kan inte flytta kontakt."
+msgstr "Kan inte spara ändringar i kontot."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -16401,9 +16303,8 @@ msgstr "Du kan inte skapa två konton med samma namn."
 
 #. mail:ask-delete-account title
 #: mail/mail-errors.xml.h:164
-#, fuzzy
 msgid "Delete account?"
-msgstr "Verkligen ta bort kontot?"
+msgstr "Ta bort kontot?"
 
 #. mail:ask-delete-account primary
 #: mail/mail-errors.xml.h:166
@@ -16421,14 +16322,14 @@ msgstr "Ta inte bort"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
-#, fuzzy
 msgid "Could not save signature file."
-msgstr "Kunde inte spara signaturfilen: %s"
+msgstr "Kunde inte spara signaturfilen."
 
+# Mycket konstigt meddelande...
 #. mail:no-save-signature secondary
 #: mail/mail-errors.xml.h:173
 msgid "Because \"{0}\"."
-msgstr ""
+msgstr "Eftersom \"{0}\"."
 
 #. mail:signature-notscript primary
 #: mail/mail-errors.xml.h:175
@@ -16588,32 +16489,74 @@ msgstr "Skriv över"
 msgid "_Append"
 msgstr "Aspen"
 
-#. mail:gw-accountsetup-error primary
+#. mail:no-load-license primary
 #: mail/mail-errors.xml.h:234
+#, fuzzy
+msgid "Unable to read license file."
+msgstr ""
+"Kan inte spola filen: %s\n"
+"%s"
+
+#. mail:no-load-license secondary
+#: mail/mail-errors.xml.h:236
+msgid ""
+"Cannot read the license file \"{0}\", due to an\n"
+"      installation problem.  You will not be able to use this provider "
+"until\n"
+"      you can accept its license."
+msgstr ""
+
+#. mail:checking-service title
+#: mail/mail-errors.xml.h:240
+msgid "Querying server"
+msgstr ""
+
+#. mail:checking-service primary
+#: mail/mail-errors.xml.h:242
+#, fuzzy
+msgid "Please wait."
+msgstr "Var vänlig vänta"
+
+#. mail:checking-service secondary
+#: mail/mail-errors.xml.h:244
+#, fuzzy
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr "Kryptering behövs för begärd autentiseringsmekanism"
+
+#. mail:gw-accountsetup-error primary
+#: mail/mail-errors.xml.h:246
+#, fuzzy
 msgid ""
-"Could not connect to {0}. Groupwise account setup is incomplete. You may "
-"need to setup  the account again"
+"Unable to connect to the GroupWise\n"
+"server."
+msgstr "Misslyckades med att ansluta till LDAP-server"
+
+#. mail:gw-accountsetup-error secondary
+#: mail/mail-errors.xml.h:249
+msgid ""
+"\n"
+"Please check your account settings and try again.\n"
 msgstr ""
 
-#: mail/mail-folder-cache.c:795
+#: mail/mail-folder-cache.c:812
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
 
-#: mail/mail-ops.c:98
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtrerar mapp"
 
-#: mail/mail-ops.c:259
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Hämtar post"
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:554
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Misslyckades med att tillämpa utgående filter: %s"
 
-#: mail/mail-ops.c:567
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16622,115 +16565,110 @@ msgstr ""
 "Misslyckades med att lägga till i %s: %s\n"
 "Lägger till i lokala \"Skickat\"-mappen istället."
 
-#: mail/mail-ops.c:576
+#: mail/mail-ops.c:588
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Misslyckades med att lägga till i lokala \"Skickat\"-mappen: %s"
 
-#: mail/mail-ops.c:672
+#: mail/mail-ops.c:685
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Skickar meddelande %d av %d"
 
-#: mail/mail-ops.c:703
+#: mail/mail-ops.c:716
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Misslyckades med att avkoda meddelandet."
 
-#: mail/mail-ops.c:707
+#: mail/mail-ops.c:720
 msgid "Complete."
 msgstr "Färdig."
 
-#: mail/mail-ops.c:804
+#: mail/mail-ops.c:817
 msgid "Saving message to folder"
 msgstr "Sparar meddelande till mappen"
 
-#: mail/mail-ops.c:889
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: mail/mail-ops.c:889
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: mail/mail-ops.c:1002
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Genomsöker mappar i \"%s\""
-
-#: mail/mail-ops.c:1115
+#: mail/mail-ops.c:1128
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1158
+#: mail/mail-ops.c:1171
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1230
+#: mail/mail-ops.c:1243
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagret %s"
 
-#: mail/mail-ops.c:1308
+#: mail/mail-ops.c:1321
 #, c-format
 msgid "Removing folder %s"
 msgstr "Byter namn på mappen %s"
 
-#: mail/mail-ops.c:1402
+#: mail/mail-ops.c:1415
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/mail-ops.c:1467
+#: mail/mail-ops.c:1480
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1481
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1536
 msgid "Refreshing folder"
 msgstr "Uppdaterar mapp"
 
-#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
+#: mail/mail-ops.c:1572 mail/mail-ops.c:1623
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: mail/mail-ops.c:1607
+#: mail/mail-ops.c:1620
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tömmer papperskorgen i \"%s\""
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1621
 msgid "Local Folders"
 msgstr "Lokala mappar"
 
-#: mail/mail-ops.c:1691
+#: mail/mail-ops.c:1704
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: mail/mail-ops.c:1763
+#: mail/mail-ops.c:1776
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Hämtar %d meddelande(n)"
 msgstr[1] "Hämtar %d meddelande(n)"
 
-#: mail/mail-ops.c:1849
+#: mail/mail-ops.c:1862
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Sparar %d meddelande(n)"
 msgstr[1] "Sparar %d meddelande(n)"
 
-#: mail/mail-ops.c:1899
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16739,7 +16677,7 @@ msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1927
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16748,11 +16686,11 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:2011
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: mail/mail-ops.c:2010
+#: mail/mail-ops.c:2023
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16761,36 +16699,40 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2033
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: mail/mail-ops.c:2168
+#: mail/mail-ops.c:2181
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar från %s"
 
-#: mail/mail-ops.c:2168
+#: mail/mail-ops.c:2181
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ansluter igen till %s"
 
-#: mail/mail-send-recv.c:157
+#: mail/mail-ops.c:2285
+msgid "Checking Service"
+msgstr "Kontrollerar tjänst"
+
+#: mail/mail-send-recv.c:158
 msgid "Cancelling..."
 msgstr "Avbryter..."
 
-#: mail/mail-send-recv.c:264
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, typ: %s"
 
-#: mail/mail-send-recv.c:266
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Sökväg: %s, typ: %s"
 
-#: mail/mail-send-recv.c:268
+#: mail/mail-send-recv.c:269
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
@@ -16803,24 +16745,24 @@ msgstr "Skicka och ta emot e-post"
 msgid "Cancel _All"
 msgstr "Avbryt _allt"
 
-#: mail/mail-send-recv.c:412
+#: mail/mail-send-recv.c:410
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
-#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466
+#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:462
 msgid "Waiting..."
 msgstr "Väntar..."
 
-#: mail/mail-session.c:207
+#: mail/mail-session.c:208
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ange lösenord för %s"
 
-#: mail/mail-session.c:209
+#: mail/mail-session.c:210
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Användaren avbröt åtgärden."
 
@@ -16836,26 +16778,26 @@ msgstr "Ange ett namn för denna signatur."
 msgid "Name:"
 msgstr "Namn:"
 
-#: mail/mail-tools.c:114
+#: mail/mail-tools.c:115
 #, fuzzy, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Kunde inte skapa katalogen %s: %s"
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:142
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
 
-#: mail/mail-tools.c:276
+#: mail/mail-tools.c:277
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidarebefordrat meddelande - %s"
 
-#: mail/mail-tools.c:278
+#: mail/mail-tools.c:279
 msgid "Forwarded message"
 msgstr "Vidarebefordrat meddelande"
 
-#: mail/mail-tools.c:319
+#: mail/mail-tools.c:320
 #, fuzzy, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Öppnar mappen %s"
@@ -16875,79 +16817,84 @@ msgstr "Uppdaterar virtuella mappar för uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Uppdaterar virtuella mappar för uri: %s"
 
-#: mail/mail-vfolder.c:942
+#: mail/mail-vfolder.c:950
 msgid "vFolders"
 msgstr "Virtuella mappar"
 
-#: mail/mail-vfolder.c:981
+#: mail/mail-vfolder.c:989
 msgid "Edit VFolder"
 msgstr "Redigera virtuell mapp"
 
-#: mail/mail-vfolder.c:1065
+#: mail/mail-vfolder.c:1073
 msgid "New VFolder"
 msgstr "Ny virtuell mapp"
 
-#: mail/message-list.c:1000
+#: mail/message-list.c:999
 msgid "Unseen"
 msgstr "Oläst"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1000
 msgid "Seen"
 msgstr "Läst"
 
-#: mail/message-list.c:1002
+#: mail/message-list.c:1001
 msgid "Answered"
 msgstr "Besvarad"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1002
 msgid "Multiple Unseen Messages"
 msgstr "Flera olästa meddelanden"
 
-#: mail/message-list.c:1004
+#: mail/message-list.c:1003
 msgid "Multiple Messages"
 msgstr "Flera meddelanden"
 
-#: mail/message-list.c:1008
+#: mail/message-list.c:1007
 msgid "Lowest"
 msgstr "Lägsta"
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:1008
 msgid "Lower"
 msgstr "Lägre"
 
-#: mail/message-list.c:1013
+#: mail/message-list.c:1012
 msgid "Higher"
 msgstr "Högre"
 
-#: mail/message-list.c:1014
+#: mail/message-list.c:1013
 msgid "Highest"
 msgstr "Högsta"
 
-#: mail/message-list.c:1337
+#: mail/message-list.c:1341
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1344
+#: mail/message-list.c:1348
 msgid "Today %l:%M %p"
 msgstr "Idag %H.%M"
 
-#: mail/message-list.c:1353
+#: mail/message-list.c:1357
 msgid "Yesterday %l:%M %p"
 msgstr "Igår %H.%M"
 
-#: mail/message-list.c:1365
+#: mail/message-list.c:1369
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: mail/message-list.c:1373
+#: mail/message-list.c:1377
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: mail/message-list.c:1375
+#: mail/message-list.c:1379
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3376
+#: mail/message-list.c:2044
+#, fuzzy
+msgid "Message List"
+msgstr "Meddelanden"
+
+#: mail/message-list.c:3409
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
@@ -16979,39 +16926,39 @@ msgstr "Mottaget"
 msgid "Size"
 msgstr "Storlek"
 
-#: mail/message-tag-followup.c:73
+#: mail/message-tag-followup.c:74
 msgid "Call"
 msgstr "Ring"
 
-#: mail/message-tag-followup.c:74
+#: mail/message-tag-followup.c:75
 msgid "Do Not Forward"
 msgstr "Vidarebefordra inte"
 
-#: mail/message-tag-followup.c:75
+#: mail/message-tag-followup.c:76
 msgid "Follow-Up"
 msgstr "Följ upp"
 
-#: mail/message-tag-followup.c:76
+#: mail/message-tag-followup.c:77
 msgid "For Your Information"
 msgstr "För information"
 
-#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:78 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: mail/message-tag-followup.c:78
+#: mail/message-tag-followup.c:79
 msgid "No Response Necessary"
 msgstr "Inget svar krävs"
 
-#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Svara"
 
-#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:82 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: mail/message-tag-followup.c:82
+#: mail/message-tag-followup.c:83
 msgid "Review"
 msgstr "Granska"
 
@@ -17063,68 +17010,63 @@ msgstr "Evolutions testkomponent"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
-msgid "480"
-msgstr "40%"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:2
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Växla om mappraden ska visas"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:3
+#: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
 msgid "Default window height"
 msgstr "Standardprioritet:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window width"
 msgstr "Standardprioritet:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Evolutions e-postkonfigurationsgränssnitt"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 msgid ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:7
 msgid ""
 "If set to true, the warning dialog in development versions of Evolution is "
 "not displayed."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: shell/apps_evolution_shell.schemas.in.in.h:8
 #, fuzzy
 msgid "Last upgraded Evolution configuration version"
 msgstr "Evolutions e-postkonfigurationsgränssnitt"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Toolbar is visible"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:13
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Whether the toolbar should be visible."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:14
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
@@ -17168,7 +17110,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Avboka sammanträdet för detta objekt"
 
-#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:748
+#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:750
 msgid "Please select the information that you would like to import:"
 msgstr "Välj den information som du vill importera:"
 
@@ -17184,7 +17126,7 @@ msgstr ""
 "inställningar som kunde importeras hittades. Om du vill\n"
 "försöka igen bör du klicka på knappen \"Bakåt\".\n"
 
-#: shell/e-shell-importer.c:229 shell/e-shell-importer.c:260
+#: shell/e-shell-importer.c:232 shell/e-shell-importer.c:266
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -17193,30 +17135,30 @@ msgstr ""
 "Importerar %s\n"
 "Importerar objekt %d."
 
-#: shell/e-shell-importer.c:333
+#: shell/e-shell-importer.c:340
 msgid "Select importer"
 msgstr "Välj importör"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:461 shell/e-shell-importer.c:1073
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s finns inte"
 
-#: shell/e-shell-importer.c:459
+#: shell/e-shell-importer.c:469
 msgid "Importing"
 msgstr "Importerar"
 
-#: shell/e-shell-importer.c:467
+#: shell/e-shell-importer.c:477
 #, fuzzy, c-format
 msgid "Importing %s.\n"
 msgstr "Importerar"
 
-#: shell/e-shell-importer.c:477 shell/e-shell-importer.c:478
+#: shell/e-shell-importer.c:487 shell/e-shell-importer.c:488
 #, c-format
 msgid "Error loading %s"
 msgstr "Fel vid inläsning av %s"
 
-#: shell/e-shell-importer.c:495
+#: shell/e-shell-importer.c:506
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -17225,35 +17167,35 @@ msgstr ""
 "Importerar %s\n"
 "Importerar objekt 1."
 
-#: shell/e-shell-importer.c:570
+#: shell/e-shell-importer.c:582
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:638
 #, fuzzy
 msgid "F_ilename:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:631
+#: shell/e-shell-importer.c:643
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:655
 #, fuzzy
 msgid "File _type:"
 msgstr "Filtyp:"
 
-#: shell/e-shell-importer.c:682
+#: shell/e-shell-importer.c:694
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importera data och inställningar från äldre program"
 
-#: shell/e-shell-importer.c:685
+#: shell/e-shell-importer.c:697
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importera en ensam fil"
 
-#: shell/e-shell-importer.c:753 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:765 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -17261,26 +17203,26 @@ msgstr ""
 "Var god vänta...\n"
 "Letar efter befintliga konfigurationer"
 
-#: shell/e-shell-importer.c:757
+#: shell/e-shell-importer.c:772
 msgid "Starting Intelligent Importers"
 msgstr "Startar intelligenta importörer"
 
-#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:898 shell/e-shell-startup-wizard.c:700
 #, c-format
 msgid "From %s:"
 msgstr "Från %s:"
 
-#: shell/e-shell-importer.c:1074
+#: shell/e-shell-importer.c:1092
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Det finns ingen leverantör för protokollet \"%s\""
 
-#: shell/e-shell-importer.c:1086
+#: shell/e-shell-importer.c:1106
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Misslyckades med att köra gpg."
 
-#: shell/e-shell-importer.c:1200
+#: shell/e-shell-importer.c:1220
 #, fuzzy
 msgid "_Import"
 msgstr "Importera"
@@ -17293,11 +17235,11 @@ msgstr "Kopplar från anslutningar..."
 msgid "Evolution Settings"
 msgstr "Inställningar för Evolution"
 
-#: shell/e-shell-startup-wizard.c:575
+#: shell/e-shell-startup-wizard.c:577
 msgid "Starting import"
 msgstr "Startar import"
 
-#: shell/e-shell-startup-wizard.c:795
+#: shell/e-shell-startup-wizard.c:797
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -17348,70 +17290,86 @@ msgstr "Bug-buddy är inte installerat."
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kunde inte köras."
 
-#: shell/e-shell-window-commands.c:323
-#, fuzzy
+#. The translator-credits string is for translators to list
+#. * per language credits for translation, displayed in the
+#. * about box
+#: shell/e-shell-window-commands.c:425
+msgid "translator-credits"
+msgstr ""
+"Christian Rose\n"
+"Martin Norbäck\n"
+"Richard Hult\n"
+"Johan Dahlin\n"
+"Andreas Hydén\n"
+"Skicka synpunkter på översättningen till sv@li.org"
+
+#: shell/e-shell-window-commands.c:439
 msgid "Groupware Suite"
-msgstr "Grupp"
+msgstr "Grupprogramvarusvit"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:680
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:693 ui/evolution.xml.h:40
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:706 ui/evolution.xml.h:26
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
-#: shell/e-shell-window.c:337
+#: shell/e-shell-window.c:343
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution är just nu ansluten. Klicka på denna knapp för att koppla "
 "från."
 
-#: shell/e-shell-window.c:344
+#: shell/e-shell-window.c:351
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution håller på att koppla från."
 
-#: shell/e-shell-window.c:350
+#: shell/e-shell-window.c:358
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution är just nu frånkopplad. Klicka på denna knapp för att "
 "ansluta."
 
-#: shell/e-shell-window.c:637
+#: shell/e-shell-window.c:651
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "E-post till %s"
 
-#: shell/e-shell.c:585
+#: shell/e-shell.c:590
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Okänt fel"
 
-#: shell/e-shell.c:789 shell/e-shell.c:790
+#: shell/e-shell.c:798 shell/e-shell.c:799
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:1212
+#: shell/e-shell.c:1237 widgets/misc/e-cell-date-edit.c:256
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:1239
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: shell/e-shell.c:1214
+#: shell/e-shell.c:1241
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera på OAF"
 
-#: shell/e-shell.c:1216
+#: shell/e-shell.c:1243
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
-#: shell/e-shell.c:1218
+#: shell/e-shell.c:1245
 msgid "Generic error"
 msgstr "Allmänt fel"
 
@@ -17436,10 +17394,10 @@ msgid "Welcome"
 msgstr "Välkommen"
 
 #: shell/evolution-startup-wizard.glade.h:6
+#, fuzzy
 msgid ""
-"Welcome to Evolution. The next few screens will allow\n"
-"Evolution to connect to your email accounts, and to import\n"
-"files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
@@ -17449,10 +17407,11 @@ msgstr ""
 "\n"
 "Klicka på knappen \"Framåt\" för att fortsätta. "
 
-#: shell/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:9
+#, fuzzy
 msgid ""
-"You have successfully entered all of the information\n"
-"needed to set up Evolution. \n"
+"You have successfully entered all of the information needed to set up "
+"Evolution. \n"
 "\n"
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
@@ -17541,7 +17500,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importera data från följande filer:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:226
+#: shell/main.c:237
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17578,7 +17537,7 @@ msgstr ""
 "Vi hoppas att du gläds åt resultatet av vårt hårda arbete, och vi\n"
 "inväntar med spänning dina bidrag!\n"
 
-#: shell/main.c:250
+#: shell/main.c:261
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -17587,38 +17546,44 @@ msgstr ""
 "Tack\n"
 "Ximian Evolution-teamet\n"
 
-#: shell/main.c:257
+#: shell/main.c:268
 msgid "Don't tell me again"
 msgstr "Tala inte om för mig igen"
 
-#: shell/main.c:462
+#: shell/main.c:473
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:464
+#: shell/main.c:475
 msgid "Start in offline mode"
 msgstr "Starta i frånkopplat läge"
 
-#: shell/main.c:466
+#: shell/main.c:477
 msgid "Start in online mode"
 msgstr "Starta i anslutet läge"
 
-# Evolution bör skrivas med stort E
-# http://bugzilla.ximian.com/show_bug.cgi?id=61065
-#: shell/main.c:469
-msgid "Forcibly shut down all evolution components"
-msgstr "Tvinga fram nedstängning av alla evolution-komponenter"
+#: shell/main.c:480
+msgid "Forcibly shut down all Evolution components"
+msgstr "Tvinga fram nedstängning av alla Evolution-komponenter"
 
-#: shell/main.c:473
+#: shell/main.c:484
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvinga uppgradering av konfigurationsfiler från Evolution 1.0.x"
 
-#: shell/main.c:476
+#: shell/main.c:487
 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:507
+#: shell/main.c:490
+msgid "Disable the mono plugin environment."
+msgstr ""
+
+#: shell/main.c:493
+msgid "Disable loading of any plugins."
+msgstr ""
+
+#: shell/main.c:524
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17820,7 +17785,7 @@ msgid "Enter new password"
 msgstr "Ange lösenord"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:121
+#: smime/gui/e-cert-selector.c:119
 #, fuzzy, c-format
 msgid ""
 "Issued to:\n"
@@ -17829,7 +17794,7 @@ msgstr ""
 "Utställare: %s\n"
 "Ämne: %s"
 
-#: smime/gui/e-cert-selector.c:122
+#: smime/gui/e-cert-selector.c:120
 #, fuzzy, c-format
 msgid ""
 "Issued by:\n"
@@ -17838,7 +17803,7 @@ msgstr ""
 "Utställare: %s\n"
 "Ämne: %s"
 
-#: smime/gui/e-cert-selector.c:169
+#: smime/gui/e-cert-selector.c:167
 #, fuzzy
 msgid "Select certificate"
 msgstr "Gå till ett specifikt datum"
@@ -18036,6 +18001,10 @@ msgstr "_Certifikat-ID:"
 msgid "_Edit CA Trust"
 msgstr "Redigera uppgift"
 
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
+
 #. XXX we shouldn't be popping up dialogs in this code.
 #: smime/lib/e-cert-db.c:612
 #, fuzzy
@@ -18273,16 +18242,16 @@ msgstr "Ämnet är %s"
 msgid "Certificate Signature Value"
 msgstr "Certifikatsignaturfel"
 
-#: smime/lib/e-pkcs12.c:263
+#: smime/lib/e-pkcs12.c:264
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:263
+#: smime/lib/e-pkcs12.c:264
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Ange lösenord för %s"
 
-#: smime/lib/e-pkcs12.c:362
+#: smime/lib/e-pkcs12.c:363
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "_Certifikat-ID:"
@@ -18417,7 +18386,7 @@ msgstr "Visa den aktuella kontakten"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:28
 msgid "_Actions"
 msgstr "_Åtgärder"
 
@@ -18552,8 +18521,8 @@ msgstr "Visa en vecka"
 msgid "Show the working week"
 msgstr "Visa arbetsveckan"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
-#: widgets/misc/e-dateedit.c:435
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:450
 msgid "Today"
 msgstr "Idag"
 
@@ -18641,7 +18610,7 @@ msgstr "Spara detta objekt till disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_File"
 msgstr "_Arkiv"
 
@@ -19310,7 +19279,7 @@ msgstr "_Föregående meddelande"
 msgid "_Quoted"
 msgstr "_Citerad"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:37
 msgid "_Tools"
 msgstr "V_erktyg"
 
@@ -19324,7 +19293,7 @@ msgstr "Stäng detta fönster"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:29
 msgid "_Close"
 msgstr "S_täng"
 
@@ -19671,70 +19640,75 @@ msgid "Pi_lot Settings..."
 msgstr "Pi_lotinställningar..."
 
 #: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Prefere_nces"
+msgstr "_Inställningar..."
+
+#: ui/evolution.xml.h:17
 msgid "Send / Receive"
 msgstr "Skicka / Ta emot"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:18
 msgid "Send queued items and retrieve new items"
 msgstr "Skicka kölagda objekt och hämta nya objekt"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Set up Pilot configuration"
 msgstr "Konfigurera Pilotkonfiguration"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Show information about Evolution"
 msgstr "Visa information om Ximian Evolution"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Submit Bug Report"
 msgstr "Skicka felrapport"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "Submit _Bug Report"
 msgstr "Skicka _felrapport"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:23
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Skicka en felrapport med Bug-Buddy"
 
-#: ui/evolution.xml.h:23
-#, fuzzy
-msgid "T_oolbar"
-msgstr "_Verktygsrader"
-
 #: ui/evolution.xml.h:24
 msgid "Toggle whether we are working offline."
 msgstr "Växla om vi arbetar frånkopplade."
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Tool_bar"
+msgstr "_Verktygsrader"
+
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "_About Evolution..."
 msgstr "Om Ximian Evolution"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Import..."
 msgstr "_Importera..."
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_New"
 msgstr "_Nytt"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Snabbsökning"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_Send / Receive"
 msgstr "_Skicka / Ta emot"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Window"
 msgstr "_Sök nu"
@@ -19812,8 +19786,8 @@ msgstr "Förfallodatum:"
 msgid "With _Status"
 msgstr "Ställ in status"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:195
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:637
 msgid "UTC"
 msgstr "UTC"
 
@@ -19827,11 +19801,18 @@ msgstr "Tidszoner"
 msgid "<b>_Selection</b>"
 msgstr "_Markering:"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Välj en tidszon"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#, fuzzy
+msgid "TimeZone Combobox"
+msgstr ""
+"\n"
+"Tidszon: "
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -19845,40 +19826,41 @@ msgstr ""
 msgid "_Current View"
 msgstr "_Aktuell vy"
 
-#. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:351
-msgid "Custom View"
-msgstr "Anpassad vy"
-
 #: widgets/menus/gal-view-menus.c:360
 msgid "Save Custom View..."
 msgstr "Spara anpassad vy..."
 
-#: widgets/menus/gal-view-menus.c:373
-msgid "Define Views..."
-msgstr "Definiera vyer..."
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:423
+#: widgets/misc/e-calendar-item.c:415
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1128
+#: widgets/misc/e-calendar-item.c:1123
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-calendar.c:177 widgets/misc/e-calendar.c:201
+#, fuzzy
+msgid "Previous Button"
+msgstr "Föregående"
+
+#: widgets/misc/e-calendar.c:226
+#, fuzzy
+msgid "Month Calendar"
+msgstr "Skriv ut kalender"
+
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:444
 msgid "Now"
 msgstr "Nu"
 
-#: widgets/misc/e-cell-date-edit.c:805
+#: widgets/misc/e-cell-date-edit.c:801
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Tiden måste anges i formatet: %s"
 
-#: widgets/misc/e-cell-percent.c:77
+#: widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentvärdet måste vara mellan 0 och 100"
 
@@ -19970,6 +19952,37 @@ msgstr "Annan..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-dateedit.c:313
+#, fuzzy
+msgid "Date and Time Entry"
+msgstr "Datum och tid"
+
+#: widgets/misc/e-dateedit.c:332
+msgid "Text entry to input date"
+msgstr ""
+
+#: widgets/misc/e-dateedit.c:333
+msgid "Text Date Entry"
+msgstr ""
+
+#: widgets/misc/e-dateedit.c:350
+msgid "Click this button to show a calendar"
+msgstr ""
+
+#: widgets/misc/e-dateedit.c:351
+#, fuzzy
+msgid "Date Button"
+msgstr "Watertown"
+
+#: widgets/misc/e-dateedit.c:371
+#, fuzzy
+msgid "Combo box to select time"
+msgstr "Gå till nuvarande tid"
+
+#: widgets/misc/e-dateedit.c:372
+msgid "Time Combo Box"
+msgstr ""
+
 #: widgets/misc/e-error.c:83 widgets/misc/e-error.c:84
 #: widgets/misc/e-error.c:126
 msgid "Evolution Error"
@@ -20157,16 +20170,655 @@ msgstr ""
 "Kan inte spara till \"%s\":\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:212
+#: widgets/misc/e-task-widget.c:208
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:217
+#: widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% färdigt)"
 
+#~ msgid "Contact List:"
+#~ msgstr "Kontaktlista:"
+
+#~ msgid "Contact List"
+#~ msgstr "Kontaktlista"
+
+#~ msgid "Contact:"
+#~ msgstr "Kontakt:"
+
+#~ msgid "Search for the Contact."
+#~ msgstr "Sök efter kontakten."
+
+#~ msgid ""
+#~ "Adding a meaningful Summary to your task will give your recipients an "
+#~ "idea of what your task is about."
+#~ msgstr ""
+#~ "Att lägga till en meningsfull sammanfattning till din uppgift kommer att "
+#~ "ge dina mottagare en ledtråd till vad uppgiften handlar om."
+
+#~ msgid "Task List"
+#~ msgstr "Uppgiftslista"
+
+#~ msgid "Meetings"
+#~ msgstr "Sammanträden"
+
+#~ msgid "Assigned Task"
+#~ msgstr "Tilldelad uppgift"
+
+#~ msgid "Timezone"
+#~ msgstr "Tidszon"
+
+#~ msgid "Time zone"
+#~ msgstr "Tidszon"
+
+#~ msgid "Time Zone"
+#~ msgstr "Tidszon"
+
+#~ msgid "Use custom command to connect to server"
+#~ msgstr "Använd anpassat kommando för att ansluta till servern"
+
+#~ msgid "Add attachment..."
+#~ msgstr "Lägg till bilaga..."
+
+#~ msgid "Reply-To:"
+#~ msgstr "Svara till:"
+
+#~ msgid "From:"
+#~ msgstr "Från:"
+
+#~ msgid "Subject:"
+#~ msgstr "Ämne:"
+
+#~ msgid "To:"
+#~ msgstr "Till:"
+
+#~ msgid "Cc:"
+#~ msgstr "Kopia:"
+
+#~ msgid "Bcc:"
+#~ msgstr "Blindkopia:"
+
+#~ msgid "Post to:"
+#~ msgstr "Posta till:"
+
+#~ msgid "Signature:"
+#~ msgstr "Signatur:"
+
+#~ msgid "Save Message"
+#~ msgstr "Spara meddelande"
+
+#~ msgid "Rule name:"
+#~ msgstr "Regelnamn:"
+
+#~ msgid "contact's header: "
+#~ msgstr "kontaktens huvud: "
+
+#~ msgid ""
+#~ "Address book '%s' will be removed. Are you sure you want to continue?"
+#~ msgstr ""
+#~ "Adressboken \"%s\" kommer att tas bort. Är du säker på att du vill "
+#~ "fortsätta?"
+
+# Evolution bör skrivas med stort E
+# http://bugzilla.ximian.com/show_bug.cgi?id=61065
+#~ msgid ""
+#~ "The number of characters that must be typed before evolution will attempt "
+#~ "to autocomplete"
+#~ msgstr ""
+#~ "Antalet tecken som måste skrivas innan evolution automatiskt kommer att "
+#~ "försöka fylla i"
+
+#~ msgid "Go to Folder..."
+#~ msgstr "Gå till mapp..."
+
+#~ msgid "Import..."
+#~ msgstr "Importera..."
+
+#~ msgid "Address Book Sources..."
+#~ msgstr "Adressbokskällor..."
+
+#~ msgid "Pilot Settings..."
+#~ msgstr "Pilotinställningar..."
+
+#~ msgid "Print Envelope"
+#~ msgstr "Skriv ut kuvert"
+
+#~ msgid "Evolution VCard importer"
+#~ msgstr "Evolutions VCard-importör"
+
+# Lack of space after the comma
+# http://bugzilla.ximian.com/show_bug.cgi?id=61069
+#~ msgid ""
+#~ "The number of cards in one output file in asychronous mode,default size "
+#~ "100."
+#~ msgstr ""
+#~ "Antalet kort i en utdatafil i asynkront läge, standardstorleken 100."
+
+#~ msgid "Impossible internal error."
+#~ msgstr "Omöjligt internt fel."
+
+#~ msgid "Unnamed List"
+#~ msgstr "Namnlös lista"
+
+#~ msgid "Starting:"
+#~ msgstr "Startar:"
+
+#~ msgid "Ending:"
+#~ msgstr "Slutar:"
+
+#~ msgid "Evolution Alarm"
+#~ msgstr "Evolutionalarm"
+
+#~ msgid "Alarm on %s"
+#~ msgstr "Alarm den %s"
+
+#~ msgid "_Edit appointment"
+#~ msgstr "_Redigera möte"
+
+#~ msgid "%A %d %B %Y"
+#~ msgstr "%A %d %B %Y"
+
+#~ msgid "%d %B %Y"
+#~ msgstr "%d %B %Y"
+
+#~ msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
+#~ msgstr ""
+#~ "Kalendern \"%s\" kommer att tas bort. Är du säker på att du vill "
+#~ "fortsätta?"
+
+#~ msgid "You must specify a location to get the calendar from."
+#~ msgstr "Du måste ange en plats att hämta kalendern från."
+
+#~ msgid "The source location '%s' is not well-formed."
+#~ msgstr "Källplatsen \"%s\" är inte välformad."
+
+#~ msgid "The source location '%s' is not a webcal source."
+#~ msgstr "Källplatsen \"%s\" är inte en webcal-källa."
+
+#~ msgid "Source with name '%s' already exists in the selected group"
+#~ msgstr "Källan med namnet \"%s\" finns redan i den markerade gruppen"
+
+#~ msgid ""
+#~ "The group '%s' is remote. You must specify a location to get the calendar "
+#~ "from"
+#~ msgstr ""
+#~ "Gruppen \"%s\" är en fjärrgrupp. Du måste ange en plats att hämta "
+#~ "kalendern från"
+
+#~ msgid "Select destination"
+#~ msgstr "Välj mål"
+
+#~ msgid "_Destination"
+#~ msgstr "_Mål"
+
+#~ msgid "Go to _Today"
+#~ msgstr "Gå till _idag"
+
+#~ msgid "_Go to Date..."
+#~ msgstr "_Gå till datum..."
+
+#~ msgid "_Settings..."
+#~ msgstr "_Inställningar..."
+
+#~ msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+#~ msgstr ""
+#~ "Uppgiftslistan \"%s\" kommer att tas bort. Är du säker på att du vill "
+#~ "fortsätta?"
+
+#~ msgid "Failed to decrypt MIME part: invalid structure"
+#~ msgstr "Misslyckades med att dekryptera MIME-del: ogiltig struktur"
+
+#~ msgid "cannot create thread"
+#~ msgstr "kan inte skapa tråd"
+
+#~ msgid "Resolving: %s"
+#~ msgstr "Slår upp: %s"
+
+#~ msgid "Host lookup failed"
+#~ msgstr "Uppslagning av värdnamn misslyckades"
+
+#~ msgid "Host lookup failed: %s: %s"
+#~ msgstr "Uppslagning av värdnamn misslyckades: %s: %s"
+
+#~ msgid "Resolving address"
+#~ msgstr "Slår upp adress"
+
+#~ msgid "Name lookup failed"
+#~ msgstr "Namnuppslagning misslyckades"
+
+#~ msgid "Name lookup failed: %s"
+#~ msgstr "Namnuppslagning misslyckades: %s"
+
+#~ msgid "Could not connect to POP server %s (port %s): %s"
+#~ msgstr "Kunde inte ansluta till POP-servern %s (port %s): %s"
+
+#~ msgid "server does not appear to support SSL"
+#~ msgstr "servern verkar inte stöda SSL"
+
+#~ msgid "Remove selected items from the attachment list"
+#~ msgstr "Ta bort markerade objekt från bifogningslistan"
+
+#~ msgid "Attach a file to the message"
+#~ msgstr "Bifoga en fil till meddelandet"
+
+#~ msgid "incoming"
+#~ msgstr "inkommande"
+
+#~ msgid "outgoing"
+#~ msgstr "utgående"
+
+#~ msgid "Evolution Account Editor"
+#~ msgstr "Evolutions kontoredigerare"
+
+#~ msgid "%s License Agreement"
+#~ msgstr "Licensavtal för %s"
+
+#~ msgid "Connecting to server..."
+#~ msgstr "Ansluter till server..."
+
+#~ msgid "Receiving Mail"
+#~ msgstr "Mottagande av post"
+
+#~ msgid ""
+#~ "Please enter information about your incoming mail server below. If you "
+#~ "are not sure, ask your system administrator or Internet Service Provider."
+#~ msgstr ""
+#~ "Ange information om din server för inkommande e-post nedan. Om du inte är "
+#~ "säker bör du fråga din systemadministratör eller Internetleverantör."
+
+#, fuzzy
+#~ msgid "<span weight=\"bold\">Checking for New Mail</span>"
+#~ msgstr "Kontrollerar ny e-post"
+
+# Låter konstigt
+#, fuzzy
+#~ msgid "Automatically check for _new mail every"
+#~ msgstr "Kontrollera _automatiskt ny e-post var"
+
+#~ msgid "IMAPv4 "
+#~ msgstr "IMAPv4 "
+
+#~ msgid "Kerberos "
+#~ msgstr "Kerberos "
+
+#~ msgid "Qmail maildir "
+#~ msgstr "Qmail-epostkatalog "
+
+#, fuzzy
+#~ msgid "Receiving Options"
+#~ msgstr "_Alternativ för mottagning"
+
+#~ msgid "Standard Unix mbox"
+#~ msgstr "Standard Unix-brevlåda"
+
+#, fuzzy
+#~ msgid "_Use Secure Connection (SSL):"
+#~ msgstr "_Använd säker anslutning (SSL):"
+
+#~ msgid "C_ompleted"
+#~ msgstr "F_ärdigt"
+
+# Evolution bör skrivas med stort E
+# http://bugzilla.ximian.com/show_bug.cgi?id=61065
+#~ msgid "Forcibly shut down all evolution components"
+#~ msgstr "Tvinga fram nedstängning av alla evolution-komponenter"
+
+#~ msgid "Enter security pass-phrase for `%s'"
+#~ msgstr "Ange säkerhetslösenfras för \"%s\""
+
+#, fuzzy
+#~ msgid "Fetching envelopes for new messages"
+#~ msgstr "Kontrollerar nya meddelanden"
+
+#, fuzzy
+#~ msgid "The orientation of the tray."
+#~ msgstr "Beskrivning av bilagan."
+
+#, fuzzy
+#~ msgid "_Print Contacts..."
+#~ msgstr "Skriv ut kontakter"
+
+#~ msgid "As _Table"
+#~ msgstr "Som _tabell"
+
+#, fuzzy
+#~ msgid "_New Contact"
+#~ msgstr "Ny kontakt"
+
+#, fuzzy
+#~ msgid "_Search for contacts"
+#~ msgstr "_Sök efter kontakter"
+
+#~ msgid "Find"
+#~ msgstr "Sök"
+
+#, fuzzy
+#~ msgid "Find a contact"
+#~ msgstr "Sök kontakt i"
+
+#, fuzzy
+#~ msgid "Delete a contact"
+#~ msgstr "Ta bort kontakten?"
+
+#~ msgid "View All"
+#~ msgstr "Visa alla"
+
+#~ msgid "View all contacts"
+#~ msgstr "Visa alla kontakter"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Infoga textfil..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Infoga en fil som text i meddelandet"
+
+#~ msgid "Send the message now"
+#~ msgstr "Skicka meddelandet nu"
+
+#, fuzzy
+#~ msgid "Send _later"
+#~ msgstr "Avsändare"
+
+#, fuzzy
+#~ msgid "Send the message later"
+#~ msgstr "Skicka meddelandet nu"
+
+#, fuzzy
+#~ msgid "HTML"
+#~ msgstr "H_TML"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Spara i map_p... (FIXME)"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Infoga textfil... (FIXME)"
+
+#, fuzzy
+#~ msgid "Send _Later"
+#~ msgstr "Avsändare"
+
+#~ msgid "F_ormat"
+#~ msgstr "F_ormat"
+
+#~ msgid "_About..."
+#~ msgstr "_Om..."
+
+#~ msgid "_Debug"
+#~ msgstr "_Felsök"
+
+#~ msgid "Send this message now"
+#~ msgstr "Skicka detta meddelande nu"
+
+#~ msgid "Bold"
+#~ msgstr "Fet"
+
+#~ msgid "Sets something as bold"
+#~ msgstr "Sätt någonting till fetstil"
+
+#~ msgid "Hide _Attachment Bar"
+#~ msgstr "Dölj _bilageraden"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "Visa _bilageraden"
+
+#~ msgid "Open in New Window"
+#~ msgstr "Öppna i nytt fönster"
+
+#~ msgid "Properties"
+#~ msgstr "Egenskaper"
+
+#~ msgid "Filter Junk"
+#~ msgstr "Filtrera skräp"
+
+#~ msgid "Copy Link Location"
+#~ msgstr "Kopiera länkplats"
+
+#~ msgid "View Inline"
+#~ msgstr "Visa inuti"
+
+#~ msgid "Hide"
+#~ msgstr "Dölj"
+
+#~ msgid " (%a, %R %Z)"
+#~ msgstr " (%a %H.%M %Z)"
+
+#~ msgid "(%a, %R %Z)"
+#~ msgstr "(%a %H.%M %Z)"
+
+#~ msgid " (%R %Z)"
+#~ msgstr " (%H.%M %Z)"
+
+#~ msgid "(%R %Z)"
+#~ msgstr "(%H.%M %Z)"
+
+#~ msgid "Newsgroup"
+#~ msgstr "Diskussionsgrupp"
+
+#~ msgid "Reply to sender"
+#~ msgstr "Svara till avsändaren"
+
+#~ msgid "Open Link in Browser"
+#~ msgstr "Öppna länk i webbläsare"
+
+#~ msgid "Add to Addressbook"
+#~ msgstr "Lägg till i adressbok"
+
+#~ msgid "Message"
+#~ msgstr "Meddelande"
+
+#~ msgid "Virtual Folders"
+#~ msgstr "Virtuella mappar"
+
+#~ msgid "Thread the message list"
+#~ msgstr "Tråda meddelandelistan"
+
+#~ msgid "Thread the message list based on Subject"
+#~ msgstr "Tråda meddelandelistan baserat på ämnet"
+
+#~ msgid "Importing data"
+#~ msgstr "Importerar data"
+
+#~ msgid "Destination folder"
+#~ msgstr "Målmapp"
+
+#~ msgid "%d unread"
+#~ msgid_plural "%d unread"
+#~ msgstr[0] "%d oläst"
+#~ msgstr[1] "%d olästa"
+
+#~ msgid "<b>Signatures</b>"
+#~ msgstr "<b>Signaturer</b>"
+
+#~ msgid "S_ignatures"
+#~ msgstr "S_ignaturer"
+
+#~ msgid "S_ignature"
+#~ msgstr "S_ignatur"
+
+#~ msgid "<b>Languages</b>"
+#~ msgstr "<b>Språk</b>"
+
+#~ msgid "_Languages"
+#~ msgstr "_Språk"
+
+#~ msgid "Languages"
+#~ msgstr "Språk"
+
+#~ msgid "<b>_Language</b>"
+#~ msgstr "<b>_Språk</b>"
+
+#~ msgid "<b>Language</b>"
+#~ msgstr "<b>Språk</b>"
+
+#~ msgid "_Language"
+#~ msgstr "_Språk"
+
+#~ msgid "Language:"
+#~ msgstr "Språk:"
+
+#~ msgid "Add New Signature..."
+#~ msgstr "Lägg till ny signatur..."
+
+#~ msgid "Failed to resolve host `%s': %s"
+#~ msgstr "Misslyckades med att slå upp värden \"%s\": %s"
+
+#~ msgid "Failure in name lookup: %s"
+#~ msgstr "Namnuppslagning misslyckades: %s"
+
+#~ msgid "Host lookup failed: cannot create thread: %s"
+#~ msgstr "Uppslagning av värdnamn misslyckades: kan inte skapa tråd: %s"
+
+#~ msgid "Host lookup failed: %s: unknown reason"
+#~ msgstr "Uppslagning av värdnamn misslyckades: %s: okänd orsak"
+
+#~ msgid "Host lookup failed: host not found"
+#~ msgstr "Uppslagning av värdnamn misslyckades: värden kunde inte hittas"
+
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "Misslyckades med att ansluta till IMAP-servern %s i säkert läge: Servern "
+#~ "stöder inte STARTTLS"
+
+#~ msgid "Authentication requested but not username provided"
+#~ msgstr "Autentisering begärd men inget användarnamn angivet"
+
+#~ msgid "Address Book:"
+#~ msgstr "Adressbok:"
+
+#~ msgid "Att_endees"
+#~ msgstr "D_eltagare"
+
+#~ msgid "<b>Attendees</b>"
+#~ msgstr "<b>Deltagare</b>"
+
+#~ msgid "<b>Free/Busy Calendars</b>"
+#~ msgstr "<b>Ledig-/upptagenkalendrar</b>"
+
+#~ msgid "Free/Busy C_alendars"
+#~ msgstr "Ledig-/upptagenk_alendrar"
+
+#~ msgid "Free/Busy Calendars"
+#~ msgstr "Ledig-/upptagenkalendrar"
+
+#~ msgid "Publishing Frequency"
+#~ msgstr "Publiceringsfrekvens"
+
+#~ msgid "<b>Publishing Location</b>"
+#~ msgstr "<b>Publiceringsplats</b>"
+
+#~ msgid "Publishing _Location"
+#~ msgstr "Publiceringsplats"
+
+#~ msgid "Publishing Location"
+#~ msgstr "Publiceringsplats"
+
+#~ msgid "Password:"
+#~ msgstr "Lösenord:"
+
+#~ msgid "Remember password"
+#~ msgstr "Kom ihåg lösenord"
+
+#~ msgid "Username:"
+#~ msgstr "Användarnamn:"
+
+#~ msgid "Task list"
+#~ msgstr "Uppgiftslista"
+
+#~ msgid "Use Secure Connection (SSL):"
+#~ msgstr "Använd säker anslutning (SSL):"
+
+#~ msgid "_Use Secure Connection (SSL)"
+#~ msgstr "_Använd säker anslutning (SSL)"
+
+#~ msgid "IMAPv4"
+#~ msgstr "IMAPv4"
+
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "För läsande och lagrande av e-post på IMAPv4rev1-servrar."
+
+#~ msgid "Please enter the IMAP password for %s on host %s"
+#~ msgstr "Ange IMAP-lösenordet för %s på värden %s"
+
+#~ msgid "Invalid mailbox name"
+#~ msgstr "Ogiltigt namn på brevlåda"
+
+#~ msgid "Could not connect to POP server %s."
+#~ msgstr "Kunde inte ansluta till POP-servern %s."
+
+#~ msgid "Cannot create directory `%s': %s"
+#~ msgstr "Kan inte skapa katalogen \"%s\": %s"
+
+#~ msgid "Not connected"
+#~ msgstr "Inte ansluten"
+
+#~ msgid "Please enter the POP password for %s on host %s"
+#~ msgstr "Ange POP-lösenordet för %s på värden %s"
+
+#~ msgid "Please enter the SMTP password for %s on host %s"
+#~ msgstr "Ange SMTP-lösenordet för %s på värden %s"
+
+#~ msgid "<b>Filter rules</b>"
+#~ msgstr "<b>Filterregler</b>"
+
+#~ msgid "_Filter rules"
+#~ msgstr "_Filterregler"
+
+#~ msgid "Filter Rules"
+#~ msgstr "Filterregler"
+
+#~ msgid "Forwarded Message"
+#~ msgstr "Vidarebefordrat meddelande"
+
+#~ msgid "Run Program:"
+#~ msgstr "Kör program:"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Christian Rose\n"
+#~ "Martin Norbäck\n"
+#~ "Richard Hult\n"
+#~ "Johan Dahlin\n"
+#~ "Andreas Hydén\n"
+#~ "Skicka synpunkter på översättningen till sv@li.org"
+
+# Varför är detta markerat för översättning?
+# http://bugzilla.ximian.com/show_bug.cgi?id=61062
+#~ msgid "*Control*F2"
+#~ msgstr "*Control*F2"
+
+#~ msgid ""
+#~ "The contact cannot be saved to the selected address book. Do you want to "
+#~ "discard changes?"
+#~ msgstr ""
+#~ "Kontakten kan inte sparas till den valda adressboken. Vill du förkasta "
+#~ "ändringar?"
+
+#~ msgid ""
+#~ "You are moving the contact from one address book to another, but it "
+#~ "cannot be removed from the source. Do you want to save a copy instead?"
+#~ msgstr ""
+#~ "Du flyttar kontakten från en adressbok till en annan, men den kan inte "
+#~ "tas bort från källan. Vill du spara en kopia istället?"
+
+# Varför är detta markerat för översättning?
+# http://bugzilla.ximian.com/show_bug.cgi?id=61062
+#~ msgid "*Control*F3"
+#~ msgstr "*Control*F3"
+
+# Varför är detta markerat för översättning?
+# http://bugzilla.ximian.com/show_bug.cgi?id=61062
+#~ msgid "*Control*F4"
+#~ msgstr "*Control*F4"
+
+#, fuzzy
+#~ msgid "480"
+#~ msgstr "40%"
+
 #~ msgid "_Add Group"
 #~ msgstr "_Lägg till grupp"
 
@@ -20295,22 +20947,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "_Contacts Group"
 #~ msgstr "_Kontaktgrupp"
 
-#~ msgid ""
-#~ "The number of characters that must be typed before Evolution will attempt "
-#~ "to autocomplete"
-#~ msgstr ""
-#~ "Antalet tecken som måste skrivas innan Evolution automatiskt kommer att "
-#~ "försöka fylla i"
-
-#~ msgid "Authentication"
-#~ msgstr "Autentisering"
-
-#~ msgid "Downloading"
-#~ msgstr "Hämtning"
-
-#~ msgid "Server Information"
-#~ msgstr "Serverinformation"
-
 #~ msgid "Category:"
 #~ msgstr "Kategori:"
 
@@ -20389,12 +21025,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Export in asynchronous mode"
 #~ msgstr "Exportera i asynkront läge"
 
-#~ msgid ""
-#~ "The number of cards in one output file in asychronous mode, default size "
-#~ "100."
-#~ msgstr ""
-#~ "Antalet kort i en utdatafil i asynkront läge, standardstorleken 100."
-
 #~ msgid "Enter Password:"
 #~ msgstr "Ange lösenord:"
 
@@ -20431,18 +21061,9 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "_Contacts"
 #~ msgstr "_Kontakter"
 
-#~ msgid "Date and Time"
-#~ msgstr "Datum och tid"
-
-#~ msgid "Description"
-#~ msgstr "Beskrivning"
-
 #~ msgid "Attendees"
 #~ msgstr "Deltagare"
 
-#~ msgid "Organizer"
-#~ msgstr "Organisatör"
-
 #~ msgid "_Contacts..."
 #~ msgstr "_Kontakter..."
 
@@ -20724,9 +21345,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "_User:"
 #~ msgstr "_Användare:"
 
-#~ msgid "Failed to connect to LDAP server"
-#~ msgstr "Misslyckades med att ansluta till LDAP-server"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Kunde inte utföra fråga på rot-DSE"
 
@@ -20758,9 +21376,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "S_earch scope: "
 #~ msgstr "S_ökomfattning: "
 
-#~ msgid "Searching"
-#~ msgstr "Söker"
-
 #~ msgid "This option controls how long a search will be run."
 #~ msgstr "Detta alternativ styr hur lång tid en sökning kommer att köras."
 
@@ -20825,18 +21440,10 @@ msgstr "%s (%d%% färdigt)"
 #~ "använda det igen"
 
 #, fuzzy
-#~ msgid "Calendar Properties"
-#~ msgstr "Inställningar för kalendern..."
-
-#, fuzzy
 #~ msgid "Remote"
 #~ msgstr "Ta bort"
 
 #, fuzzy
-#~ msgid "Task List Properties"
-#~ msgstr "Egenskaper för att-göra-listan"
-
-#, fuzzy
 #~ msgid "_Refresh Interval:"
 #~ msgstr " _Uppdatera lista "
 
@@ -20889,9 +21496,6 @@ msgstr "%s (%d%% färdigt)"
 #~ "\n"
 #~ "Vill du spara dina ändringar?"
 
-#~ msgid "_Discard Changes"
-#~ msgstr "_Förkasta ändringar"
-
 #~ msgid "Save Event"
 #~ msgstr "Spara evenemang"
 
@@ -21428,13 +22032,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgstr "Fel vid åtkomst av filen: %s"
 
 #~ msgid ""
-#~ "Unable to seek on file: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan inte spola filen: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Unable to truncate file: %s\n"
 #~ "%s"
 #~ msgstr ""
@@ -21673,9 +22270,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Edit VFolders"
 #~ msgstr "Redigera virtuella mappar"
 
-#~ msgid "Outgoing"
-#~ msgstr "Utgående"
-
 #~ msgid "Pipe Message to Shell Command"
 #~ msgstr "Skicka meddelande till skalkommando"
 
@@ -21688,9 +22282,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Add script signature"
 #~ msgstr "Lägg till skriptsignatur"
 
-#~ msgid "_Search for Contacts"
-#~ msgstr "_Sök efter kontakter"
-
 #~ msgid "Go to _Date"
 #~ msgstr "Gå till _datum"
 
@@ -21703,9 +22294,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Show Contacts"
 #~ msgstr "Visa kontakter"
 
-#~ msgid "Find"
-#~ msgstr "Sök"
-
 #~ msgid "Primary"
 #~ msgstr "Primär"
 
@@ -21922,9 +22510,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Step 4: Display Name"
 #~ msgstr "Steg 4: Visar namn"
 
-#~ msgid "Find contact in"
-#~ msgstr "Sök kontakt i"
-
 #~ msgid "Selected Contacts:"
 #~ msgstr "Markerade kontakter:"
 
@@ -24545,9 +25130,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Dutch Harbor"
 #~ msgstr "Dutch Harbor"
 
-#~ msgid "Dyersburg"
-#~ msgstr "Dyersburg"
-
 #~ msgid "Eagle"
 #~ msgstr "Eagle"
 
@@ -26786,9 +27368,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Missouri"
 #~ msgstr "Missouri"
 
-#~ msgid "Mitchell"
-#~ msgstr "Mitchell"
-
 #~ msgid "Mitilini"
 #~ msgstr "Mitilini"
 
@@ -29690,9 +30269,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Waterloo"
 #~ msgstr "Waterloo"
 
-#~ msgid "Watertown"
-#~ msgstr "Watertown"
-
 #~ msgid "Waterville"
 #~ msgstr "Waterville"
 
@@ -30452,9 +31028,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Blowing small hail"
 #~ msgstr "Högt småhageldrev"
 
-#~ msgid "Showers of small hail"
-#~ msgstr "Skurar med småhagel"
-
 #~ msgid "Drifting small hail"
 #~ msgstr "Lågt småhageldrev"
 
@@ -31005,12 +31578,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Add a Folder"
 #~ msgstr "Lägg till en mapp"
 
-#~ msgid "Outbox"
-#~ msgstr "Utkorg"
-
-#~ msgid "Sent"
-#~ msgstr "Skickat"
-
 #~ msgid "Could not update files correctly"
 #~ msgstr "Kunde inte uppdatera filerna korrekt"
 
@@ -31417,9 +31984,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "_Forward Message"
 #~ msgstr "_Vidarebefordra meddelande"
 
-#~ msgid "Clear"
-#~ msgstr "Töm"
-
 #~ msgid "Blue"
 #~ msgstr "Blå"
 
@@ -31633,12 +32197,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Scanning folders..."
 #~ msgstr "Genomsöker mappar..."
 
-#~ msgid "Forcibly shut down all Evolution components"
-#~ msgstr "Tvinga fram nedstängning av alla Evolution-komponenter"
-
-#~ msgid "Save Custom View"
-#~ msgstr "Spara anpassad vy"
-
 #~ msgid "Define Views"
 #~ msgstr "Definiera vyer"
 
@@ -31978,9 +32536,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Cannot initialize the Evolution composer."
 #~ msgstr "Kan inte initiera Evolution-redigeraren."
 
-#~ msgid "minute"
-#~ msgstr "minut"
-
 #~ msgid "hour"
 #~ msgstr "timme"
 
@@ -32226,18 +32781,12 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Factory for the sample Addressbook control"
 #~ msgstr "Fabrik för adressbokstestkontrollen"
 
-#~ msgid "Delete Contact?"
-#~ msgstr "Ta bort kontakten?"
-
 #~ msgid "Display Cards?"
 #~ msgstr "Visa kort?"
 
 #~ msgid "Display Cards"
 #~ msgstr "Visa kort"
 
-#~ msgid "Print Calendar"
-#~ msgstr "Skriv ut kalender"
-
 #~ msgid "Warning!"
 #~ msgstr "Varning!"
 
@@ -32339,9 +32888,6 @@ msgstr "%s (%d%% färdigt)"
 #~ "Importören är inte redo.\n"
 #~ "Väntar 5 sekunder med nytt försök."
 
-#~ msgid "_Preferences..."
-#~ msgstr "_Inställningar..."
-
 #~ msgid "Error in search expression."
 #~ msgstr "Fel i sökuttryck."
 
@@ -32399,7 +32945,7 @@ msgstr "%s (%d%% färdigt)"
 #~ "detailed description of the circumstances under which this error\n"
 #~ "occurred.  Thank you."
 #~ msgstr ""
-#~ "Evolution kan inte få tag i det lokala adressbokslagret.\n"
+#~ "Evolution kan inte hämta det lokala adressbokslagret.\n"
 #~ "Detta kan ha orsakats av att komponenten evolution-addressbook kraschar.\n"
 #~ "För att hjälpa oss att bättre förstå och lösa detta problem en gång för\n"
 #~ "alla kan du skicka ett brev till Jon Trowbridge <trow@ximian.com> med en\n"
@@ -32496,18 +33042,9 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "You may only import to local folders"
 #~ msgstr "Du kan endast importera till lokala mappar"
 
-#~ msgid "_Contact List"
-#~ msgstr "_Kontaktlista"
-
 #~ msgid "Inline Text _File..."
 #~ msgstr "Infoga text_fil..."
 
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Infoga en fil som text i meddelandet"
-
-#~ msgid "Insert text file..."
-#~ msgstr "Infoga textfil..."
-
 #~ msgid "_Pilot Settings..."
 #~ msgstr "_Pilotinställningar..."
 
@@ -32606,7 +33143,7 @@ msgstr "%s (%d%% färdigt)"
 #~ "%s\n"
 #~ "No shortcut will be created."
 #~ msgstr ""
-#~ "Kunde inte få tag i inkorg för e-postlager:\n"
+#~ "Kunde inte hämta inkorg för e-postlager:\n"
 #~ "%s\n"
 #~ "Ingen genväg kommer att skapas."
 
@@ -32664,9 +33201,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Advanced"
 #~ msgstr "Avancerat"
 
-#~ msgid "Base"
-#~ msgstr "Bas"
-
 #~ msgid "Check this if the server requires you to authenticate."
 #~ msgstr "Kontrollera detta om servern kräver autentisering."
 
@@ -33096,13 +33630,6 @@ msgstr "%s (%d%% färdigt)"
 
 #~ msgid ""
 #~ "\n"
-#~ "Time Zone: "
-#~ msgstr ""
-#~ "\n"
-#~ "Tidszon: "
-
-#~ msgid ""
-#~ "\n"
 #~ "Geo Location: "
 #~ msgstr ""
 #~ "\n"
@@ -33484,9 +34011,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Folder cannot contain the directory separator."
 #~ msgstr "Mappen kan inte innehålla katalogavskiljaren."
 
-#~ msgid "F_ormat"
-#~ msgstr "F_ormat"
-
 #~ msgid "Alarm on %A %b %d %Y %H:%M"
 #~ msgstr "Alarm på %A %d %b %Y %H.%M"
 
@@ -33864,9 +34388,6 @@ msgstr "%s (%d%% färdigt)"
 #~ 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"
 
@@ -34199,9 +34720,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Send _message to group..."
 #~ msgstr "Skicka _meddelandet till grupp..."
 
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "Spara i map_p... (FIXME)"
-
 #~ msgid "???"
 #~ msgstr "???"
 
@@ -34399,12 +34917,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Select everything"
 #~ msgstr "Markera alltihop"
 
-#~ msgid "View All"
-#~ msgstr "Visa alla"
-
-#~ msgid "View all contacts"
-#~ msgstr "Visa alla kontakter"
-
 #~ msgid "About this application"
 #~ msgstr "Om detta program"
 
@@ -34456,9 +34968,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Schedule some sort of a meeting"
 #~ msgstr "Boka någon typ av sammanträde"
 
-#~ msgid "_About..."
-#~ msgstr "_Om..."
-
 #~ msgid "_Journal Entry (FIXME)"
 #~ msgstr "_Dagbokspost (FIXME)"
 
@@ -34477,9 +34986,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "_Unread Item (FIXME)"
 #~ msgstr "O_läst objekt (FIXME)"
 
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "_Infoga textfil... (FIXME)"
-
 #~ msgid "Redo the undone action"
 #~ msgstr "Gör om den ångrade åtgärden"
 
@@ -34555,9 +35061,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "As _Minicards"
 #~ msgstr "Som _minikort"
 
-#~ msgid "As _Table"
-#~ msgstr "Som _tabell"
-
 #~ msgid "Mark Complete"
 #~ msgstr "Markera som färdig"
 
@@ -34627,9 +35130,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "_Threaded"
 #~ msgstr "_Trådat"
 
-#~ msgid "Send the message now"
-#~ msgstr "Skicka meddelandet nu"
-
 #~ msgid ""
 #~ "We were unable to open this addressbook.  This either\n"
 #~ "means you have entered an incorrect URI, or have tried\n"
@@ -35334,12 +35834,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "MH folders may not be nested."
 #~ msgstr "MH-mappar får inte nästlas."
 
-#~ msgid "Bold"
-#~ msgstr "Fet"
-
-#~ msgid "Sets something as bold"
-#~ msgstr "Sätt någonting till fetstil"
-
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Kan inte initiera Evolutions hashfunktion för e-postlagring."
author	Christian Rose <menthos@menthos.com>	2004-12-18 07:07:59 +0800
committer	Christian Rose <menthos@src.gnome.org>	2004-12-18 07:07:59 +0800
commit	84700b4c86fa9b5de9c802fdf32f9f089a54c9b5 (patch)
tree	f503a23a3fef7e2c373325a8cba71c435e6eb02d /po/sv.po
parent	02e497ddf29a17f87aa8979cc511506d5eb46011 (diff)
download	gsoc2013-evolution-84700b4c86fa9b5de9c802fdf32f9f089a54c9b5.tar.gz gsoc2013-evolution-84700b4c86fa9b5de9c802fdf32f9f089a54c9b5.tar.zst gsoc2013-evolution-84700b4c86fa9b5de9c802fdf32f9f089a54c9b5.zip