Updated Swedish translation.

2005-02-13  Christian Rose  <menthos@menthos.com>

	* sv.po: Updated Swedish translation.

svn path=/trunk/; revision=28781

2 files changed, 2691 insertions, 2317 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index f93e5a578d..ab1ed7734a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-13  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
 2005-02-13  David Lodge <dave@cirt.net>
 
 	* en_GB.po: Updated British translation.
diff --git a/po/sv.po b/po/sv.po
index 40b7b35dae..f9ab46abea 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,14 +11,14 @@
 # meeting = sammanträde
 # event = evenemang
 #
-# $Id: sv.po,v 1.204 2005/01/28 22:51:17 menthos Exp $
+# $Id: sv.po,v 1.205 2005/02/13 21:55:48 menthos Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 23:49+0100\n"
-"PO-Revision-Date: 2005-01-28 23:50+0100\n"
+"POT-Creation-Date: 2005-02-13 22:54+0100\n"
+"PO-Revision-Date: 2005-02-13 22:54+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -32,6 +32,23 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution-adressbok"
 
+#: a11y/addressbook/ea-minicard-view.c:34
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "New Contact"
+msgstr "Ny kontakt"
+
+#: a11y/addressbook/ea-minicard-view.c:35
+#: addressbook/gui/component/addressbook-component.c:190
+msgid "New Contact List"
+msgstr "Ny kontaktlista"
+
+#: a11y/addressbook/ea-minicard-view.c:149
+#, c-format
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "aktuella adressboksmappen har %d kort"
+msgstr[1] "aktuella adressboksmappen har %d kort"
+
 #: a11y/addressbook/ea-minicard.c:31
 #: calendar/gui/alarm-notify/alarm-queue.c:863
 #: ui/evolution-message-composer.xml.h:10
@@ -50,22 +67,34 @@ msgstr "Kontakt: "
 msgid "evolution minicard"
 msgstr "evolution-minikort"
 
-#: a11y/addressbook/ea-minicard-view.c:34
-#: addressbook/gui/component/addressbook-component.c:97
-msgid "New Contact"
-msgstr "Ny kontakt"
+#: a11y/calendar/ea-cal-view-event.c:235
+msgid "It has alarms."
+msgstr "Det har alarm."
 
-#: a11y/addressbook/ea-minicard-view.c:35
-#: addressbook/gui/component/addressbook-component.c:105
-msgid "New Contact List"
-msgstr "Ny kontaktlista"
+#: a11y/calendar/ea-cal-view-event.c:238
+msgid "It has recurrences."
+msgstr "Det har upprepningar."
 
-#: a11y/addressbook/ea-minicard-view.c:149
+#: a11y/calendar/ea-cal-view-event.c:241
+msgid "It is a meeting."
+msgstr "Det är ett sammanträde."
+
+#: a11y/calendar/ea-cal-view-event.c:247
 #, c-format
-msgid "current addressbook folder has %d card"
-msgid_plural "current addressbook folder have %d cards"
-msgstr[0] "aktuella adressboksmappen har %d kort"
-msgstr[1] "aktuella adressboksmappen har %d kort"
+msgid "Calendar Event: Summary is %s."
+msgstr "Kalenderevenemang: Sammanfattningen är %s."
+
+#: a11y/calendar/ea-cal-view-event.c:249
+msgid "Calendar Event: It has no summary."
+msgstr "Kalenderevenemang: Det har ingen sammanfattning."
+
+#: a11y/calendar/ea-cal-view-event.c:268
+msgid "calendar view event"
+msgstr "kalendervisningshändelse"
+
+#: a11y/calendar/ea-cal-view-event.c:485
+msgid "Grab Focus"
+msgstr "Tag fokus"
 
 #: a11y/calendar/ea-cal-view.c:306
 msgid "New Appointment"
@@ -75,7 +104,7 @@ msgstr "Nytt möte"
 msgid "New All Day Event"
 msgstr "Nytt heldagsevenemang"
 
-#: a11y/calendar/ea-cal-view.c:308 calendar/gui/e-calendar-view.c:1366
+#: a11y/calendar/ea-cal-view.c:308 calendar/gui/e-calendar-view.c:1372
 msgid "New Meeting"
 msgstr "Nytt sammanträde"
 
@@ -87,75 +116,40 @@ msgstr "Gå till idag"
 msgid "Go to Date"
 msgstr "Gå till datum"
 
-#: a11y/calendar/ea-cal-view-event.c:235
-#, fuzzy
-msgid "alarm "
-msgstr "Alarm"
-
-#: a11y/calendar/ea-cal-view-event.c:241
-#, fuzzy
-msgid "recurrence "
-msgstr "Upprepning"
-
-#: a11y/calendar/ea-cal-view-event.c:247
-#, fuzzy
-msgid "time-zone "
-msgstr "Tidszon "
-
-#: a11y/calendar/ea-cal-view-event.c:253
-#, fuzzy
-msgid "meeting "
-msgstr "Sammanträde"
-
-#: a11y/calendar/ea-cal-view-event.c:258
-#, fuzzy
-msgid "event. Summary is "
-msgstr "Skriv ut sammanfattning"
-
-#: a11y/calendar/ea-cal-view-event.c:269
-msgid "empty"
-msgstr "tom"
+#: a11y/calendar/ea-day-view-main-item.c:299
+#: a11y/calendar/ea-week-view-main-item.c:301
+msgid "a table to view and select the current time range"
+msgstr "en tabell för att visa och välja den aktuella tidsperioden"
 
-#: a11y/calendar/ea-cal-view-event.c:288
-msgid "calendar view event"
-msgstr "kalendervisningshändelse"
+#: a11y/calendar/ea-day-view.c:146 a11y/calendar/ea-week-view.c:148
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "Det har %d evenemang."
+msgstr[1] "Det har %d evenemang."
 
-#: a11y/calendar/ea-cal-view-event.c:505
-#, fuzzy
-msgid "Grab Focus"
-msgstr "Har fokus"
+#: a11y/calendar/ea-day-view.c:148 a11y/calendar/ea-week-view.c:150
+msgid "It has no events."
+msgstr "Det har inga evenemang."
 
-#: a11y/calendar/ea-day-view.c:147 a11y/calendar/ea-week-view.c:148
+#: a11y/calendar/ea-day-view.c:152
 #, c-format
-msgid ", %d event"
-msgstr ", %d evenemang"
+msgid "Work Week View: %s. %s"
+msgstr "Arbetsveckovy: %s. %s"
 
-#: a11y/calendar/ea-day-view.c:147 a11y/calendar/ea-week-view.c:148
+#: a11y/calendar/ea-day-view.c:155
 #, c-format
-msgid ", %d events"
-msgstr ", %d evenemang"
+msgid "Day View: %s. %s"
+msgstr "Dagsvy: %s. %s"
 
-#: a11y/calendar/ea-day-view.c:150
-msgid "work week view :"
-msgstr "arbetsveckovy:"
-
-#: a11y/calendar/ea-day-view.c:154
-msgid "day view :"
-msgstr "dagsvy:"
-
-#: a11y/calendar/ea-day-view.c:181
+#: a11y/calendar/ea-day-view.c:186
 msgid "calendar view for a work week"
 msgstr "kalendervy för en arbetsvecka"
 
-#: a11y/calendar/ea-day-view.c:183
+#: a11y/calendar/ea-day-view.c:188
 msgid "calendar view for one or more days"
 msgstr "kalendervy för en eller flera dagar"
 
-#: a11y/calendar/ea-day-view-main-item.c:299
-#: a11y/calendar/ea-week-view-main-item.c:301
-msgid "a table to view and select the current time range"
-msgstr "en tabell för att visa och välja den aktuella tidsperioden"
-
 #: a11y/calendar/ea-gnome-calendar.c:187 calendar/gui/calendar-component.c:520
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
@@ -167,7 +161,7 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: a11y/calendar/ea-gnome-calendar.c:190 calendar/gui/calendar-component.c:523
-#: calendar/gui/e-day-view.c:1511 calendar/gui/e-day-view-top-item.c:719
+#: calendar/gui/e-day-view-top-item.c:719 calendar/gui/e-day-view.c:1511
 #: calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -191,7 +185,7 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: a11y/calendar/ea-gnome-calendar.c:220 calendar/gui/calendar-component.c:549
-#: calendar/gui/e-day-view.c:1527 calendar/gui/e-day-view-top-item.c:723
+#: calendar/gui/e-day-view-top-item.c:723 calendar/gui/e-day-view.c:1527
 #: calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
@@ -206,56 +200,47 @@ msgid "search bar"
 msgstr "sökrad"
 
 #: a11y/calendar/ea-gnome-calendar.c:291
-#, fuzzy
 msgid "evolution calendar search bar"
-msgstr "Evolutionkalenderns visare"
+msgstr "sökrad i evolutionkalendern"
 
 #: a11y/calendar/ea-jump-button.c:149
 msgid "Jump button"
 msgstr "Hoppaknapp"
 
 #: a11y/calendar/ea-jump-button.c:158
-#, fuzzy
 msgid "Click here, you can find more events."
-msgstr "Klicka här för att lägga till en deltagare"
+msgstr "Klicka här, du kan hitta fler evenemang."
 
-#: a11y/calendar/ea-week-view.c:153
-msgid "month view :"
-msgstr "månadsvy:"
+#: a11y/calendar/ea-week-view.c:155
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "Månadsvy: %s. %s"
 
-#: a11y/calendar/ea-week-view.c:158
-msgid "week view :"
-msgstr "veckovy:"
+#: a11y/calendar/ea-week-view.c:159
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "Veckovy: %s. %s"
 
-#: a11y/calendar/ea-week-view.c:185
+#: a11y/calendar/ea-week-view.c:190
 msgid "calendar view for a month"
 msgstr "kalendervy för en månad"
 
-#: a11y/calendar/ea-week-view.c:187
+#: a11y/calendar/ea-week-view.c:192
 msgid "calendar view for one or more weeks"
 msgstr "kalendervy för en eller flera veckor"
 
-#: a11y/widgets/ea-calendar-item.c:293 a11y/widgets/ea-calendar-item.c:299
-msgid " %d %B %Y"
-msgstr " %d %B %Y"
-
-#: a11y/widgets/ea-calendar-item.c:301
-msgid "calendar (from "
-msgstr "kalender (från "
-
-#: a11y/widgets/ea-calendar-item.c:303
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2261
-msgid " to "
-msgstr " till "
+#: a11y/widgets/ea-calendar-item.c:290 a11y/widgets/ea-calendar-item.c:296
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
 
-#: a11y/widgets/ea-calendar-item.c:305
-msgid ")"
-msgstr ")"
+#: a11y/widgets/ea-calendar-item.c:298
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Kalender: från %s till %s"
 
-#: a11y/widgets/ea-calendar-item.c:337
-#, fuzzy
+#: a11y/widgets/ea-calendar-item.c:333
 msgid "evolution calendar item"
-msgstr "Evolutionkalenderns visare"
+msgstr "evolutionkalenderobjekt"
 
 #: a11y/widgets/ea-combo-button.c:40
 msgid "Combo Button"
@@ -470,6 +455,25 @@ msgstr ""
 msgid "_Add"
 msgstr "_Lägg till"
 
+#. addressbook:server-version title
+#. calendar:server-version title
+#: addressbook/addressbook-errors.xml.h:64 calendar/calendar-errors.xml.h:142
+msgid "Server Version"
+msgstr "Serverversion"
+
+#. addressbook:server-version primary
+#. calendar:server-version primary
+#: addressbook/addressbook-errors.xml.h:66 calendar/calendar-errors.xml.h:144
+msgid "Your server needs to be updated"
+msgstr "Din server måste uppdateras"
+
+#. addressbook:server-version secondary
+#: addressbook/addressbook-errors.xml.h:68
+msgid "Some features may not work correctly with your current server version"
+msgstr ""
+"En del funktioner kanske inte fungerar korrekt med din nuvarande "
+"serverversion"
+
 #: addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Standardsynkroniseringsadress:"
@@ -484,52 +488,121 @@ msgstr "Kunde inte läsa in adressboken"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte läsa pilotens adressprogramblock"
 
-#: addressbook/gui/component/addressbook.c:98
-msgid "Accessing LDAP Server anonymously"
-msgstr "Ansluter anonymt till LDAP-servern"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
+msgstr "Automatisk ifyllning"
 
-#: addressbook/gui/component/addressbook.c:186
-#: plugins/groupwise-account-setup/camel-gw-listener.c:478
-msgid "Failed to authenticate.\n"
-msgstr "Misslyckades med autentisering.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "C_ontacts"
+msgstr "K_ontakter"
 
-#: addressbook/gui/component/addressbook.c:193
-#: plugins/groupwise-account-setup/camel-gw-listener.c:461
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Ange lösenord för %s (användare %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Certificates"
+msgstr "Certifikat"
 
-#: addressbook/gui/component/addressbook-component.c:98
+#: 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:5
+#: addressbook/gui/component/addressbook-view.c:1119
+#: calendar/gui/migration.c:378
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: 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:7
+msgid "Evolution Addressbook address pop-up"
+msgstr "Adress-popup för Evolutions adressbok"
+
+#: 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:9
+msgid "Evolution Addressbook card viewer"
+msgstr "Kortvisare för Evolutions adressbok"
+
+#: 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: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:12
+msgid "Evolution folder settings configuration control"
+msgstr "Evolutions konfigurationskontroll för mappinställningar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manage your S/MIME certificates here"
+msgstr ""
+
+#. create the local source group
+#. On This Computer is always first and vFolders is always last
+#: addressbook/gui/component/addressbook-component.c:120
+#: addressbook/gui/component/addressbook-migrate.c:493
+#: calendar/gui/migration.c:452 calendar/gui/migration.c:545
+#: mail/em-folder-tree-model.c:197 mail/em-folder-tree-model.c:199
+#: mail/mail-component.c:270 mail/mail-vfolder.c:222
+msgid "On This Computer"
+msgstr "På denna dator"
+
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person task list
+#. orange
+#: addressbook/gui/component/addressbook-component.c:128
+#: addressbook/gui/component/addressbook-migrate.c:501
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/migration.c:460 calendar/gui/migration.c:553
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:77
+#: mail/mail-config.glade.h:101
+msgid "Personal"
+msgstr "Personligt"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:136
+#: addressbook/gui/component/addressbook-migrate.c:509
+msgid "On LDAP Servers"
+msgstr "På LDAP-servrar"
+
+#: addressbook/gui/component/addressbook-component.c:183
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:99
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Create a new contact"
 msgstr "Skapa en ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:106
+#: addressbook/gui/component/addressbook-component.c:191
 msgid "Contact _List"
 msgstr "Kontakt_lista"
 
-#: addressbook/gui/component/addressbook-component.c:107
+#: addressbook/gui/component/addressbook-component.c:192
 msgid "Create a new contact list"
 msgstr "Skapa en ny kontaktlista"
 
-#: addressbook/gui/component/addressbook-component.c:113
-#: addressbook/gui/component/addressbook-config.c:1115
+#: addressbook/gui/component/addressbook-component.c:198
+#: addressbook/gui/component/addressbook-config.c:1121
 #: addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "Ny adressbok"
 
-#: addressbook/gui/component/addressbook-component.c:114
+#: addressbook/gui/component/addressbook-component.c:199
 msgid "Address _Book"
 msgstr "Adress_bok"
 
-#: addressbook/gui/component/addressbook-component.c:115
+#: addressbook/gui/component/addressbook-component.c:200
 msgid "Create a new address book"
 msgstr "Skapa en ny adressbok"
 
-#: addressbook/gui/component/addressbook-component.c:188
+#: addressbook/gui/component/addressbook-component.c:273
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Misslyckades med att uppgradera inställningar eller mappar."
 
@@ -549,11 +622,10 @@ msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:904
 #: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/calendar-setup.c:361
-#: calendar/gui/dialogs/calendar-setup.c:372
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: mail/em-folder-properties.c:214 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.c:361
+#: calendar/gui/dialogs/calendar-setup.c:372 mail/em-folder-properties.c:215
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Allmänt"
 
@@ -584,7 +656,7 @@ msgstr "Söker"
 msgid "Downloading"
 msgstr "Hämtning"
 
-#: addressbook/gui/component/addressbook-config.c:1113
+#: addressbook/gui/component/addressbook-config.c:1119
 #: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Egenskaper för adressboken"
@@ -600,32 +672,6 @@ msgstr "Migrerar..."
 msgid "Migrating `%s':"
 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:452 calendar/gui/migration.c:545
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-component.c:270 mail/mail-vfolder.c:222
-msgid "On This Computer"
-msgstr "På denna dator"
-
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
-#: addressbook/gui/component/addressbook-migrate.c:501
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: calendar/gui/migration.c:460 calendar/gui/migration.c:553
-#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:77
-#: mail/mail-config.glade.h:101
-msgid "Personal"
-msgstr "Personligt"
-
-#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:509
-msgid "On LDAP Servers"
-msgstr "På LDAP-servrar"
-
 #: addressbook/gui/component/addressbook-migrate.c:637
 msgid "LDAP Servers"
 msgstr "LDAP-servrar"
@@ -690,52 +736,50 @@ msgstr "Ta bort"
 msgid "Properties..."
 msgstr "Egenskaper..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:1119
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: calendar/gui/migration.c:378
-msgid "Contacts"
-msgstr "Kontakter"
-
 #: addressbook/gui/component/addressbook-view.c:1130
 msgid "Contact Source Selector"
 msgstr "Väljare för kontaktkälla"
 
+#: addressbook/gui/component/addressbook.c:98
+msgid "Accessing LDAP Server anonymously"
+msgstr "Ansluter anonymt till LDAP-servern"
+
+#: addressbook/gui/component/addressbook.c:193
+#: plugins/groupwise-account-setup/camel-gw-listener.c:478
+msgid "Failed to authenticate.\n"
+msgstr "Misslyckades med autentisering.\n"
+
+#: addressbook/gui/component/addressbook.c:200
+#: plugins/groupwise-account-setup/camel-gw-listener.c:461
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Ange 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 "Autocomplete length"
+msgstr "Fyll i längd automatiskt"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
-msgid "EFolderList XML for the list of completion URIs."
+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"
+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:4
-msgid "Position of the vertical pane in main view."
-msgstr "Position för den vertikala panelen i huvudvyn."
+#, fuzzy
+msgid ""
+"Position of the vertical pane, between the card and list views and the "
+"preview pane, in pixels."
+msgstr "Position på den vertikala panelen i månadsvyn"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
-#: mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
+#, fuzzy
+msgid "Show 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:74
-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 "
-"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:8
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -743,61 +787,24 @@ 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
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 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
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 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/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Automatisk ifyllning"
-
-#: 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:3
-msgid "Certificates"
-msgstr "Certifikat"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "Konfigurera automatisk ifyllning här"
-
-#: 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:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Adress-popup för Evolutions adressbok"
-
-#: 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:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Kortvisare för Evolutions adressbok"
-
-#: 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: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:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolutions konfigurationskontroll för mappinställningar"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#, fuzzy
+msgid "Vertical pane position"
+msgstr "Geografisk position"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manage your S/MIME certificates here"
-msgstr ""
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#, fuzzy
+msgid "Whether to show the preview pane."
+msgstr "Växla om mappraden ska visas"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -805,15 +812,13 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-dialog.glade.h:1
-#: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/cal-attachment.glade.h:1
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
 #: calendar/gui/dialogs/new-task-list.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-dialogs.glade.h:6
 #: mail/message-tags.glade.h:1 plugins/shared-folder/properties.glade.h:1
@@ -1084,9 +1089,9 @@ 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/alarm-dialog.glade.h:26
 #: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:16
-#: mail/em-account-editor.c:1821 plugins/calendar-http/calendar-http.c:263
+#: mail/em-account-editor.c:1825 plugins/calendar-http/calendar-http.c:263
 #: plugins/calendar-weather/calendar-weather.c:564
 msgid "minutes"
 msgstr "minut"
@@ -1182,8 +1187,8 @@ msgstr "Telefon"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: addressbook/gui/contact-editor/e-contact-editor.c:199
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:235
+#: addressbook/gui/contact-editor/e-contact-editor.c:199
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:76
 #: mail/mail-config.glade.h:148
 msgid "Work"
@@ -1207,7 +1212,7 @@ msgid "_Birthday:"
 msgstr "_Födelsedag:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: plugins/itip-formatter/itip-view.c:1617
+#: plugins/itip-formatter/itip-view.c:1619
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -1299,22 +1304,6 @@ msgstr "_Var:"
 msgid "_Zip/Postal Code:"
 msgstr "_Postnummer:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Är du säker på att du vill\n"
-"ta bort dessa kontakter?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:322
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Är du säker på att du vill\n"
-"ta bort denna kontakt?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #: addressbook/gui/widgets/eab-contact-display.c:365
 #: addressbook/gui/widgets/eab-contact-display.c:380
@@ -1322,16 +1311,16 @@ msgid "Address"
 msgstr "Adress"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:298
 #: 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:298
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:310
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:519
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:519
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Redigerbar"
 
@@ -2303,43 +2292,71 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: plugins/plugin-manager/plugin-manager.c:44
+#: plugins/save-attachments/save-attachments.c:362
+msgid "Name"
+msgstr "Namn"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #: addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:351
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:350
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
 #: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:347
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Tjänst"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Plats"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Användarnamn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:200
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:231
+#: addressbook/gui/contact-editor/e-contact-editor.c:200
 msgid "Home"
 msgstr "Hem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:239
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 msgid "Other"
 msgstr "Annat"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:351
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "GroupWise"
+msgstr "GroupWise"
+
 #: addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Source Book"
 msgstr "Källbok"
@@ -2384,34 +2401,6 @@ msgstr ""
 msgid "Invalid contact."
 msgstr "Ogiltig kontakt."
 
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: plugins/plugin-manager/plugin-manager.c:44
-#: plugins/save-attachments/save-attachments.c:362
-msgid "Name"
-msgstr "Namn"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Tjänst"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:587
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Location"
-msgstr "Plats"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Användarnamn"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:277
 msgid "Contact Quick-Add"
 msgstr "Snabbinläggning av kontakt"
@@ -2428,6 +2417,22 @@ msgstr "_Fullständigt namn:"
 msgid "E-_mail:"
 msgstr "E-_post:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Är du säker på att du vill\n"
+"ta bort dessa kontakter?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:322
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Är du säker på att du vill\n"
+"ta bort denna kontakt?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adress _2:"
@@ -2575,8 +2580,8 @@ msgstr "_Ange en e-postadress eller dra en kontakt till listan nedan:"
 #: addressbook/gui/widgets/e-addressbook-model.c:296
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
 #: addressbook/gui/widgets/e-addressbook-view.c:223
-#: addressbook/gui/widgets/e-minicard-view.c:505
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:505
 msgid "Book"
 msgstr "Bok"
 
@@ -2635,6 +2640,409 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "Inga kontakter"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d kontakt"
+msgstr[1] "%d kontakter"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:303
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
+#: addressbook/gui/widgets/e-addressbook-view.c:237
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:512
+msgid "Query"
+msgstr "Fråga"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:446
+msgid "Error getting book view"
+msgstr "Fel vid hämtande av bokvy"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+msgid "Model"
+msgstr "Modell"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Fel vid ändring av kort"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+msgid "Name begins with"
+msgstr "Namn börjar med"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+msgid "Email begins with"
+msgstr "E-postadress börjar med"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr "Kategori är"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: 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:173
+#: addressbook/gui/widgets/e-addressbook-view.c:178
+msgid "Advanced..."
+msgstr "Avancerat..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:230
+msgid "Source"
+msgstr "Källkod"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:244
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:244
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Typ"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+msgid "Address Book"
+msgstr "Adressbok"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:922
+#: addressbook/gui/widgets/e-addressbook-view.c:1982
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard..."
+msgstr "Spara som VCard..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:918
+msgid "New Contact..."
+msgstr "Ny kontakt..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:919
+msgid "New Contact List..."
+msgstr "Ny kontaktlista..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:923
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Vidarebefordra kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:924
+msgid "Send Message to Contact"
+msgstr "Skicka meddelande till kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: calendar/gui/calendar-commands.c:120 calendar/gui/print.c:2489
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: 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:928
+msgid "Copy to Address Book..."
+msgstr "Kopiera till adressbok..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:929
+msgid "Move to Address Book..."
+msgstr "Flytta till adressbok..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:932
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Klipp ut"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:933
+#: calendar/gui/calendar-component.c:385 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:934
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Klistra in"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1537
+#: calendar/gui/cal-search-bar.c:346
+msgid "Any Category"
+msgstr "Alla kategorier"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1750
+msgid "Print cards"
+msgstr "Skriv ut kort"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Assistent"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Sekreterartelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Företagsfax"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Arbetstelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "Företagstelefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "Tillbakaringningstelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "Biltelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Categories"
+msgstr "Kategorier"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr "Företagets telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: 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:441
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "E-post 3"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Efternamn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr "Arkivera som"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Given Name"
+msgstr "Förnamn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Fax hem"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Hemtelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "Hemtelefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "ISDN Phone"
+msgstr "ISDN-telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "Dagbok"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "Manager"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:379
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Smeknamn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:390
+msgid "Note"
+msgstr "Notering"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Kontor"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Annan fax"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Annan telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Personsökare"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Primär telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+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:251
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Roll"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Spouse"
+msgstr "Partner"
+
+#. Translators: This is a vcard standard and stands for the type of
+#. phone used by the hearing impaired. TTY stands for "teletype"
+#. (familiar from Unix device names), and TDD is "Telecommunications
+#. Device for Deaf". However, you probably want to leave this
+#. abbreviation unchanged unless you know that there is actually a
+#. different and established translation for this in your language.
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+msgid "Title"
+msgstr "Titel"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Unit"
+msgstr "Enhet"
+
+# Web site är webbplats. Web page är webbsida.
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Web Site"
+msgstr "Webbplats"
+
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
+msgid "Width"
+msgstr "Bredd"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
+msgid "Height"
+msgstr "Höjd"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
+msgid "Has Focus"
+msgstr "Har fokus"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "Fält"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "Fältnamn"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "Textmodell"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "Maximal fältnamnslängd"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Kolumnbredd"
+
+#: 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"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Det finns inga objekt att visa i denna vy.\n"
+"\n"
+"Dubbelklicka här för att skapa en ny kontakt."
+
+#: 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"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Det finns inga objekt att visa i denna vy."
+
+#: addressbook/gui/widgets/e-minicard-view.c:498
+msgid "Adapter"
+msgstr "Adapter"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Markerad"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Har markör"
+
 # Osäker
 #: addressbook/gui/widgets/eab-contact-display.c:133
 #: addressbook/gui/widgets/eab-contact-display.c:196
@@ -2658,11 +3066,6 @@ msgstr "Listmedlemmar"
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organisation"
-
 #: addressbook/gui/widgets/eab-contact-display.c:361
 msgid "Position"
 msgstr "Position"
@@ -2693,30 +3096,14 @@ msgstr "WWW"
 msgid "Blog"
 msgstr "Webblogg"
 
-#: addressbook/gui/widgets/eab-contact-display.c:379
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
 #: addressbook/gui/widgets/eab-contact-display.c:383
 msgid "personal"
 msgstr "personligt"
 
-#: addressbook/gui/widgets/eab-contact-display.c:390
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Notering"
-
 #: addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Job Title"
 msgstr "Jobbtitel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:560
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-post"
-
 #: addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Home page"
 msgstr "Hemsida"
@@ -2773,8 +3160,8 @@ msgstr "Protokollet stöds inte"
 #: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:232
-#: calendar/gui/e-calendar-table.c:458 calendar/gui/e-cal-model-tasks.c:347
-#: calendar/gui/e-cal-model-tasks.c:660 calendar/gui/print.c:2352
+#: calendar/gui/e-cal-model-tasks.c:347 calendar/gui/e-cal-model-tasks.c:660
+#: calendar/gui/e-calendar-table.c:458 calendar/gui/print.c:2352
 msgid "Cancelled"
 msgstr "Avbruten"
 
@@ -2992,16 +3379,6 @@ msgstr "(ingen)"
 msgid "Primary Email"
 msgstr "Primär e-post"
 
-#: addressbook/gui/widgets/eab-popup-control.c:441
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:451
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "E-post 3"
-
 #: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Välj en åtgärd"
@@ -3044,379 +3421,6 @@ msgstr "Spara kompakt VCard"
 msgid "Save in addressbook"
 msgstr "Spara i adressboken"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-msgid "No contacts"
-msgstr "Inga kontakter"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d kontakt"
-msgstr[1] "%d kontakter"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:303
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: addressbook/gui/widgets/e-addressbook-view.c:237
-#: addressbook/gui/widgets/e-minicard-view.c:512
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-msgid "Query"
-msgstr "Fråga"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:446
-msgid "Error getting book view"
-msgstr "Fel vid hämtande av bokvy"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-msgid "Model"
-msgstr "Modell"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "Fel vid ändring av kort"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:169
-msgid "Name begins with"
-msgstr "Namn börjar med"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Email begins with"
-msgstr "E-postadress börjar med"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:171
-#: calendar/gui/cal-search-bar.c:53
-msgid "Category is"
-msgstr "Kategori är"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-#: 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:173
-#: addressbook/gui/widgets/e-addressbook-view.c:178
-msgid "Advanced..."
-msgstr "Avancerat..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:230
-msgid "Source"
-msgstr "Källkod"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:244
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:244
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Typ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:541
-msgid "Address Book"
-msgstr "Adressbok"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:804
-#: addressbook/gui/widgets/e-addressbook-view.c:922
-#: addressbook/gui/widgets/e-addressbook-view.c:1982
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard..."
-msgstr "Spara som VCard..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:918
-msgid "New Contact..."
-msgstr "Ny kontakt..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:919
-msgid "New Contact List..."
-msgstr "Ny kontaktlista..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:923
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Vidarebefordra kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:924
-msgid "Send Message to Contact"
-msgstr "Skicka meddelande till kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:925
-#: calendar/gui/calendar-commands.c:120 calendar/gui/print.c:2489
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: 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:928
-msgid "Copy to Address Book..."
-msgstr "Kopiera till adressbok..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:929
-msgid "Move to Address Book..."
-msgstr "Flytta till adressbok..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:932
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:933
-#: calendar/gui/calendar-component.c:385 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:934
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Klistra in"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1537
-#: calendar/gui/cal-search-bar.c:346
-msgid "Any Category"
-msgstr "Alla kategorier"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1750
-msgid "Print cards"
-msgstr "Skriv ut kort"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Sekreterartelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Företagsfax"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "Arbetstelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "Företagstelefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "Tillbakaringningstelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Biltelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/dialogs/task-page.glade.h:7
-#: calendar/gui/e-calendar-table.etspec.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "Categories"
-msgstr "Kategorier"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Företagets telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Family Name"
-msgstr "Efternamn"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "File As"
-msgstr "Arkivera som"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Given Name"
-msgstr "Förnamn"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "Fax hem"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "Hemtelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "Hemtelefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "ISDN Phone"
-msgstr "ISDN-telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Journal"
-msgstr "Dagbok"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "Manager"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "Smeknamn"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "Kontor"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "Annan fax"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Annan telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "Personsökare"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "Primär telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-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:251
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Roll"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Spouse"
-msgstr "Partner"
-
-#. Translators: This is a vcard standard and stands for the type of
-#. phone used by the hearing impaired. TTY stands for "teletype"
-#. (familiar from Unix device names), and TDD is "Telecommunications
-#. Device for Deaf". However, you probably want to leave this
-#. abbreviation unchanged unless you know that there is actually a
-#. different and established translation for this in your language.
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:41
-msgid "TTYTDD"
-msgstr "TTYTDD"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:42
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-msgid "Title"
-msgstr "Titel"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-msgid "Unit"
-msgstr "Enhet"
-
-# Web site är webbplats. Web page är webbsida.
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-msgid "Web Site"
-msgstr "Webbplats"
-
-#: addressbook/gui/widgets/e-minicard.c:137
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Bredd"
-
-#: addressbook/gui/widgets/e-minicard.c:144
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Höjd"
-
-#: addressbook/gui/widgets/e-minicard.c:152
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Har fokus"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Markerad"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Har markör"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Fält"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Fältnamn"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Textmodell"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Maximal fältnamnslängd"
-
-#: 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"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Det finns inga objekt att visa i denna vy.\n"
-"\n"
-"Dubbelklicka här för att skapa en ny kontakt."
-
-#: 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"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"Det finns inga objekt att visa i denna vy."
-
-#: addressbook/gui/widgets/e-minicard-view.c:498
-msgid "Adapter"
-msgstr "Adapter"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Kolumnbredd"
-
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:25
 msgid "Card View"
 msgstr "Kortvy"
@@ -3441,6 +3445,11 @@ msgstr "Evolutions VCard-importör"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:213
+#: addressbook/printing/e-contact-print-envelope.c:234
+msgid "Print envelope"
+msgstr "Skriv ut kuvert"
+
 #: addressbook/printing/e-contact-print.c:1001
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
@@ -3450,11 +3459,6 @@ msgstr "Skriv ut kontakter"
 msgid "Print contact"
 msgstr "Skriv ut kontakt"
 
-#: addressbook/printing/e-contact-print-envelope.c:213
-#: addressbook/printing/e-contact-print-envelope.c:234
-msgid "Print envelope"
-msgstr "Skriv ut kuvert"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3645,6 +3649,20 @@ msgstr "Test av utskrift av kontakter"
 msgid "This should test the contact print code"
 msgstr "Detta bör testa koden för utskrift av kontakter"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Kan inte öppna fil"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "Kunde inte hämta lista med adressböcker"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "misslyckades med att öppna bok"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Ange utdatafilen istället för standard ut"
@@ -3700,20 +3718,6 @@ msgstr "Storleksflaggan behövs inte i normalt läge."
 msgid "Unhandled error"
 msgstr "Fel som inte hanteras"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Kan inte öppna fil"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "Kunde inte hämta lista med adressböcker"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "misslyckades med att öppna bok"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Fel vid inläsning av standardadressboken."
@@ -4071,6 +4075,31 @@ msgstr ""
 "Att lägga till en meningsfull sammanfattning till din uppgift kommer att ge "
 "dina mottagare en ledtråd till vad uppgiften handlar om."
 
+#. calendar:prompt-no-contents-offline-calendar primary
+#: calendar/calendar-errors.xml.h:134
+msgid "Error loading calendar"
+msgstr "Fel vid inläsning av kalendern"
+
+#. calendar:prompt-no-contents-offline-calendar secondary
+#: calendar/calendar-errors.xml.h:136
+msgid "The calendar is not marked for offline usage"
+msgstr "Kalendern är inte markerad för frånkopplad användning"
+
+#. calendar:prompt-no-contents-offline-tasks primary
+#: calendar/calendar-errors.xml.h:138
+msgid "Error loading task list"
+msgstr "Fel vid inläsning av uppgiftslista"
+
+#. calendar:prompt-no-contents-offline-tasks secondary
+#: calendar/calendar-errors.xml.h:140
+msgid "The task list is not marked for offline usage"
+msgstr ""
+
+#. calendar:server-version secondary
+#: calendar/calendar-errors.xml.h:146
+msgid " Some features may not work correctly with your current server version"
+msgstr ""
+
 #: calendar/common/authentication.c:49 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
@@ -4101,6 +4130,65 @@ msgstr "Standardprioritet:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunde inte läsa pilotens att-göra-programblock"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender och uppgifter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: calendar/gui/calendar-component.c:1150
+msgid "Calendars"
+msgstr "Kalendrar"
+
+#: 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:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolutionkalender och -uppgifter"
+
+#: 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:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolutionkalenderns schemaläggningsmeddelandevisare"
+
+#: 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:8
+msgid "Evolution's Calendar component"
+msgstr "Evolutions kalenderkomponent"
+
+#: 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:10
+#: calendar/gui/e-tasks.c:1219 calendar/gui/print.c:1822
+#: calendar/gui/tasks-component.c:408 calendar/gui/tasks-component.c:881
+#: calendar/gui/tasks-control.c:408 calendar/importers/icalendar-importer.c:83
+#: calendar/importers/icalendar-importer.c:701
+#: plugins/groupwise-account-setup/camel-gw-listener.c:383
+msgid "Tasks"
+msgstr "Uppgifter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "_Calendars"
+msgstr "_Kalendrar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Uppgifter"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolutionkalenderns alarmaviseringstjänst"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:79
 msgid "minute"
 msgid_plural "minutes"
@@ -4108,7 +4196,7 @@ msgstr[0] "minut"
 msgstr[1] "minuter"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: calendar/gui/dialogs/event-editor.c:138 calendar/gui/print.c:2298
+#: calendar/gui/dialogs/event-editor.c:140 calendar/gui/print.c:2298
 msgid "Appointment"
 msgstr "Möte"
 
@@ -4118,13 +4206,13 @@ msgstr "Mötestitel"
 
 #. End time
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: plugins/itip-formatter/itip-view.c:874
+#: plugins/itip-formatter/itip-view.c:876
 msgid "End time:"
 msgstr "Sluttid:"
 
 #. Location
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: calendar/gui/e-itip-control.c:1118 plugins/itip-formatter/itip-view.c:857
+#: calendar/gui/e-itip-control.c:1118 plugins/itip-formatter/itip-view.c:859
 msgid "Location:"
 msgstr "Plats:"
 
@@ -4134,7 +4222,7 @@ msgstr "Slumrings_tid:"
 
 #. Start time
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: plugins/itip-formatter/itip-view.c:865
+#: plugins/itip-formatter/itip-view.c:867
 msgid "Start time:"
 msgstr "Starttid:"
 
@@ -4245,10 +4333,6 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Fråga mig inte om detta program igen."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolutionkalenderns alarmaviseringstjänst"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Kunde inte initiera Bonobo"
@@ -4262,159 +4346,347 @@ msgid "invalid time"
 msgstr "ogiltig tid"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
-msgid "Allocate less space to weekend appointments"
-msgstr "Allokera mindre utrymme till helgmöten"
+msgid "Alarm programs"
+msgstr "Alarmprogram"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
-msgid "Calendars to run alarms for"
-msgstr "Kalendrar att köra alarm för"
+msgid "Ask for confirmation when deleting items"
+msgstr "Fråga efter bekräftelse vid borttagning av objekt"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
-msgid "Color of tasks that are due today"
-msgstr "Färg på uppgifter som ska utföras idag"
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr "Bakgrundsfärg på uppgifter som ska utföras idag, i \"#rrggbb\"-format."
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
-msgid "Color of tasks that are overdue"
-msgstr "Färg på uppgifter som skulle ha utförts"
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr ""
+"Bakgrundsfärg på uppgifter som skulle ha utförts, i \"#rrggbb\"-format."
 
-# Detta borde bero på lokalen?!
-# http://bugzilla.ximian.com/show_bug.cgi?id=61073
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
-msgid "Days that are work days"
-msgstr "Dagar som är arbetsdagar"
+msgid "Calendars to run alarms for"
+msgstr "Kalendrar att köra alarm för"
 
-# Detta borde bero på lokalen?!
-# http://bugzilla.ximian.com/show_bug.cgi?id=61073
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid "Default timezone for meetings"
-msgstr "Standardtidszon för sammanträden"
+msgid "Compress weekends in month view"
+msgstr "Tryck ihop helger i månadsvyn"
 
-# Detta borde bero på lokalen?!
-# http://bugzilla.ximian.com/show_bug.cgi?id=61073
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
-msgid "Hour the workday ends on"
-msgstr "Timme som arbetsdagen slutar"
+msgid "Confirm expunge"
+msgstr "Bekräfta tömning"
 
-# Detta borde bero på lokalen?!
-# http://bugzilla.ximian.com/show_bug.cgi?id=61073
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
-msgid "Hour the workday starts on"
-msgstr "Timme som arbetsdagen börjar"
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr "Dagar på vilka början och slutet av arbetstiden ska indikeras."
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
-msgid "Intervals shown in Day and Work Week views"
-msgstr "Intervall som visas i dags- och arbetsveckovyerna"
+msgid "Default appointment reminder"
+msgstr "Standardmötespåminnelse"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
-msgid "List of urls for free/busy publishing"
-msgstr "Lista med url:er för ledig-/upptagenpublicering"
+msgid "Default reminder units"
+msgstr "Standardpåminnelseenheter"
 
-# Detta borde bero på lokalen?!
-# http://bugzilla.ximian.com/show_bug.cgi?id=61073
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
-msgid "Minute the workday ends on"
-msgstr "Minut som arbetsdagen slutar"
+msgid "Default reminder value"
+msgstr "Standardpåminnelsevärde"
 
-# Detta borde bero på lokalen?!
-# http://bugzilla.ximian.com/show_bug.cgi?id=61073
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
-msgid "Minute the workday starts on"
-msgstr "Minut som arbetsdagen börjar"
+#, fuzzy
+msgid "Free/busy server urls"
+msgstr "Ledig-/Upptagenbegäran"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
-msgid "Number of units for default reminder"
-msgstr "Antal enheter för standardpåminnelse"
+#, fuzzy
+msgid "Free/busy template url"
+msgstr "Ledig-/Upptagensvar"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Number of units for determining when to hide tasks"
-msgstr "Antal enheter för avgörande av när uppgifter ska döljas"
+msgid "Hide completed tasks"
+msgstr "Dölj färdiga uppgifter"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Position of the horizontal pane"
-msgstr "Position på den horisontella panelen"
+msgid "Hide task units"
+msgstr "Dölj uppgiftsenheter"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
-msgid "Position of the horizontal pane in the month view"
-msgstr "Position på den horisontella panelen i månadsvyn"
+msgid "Hide task value"
+msgstr "Dölj uppgiftsvärde"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
-msgid "Position of the vertical pane"
-msgstr "Position på den vertikala panelen"
+msgid "Horizontal pane position"
+msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Position of the vertical pane in the month view"
-msgstr "Position på den vertikala panelen i månadsvyn"
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
-msgid "Position of the vertical pane in the task view"
-msgstr "Position på den vertikala panelen i uppgiftsvyn"
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
-msgid "Programs that can run as part of alarms"
-msgstr "Program som kan köra som en del av alarm"
+msgid "Last alarm time"
+msgstr "Senaste alarmtid"
 
-# Dessa meddelanden är bara <short>, <long> behövs nog också
-# http://bugzilla.ximian.com/show_bug.cgi?id=61075
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
-msgid "Show where events end in week and month views"
-msgstr "Visa var evenemang slutar i vecko- och månadsvyerna"
+msgid "List of server urls for free/busy publishing."
+msgstr "Lista med server-url:er för ledig-/upptagenpublicering."
 
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
-msgid "The url template to use as a free/busy data fallback"
-msgstr ""
+msgid "Minute the workday ends on, 0 to 59"
+msgstr "Minut som arbetsdagen slutar, 0 till 59."
 
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
-msgid "Time last alarm ran"
-msgstr "Tid som senaste alarmet körde"
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "Minut som arbetsdagen börjar, 0 till 59."
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-msgid "Units for determining when to hide tasks"
-msgstr "Enheter för avgörande av när uppgifter ska döljas"
+#, fuzzy
+msgid "Month view horizontal pane position"
+msgstr "Position på den horisontella panelen"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
-msgid "Units of default reminder"
-msgstr "Enheter för standardpåminnelse"
+#, fuzzy
+msgid "Month view vertical pane position"
+msgstr "Position för den vertikala panelen i huvudvyn"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Number of units for determining for a default reminder."
+msgstr "Antal enheter för standardpåminnelse"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Number of units for determining when to hide tasks."
+msgstr "Antal enheter för avgörande av när uppgifter ska döljas"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+msgid "Overdue tasks color"
+msgstr "Färg på uppgifter som skulle ha utförts"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid ""
+"Position of the vertical pane, between task list and the task preview pane, "
+"in pixels."
+msgstr "Position på den vertikala panelen i uppgiftsvyn"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#, fuzzy
+msgid "Programs that are allowed to be run by alarms."
+msgstr "Program som kan köra som en del av alarm"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#, fuzzy
+msgid "Show appointment end times in week and month views"
+msgstr "_Visa sluttiderna på möten i vecko- och månadsvyerna"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+msgid "Show display alarms in notification tray"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#, fuzzy
+msgid "Show week numbers in date navigator"
+msgstr "Visa v_eckonummer i datumbläddraren"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#, fuzzy
+msgid "Tasks due today color"
+msgstr "U_ppgifter som ska utföras idag:"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#, fuzzy
+msgid "Tasks vertical pane position"
+msgstr "Partiella bankar med nederbörd"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#, no-c-format
+msgid ""
+"The url template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Time divisions</short> <short>Intervals shown in Day and Work Week views, in "
+"minutes."
+msgstr "Intervall som visas i dags- och arbetsveckovyerna"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#, fuzzy
+msgid "Time the last alarm ran, in time_t."
+msgstr "Tid som senaste alarmet körde"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+msgid "Timezone"
+msgstr "Tidszon"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+msgid "Twenty four hour time format"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#, fuzzy
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "Enheter för avgörande av när uppgifter ska döljas"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#, fuzzy
+msgid "Week start"
+msgstr "V_eckan börjar:"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-msgid "Weekday the week starts on"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#, fuzzy
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Veckodag som veckan börjar"
 
 # Osäker
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-msgid "Whether or not to use the notification tray for display alarms"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#, fuzzy
+msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 "Huruvida notifieringslådan ska användas för visning av alarm eller inte"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
-msgid "Whether to ask for confirmation on appointment deletion"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#, fuzzy
+msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Huruvida det ska frågas efter bekräftelse vid borttagning av möten"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
-msgid "Whether to ask for confirmation when folder is expunged"
-msgstr "Huruvida det ska frågas efter bekräftelse vid tömning av mapp"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#, fuzzy
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "Huruvida det ska frågas efter bekräftelse vid borttagning av möten"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
-msgid "Whether to hide completed tasks"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#, fuzzy
+msgid "Whether to display the end time of events in the week and month views."
+msgstr "_Visa sluttiderna på möten i vecko- och månadsvyerna"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#, fuzzy
+msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Huruvida färdigställda uppgifter ska döljas"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
-msgid "Whether to set a default reminder for events"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#, fuzzy
+msgid "Whether to set a default reminder for appointments."
 msgstr "Huruvida en standardpåminnare för evenemang ska ställas in"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
-msgid "Whether to show times in 24h format instead of using am/pm"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#, fuzzy
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Huruvida tider ska visas i 24-timmarsformat istället för fm/em"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
-msgid "Whether to show week numbers in date navigator"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#, fuzzy
+msgid "Whether to show week numbers in the date navigator."
 msgstr "Huruvida veckonummer ska visas i datumbläddraren"
 
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#, fuzzy
+msgid "Work days"
+msgstr "Arbetsdagar:"
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#, fuzzy
+msgid "Workday end hour"
+msgstr "Timme som arbetsdagen slutar"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#, fuzzy
+msgid "Workday end minute"
+msgstr "A_rbeta ansluten"
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#, fuzzy
+msgid "Workday start hour"
+msgstr "Timme som arbetsdagen börjar"
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#, fuzzy
+msgid "Workday start minute"
+msgstr "Timme som arbetsdagen börjar"
+
+#: calendar/gui/cal-search-bar.c:49
+msgid "Summary contains"
+msgstr "Sammanfattningen innehåller"
+
+#: calendar/gui/cal-search-bar.c:50
+msgid "Description contains"
+msgstr "Beskrivningen innehåller"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Comment contains"
+msgstr "Kommentaren innehåller"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Location contains"
+msgstr "Platsen innehåller"
+
+#: calendar/gui/cal-search-bar.c:350
+msgid "Unmatched"
+msgstr "Omatchade"
+
 #: calendar/gui/calendar-commands.c:120 calendar/gui/calendar-component.c:568
 #: calendar/gui/dialogs/calendar-setup.c:362 calendar/gui/gnome-cal.c:1942
 #: plugins/groupwise-account-setup/camel-gw-listener.c:382
@@ -4437,7 +4709,7 @@ msgid "Purge events older than"
 msgstr "Töm evenemang äldre än"
 
 #: calendar/gui/calendar-commands.c:366
-#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:14
 #: plugins/calendar-http/calendar-http.c:265
 #: plugins/calendar-weather/calendar-weather.c:566
@@ -4450,76 +4722,71 @@ msgstr "dag"
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:701
+#: calendar/gui/calendar-component.c:703
 msgid "Failed upgrading calendars."
 msgstr "Misslyckades med att uppgradera kalendrar."
 
-#: calendar/gui/calendar-component.c:997
+#: calendar/gui/calendar-component.c:999
 #, 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:1013
+#: calendar/gui/calendar-component.c:1015
 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:1123
+#: calendar/gui/calendar-component.c:1125
 msgid "Calendar Source Selector"
 msgstr "Väljare för kalenderkälla"
 
-#: calendar/gui/calendar-component.c:1148
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Calendars"
-msgstr "Kalendrar"
-
-#: calendar/gui/calendar-component.c:1314
+#: calendar/gui/calendar-component.c:1316
 msgid "New appointment"
 msgstr "Nytt möte"
 
-#: calendar/gui/calendar-component.c:1315
+#: calendar/gui/calendar-component.c:1317
 msgid "_Appointment"
 msgstr "_Möte"
 
-#: calendar/gui/calendar-component.c:1316
+#: calendar/gui/calendar-component.c:1318
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt möte"
 
-#: calendar/gui/calendar-component.c:1322
+#: calendar/gui/calendar-component.c:1324
 msgid "New meeting"
 msgstr "Nytt sammanträde"
 
-#: calendar/gui/calendar-component.c:1323
+#: calendar/gui/calendar-component.c:1325
 msgid "M_eeting"
 msgstr "_Sammanträde"
 
-#: calendar/gui/calendar-component.c:1324
+#: calendar/gui/calendar-component.c:1326
 msgid "Create a new meeting request"
 msgstr "Skapa en ny sammanträdesbegäran"
 
-#: calendar/gui/calendar-component.c:1330
+#: calendar/gui/calendar-component.c:1332
 msgid "New all day appointment"
 msgstr "Nytt heldagsmöte"
 
-#: calendar/gui/calendar-component.c:1331
+#: calendar/gui/calendar-component.c:1333
 msgid "All Day A_ppointment"
 msgstr "Hel_dagsmöte"
 
-#: calendar/gui/calendar-component.c:1332
+#: calendar/gui/calendar-component.c:1334
 msgid "Create a new all-day appointment"
 msgstr "Skapa ett nytt heldagsmöte"
 
-#: calendar/gui/calendar-component.c:1338
+#: calendar/gui/calendar-component.c:1340
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:1339
+#: calendar/gui/calendar-component.c:1341
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: calendar/gui/calendar-component.c:1340
+#: calendar/gui/calendar-component.c:1342
 msgid "Create a new calendar"
 msgstr "Skapa en ny kalender"
 
@@ -4539,26 +4806,6 @@ msgstr "Veckovy"
 msgid "Month View"
 msgstr "Månadsvy"
 
-#: calendar/gui/cal-search-bar.c:49
-msgid "Summary contains"
-msgstr "Sammanfattningen innehåller"
-
-#: calendar/gui/cal-search-bar.c:50
-msgid "Description contains"
-msgstr "Beskrivningen innehåller"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Comment contains"
-msgstr "Kommentaren innehåller"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Location contains"
-msgstr "Platsen innehåller"
-
-#: calendar/gui/cal-search-bar.c:350
-msgid "Unmatched"
-msgstr "Omatchade"
-
 #: calendar/gui/comp-editor-factory.c:413
 msgid "Error while opening the calendar"
 msgstr "Fel vid öppnande av kalendern"
@@ -4575,130 +4822,109 @@ msgstr "Åtkomst nekas för öppnande av kalendern"
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>Alarm</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
 msgid "<b>Options</b>"
 msgstr "<b>Alternativ</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Repeat</b>"
 msgstr "<b>Upprepa</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
 msgid "Add Alarm"
 msgstr "Lägg till alarm"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
 msgid "Custom _message"
 msgstr "Anpassat _meddelande"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom alarm sound"
 msgstr "Anpassat alarmljud"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Mes_sage:"
 msgstr "Me_ddelande:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Spela ett ljud"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Visa en varning"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
 #: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Kör ett program"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Send To:"
 msgstr "Skicka till:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
 #: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Skicka ett brev"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Arguments:"
 msgstr "_Argument:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Program:"
 msgstr "_Program:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Repeat the alarm"
 msgstr "_Upprepa larmet"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Sound:"
 msgstr "_Ljud:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "after"
 msgstr "efter"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "before"
 msgstr "före"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dag"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
 msgid "end of appointment"
 msgstr "slut på möte"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "extra times every"
 msgstr "extra gånger var"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "hour(s)"
 msgstr "timme/timmar"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:15
 #: plugins/calendar-http/calendar-http.c:264
 #: plugins/calendar-weather/calendar-weather.c:565
 msgid "hours"
 msgstr "timme"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
 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
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
 msgid "start of appointment"
 msgstr "start på möte"
 
@@ -4714,117 +4940,63 @@ msgstr "L_ägg till"
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/dialogs/calendar-setup.c:284
-msgid "Copy calendar contents locally for offline operation"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:336
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "F_ärg:"
-
-#: calendar/gui/dialogs/calendar-setup.c:373
-msgid "Tasks List"
-msgstr "Uppgiftslista"
-
-#: calendar/gui/dialogs/calendar-setup.c:440
-msgid "Calendar Properties"
-msgstr "Egenskaper för kalendern"
-
-#: calendar/gui/dialogs/calendar-setup.c:506
-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
-msgid "Add Task List"
-msgstr "Lägg till uppgiftslista"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:102
-msgid "Pick a color"
-msgstr "Välj en färg"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Lägg till kalender"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Task List"
-msgstr "_Lägg till uppgiftslista"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#: plugins/calendar-http/calendar-http.c:248
-#: plugins/calendar-weather/calendar-weather.c:549
-msgid "_Refresh:"
-msgstr "_Uppdatera:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#: plugins/calendar-http/calendar-http.c:120
-msgid "_URL:"
-msgstr "_URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:21
-#: plugins/calendar-http/calendar-http.c:266
-#: plugins/calendar-weather/calendar-weather.c:567
-msgid "weeks"
-msgstr "veckor"
-
 #: calendar/gui/dialogs/cal-attachment-bar.c:108
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%.0fK"
 msgstr "%.0f k"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:111
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.0fM"
 msgstr "%.0f M"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:114
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:109
 #, c-format
 msgid "%.0fG"
 msgstr "%.0f G"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:298
-#: calendar/gui/dialogs/cal-attachment-bar.c:910
-#: composer/e-msg-composer-attachment-bar.c:293 mail/em-utils.c:436
+#: calendar/gui/dialogs/cal-attachment-bar.c:913
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:436
 msgid "attachment"
 msgstr "bilaga"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:439
 #: calendar/gui/dialogs/meeting-page.c:781
-#: composer/e-msg-composer-attachment-bar.c:440
+#: composer/e-msg-composer-attachment-bar.c:437
 #: plugins/shared-folder/properties.glade.h:14
 msgid "_Remove"
 msgstr "_Ta bort"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:440
-#: composer/e-msg-composer-attachment-bar.c:441 mail/em-folder-tree.c:2770
+#: composer/e-msg-composer-attachment-bar.c:438 mail/em-folder-tree.c:2818
 #: ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "_Egenskaper"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:442
-#: composer/e-msg-composer-attachment-bar.c:443
+#: composer/e-msg-composer-attachment-bar.c:440
 msgid "_Add attachment..."
 msgstr "_Lägg till bilaga..."
 
+#: calendar/gui/dialogs/cal-attachment-bar.c:699
+msgid "Attachment Bar"
+msgstr "Bilagerad"
+
 #: calendar/gui/dialogs/cal-attachment-select-file.c:96
 #: calendar/gui/dialogs/cal-attachment-select-file.c:115
 #: calendar/gui/dialogs/cal-attachment.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:93
-#: composer/e-msg-composer-select-file.c:112
+#: composer/e-msg-composer-select-file.c:95
+#: composer/e-msg-composer-select-file.c:115
 msgid "Suggest automatic display of attachment"
 msgstr "Föreslå automatisk visning av bilaga"
 
 #: calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: composer/e-msg-composer-select-file.c:187
+#: composer/e-msg-composer-select-file.c:230
 msgid "Attach file(s)"
 msgstr "Bifoga fil(er)"
 
@@ -4866,7 +5038,7 @@ msgstr "MIME-typ:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: calendar/gui/dialogs/cal-prefs-dialog.c:576 mail/em-account-prefs.c:460
-#: mail/em-composer-prefs.c:884 plugins/plugin-manager/plugin-manager.c:213
+#: mail/em-composer-prefs.c:888 plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Aktiverad"
 
@@ -5148,6 +5320,64 @@ msgstr "alternativmeny att välja påminnarenheter"
 msgid "option menu to choose time units"
 msgstr "alternativmeny att välja tidsenheter"
 
+#: calendar/gui/dialogs/calendar-setup.c:284
+msgid "Copy calendar contents locally for offline operation"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:336
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "F_ärg:"
+
+#: calendar/gui/dialogs/calendar-setup.c:373
+msgid "Tasks List"
+msgstr "Uppgiftslista"
+
+#: calendar/gui/dialogs/calendar-setup.c:440
+msgid "Calendar Properties"
+msgstr "Egenskaper för kalendern"
+
+#: calendar/gui/dialogs/calendar-setup.c:506
+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
+msgid "Add Task List"
+msgstr "Lägg till uppgiftslista"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:102
+msgid "Pick a color"
+msgstr "Välj en färg"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Lägg till kalender"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Task List"
+msgstr "_Lägg till uppgiftslista"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#: plugins/calendar-http/calendar-http.c:248
+#: plugins/calendar-weather/calendar-weather.c:549
+msgid "_Refresh:"
+msgstr "_Uppdatera:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: plugins/calendar-http/calendar-http.c:120
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:21
+#: plugins/calendar-http/calendar-http.c:266
+#: plugins/calendar-weather/calendar-weather.c:567
+msgid "weeks"
+msgstr "veckor"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Detta evenemang har tagits bort."
@@ -5194,100 +5424,143 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har inte gjort några ändringar, uppdatera redigeraren?"
 
-#: calendar/gui/dialogs/comp-editor.c:279
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Valideringsfel: %s"
+
+#: 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:2265
+msgid " (Completed "
+msgstr " (Färdigt "
+
+#: 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:2272
+msgid " (Due "
+msgstr " (Ska utföras "
+
+#: 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:181 composer/e-msg-composer.c:2676
+#, c-format
+msgid "Attached message - %s"
+msgstr "Bifogat meddelande - %s"
+
+#. translators, this count will always be >1
+#: calendar/gui/dialogs/comp-editor.c:186
+#: calendar/gui/dialogs/comp-editor.c:349 composer/e-msg-composer.c:2681
+#: composer/e-msg-composer.c:2844
+#, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Bifogat meddelande"
+msgstr[1] "%d bifogade meddelanden"
+
+#: calendar/gui/dialogs/comp-editor.c:412 calendar/gui/e-calendar-table.c:1164
+#: calendar/gui/e-calendar-view.c:1402 composer/e-msg-composer.c:2906
+#: mail/em-folder-tree.c:1046 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:105
+#: ui/evolution-tasks.xml.h:20
+msgid "_Copy"
+msgstr "_Kopiera"
+
+#: calendar/gui/dialogs/comp-editor.c:413 composer/e-msg-composer.c:2907
+#: mail/em-folder-tree.c:1047 mail/em-folder-tree.c:2311
+#: mail/em-folder-view.c:860 mail/message-list.c:1713
+msgid "_Move"
+msgstr "_Flytta"
+
+#: calendar/gui/dialogs/comp-editor.c:415 composer/e-msg-composer.c:2909
+#: mail/em-folder-tree.c:1049 mail/message-list.c:1715
+msgid "Cancel _Drag"
+msgstr "Avbryt _dragning"
+
+#: calendar/gui/dialogs/comp-editor.c:659
 msgid "Could not update object"
 msgstr "Kunde inte uppdatera objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:436 composer/e-msg-composer.c:2315
+#: calendar/gui/dialogs/comp-editor.c:820 composer/e-msg-composer.c:2310
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] "<b>%d</b> fil bifogad"
 msgstr[1] "<b>%d</b> filer bifogade"
 
-#: calendar/gui/dialogs/comp-editor.c:489 composer/e-msg-composer.c:2344
+#: calendar/gui/dialogs/comp-editor.c:873 composer/e-msg-composer.c:2339
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Dölj _bilageraden (släpp bilagor här)"
 
-#: calendar/gui/dialogs/comp-editor.c:492
-#: calendar/gui/dialogs/comp-editor.c:537 composer/e-msg-composer.c:2347
-#: composer/e-msg-composer.c:3466
+#: calendar/gui/dialogs/comp-editor.c:876
+#: calendar/gui/dialogs/comp-editor.c:928 composer/e-msg-composer.c:2342
+#: composer/e-msg-composer.c:3471
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Visa _bilageraden (släpp bilagor här)"
 
-#: calendar/gui/dialogs/comp-editor.c:1066
-#: calendar/gui/dialogs/comp-editor.c:1109
+#: calendar/gui/dialogs/comp-editor.c:952
+msgid "Attachment Button: Press space key to toggle attachment bar"
+msgstr "Bilageknapp: Tryck på blankstegstangenten för att växla bilageraden"
+
+#: calendar/gui/dialogs/comp-editor.c:1499
+#: calendar/gui/dialogs/comp-editor.c:1542
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: calendar/gui/dialogs/comp-editor.c:1072
-#: calendar/gui/dialogs/comp-editor.c:1115
+#: calendar/gui/dialogs/comp-editor.c:1505
+#: calendar/gui/dialogs/comp-editor.c:1548
 #, c-format
 msgid "Meeting - %s"
 msgstr "Sammanträde - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/dialogs/comp-editor.c:1117
+#: calendar/gui/dialogs/comp-editor.c:1507
+#: calendar/gui/dialogs/comp-editor.c:1550
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1078
-#: calendar/gui/dialogs/comp-editor.c:1121
+#: calendar/gui/dialogs/comp-editor.c:1511
+#: calendar/gui/dialogs/comp-editor.c:1554
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tilldelad uppgift - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1080
-#: calendar/gui/dialogs/comp-editor.c:1123
+#: calendar/gui/dialogs/comp-editor.c:1513
+#: calendar/gui/dialogs/comp-editor.c:1556
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1083
-#: calendar/gui/dialogs/comp-editor.c:1126
+#: calendar/gui/dialogs/comp-editor.c:1516
+#: calendar/gui/dialogs/comp-editor.c:1559
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagbokspost - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1094
-#: calendar/gui/dialogs/comp-editor.c:1136
+#: calendar/gui/dialogs/comp-editor.c:1527
+#: calendar/gui/dialogs/comp-editor.c:1569
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: calendar/gui/dialogs/comp-editor.c:1568
-#: calendar/gui/dialogs/comp-editor.c:1601
-#: calendar/gui/dialogs/comp-editor.c:1625
+#: calendar/gui/dialogs/comp-editor.c:2001
+#: calendar/gui/dialogs/comp-editor.c:2034
+#: calendar/gui/dialogs/comp-editor.c:2058
 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:1649
+#: calendar/gui/dialogs/comp-editor.c:2082
 msgid "Unable to use current version!"
 msgstr "Kan inte använda aktuell version!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "Valideringsfel: %s"
-
-#: 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:2267
-msgid "Completed "
-msgstr "Färdigt "
-
-#: 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:2274
-msgid "Due "
-msgstr "Ska utföras "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
 msgstr "Kunde inte uppdatera källa"
@@ -5360,19 +5633,19 @@ msgstr "Delegera till:"
 msgid "Enter Delegate"
 msgstr "Ange delegerad person"
 
-#: calendar/gui/dialogs/event-editor.c:147
+#: calendar/gui/dialogs/event-editor.c:149
 msgid "Recurrence"
 msgstr "Upprepning"
 
-#: calendar/gui/dialogs/event-editor.c:159
-#: calendar/gui/dialogs/event-editor.c:231
-#: calendar/gui/dialogs/event-editor.c:376
+#: calendar/gui/dialogs/event-editor.c:161
+#: calendar/gui/dialogs/event-editor.c:233
+#: calendar/gui/dialogs/event-editor.c:378
 msgid "Scheduling"
 msgstr "Schemaläggning"
 
-#: calendar/gui/dialogs/event-editor.c:166
-#: calendar/gui/dialogs/event-editor.c:234
-#: calendar/gui/dialogs/event-editor.c:379
+#: calendar/gui/dialogs/event-editor.c:168
+#: calendar/gui/dialogs/event-editor.c:236
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Invitations"
 msgstr "Inbjudningar"
 
@@ -5439,34 +5712,34 @@ msgid "15 minutes before appointment"
 msgstr "15 minuter före möte"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "<b>Basics</b>"
 msgstr "<b>Grundläggande</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:2
 msgid "<b>Date and Time</b>"
 msgstr "<b>Datum och tid</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, fuzzy
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "<b>Send Options</b>"
-msgstr "<b>Alternativ</b>"
+msgstr "<b>Alternativ för skickande</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
 msgid "A_ll day event"
 msgstr "He_ldagsevenemang"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#, fuzzy
 msgid "Ad_vanced  send options"
-msgstr "Avancerade alternativ"
+msgstr "A_vancerade alternativ för skickande"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 msgid "C_ustomize..."
 msgstr "_Anpassa..."
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
@@ -5475,14 +5748,13 @@ msgid "Cale_ndar:"
 msgstr "Kale_nder:"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Classi_fication:"
 msgstr "Klassi_fikation:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:362 calendar/gui/e-cal-list-view.c:255
-#: calendar/gui/e-cal-model.c:305
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:255
+#: calendar/gui/e-cal-model.c:305 calendar/gui/e-calendar-table.c:362
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
@@ -5495,16 +5767,16 @@ msgid "Locat_ion:"
 msgstr "_Plats:"
 
 #: calendar/gui/dialogs/event-page.glade.h:17
-#: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:361 calendar/gui/e-cal-list-view.c:254
-#: calendar/gui/e-cal-model.c:303
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-cal-list-view.c:254 calendar/gui/e-cal-model.c:303
+#: calendar/gui/e-calendar-table.c:361
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/dialogs/event-page.glade.h:18
-#: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:360 calendar/gui/e-cal-list-view.c:253
-#: calendar/gui/e-cal-model.c:294 calendar/gui/e-cal-model.c:301
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-cal-list-view.c:253 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-cal-model.c:301 calendar/gui/e-calendar-table.c:360
 msgid "Public"
 msgstr "Publikt"
 
@@ -5513,7 +5785,7 @@ msgid "Show time as _busy"
 msgstr "Visa tid som _upptagen"
 
 #: calendar/gui/dialogs/event-page.glade.h:20
-#: calendar/gui/dialogs/task-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Su_mmary:"
 msgstr "Sa_mmanfattning:"
 
@@ -5547,12 +5819,12 @@ msgstr "_Starttid:"
 #: calendar/gui/dialogs/meeting-page.c:296
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-cal-model-tasks.c:652 calendar/gui/e-itip-control.c:1104
-#: composer/e-msg-composer.c:2122 filter/filter-rule.c:878
-#: mail/em-account-editor.c:675 mail/em-account-editor.c:1269
-#: mail/em-account-prefs.c:421 mail/em-folder-view.c:965
+#: composer/e-msg-composer.c:2117 filter/filter-rule.c:878
+#: mail/em-account-editor.c:675 mail/em-account-editor.c:1273
+#: mail/em-account-prefs.c:421 mail/em-folder-view.c:998
 #: plugins/calendar-weather/calendar-weather.c:371
 #: plugins/calendar-weather/calendar-weather.c:425
-#: plugins/itip-formatter/itip-formatter.c:1373
+#: plugins/itip-formatter/itip-formatter.c:1376
 #: 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
@@ -5620,7 +5892,7 @@ msgid "RSVP"
 msgstr "OSA"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/dialogs/task-editor.c:145
+#: calendar/gui/dialogs/task-editor.c:146
 #: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:265
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:63
@@ -5822,6 +6094,10 @@ msgstr "år"
 msgid "Completed date is wrong"
 msgstr "Utförtdatumet är fel"
 
+#: calendar/gui/dialogs/task-details-page.c:522
+msgid "Web Page"
+msgstr "Webbsida"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "<span weight=\"bold\">Miscellaneous</span>"
 msgstr "<span weight=\"bold\">Diverse</span>"
@@ -5834,8 +6110,8 @@ msgstr "<span weight=\"bold\">Status</span>"
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:229
-#: calendar/gui/e-calendar-table.c:457 calendar/gui/e-cal-model-tasks.c:345
-#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-cal-model-tasks.c:345 calendar/gui/e-cal-model-tasks.c:658
+#: calendar/gui/e-calendar-table.c:457 calendar/gui/e-itip-control.c:896
 #: calendar/gui/e-meeting-store.c:196 calendar/gui/e-meeting-store.c:219
 #: calendar/gui/print.c:2349
 msgid "Completed"
@@ -5849,8 +6125,8 @@ msgstr "Hög"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:226
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-tasks.c:343
-#: calendar/gui/e-cal-model-tasks.c:656 calendar/gui/e-cal-model-tasks.c:731
+#: calendar/gui/e-cal-model-tasks.c:343 calendar/gui/e-cal-model-tasks.c:656
+#: calendar/gui/e-cal-model-tasks.c:731 calendar/gui/e-calendar-table.c:456
 #: calendar/gui/print.c:2346
 msgid "In Progress"
 msgstr "Pågår"
@@ -5862,16 +6138,15 @@ msgid "Low"
 msgstr "Låg"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:250
-#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:899
-#: mail/message-list.c:1010
+#: calendar/gui/e-cal-component-preview.c:250 calendar/gui/e-cal-model.c:899
+#: calendar/gui/e-calendar-table.c:383 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:236
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-tasks.c:341
-#: calendar/gui/e-cal-model-tasks.c:654 calendar/gui/print.c:2343
+#: calendar/gui/e-cal-model-tasks.c:341 calendar/gui/e-cal-model-tasks.c:654
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/print.c:2343
 msgid "Not Started"
 msgstr "Inte startad"
 
@@ -5901,13 +6176,13 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Webbsida:"
 
-#: calendar/gui/dialogs/task-editor.c:136 calendar/gui/print.c:2300
+#: calendar/gui/dialogs/task-editor.c:137 calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Uppgift"
 
-#: calendar/gui/dialogs/task-editor.c:156
-#: calendar/gui/dialogs/task-editor.c:218
-#: calendar/gui/dialogs/task-editor.c:357
+#: calendar/gui/dialogs/task-editor.c:157
+#: calendar/gui/dialogs/task-editor.c:219
+#: calendar/gui/dialogs/task-editor.c:358
 msgid "Assignment"
 msgstr "Tilldelning"
 
@@ -5920,40 +6195,27 @@ msgstr "Förfallodatumet är fel"
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan inte öppna uppgifter i \"%s\"."
 
-# Finns både med <b> och <span blah blah. Varför?
-# http://bugzilla.ximian.com/show_bug.cgi?id=61078
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "<span weight=\"bold\">Basics</span>"
-msgstr "<span weight=\"bold\">Grundläggande</span>"
-
-# Finns både med <b> och <span blah blah. Varför?
-# http://bugzilla.ximian.com/show_bug.cgi?id=61078
 #: calendar/gui/dialogs/task-page.glade.h:4
-msgid "<span weight=\"bold\">Date and Time</span>"
-msgstr "<span weight=\"bold\">Datum och tid</span>"
-
-#: calendar/gui/dialogs/task-page.glade.h:5
-#, fuzzy
 msgid "Ad_vanced send options"
-msgstr "Avancerade alternativ"
+msgstr "A_vancerade alternativ för skickande"
 
-#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "B_eskrivning:"
 
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:12
 msgid "Sta_rt date:"
 msgstr "Sta_rtdatum:"
 
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:14
 msgid "Task Description"
 msgstr "Uppgiftsbeskrivning"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "_Due date:"
 msgstr "_Förfallodatum:"
 
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/task-page.glade.h:16
 msgid "_Group:"
 msgstr "_Grupp:"
 
@@ -5970,9 +6232,8 @@ msgid "<b>Publishing _Location</b>"
 msgstr "<b>Publiceringsplats</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-#, fuzzy
 msgid "Free/Busy Publishing Settings"
-msgstr "Publicering av ledig/upptagen"
+msgstr "Inställningar för publicering av ledig/upptagen-information"
 
 # Tror det har att göra med "Användaren publicerar"
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
@@ -6091,7 +6352,7 @@ 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:70 mail/em-folder-view.c:2470
+#: calendar/gui/e-cal-component-preview.c:70 mail/em-folder-view.c:2520
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicka för att öppna %s"
@@ -6115,9 +6376,12 @@ msgid "Due Date:"
 msgstr "Förfallodatum:"
 
 #. write status
+#. translators: exchange out of office status header
 #. Status
 #: calendar/gui/e-cal-component-preview.c:222
-#: calendar/gui/e-itip-control.c:1132 plugins/itip-formatter/itip-view.c:882
+#: calendar/gui/e-itip-control.c:1132
+#: plugins/exchange-account-setup/exchange-account-setup.c:129
+#: plugins/itip-formatter/itip-view.c:884
 msgid "Status:"
 msgstr "Status:"
 
@@ -6129,6 +6393,98 @@ msgstr "Prioritet:"
 msgid "Web Page:"
 msgstr "Webbsida:"
 
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Slutdatum"
+
+#: calendar/gui/e-cal-list-view.etspec.h:4
+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:21
+msgid "Summary"
+msgstr "Sammanfattning"
+
+#: calendar/gui/e-cal-model-calendar.c:179 calendar/gui/e-calendar-table.c:434
+msgid "Free"
+msgstr "Ledig"
+
+#: calendar/gui/e-cal-model-calendar.c:182 calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-meeting-time-sel.c:412
+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: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: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: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:299
+msgid "W"
+msgstr "V"
+
+#: calendar/gui/e-cal-model-tasks.c:606
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Den geografiska positionen måste anges i formatet: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1017 calendar/gui/e-cal-model.c:905
+#: calendar/gui/e-meeting-list-view.c:163 calendar/gui/e-meeting-store.c:168
+#: calendar/gui/e-meeting-store.c:178 calendar/gui/e-meeting-store.c:808
+msgid "Yes"
+msgstr "Ja"
+
+#: calendar/gui/e-cal-model-tasks.c:1017 calendar/gui/e-cal-model.c:905
+#: calendar/gui/e-meeting-list-view.c:164 calendar/gui/e-meeting-store.c:180
+msgid "No"
+msgstr "Nej"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:307 calendar/gui/e-cal-model.c:310
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-meeting-list-view.c:139
+#: calendar/gui/e-meeting-list-view.c:153 calendar/gui/e-meeting-store.c:124
+#: calendar/gui/e-meeting-store.c:159 calendar/gui/e-meeting-store.c:224
+#: mail/em-utils.c:1157 plugins/itip-formatter/itip-formatter.c:251
+#: plugins/itip-formatter/itip-formatter.c:1398
+#: plugins/plugin-manager/plugin-manager.c:72 shell/e-component-registry.c:201
+#: shell/e-component-registry.c:205 widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Okänd"
+
+#: calendar/gui/e-cal-model.c:901
+msgid "Recurring"
+msgstr "Återkommande"
+
+#: calendar/gui/e-cal-model.c:903
+msgid "Assigned"
+msgstr "Tilldelad"
+
 #: calendar/gui/e-calendar-table.c:404
 msgid "0%"
 msgstr "0%"
@@ -6173,15 +6529,6 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:434 calendar/gui/e-cal-model-calendar.c:179
-msgid "Free"
-msgstr "Ledig"
-
-#: calendar/gui/e-calendar-table.c:435 calendar/gui/e-cal-model-calendar.c:182
-#: calendar/gui/e-meeting-time-sel.c:412
-msgid "Busy"
-msgstr "Upptagen"
-
 #: calendar/gui/e-calendar-table.c:516
 msgid "Task Table"
 msgstr "Uppgiftstabell"
@@ -6195,12 +6542,12 @@ msgid "Updating objects"
 msgstr "Uppdaterar objekt"
 
 #: calendar/gui/e-calendar-table.c:1014 calendar/gui/e-calendar-view.c:1064
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1241
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: calendar/gui/e-calendar-table.c:1156 calendar/gui/e-calendar-view.c:1389
-#: mail/em-folder-view.c:931 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1156 calendar/gui/e-calendar-view.c:1395
+#: mail/em-folder-view.c:964 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Öppna"
 
@@ -6208,37 +6555,29 @@ msgstr "_Öppna"
 msgid "Open _Web Page"
 msgstr "Öppna _webbsida"
 
-#: calendar/gui/e-calendar-table.c:1158 calendar/gui/e-calendar-view.c:1390
-#: mail/em-folder-view.c:933 mail/em-popup.c:493
-#: ui/evolution-mail-message.xml.h:128
+#: calendar/gui/e-calendar-table.c:1158 calendar/gui/e-calendar-view.c:1396
+#: mail/em-folder-view.c:966 mail/em-popup.c:493
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: calendar/gui/e-calendar-table.c:1159 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-mail-message.xml.h:125
+#: calendar/gui/e-calendar-table.c:1159 calendar/gui/e-calendar-view.c:1376
+#: calendar/gui/e-calendar-view.c:1397 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-mail-message.xml.h:121
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: calendar/gui/e-calendar-table.c:1163 calendar/gui/e-calendar-view.c:1395
+#: calendar/gui/e-calendar-table.c:1163 calendar/gui/e-calendar-view.c:1401
 #: 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:1164 calendar/gui/e-calendar-view.c:1396
-#: composer/e-msg-composer.c:2901 mail/em-folder-tree.c:1036
-#: 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:1165 calendar/gui/e-calendar-view.c:1373
-#: calendar/gui/e-calendar-view.c:1397 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1165 calendar/gui/e-calendar-view.c:1379
+#: calendar/gui/e-calendar-view.c:1403 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
+#: ui/evolution-mail-message.xml.h:119 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Klistra _in"
 
@@ -6259,10 +6598,10 @@ 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:1176 calendar/gui/e-calendar-view.c:1408
-#: mail/em-folder-tree.c:2766 mail/em-folder-view.c:956
+#: calendar/gui/e-calendar-table.c:1176 calendar/gui/e-calendar-view.c:1414
+#: mail/em-folder-tree.c:2814 mail/em-folder-view.c:989
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+#: ui/evolution-mail-message.xml.h:108 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Ta bort"
 
@@ -6300,159 +6639,76 @@ msgstr "Prioritet"
 msgid "Start date"
 msgstr "Startdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-#: calendar/gui/e-cal-list-view.etspec.h:5 mail/mail-dialogs.glade.h:21
-msgid "Summary"
-msgstr "Sammanfattning"
-
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Sortera efter uppgift"
 
-#: calendar/gui/e-calendar-view.c:1179
+#: calendar/gui/e-calendar-view.c:1185
 msgid "Moving items"
 msgstr "Flyttar objekt"
 
-#: calendar/gui/e-calendar-view.c:1181
+#: calendar/gui/e-calendar-view.c:1187
 msgid "Copying items"
 msgstr "Kopierar objekt"
 
-#: calendar/gui/e-calendar-view.c:1364
+#: calendar/gui/e-calendar-view.c:1370
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
-#: calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1371
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsevenemang"
 
-#: calendar/gui/e-calendar-view.c:1367
+#: calendar/gui/e-calendar-view.c:1373
 msgid "New Task"
 msgstr "Ny uppgift"
 
 #. FIXME: hook in this somehow
-#: calendar/gui/e-calendar-view.c:1377
+#: calendar/gui/e-calendar-view.c:1383
 msgid "Current View"
 msgstr "Aktuell vy"
 
-#: calendar/gui/e-calendar-view.c:1379 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1385 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Markera i_dag"
 
-#: calendar/gui/e-calendar-view.c:1380
+#: calendar/gui/e-calendar-view.c:1386
 msgid "_Select Date..."
 msgstr "_Markera datum..."
 
 #. 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
+#: calendar/gui/e-calendar-view.c:1391 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicera ledig-/upptageninformation"
 
-#: calendar/gui/e-calendar-view.c:1401
+#: calendar/gui/e-calendar-view.c:1407
 msgid "Cop_y to Calendar..."
 msgstr "Kopi_era till kalender..."
 
-#: calendar/gui/e-calendar-view.c:1402
+#: calendar/gui/e-calendar-view.c:1408
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytta till kalender..."
 
-#: calendar/gui/e-calendar-view.c:1403
+#: calendar/gui/e-calendar-view.c:1409
 msgid "_Schedule Meeting..."
 msgstr "_Boka sammanträde..."
 
-#: calendar/gui/e-calendar-view.c:1404
+#: calendar/gui/e-calendar-view.c:1410
 msgid "_Forward as iCalendar..."
 msgstr "_Vidarebefordra som iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1409
+#: calendar/gui/e-calendar-view.c:1415
 msgid "Make this Occurrence _Movable"
 msgstr "Gör denna förekomst _flyttbar"
 
-#: calendar/gui/e-calendar-view.c:1410
+#: calendar/gui/e-calendar-view.c:1416
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: calendar/gui/e-calendar-view.c:1411
+#: calendar/gui/e-calendar-view.c:1417
 msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "Slutdatum"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-msgid "Start Date"
-msgstr "Startdatum"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:307 calendar/gui/e-cal-model.c:310
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1290
-#: calendar/gui/e-meeting-list-view.c:139
-#: calendar/gui/e-meeting-list-view.c:153 calendar/gui/e-meeting-store.c:124
-#: calendar/gui/e-meeting-store.c:159 calendar/gui/e-meeting-store.c:224
-#: mail/em-utils.c:1157 plugins/itip-formatter/itip-formatter.c:251
-#: plugins/itip-formatter/itip-formatter.c:1395
-#: plugins/plugin-manager/plugin-manager.c:72 shell/e-component-registry.c:201
-#: shell/e-component-registry.c:205 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Okänd"
-
-#: calendar/gui/e-cal-model.c:901
-msgid "Recurring"
-msgstr "Återkommande"
-
-#: calendar/gui/e-cal-model.c:903
-msgid "Assigned"
-msgstr "Tilldelad"
-
-#: calendar/gui/e-cal-model.c:905 calendar/gui/e-cal-model-tasks.c:1017
-#: calendar/gui/e-meeting-list-view.c:163 calendar/gui/e-meeting-store.c:168
-#: calendar/gui/e-meeting-store.c:178 calendar/gui/e-meeting-store.c:808
-msgid "Yes"
-msgstr "Ja"
-
-#: calendar/gui/e-cal-model.c:905 calendar/gui/e-cal-model-tasks.c:1017
-#: calendar/gui/e-meeting-list-view.c:164 calendar/gui/e-meeting-store.c:180
-msgid "No"
-msgstr "Nej"
-
-# 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: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: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: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:299
-msgid "W"
-msgstr "V"
-
-#: calendar/gui/e-cal-model-tasks.c:606
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Den geografiska positionen måste anges i formatet: \n"
-"\n"
-"45.436845,125.862501"
-
 #. 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.
@@ -6484,17 +6740,10 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:748 calendar/gui/e-week-view.c:512
-#: 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:751 calendar/gui/e-week-view.c:515
-#: calendar/gui/print.c:843
-msgid "pm"
-msgstr "em"
+#: calendar/gui/e-day-view-time-item.c:527
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutdivisioner"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
@@ -6502,15 +6751,22 @@ msgstr "em"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: calendar/gui/e-day-view.c:1494 calendar/gui/e-day-view-top-item.c:715
+#: calendar/gui/e-day-view-top-item.c:715 calendar/gui/e-day-view.c:1494
 #: calendar/gui/e-week-view-main-item.c:312 calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#: calendar/gui/e-day-view-time-item.c:527
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutdivisioner"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:748 calendar/gui/e-week-view.c:512
+#: 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:751 calendar/gui/e-week-view.c:515
+#: calendar/gui/print.c:843
+msgid "pm"
+msgstr "em"
 
 #: calendar/gui/e-itip-control.c:761
 msgid "Yes. (Complex Recurrence)"
@@ -6631,19 +6887,19 @@ msgstr ""
 
 #: calendar/gui/e-itip-control.c:1137 calendar/gui/e-meeting-list-view.c:175
 #: calendar/gui/e-meeting-store.c:188 calendar/gui/e-meeting-store.c:211
-#: calendar/gui/itip-utils.c:422 plugins/itip-formatter/itip-formatter.c:1386
+#: calendar/gui/itip-utils.c:422 plugins/itip-formatter/itip-formatter.c:1389
 msgid "Accepted"
 msgstr "Godtaget"
 
 #: calendar/gui/e-itip-control.c:1141 calendar/gui/itip-utils.c:425
-#: plugins/itip-formatter/itip-formatter.c:1389
+#: plugins/itip-formatter/itip-formatter.c:1392
 msgid "Tentatively Accepted"
 msgstr "Preliminärt godtaget"
 
 #: calendar/gui/e-itip-control.c:1145 calendar/gui/e-meeting-list-view.c:176
 #: calendar/gui/e-meeting-store.c:190 calendar/gui/e-meeting-store.c:213
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
-#: plugins/itip-formatter/itip-formatter.c:1392
+#: plugins/itip-formatter/itip-formatter.c:1395
 msgid "Declined"
 msgstr "Avböjt"
 
@@ -7029,6 +7285,36 @@ msgstr "Delegerat"
 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:444
+#: calendar/gui/e-meeting-time-sel.c:2104
+msgid "%A, %B %d, %Y"
+msgstr "%A %d %B %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %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:448
+#: calendar/gui/e-meeting-time-sel.c:2137 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"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. 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: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:413 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Inte inne"
@@ -7081,42 +7367,12 @@ msgstr "Folk som k_rävs"
 msgid "Required people and _one resource"
 msgstr "Folk som krävs _och en resurs"
 
-#. 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.c:2104
-#: calendar/gui/e-meeting-time-sel-item.c:444
-msgid "%A, %B %d, %Y"
-msgstr "%A %d %B %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %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.c:2137
-#: calendar/gui/e-meeting-time-sel-item.c:448 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"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. 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: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-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Ange lösenordet för %s"
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:2353
+#: calendar/gui/e-tasks.c:763 calendar/gui/gnome-cal.c:2373
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7125,37 +7381,27 @@ msgstr ""
 "Fel vid %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:808
+#: calendar/gui/e-tasks.c:811
 msgid "Loading tasks"
 msgstr "Läser in uppgifter"
 
-#: calendar/gui/e-tasks.c:890
+#: calendar/gui/e-tasks.c:895
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Öppnar uppgifter i %s"
 
-#: calendar/gui/e-tasks.c:1086
+#: calendar/gui/e-tasks.c:1091
 msgid "Completing tasks..."
 msgstr "Färdigställer uppgifter..."
 
-#: calendar/gui/e-tasks.c:1109
+#: calendar/gui/e-tasks.c:1114
 msgid "Deleting selected objects..."
 msgstr "Tar bort markerade objekt..."
 
-#: calendar/gui/e-tasks.c:1136
+#: calendar/gui/e-tasks.c:1141
 msgid "Expunging"
 msgstr "Tömmer"
 
-#: calendar/gui/e-tasks.c:1214
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: calendar/gui/print.c:1822 calendar/gui/tasks-component.c:408
-#: calendar/gui/tasks-component.c:881 calendar/gui/tasks-control.c:408
-#: calendar/importers/icalendar-importer.c:83
-#: calendar/importers/icalendar-importer.c:701
-#: plugins/groupwise-account-setup/camel-gw-listener.c:383
-msgid "Tasks"
-msgstr "Uppgifter"
-
 #: calendar/gui/e-timezone-entry.c:133
 msgid "Timezone Button"
 msgstr "Tidszonsknapp"
@@ -7184,66 +7430,25 @@ msgstr "Spara anpassad vy"
 msgid "Define Views..."
 msgstr "Definiera vyer..."
 
-#: calendar/gui/gnome-cal.c:2207
+#: calendar/gui/gnome-cal.c:2223
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Läser in möten i %s"
 
-#: calendar/gui/gnome-cal.c:2226
+#: calendar/gui/gnome-cal.c:2242
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Läser in uppgifter i %s"
 
-#: calendar/gui/gnome-cal.c:2319
+#: calendar/gui/gnome-cal.c:2339
 #, c-format
 msgid "Opening %s"
 msgstr "Öppnar %s"
 
-#: calendar/gui/gnome-cal.c:3209
+#: calendar/gui/gnome-cal.c:3229
 msgid "Purging"
 msgstr "Tömmer"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender och uppgifter"
-
-#: 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:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolutionkalender och -uppgifter"
-
-#: 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:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolutionkalenderns schemaläggningsmeddelandevisare"
-
-#: 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:8
-msgid "Evolution's Calendar component"
-msgstr "Evolutions kalenderkomponent"
-
-#: 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:11
-msgid "_Calendars"
-msgstr "_Kalendrar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Uppgifter"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -9295,87 +9500,6 @@ msgstr "Stilla_Havet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stilla_Havet/Yap"
 
-#: composer/e-msg-composer.c:727
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Kan inte signera utgående meddelande: Inget signeringscertifikat angivet för "
-"detta konto"
-
-#: composer/e-msg-composer.c:734
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Kan inte kryptera utgående meddelande: Inget krypteringscertifikat angivet "
-"för detta konto"
-
-#: composer/e-msg-composer.c:1233 composer/e-msg-composer.c:1254
-msgid "Unknown reason"
-msgstr "Okänd anledning"
-
-#: composer/e-msg-composer.c:1291
-msgid "Could not open file"
-msgstr "Kunde inte öppna fil"
-
-#: composer/e-msg-composer.c:1299
-msgid "Unable to retrieve message from editor"
-msgstr "Kunde inte hämta meddelande från redigeraren"
-
-#: composer/e-msg-composer.c:1569
-msgid "Untitled Message"
-msgstr "Namnlöst meddelande"
-
-#: composer/e-msg-composer.c:1599
-msgid "Open file"
-msgstr "Öppna fil"
-
-#: composer/e-msg-composer.c:2006 mail/em-account-editor.c:578
-#: mail/em-account-editor.c:623 mail/em-account-editor.c:690
-msgid "Autogenerated"
-msgstr "Automatiskt genererad"
-
-#: composer/e-msg-composer.c:2105
-msgid "Si_gnature:"
-msgstr "Si_gnatur:"
-
-#: composer/e-msg-composer.c:2364 composer/e-msg-composer.c:3355
-#: composer/e-msg-composer.c:3356
-msgid "Compose a message"
-msgstr "Skriv ett meddelande"
-
-#: composer/e-msg-composer.c:2671
-#, c-format
-msgid "Attached message - %s"
-msgstr "Bifogat meddelande - %s"
-
-#. translators, this count will always be >1
-#: composer/e-msg-composer.c:2676 composer/e-msg-composer.c:2839
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "Bifogat meddelande"
-msgstr[1] "%d bifogade meddelanden"
-
-#: composer/e-msg-composer.c:2902 mail/em-folder-tree.c:1037
-#: mail/em-folder-tree.c:2263 mail/em-folder-view.c:827
-#: mail/message-list.c:1713
-msgid "_Move"
-msgstr "_Flytta"
-
-#: composer/e-msg-composer.c:2904 mail/em-folder-tree.c:1039
-#: mail/message-list.c:1715
-msgid "Cancel _Drag"
-msgstr "Avbryt _dragning"
-
-#: composer/e-msg-composer.c:4536
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Redigeraren innehåller ett meddelande som inte är text och som inte kan "
-"redigeras.)<b>"
-
 #: composer/e-msg-composer-hdrs.c:519
 msgid "Posting destination"
 msgstr "Postdestination"
@@ -9456,6 +9580,64 @@ msgstr "Klicka här för att välja mappar att posta till"
 msgid "Post To:"
 msgstr "Posta till:"
 
+#: composer/e-msg-composer.c:730
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Kan inte signera utgående meddelande: Inget signeringscertifikat angivet för "
+"detta konto"
+
+#: composer/e-msg-composer.c:737
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Kan inte kryptera utgående meddelande: Inget krypteringscertifikat angivet "
+"för detta konto"
+
+#: composer/e-msg-composer.c:1222 composer/e-msg-composer.c:1255
+msgid "Unknown reason"
+msgstr "Okänd anledning"
+
+#: composer/e-msg-composer.c:1292
+msgid "Could not open file"
+msgstr "Kunde inte öppna fil"
+
+#: composer/e-msg-composer.c:1300
+msgid "Unable to retrieve message from editor"
+msgstr "Kunde inte hämta meddelande från redigeraren"
+
+#: composer/e-msg-composer.c:1570
+msgid "Untitled Message"
+msgstr "Namnlöst meddelande"
+
+#. NB: This function is never used anymore
+#: composer/e-msg-composer.c:1604
+msgid "Open File"
+msgstr "Öppna fil"
+
+#: composer/e-msg-composer.c:2001 mail/em-account-editor.c:578
+#: mail/em-account-editor.c:623 mail/em-account-editor.c:690
+msgid "Autogenerated"
+msgstr "Automatiskt genererad"
+
+#: composer/e-msg-composer.c:2100
+msgid "Si_gnature:"
+msgstr "Si_gnatur:"
+
+#: composer/e-msg-composer.c:2359 composer/e-msg-composer.c:3360
+#: composer/e-msg-composer.c:3361
+msgid "Compose a message"
+msgstr "Skriv ett meddelande"
+
+#: composer/e-msg-composer.c:4541
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Redigeraren innehåller ett meddelande som inte är text och som inte kan "
+"redigeras.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
@@ -9654,7 +9836,6 @@ msgid "<b>Out of Office Message:</b>"
 msgstr "<b>Inte inne-meddelande:</b>"
 
 #: designs/OOA/ooa.glade.h:5
-#: plugins/exchange-account-setup/exchange-account-setup.c:106
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
@@ -9759,16 +9940,11 @@ msgstr ""
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: e-util/eggtrayicon.c:119
-#, fuzzy
-msgid "The orientation of the tray."
-msgstr "Beskrivning av bilagan."
-
-#: e-util/e-passwords.c:468
+#: e-util/e-passwords.c:472
 msgid "_Remember this password"
 msgstr "_Kom ihåg detta lösenord"
 
-#: e-util/e-passwords.c:469
+#: e-util/e-passwords.c:473
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Kom ihåg detta lösenord för resten av denna session"
 
@@ -9870,6 +10046,11 @@ msgstr "%H.%M"
 msgid "%I %p"
 msgstr "%I %p"
 
+#: e-util/eggtrayicon.c:119
+#, fuzzy
+msgid "The orientation of the tray."
+msgstr "Beskrivning av bilagan."
+
 #: filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
@@ -9997,6 +10178,71 @@ msgstr "Välj ett annat namn."
 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:75 mail/mail-config.glade.h:90
+msgid "Important"
+msgstr "viktigt"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:78
+#: mail/mail-config.glade.h:140
+msgid "To Do"
+msgstr "Att-göra"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:79
+#: mail/mail-config.glade.h:93
+msgid "Later"
+msgstr "Senare"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+msgid "_Rule name:"
+msgstr "_Regelnamn:"
+
+#: filter/filter-rule.c:818
+msgid "<b>If</b>"
+msgstr "<b>Om</b>"
+
+#: filter/filter-rule.c:855
+msgid "if all criteria are met"
+msgstr "om alla villkor uppfylls"
+
+#: filter/filter-rule.c:855
+msgid "if any criteria are met"
+msgstr "om några villkor uppfylls"
+
+#: filter/filter-rule.c:857
+msgid "Execute actions"
+msgstr "Utför åtgärder"
+
+#: filter/filter-rule.c:878
+msgid "All related"
+msgstr "Alla relaterade"
+
+#: filter/filter-rule.c:878
+msgid "Replies"
+msgstr "Svar"
+
+#: filter/filter-rule.c:878
+msgid "Replies and parents"
+msgstr "Svar och föräldrar"
+
+#: filter/filter-rule.c:880
+msgid "Include threads"
+msgstr "Inkludera trådar"
+
+#: filter/filter-rule.c:975 filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Inkommande"
+
+#: filter/filter-rule.c:975
+msgid "Outgoing"
+msgstr "Utgående"
+
 #: filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>_Filterregler</b>"
@@ -10005,10 +10251,6 @@ msgstr "<b>_Filterregler</b>"
 msgid "Compare against"
 msgstr "Jämför med"
 
-#: filter/filter.glade.h:3 filter/filter-rule.c:975
-msgid "Incoming"
-msgstr "Inkommande"
-
 #: filter/filter.glade.h:4
 msgid "Show filters for mail:"
 msgstr "Visa filter för e-post:"
@@ -10066,78 +10308,80 @@ msgstr "den tid du anger"
 msgid "years"
 msgstr "år"
 
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:75 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "viktigt"
+#: filter/rule-editor.c:285
+msgid "Add Rule"
+msgstr "Lägg till regel"
 
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:78
-#: mail/mail-config.glade.h:140
-msgid "To Do"
-msgstr "Att-göra"
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
+msgstr "Redigera regel"
 
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:79
-#: mail/mail-config.glade.h:93
-msgid "Later"
-msgstr "Senare"
+#: filter/rule-editor.c:685
+msgid "Rule name"
+msgstr "Regelnamn"
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Redigerarinställningar"
 
-#: filter/filter-rule.c:790
-msgid "_Rule name:"
-msgstr "_Regelnamn:"
+#: 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"
 
-#: filter/filter-rule.c:818
-msgid "<b>If</b>"
-msgstr "<b>Om</b>"
+#: 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"
 
-#: filter/filter-rule.c:855
-msgid "if all criteria are met"
-msgstr "om alla villkor uppfylls"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Konfigurera dina e-postkonton här"
 
-#: filter/filter-rule.c:855
-msgid "if any criteria are met"
-msgstr "om några villkor uppfylls"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolutions e-post"
 
-#: filter/filter-rule.c:857
-msgid "Execute actions"
-msgstr "Utför åtgärder"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolutions e-posts konfigurationskontroll för konton"
 
-#: filter/filter-rule.c:878
-msgid "All related"
-msgstr "Alla relaterade"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolutions e-postkomponent"
 
-#: filter/filter-rule.c:878
-msgid "Replies"
-msgstr "Svar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolutions e-postredigerare"
 
-#: filter/filter-rule.c:878
-msgid "Replies and parents"
-msgstr "Svar och föräldrar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolutions e-postredigerarkonfigurationskontroll"
 
-#: filter/filter-rule.c:880
-msgid "Include threads"
-msgstr "Inkludera trådar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail preferences control"
+msgstr "Evolutions e-postinställningskontroll"
 
-#: filter/filter-rule.c:975
-msgid "Outgoing"
-msgstr "Utgående"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:471
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:536
+#: mail/mail-component.c:587
+msgid "Mail"
+msgstr "E-post"
 
-#: filter/rule-editor.c:285
-msgid "Add Rule"
-msgstr "Lägg till regel"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Mail Accounts"
+msgstr "E-postkonton"
 
-#: filter/rule-editor.c:361
-msgid "Edit Rule"
-msgstr "Redigera regel"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:95
+msgid "Mail Preferences"
+msgstr "E-postinställningar"
 
-#: filter/rule-editor.c:685
-msgid "Rule name"
-msgstr "Regelnamn"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "_Mail"
+msgstr "_E-post"
 
 #: mail/em-account-editor.c:377
 #, c-format
@@ -10158,24 +10402,24 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Välj mapp"
 
-#: mail/em-account-editor.c:1813
+#: mail/em-account-editor.c:1817
 msgid "Automatically check for _new mail every"
 msgstr "Kontrollera automatiskt _ny e-post var"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: mail/em-account-editor.c:2082 mail/em-account-editor.c:2160
+#: mail/em-account-editor.c:2086 mail/em-account-editor.c:2164
 msgid "Receiving Options"
 msgstr "Alternativ för mottagning"
 
-#: mail/em-account-editor.c:2083 mail/em-account-editor.c:2161
+#: mail/em-account-editor.c:2087 mail/em-account-editor.c:2165
 msgid "Checking for New Mail"
 msgstr "Kontroll av ny e-post"
 
-#: mail/em-account-editor.c:2505 mail/mail-config.glade.h:33
+#: mail/em-account-editor.c:2509 mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "Kontoredigerare"
 
-#: mail/em-account-editor.c:2505 mail/mail-config.glade.h:79
+#: mail/em-account-editor.c:2509 mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoassistent"
 
@@ -10192,20 +10436,20 @@ msgstr "Kontonamn"
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:306 mail/em-composer-prefs.c:425
+#: mail/em-composer-prefs.c:306 mail/em-composer-prefs.c:429
 #: mail/mail-config.c:934
 msgid "Unnamed"
 msgstr "Namnlös"
 
-#: mail/em-composer-prefs.c:890
+#: mail/em-composer-prefs.c:894
 msgid "Language(s)"
 msgstr "Språk"
 
-#: mail/em-composer-prefs.c:933
+#: mail/em-composer-prefs.c:937
 msgid "Add signature script"
 msgstr "Lägg till signaturskript"
 
-#: mail/em-composer-prefs.c:953
+#: mail/em-composer-prefs.c:957
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
@@ -10366,7 +10610,7 @@ msgstr "Skräp"
 msgid "Junk Test"
 msgstr "Skräptest"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:964
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:997
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etikett"
@@ -10477,8 +10721,8 @@ msgstr "börjar med"
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: mail/em-filter-i18n.h:65 mail/em-format.c:853 mail/em-format-html.c:1533
-#: mail/em-format-quote.c:306 mail/em-mailer-prefs.c:88
+#: mail/em-filter-i18n.h:65 mail/em-format-html.c:1533
+#: 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
 #: plugins/shared-folder/properties.glade.h:7 smime/lib/e-cert.c:1131
 msgid "Subject"
@@ -10494,27 +10738,27 @@ msgid "<b>Then</b>"
 msgstr "<b>Då</b>"
 
 #: mail/em-folder-browser.c:133
-msgid "Create _Virtual Folder From Search..."
+msgid "Create _vFolder From Search..."
 msgstr "Skapa _virtuell mapp från sökning..."
 
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:143
+#: mail/em-folder-properties.c:144
 msgid "Total message:"
 msgid_plural "Total messages:"
 msgstr[0] "Totalt antal meddelande:"
 msgstr[1] "Totalt antal meddelanden:"
 
-#: mail/em-folder-properties.c:155
+#: mail/em-folder-properties.c:156
 msgid "Unread message:"
 msgid_plural "Unread messages:"
 msgstr[0] "Oläst meddelande:"
 msgstr[1] "Olästa meddelanden:"
 
-#: mail/em-folder-properties.c:270 plugins/shared-folder/properties.glade.h:3
+#: mail/em-folder-properties.c:278 plugins/shared-folder/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Mappegenskaper"
 
-#: mail/em-folder-selection-button.c:121
+#: mail/em-folder-selection-button.c:123
 msgid "<click here to select a folder>"
 msgstr "<klicka här för att välja en mapp>"
 
@@ -10522,8 +10766,8 @@ 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:2479
-#: mail/mail-component.c:734 plugins/shared-folder/install-shared.c:144
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2527
+#: mail/mail-component.c:739 plugins/shared-folder/install-shared.c:144
 #: plugins/shared-folder/share-folder-common.c:345
 msgid "Specify where to create the folder:"
 msgstr "Ange var mappen ska skapas:"
@@ -10536,441 +10780,297 @@ msgstr "Skapa"
 msgid "Folder _name:"
 msgstr "Mapp_namn:"
 
-#: mail/em-folder-tree.c:678
-#, fuzzy
+#: mail/em-folder-tree-model.c:201 mail/em-folder-tree-model.c:203
+#: mail/mail-vfolder.c:899 mail/mail-vfolder.c:969
+msgid "vFolders"
+msgstr "Virtuella mappar"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:207 mail/em-folder-tree-model.c:209
+msgid "UNMATCHED"
+msgstr "OMATCHADE"
+
+#: mail/em-folder-tree-model.c:468 mail/mail-component.c:139
+msgid "Drafts"
+msgstr "Utkast"
+
+#. translators: standard local mailbox names
+#: mail/em-folder-tree-model.c:471 mail/mail-component.c:138
+msgid "Inbox"
+msgstr "Inkorg"
+
+#: mail/em-folder-tree-model.c:474 mail/mail-component.c:140
+msgid "Outbox"
+msgstr "Utkorg"
+
+#: mail/em-folder-tree-model.c:476 mail/mail-component.c:141
+msgid "Sent"
+msgstr "Skickat"
+
+#: mail/em-folder-tree-model.c:495 mail/em-folder-tree-model.c:799
+msgid "Loading..."
+msgstr "Läser in..."
+
+#: mail/em-folder-tree.c:688
 msgid "Mail Folder Tree"
-msgstr "E-post_mapp"
+msgstr "E-postmappträd"
 
-#: mail/em-folder-tree.c:911
+#: mail/em-folder-tree.c:921
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flyttar mappen %s"
 
-#: mail/em-folder-tree.c:913
+#: mail/em-folder-tree.c:923
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierar mappen %s"
 
-#: mail/em-folder-tree.c:920 mail/message-list.c:1617
+#: mail/em-folder-tree.c:930 mail/message-list.c:1617
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flyttar meddelanden till mappen %s"
 
-#: mail/em-folder-tree.c:922 mail/message-list.c:1619
+#: mail/em-folder-tree.c:932 mail/message-list.c:1619
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierar meddelanden till mappen %s"
 
-#: mail/em-folder-tree.c:938
+#: mail/em-folder-tree.c:948
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan inte släppa meddelanden i ett lager på översta nivån"
 
-#: mail/em-folder-tree.c:1034 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:1044 ui/evolution-mail-message.xml.h:106
 msgid "_Copy to Folder"
 msgstr "_Kopiera till mapp"
 
-#: mail/em-folder-tree.c:1035 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:1045 ui/evolution-mail-message.xml.h:115
 msgid "_Move to Folder"
 msgstr "_Flytta till mapp"
 
-#: mail/em-folder-tree.c:1734 mail/mail-ops.c:1017
+#: mail/em-folder-tree.c:1750 mail/mail-ops.c:1026
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
-#: mail/em-folder-tree.c:2007
+#: mail/em-folder-tree.c:2023
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopierar \"%s\" till \"%s\""
 
-#: mail/em-folder-tree.c:2249 mail/em-folder-tree.c:2263
-#: mail/em-folder-view.c:827 mail/em-folder-view.c:842
+#: mail/em-folder-tree.c:2297 mail/em-folder-tree.c:2311
+#: mail/em-folder-view.c:860 mail/em-folder-view.c:875
 #: 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:2249 mail/em-folder-view.c:842
+#: mail/em-folder-tree.c:2297 mail/em-folder-view.c:875
 msgid "C_opy"
 msgstr "_Kopiera"
 
-#: mail/em-folder-tree.c:2290 plugins/shared-folder/share-folder-common.c:138
+#: mail/em-folder-tree.c:2338 plugins/shared-folder/share-folder-common.c:138
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Skapar mappen \"%s\""
 
-#: mail/em-folder-tree.c:2479 mail/mail-component.c:734
+#: mail/em-folder-tree.c:2527 mail/mail-component.c:739
 #: plugins/shared-folder/install-shared.c:144
 #: plugins/shared-folder/share-folder-common.c:345
 msgid "Create folder"
 msgstr "Skapa mapp"
 
-#: mail/em-folder-tree.c:2672
+#: mail/em-folder-tree.c:2720
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Byt namn på mappen \"%s\" till:"
 
-#: mail/em-folder-tree.c:2674
+#: mail/em-folder-tree.c:2722
 msgid "Rename Folder"
 msgstr "Byt namn på mapp"
 
-#: mail/em-folder-tree.c:2680
+#: mail/em-folder-tree.c:2728
 msgid "Folder names cannot contain '/'"
 msgstr "Mappnamn kan inte innehålla \"/\""
 
-#: mail/em-folder-tree.c:2754 ui/evolution-addressbook.xml.h:44
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
+#: mail/em-folder-tree.c:2802 ui/evolution-addressbook.xml.h:44
+#: ui/evolution-mail-global.xml.h:17 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Visa"
 
-#: mail/em-folder-tree.c:2755
+#: mail/em-folder-tree.c:2803
 msgid "Open in _New Window"
 msgstr "Öppna i _nytt fönster"
 
-#: mail/em-folder-tree.c:2759
+#: mail/em-folder-tree.c:2807
 msgid "_Copy..."
 msgstr "_Kopiera..."
 
-#: mail/em-folder-tree.c:2760
+#: mail/em-folder-tree.c:2808
 msgid "_Move..."
 msgstr "_Flytta..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2764
+#: mail/em-folder-tree.c:2812
 msgid "_New Folder..."
 msgstr "_Ny mapp..."
 
-#: mail/em-folder-tree.c:2767
+#: mail/em-folder-tree.c:2815
 msgid "_Rename..."
 msgstr "_Byt namn..."
 
-#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
-#: mail/mail-vfolder.c:899
-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 "OMATCHADE"
-
-#. Inbox is always first
-#. translators: standard local mailbox names
-#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
-#: mail/mail-component.c:138
-msgid "Inbox"
-msgstr "Inkorg"
-
-#: mail/em-folder-tree-model.c:491 mail/em-folder-tree-model.c:795
-msgid "Loading..."
-msgstr "Läser in..."
-
-#: mail/em-folder-view.c:438 mail/GNOME_Evolution_Mail.server.in.in.h:11
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:531
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "E-post"
-
-#: mail/em-folder-view.c:932 ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:965 ui/evolution-mail-message.xml.h:109
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
 
-#: mail/em-folder-view.c:934
+#: mail/em-folder-view.c:967
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: mail/em-folder-view.c:937 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:970 ui/evolution-mail-message.xml.h:123
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsändaren"
 
-#: mail/em-folder-view.c:938 mail/em-popup.c:497
+#: mail/em-folder-view.c:971 mail/em-popup.c:497
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: mail/em-folder-view.c:939 mail/em-popup.c:498
+#: mail/em-folder-view.c:972 mail/em-popup.c:498
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: mail/em-folder-view.c:940 mail/em-popup.c:500
-#: ui/evolution-mail-message.xml.h:114
+#: mail/em-folder-view.c:973 mail/em-popup.c:500
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:976
 msgid "Follo_w Up..."
 msgstr "Föl_j upp..."
 
-#: mail/em-folder-view.c:944
+#: mail/em-folder-view.c:977
 msgid "Fla_g Completed"
 msgstr "Fla_gga färdig"
 
-#: mail/em-folder-view.c:945
+#: mail/em-folder-view.c:978
 msgid "Cl_ear Flag"
 msgstr "T_öm flagga"
 
-#: mail/em-folder-view.c:948 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:981 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "_Markera som läst"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:982
 msgid "Mark as _Unread"
 msgstr "Markera som _oläst"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:983
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: mail/em-folder-view.c:951
+#: mail/em-folder-view.c:984
 msgid "_Mark as Unimportant"
 msgstr "Markera som ovi_ktigt"
 
-#: mail/em-folder-view.c:952 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:985 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Markera som _skräp"
 
-#: mail/em-folder-view.c:953 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:986 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Markera som _inte skräp"
 
-#: mail/em-folder-view.c:957
+#: mail/em-folder-view.c:990
 msgid "U_ndelete"
 msgstr "_Ångra borttagning"
 
-#: mail/em-folder-view.c:960
+#: mail/em-folder-view.c:993
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytta till mapp..."
 
-#: mail/em-folder-view.c:961 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:994 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: mail/em-folder-view.c:969
+#: mail/em-folder-view.c:1002
 msgid "Add Sender to Address_book"
 msgstr "Lägg till avsändaren i adress_boken"
 
-#: mail/em-folder-view.c:972
+#: mail/em-folder-view.c:1005
 msgid "Appl_y Filters"
 msgstr "Till_ämpa filter"
 
-#: mail/em-folder-view.c:973
+#: mail/em-folder-view.c:1006
 msgid "F_ilter Junk"
 msgstr "F_iltrera skräp"
 
-#: mail/em-folder-view.c:976
+#: mail/em-folder-view.c:1009
 msgid "Crea_te Rule From Message"
 msgstr "Ska_pa regel från meddelande"
 
-#: mail/em-folder-view.c:977
-msgid "VFolder on _Subject"
+#: mail/em-folder-view.c:1010
+msgid "vFolder on _Subject"
 msgstr "Virtuell mapp på _ämne"
 
-#: mail/em-folder-view.c:978
-msgid "VFolder on Se_nder"
+#: mail/em-folder-view.c:1011
+msgid "vFolder on Se_nder"
 msgstr "Virtuell mapp på _avsändare"
 
-#: mail/em-folder-view.c:979
-msgid "VFolder on _Recipients"
+#: mail/em-folder-view.c:1012
+msgid "vFolder on _Recipients"
 msgstr "Virtuell mapp på _mottagare"
 
-#: mail/em-folder-view.c:980
-msgid "VFolder on Mailing _List"
+#: mail/em-folder-view.c:1013
+msgid "vFolder on Mailing _List"
 msgstr "Virtuell mapp på sänd_lista"
 
-#: mail/em-folder-view.c:984
+#: mail/em-folder-view.c:1017
 msgid "Filter on Sub_ject"
 msgstr "Filtrera på _ämne"
 
-#: mail/em-folder-view.c:985
+#: mail/em-folder-view.c:1018
 msgid "Filter on Sen_der"
 msgstr "Filtrera på _avsändare"
 
-#: mail/em-folder-view.c:986
+#: mail/em-folder-view.c:1019
 msgid "Filter on Re_cipients"
 msgstr "Filtrera på _mottagare"
 
-#: mail/em-folder-view.c:987
+#: mail/em-folder-view.c:1020
 msgid "Filter on _Mailing List"
 msgstr "Filtrera på sä_ndlista"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1764 mail/em-folder-view.c:1807
+#: mail/em-folder-view.c:1797 mail/em-folder-view.c:1841
 msgid "Default"
 msgstr "Standard"
 
-#: mail/em-folder-view.c:1903
+#: mail/em-folder-view.c:1940
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/em-folder-view.c:2182
+#: mail/em-folder-view.c:2229
 msgid "_Copy Link Location"
 msgstr "_Kopiera länkplats"
 
-#: mail/em-folder-view.c:2465
+#: mail/em-folder-view.c:2515
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicka för att skicka e-post till %s"
 
-#: mail/em-format.c:848 mail/em-format-html.c:1424 mail/em-format-quote.c:193
-#: 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.c:849 mail/em-format-html.c:1424 mail/em-format-quote.c:193
-#: mail/em-mailer-prefs.c:84
-msgid "Reply-To"
-msgstr "Svara till"
-
-#: mail/em-format.c:850 mail/em-format-html.c:1424 mail/em-format-quote.c:193
-#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Till"
-
-#: mail/em-format.c:851 mail/em-format-html.c:1424 mail/em-format-quote.c:193
-#: mail/em-mailer-prefs.c:86
-msgid "Cc"
-msgstr "Kopia"
-
-#: mail/em-format.c:852 mail/em-format-html.c:1424 mail/em-format-quote.c:193
-#: mail/em-mailer-prefs.c:87
-msgid "Bcc"
-msgstr "Blindkopia"
-
-#: mail/em-format.c:854 mail/em-format-html.c:1577 mail/em-format-quote.c:322
-#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
-#: mail/em-format.c:855 mail/em-format-html.c:1600 mail/em-mailer-prefs.c:90
-msgid "Newsgroups"
-msgstr "Diskussionsgrupper"
-
-#: mail/em-format.c:1104
-#, c-format
-msgid "%s attachment"
-msgstr "%s-bilaga"
-
-#: mail/em-format.c:1143 mail/em-format.c:1276
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunde inte tolka S/MIME-meddelande: Okänt fel"
-
-#: mail/em-format.c:1266
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Krypteringstypen stöds inte för multipart/encrypted"
-
-#: 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:1433
-msgid "Unsupported signature format"
-msgstr "Signaturformatet stöds inte"
-
-#: mail/em-format.c:1441
-msgid "Error verifying signature"
-msgstr "Fel vid verifiering av signatur"
-
-#: mail/em-format.c:1441
-msgid "Unknown error verifying signature"
-msgstr "Oknt fel vid verifiering av signatur"
-
-#: mail/em-format-html.c:472 mail/em-format-html.c:474
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Hämtar \"%s\""
-
-#: mail/em-format-html.c:579 mail/em-format-html-display.c:645
-msgid "Unsigned"
-msgstr "Osignerat"
-
-#: mail/em-format-html.c:580 mail/em-format-html-display.c:646
-msgid "Valid signature"
-msgstr "Giltig signatur"
-
-#: mail/em-format-html.c:581 mail/em-format-html-display.c:647
-msgid "Invalid signature"
-msgstr "Ogiltig signatur"
-
-#: mail/em-format-html.c:582
-msgid "Valid signature but cannot verify sender"
-msgstr "Giltig signatur men kan inte verifiera avsändaren"
-
-#: mail/em-format-html.c:588 mail/em-format-html-display.c:654
-msgid "Unencrypted"
-msgstr "Okrypterat"
-
-#: mail/em-format-html.c:589 mail/em-format-html-display.c:655
-msgid "Encrypted, weak"
-msgstr "Krypterat, svagt"
-
-#: mail/em-format-html.c:590 mail/em-format-html-display.c:656
-msgid "Encrypted"
-msgstr "Krypterat"
-
-#: mail/em-format-html.c:591 mail/em-format-html-display.c:657
-msgid "Encrypted, strong"
-msgstr "Krypterat, starkt"
-
-#: mail/em-format-html.c:840
-msgid "Malformed external-body part."
-msgstr "Felaktig del med extern meddelandetext."
-
-#: mail/em-format-html.c:870
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pekare till FTP-plats (%s)"
-
-#: mail/em-format-html.c:881
-#, 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:883
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pekare till lokal fil (%s)"
-
-#: mail/em-format-html.c:904
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pekare till fjärrdata (%s)"
-
-#: mail/em-format-html.c:915
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pekare till okänd extern data (typen \"%s\")"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Formaterar meddelande"
-
-#. pseudo-header
-#: mail/em-format-html.c:1537 mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:986
-msgid "Mailer"
-msgstr "E-postprogram"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1564
-msgid "<I> (%a, %R %Z)</I>"
-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:1567
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%H.%M %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:412
 #, c-format
 msgid "Matches: %d"
 msgstr "Träffar: %d"
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:680 mail/em-format-html.c:579
+msgid "Unsigned"
+msgstr "Osignerat"
+
+#: mail/em-format-html-display.c:680
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10978,7 +11078,11 @@ msgstr ""
 "Detta meddelande är inte signerat. Det finns ingen garanti att detta "
 "meddelande är autentiskt."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:681 mail/em-format-html.c:580
+msgid "Valid signature"
+msgstr "Giltig signatur"
+
+#: mail/em-format-html-display.c:681
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10986,7 +11090,11 @@ msgstr ""
 "Detta meddelande är signerat och giltigt, vilket betyder att det är mycket "
 "sannolikt att meddelandet är autentiskt."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:682 mail/em-format-html.c:581
+msgid "Invalid signature"
+msgstr "Ogiltig signatur"
+
+#: mail/em-format-html-display.c:682
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10994,11 +11102,11 @@ msgstr ""
 "Signaturen för detta meddelande kan inte verifieras. Den kan ha ändrats "
 "under överföringen."
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:683
 msgid "Valid signature, cannot verify sender"
 msgstr "Giltig signatur, kan inte verifiera avsändaren"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:683
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11006,7 +11114,11 @@ msgstr ""
 "Detta meddelande är signerat med en giltig signatur, men meddelandets "
 "avsändare kan inte verifieras."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:689 mail/em-format-html.c:588
+msgid "Unencrypted"
+msgstr "Okrypterat"
+
+#: mail/em-format-html-display.c:689
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11014,7 +11126,11 @@ msgstr ""
 "Detta meddelande är inte krypterat. Dess innehåll kan ses i överföringen på "
 "Internet."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:690 mail/em-format-html.c:589
+msgid "Encrypted, weak"
+msgstr "Krypterat, svagt"
+
+#: mail/em-format-html-display.c:690
 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 "
@@ -11024,7 +11140,11 @@ msgstr ""
 "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:656
+#: mail/em-format-html-display.c:691 mail/em-format-html.c:590
+msgid "Encrypted"
+msgstr "Krypterat"
+
+#: mail/em-format-html-display.c:691
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11032,7 +11152,11 @@ 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:657
+#: mail/em-format-html-display.c:692 mail/em-format-html.c:591
+msgid "Encrypted, strong"
+msgstr "Krypterat, starkt"
+
+#: mail/em-format-html-display.c:692
 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 "
@@ -11042,35 +11166,35 @@ msgstr ""
 "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:758 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:793 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Visa certifikat"
 
-#: mail/em-format-html-display.c:773
+#: mail/em-format-html-display.c:808
 msgid "This certificate is not viewable"
 msgstr "Detta certifikatet är inte visningsbart"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1037
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Färdigställt den %d %B %Y %k.%M"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1045
 msgid "Overdue:"
 msgstr "Skulle ha utförts:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1048
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "den %d %B %Y %k.%M"
 
-#: mail/em-format-html-display.c:1060
+#: mail/em-format-html-display.c:1095
 msgid "_View Inline"
 msgstr "_Visa inuti"
 
-#: mail/em-format-html-display.c:1061
+#: mail/em-format-html-display.c:1096
 msgid "_Hide"
 msgstr "_Dölj"
 
-#: mail/em-format-html-display.c:1305
+#: mail/em-format-html-display.c:1340
 msgid "Attachment Button"
 msgstr "Bilageknapp"
 
@@ -11079,6 +11203,128 @@ msgstr "Bilageknapp"
 msgid "Page %d of %d"
 msgstr "Sida %d av %d"
 
+#: mail/em-format-html.c:472 mail/em-format-html.c:474
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Hämtar \"%s\""
+
+#: mail/em-format-html.c:582
+msgid "Valid signature but cannot verify sender"
+msgstr "Giltig signatur men kan inte verifiera avsändaren"
+
+#: mail/em-format-html.c:840
+msgid "Malformed external-body part."
+msgstr "Felaktig del med extern meddelandetext."
+
+#: mail/em-format-html.c:870
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pekare till FTP-plats (%s)"
+
+#: mail/em-format-html.c:881
+#, 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:883
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pekare till lokal fil (%s)"
+
+#: mail/em-format-html.c:904
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pekare till fjärrdata (%s)"
+
+#: mail/em-format-html.c:915
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pekare till okänd extern data (typen \"%s\")"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Formaterar meddelande"
+
+#: mail/em-format-html.c:1424 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:1424 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:1424 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:1424 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:1424 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:1537 mail/em-format-quote.c:315
+#: mail/em-mailer-prefs.c:986
+msgid "Mailer"
+msgstr "E-postprogram"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1564
+msgid "<I> (%a, %R %Z)</I>"
+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:1567
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%H.%M %Z)</I>"
+
+#: mail/em-format-html.c:1577 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:1600 mail/em-format.c:855 mail/em-mailer-prefs.c:90
+msgid "Newsgroups"
+msgstr "Diskussionsgrupper"
+
+#: mail/em-format.c:1104
+#, c-format
+msgid "%s attachment"
+msgstr "%s-bilaga"
+
+#: mail/em-format.c:1143 mail/em-format.c:1276
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kunde inte tolka S/MIME-meddelande: Okänt fel"
+
+#: mail/em-format.c:1266
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Krypteringstypen stöds inte för multipart/encrypted"
+
+#: 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:1433
+msgid "Unsupported signature format"
+msgstr "Signaturformatet stöds inte"
+
+#: mail/em-format.c:1441
+msgid "Error verifying signature"
+msgstr "Fel vid verifiering av signatur"
+
+#: mail/em-format.c:1441
+msgid "Unknown error verifying signature"
+msgstr "Oknt fel vid verifiering av signatur"
+
 #: mail/em-junk-filter.c:110
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (inbyggd)"
@@ -11193,25 +11439,25 @@ msgstr "_Lägg till i adressbok"
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
 
-#: mail/em-subscribe-editor.c:613
+#: mail/em-subscribe-editor.c:611
 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:642
+#: mail/em-subscribe-editor.c:640
 msgid "Subscribed"
 msgstr "Prenumererar"
 
-#: mail/em-subscribe-editor.c:646
+#: mail/em-subscribe-editor.c:644
 msgid "Folder"
 msgstr "Mapp"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:861
+#: mail/em-subscribe-editor.c:859
 msgid "Please select a server."
 msgstr "Välj en server."
 
-#: mail/em-subscribe-editor.c:882
+#: mail/em-subscribe-editor.c:880
 msgid "No server has been selected"
 msgstr "Ingen server har valts"
 
@@ -11242,11 +11488,11 @@ msgid "Messages from %s"
 msgstr "Meddelanden från %s"
 
 #: mail/em-vfolder-editor.c:104
-msgid "Virtual _Folders"
+msgid "v_Folders"
 msgstr "Virtuella _mappar"
 
 #: mail/em-vfolder-rule.c:574
-msgid "VFolder source"
+msgid "vFolder source"
 msgstr "Källa för virtuell mapp"
 
 #: mail/evolution-mail.schemas.in.in.h:1
@@ -11564,6 +11810,14 @@ msgstr ""
 msgid "Show deleted messages in the message-list"
 msgstr "Visa meddelanden i normal stil"
 
+#: mail/evolution-mail.schemas.in.in.h:73
+msgid "Show the \"Preview\" pane"
+msgstr "Visa panelen \"Förhandsvisning\""
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "Show the \"Preview\" pane."
+msgstr "Visa panelen \"Förhandsvisning\"."
+
 #: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
@@ -11637,11 +11891,11 @@ msgid "UID string of the default account."
 msgstr "UID-sträng för standardkontot."
 
 #: mail/evolution-mail.schemas.in.in.h:91
-msgid "Use Spamasssassin daemon and client"
+msgid "Use Spamassassin daemon and client"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:92
-msgid "Use Spamasssassin daemon and client (spamc/spamd)"
+msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:93
@@ -11718,61 +11972,33 @@ msgstr ""
 msgid "spamd port"
 msgstr "spamd-port"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Redigerarinställningar"
-
-#: 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: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:4
-msgid "Configure your email accounts here"
-msgstr "Konfigurera dina e-postkonton här"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolutions e-post"
-
-#: 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:7
-msgid "Evolution Mail component"
-msgstr "Evolutions e-postkomponent"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolutions Elm-importör"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolutions e-postredigerare"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolutions Netscape Mail-importör"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolutions e-postredigerarkonfigurationskontroll"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolutions Outlook Express 4-importör"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail preferences control"
-msgstr "Evolutions e-postinställningskontroll"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolutions Pine-importör"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Mail Accounts"
-msgstr "E-postkonton"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolutions mbox-importör"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:95
-msgid "Mail Preferences"
-msgstr "E-postinställningar"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "_Mail"
-msgstr "_E-post"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -11830,34 +12056,6 @@ msgstr "Importerar \"%s\""
 msgid "Importing mailbox"
 msgstr "Importerar brevlåda"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolutions Elm-importör"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolutions Netscape Mail-importör"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolutions Outlook Express 4-importör"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolutions Pine-importör"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolutions mbox-importör"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:363
 #, c-format
 msgid "Scanning %s"
@@ -11979,27 +12177,15 @@ msgstr "Ämnet är %s"
 msgid "Mail from %s"
 msgstr "E-post från %s"
 
-#: mail/mail-autofilter.c:271
+#: mail/mail-autofilter.c:273
 #, c-format
 msgid "%s mailing list"
 msgstr "Sändlistan %s"
 
-#: mail/mail-autofilter.c:326
+#: mail/mail-autofilter.c:328
 msgid "Add Filter Rule"
 msgstr "Lägg till filterregel"
 
-#: 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"
@@ -12049,31 +12235,31 @@ msgid_plural ", %d unread"
 msgstr[0] ", %d oläst"
 msgstr[1] ", %d olästa"
 
-#: mail/mail-component.c:686
+#: mail/mail-component.c:691
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: mail/mail-component.c:687
+#: mail/mail-component.c:692
 msgid "_Mail Message"
 msgstr "_E-postmeddelande"
 
-#: mail/mail-component.c:688
+#: mail/mail-component.c:693
 msgid "Compose a new mail message"
 msgstr "Skriv ett nytt e-postmeddelande"
 
-#: mail/mail-component.c:694
+#: mail/mail-component.c:699
 msgid "New Mail Folder"
 msgstr "Ny e-postmapp"
 
-#: mail/mail-component.c:695
+#: mail/mail-component.c:700
 msgid "Mail _Folder"
 msgstr "E-post_mapp"
 
-#: mail/mail-component.c:696
+#: mail/mail-component.c:701
 msgid "Create a new mail folder"
 msgstr "Skapa en ny e-postmapp"
 
-#: mail/mail-component.c:843
+#: mail/mail-component.c:848
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 "Misslyckades med att uppgradera e-postinställningar eller e-postmappar."
@@ -12087,12 +12273,9 @@ msgstr "    "
 msgid " Ch_eck for Supported Types "
 msgstr " _Kontrollera vilka typer som stöds "
 
-# Evolution bör skrivas med stort E
-# http://bugzilla.ximian.com/show_bug.cgi?id=61065
 #: mail/mail-config.glade.h:4
-#, fuzzy
 msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "(SSL stöds inte i detta bygge av Evolution)"
+msgstr "<b>SSL stöds inte i detta bygge av Evolution</b>"
 
 #: mail/mail-config.glade.h:5
 msgid "<b>S_ignatures</b>"
@@ -12146,7 +12329,7 @@ msgstr ""
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18 plugins/itip-formatter/itip-formatter.c:1664
+#: mail/mail-config.glade.h:18 plugins/itip-formatter/itip-formatter.c:1667
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
@@ -12271,7 +12454,6 @@ msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
 #: mail/mail-config.glade.h:48
-#, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "_Pip då ny post anländer"
 
@@ -12280,9 +12462,8 @@ msgid "C_haracter set:"
 msgstr "Te_ckenkodning:"
 
 #: mail/mail-config.glade.h:50
-#, fuzzy
 msgid "Ch_eck for Supported Types "
-msgstr " _Kontrollera vilka typer som stöds "
+msgstr "_Kontrollera vilka typer som stöds "
 
 #: mail/mail-config.glade.h:51
 #, fuzzy
@@ -12386,7 +12567,6 @@ msgid "Execute Command..."
 msgstr "Kör kommando..."
 
 #: mail/mail-config.glade.h:81
-#, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Fast _breddsteg:"
 
@@ -12511,19 +12691,16 @@ msgid "Remember _password"
 msgstr "Kom ihåg _lösenord"
 
 #: mail/mail-config.glade.h:116
-#, fuzzy
 msgid "S_elect..."
-msgstr "Markera"
+msgstr "_Välj..."
 
 #: mail/mail-config.glade.h:117
-#, fuzzy
 msgid "S_tandard Font:"
 msgstr "_Standardtypsnitt:"
 
 #: mail/mail-config.glade.h:118
-#, fuzzy
 msgid "Se_lect..."
-msgstr "Markera"
+msgstr "V_älj..."
 
 #: mail/mail-config.glade.h:119
 msgid "Security"
@@ -12554,7 +12731,6 @@ msgid "Sending Mail"
 msgstr "Skickande av post"
 
 #: mail/mail-config.glade.h:126
-#, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Mapp för skickade _meddelanden:"
 
@@ -12588,23 +12764,20 @@ msgid "Spell Checking"
 msgstr "Stavningskontroll"
 
 #: mail/mail-config.glade.h:134
-#, fuzzy
 msgid "T_erminal Font:"
 msgstr "_Terminaltypsnitt:"
 
 #: mail/mail-config.glade.h:135
-#, fuzzy
 msgid "T_ype: "
-msgstr "Typ:"
+msgstr "T_yp:"
 
 #: mail/mail-config.glade.h:136
-#, fuzzy
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 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."
+"Listan med språk här återspeglar endast de språk för vilka en ordbok är "
+"installerad."
 
 #: mail/mail-config.glade.h:137
 msgid ""
@@ -12647,18 +12820,16 @@ msgid "_Add Signature"
 msgstr "_Lägg till signatur"
 
 #: mail/mail-config.glade.h:150
-#, fuzzy
 msgid "_Always load images from the Internet"
-msgstr "Läs alltid in _bilder från nätet"
+msgstr "Läs _alltid in bilder från Internet"
 
 #: 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:152
-#, fuzzy
 msgid "_Don't sign meeting requests (for Outlook compatibility)"
-msgstr "Signera inte _sammanträdesbegäran (för kompatibilitet med Outlook)"
+msgstr "_Signera inte sammanträdesbegäran (för kompatibilitet med Outlook)"
 
 #: mail/mail-config.glade.h:154
 msgid "_Forward style:"
@@ -12736,31 +12907,28 @@ msgid ""
 msgstr ""
 
 #: mail/mail-dialogs.glade.h:7
-#, fuzzy
 msgid "<b>vFolder Sources</b>"
-msgstr "Källor för virtuella mappar"
+msgstr "<b>Källor för virtuella mappar</b>"
 
 #: mail/mail-dialogs.glade.h:8
 msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Digital signatur</span>"
 
 #: mail/mail-dialogs.glade.h:9
 msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Kryptering</span>"
 
 #: mail/mail-dialogs.glade.h:10
 msgid "Case _Sensitive"
 msgstr "Gör skillnad på _gemener/VERSALER"
 
 #: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
-#, fuzzy
 msgid "Co_mpleted"
-msgstr "Färdigt"
+msgstr "Fä_rdigt"
 
 #: mail/mail-dialogs.glade.h:13
-#, fuzzy
 msgid "F_ind:"
-msgstr "Sök:"
+msgstr "S_ök:"
 
 #: mail/mail-dialogs.glade.h:14
 msgid "Find in Message"
@@ -12777,7 +12945,7 @@ msgstr "Mapprenumerationer"
 
 #: mail/mail-dialogs.glade.h:17
 msgid "License Agreement"
-msgstr ""
+msgstr "Licensavtal"
 
 #: mail/mail-dialogs.glade.h:18
 msgid "None Selected"
@@ -12788,9 +12956,8 @@ msgid "S_erver:"
 msgstr "S_erver:"
 
 #: mail/mail-dialogs.glade.h:20
-#, fuzzy
 msgid "Security Information"
-msgstr "Källinformation"
+msgstr "Säkerhetsinformation"
 
 #: mail/mail-dialogs.glade.h:22 mail/message-tags.glade.h:4
 msgid ""
@@ -12801,12 +12968,10 @@ msgstr ""
 "Välj en uppföljningsåtgärd från menyn \"Flagga\"."
 
 #: mail/mail-dialogs.glade.h:24
-#, fuzzy
 msgid "_Accept License"
-msgstr "Godtaget"
+msgstr "_Godtag licens"
 
 #: mail/mail-dialogs.glade.h:25 mail/message-tags.glade.h:6
-#, fuzzy
 msgid "_Due By:"
 msgstr "_Ska utföras den:"
 
@@ -12819,9 +12984,8 @@ msgid "_Subscribe"
 msgstr "_Prenumerera"
 
 #: mail/mail-dialogs.glade.h:28
-#, fuzzy
 msgid "_Tick this to accept the license agreement"
-msgstr "Lista med signaturer"
+msgstr "_Kryssa för detta för att godta licensavtalet"
 
 #: mail/mail-dialogs.glade.h:29
 msgid "_Unsubscribe"
@@ -12845,9 +13009,8 @@ msgstr "med alla lokala mappar"
 
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
-#, fuzzy
 msgid "Invalid authentication"
-msgstr "Autentisering"
+msgstr "Ogiltig autentisering"
 
 #. mail:camel-service-auth-invalid secondary
 #: mail/mail-errors.xml.h:4
@@ -12860,7 +13023,7 @@ msgstr "SMTP-servern %s stöder inte den begärda autentiseringstypen %s."
 #. mail:camel-service-auth-failed primary
 #: mail/mail-errors.xml.h:6
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr ""
+msgstr "Din inloggning till servern \"{0}\" som \"{0}\" misslyckades."
 
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
@@ -12875,9 +13038,8 @@ msgstr ""
 
 #. mail:ask-send-html primary
 #: mail/mail-errors.xml.h:10
-#, fuzzy
 msgid "Are you sure you want to send a message in HTML format?"
-msgstr "Är du säker på att du vill skicka om alla %d meddelanden?"
+msgstr "Är du säker på att du vill skicka ett meddelande i HTML-format?"
 
 #. mail:ask-send-html secondary
 #: mail/mail-errors.xml.h:12
@@ -12961,9 +13123,8 @@ msgstr ""
 "Vill du använda standardmappen för utkast?"
 
 #: mail/mail-errors.xml.h:41
-#, fuzzy
 msgid "Use _Default"
-msgstr "Standard"
+msgstr "Använd _standard"
 
 #. mail:ask-expunge primary
 #: mail/mail-errors.xml.h:43
@@ -12979,11 +13140,11 @@ msgstr ""
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
+"Om du fortsätter kommer du inte att kunna återställa dessa meddelanden."
 
 #: mail/mail-errors.xml.h:46
-#, fuzzy
 msgid "_Expunge"
-msgstr "T_öm"
+msgstr "_Töm"
 
 #. mail:ask-empty-trash primary
 #: mail/mail-errors.xml.h:48
@@ -12994,25 +13155,22 @@ msgid ""
 msgstr "Ta bort alla borttagna meddelanden från alla mappar permanent"
 
 #: mail/mail-errors.xml.h:51
-#, fuzzy
 msgid "_Empty Trash"
-msgstr "Töm _papperskorgen"
+msgstr "_Töm papperskorgen"
 
 #. mail:ask-open-many primary
 #: mail/mail-errors.xml.h:53
-#, fuzzy
 msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Är du säker på att du vill redigera alla %d meddelanden?"
+msgstr "Är du säker på att du vill öppna {0} meddelanden på en gång?"
 
 #. mail:ask-open-many secondary
 #: mail/mail-errors.xml.h:55
 msgid "Opening too many messages at once may take a long time."
-msgstr ""
+msgstr "Att öppna för många meddelanden på en gång kan ta lång tid."
 
 #: mail/mail-errors.xml.h:56
-#, fuzzy
 msgid "_Open Messages"
-msgstr "_Öppna meddelande"
+msgstr "_Öppna meddelanden"
 
 #. mail:exit-unsaved primary
 #: mail/mail-errors.xml.h:58
@@ -13032,7 +13190,7 @@ msgstr ""
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:62
 msgid "Your message with the subject \"{0}\" was not delivered."
-msgstr ""
+msgstr "Ditt meddelande med ämnet \"{0}\" levererades inte."
 
 #. mail:camel-exception secondary
 #: mail/mail-errors.xml.h:64
@@ -13045,107 +13203,80 @@ msgstr ""
 
 #. mail:async-error primary
 #: mail/mail-errors.xml.h:67
-#, fuzzy
 msgid "Error while {0}."
-msgstr ""
-"Fel vid \"%s\":\n"
-"%s"
+msgstr "Fel vid {0}."
 
 # Vad är detta?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61062
 #. mail:async-error secondary
 #: mail/mail-errors.xml.h:69
-#, fuzzy
 msgid "{1}."
-msgstr "{1}"
+msgstr "{1}."
 
 #. mail:async-error-nodescribe primary
 #: mail/mail-errors.xml.h:71
-#, fuzzy
 msgid "Error while performing operation."
-msgstr ""
-"Fel vid utförande av åtgärd:\n"
-"%s"
+msgstr "Fel vid utförande av åtgärd."
 
 # Vad är detta?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61062
 #. mail:async-error-nodescribe secondary
 #: mail/mail-errors.xml.h:73
-#, fuzzy
 msgid "{0}."
-msgstr "{0}"
+msgstr "{0}."
 
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:87
-#, fuzzy
 msgid "Enter password."
-msgstr "Ange lösenord"
+msgstr "Ange lösenord."
 
 #. mail:filter-load-error primary
 #: mail/mail-errors.xml.h:91
-#, fuzzy
 msgid "Error loading filter definitions."
-msgstr ""
-"Fel vid läsning av filterinformation:\n"
-"%s"
+msgstr "Fel vid inläsning av filterdefinitioner."
 
 #. mail:no-save-path primary
 #: mail/mail-errors.xml.h:95
-#, fuzzy
 msgid "Cannot save to directory \"{0}\"."
-msgstr "Kunde inte skapa katalogen %s: %s"
+msgstr "Kan inte spara till katalogen \"{0}\"."
 
 #. mail:no-create-path primary
 #. mail:no-write-path-exists primary
 #. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:99 mail/mail-errors.xml.h:107
 #: mail/mail-errors.xml.h:111
-#, fuzzy
 msgid "Cannot save to file \"{0}\"."
-msgstr ""
-"Kan inte spara till \"%s\":\n"
-" %s"
+msgstr "Kan inte spara till filen \"{0}\"."
 
 #. mail:no-create-path secondary
 #: mail/mail-errors.xml.h:101
-#, fuzzy
 msgid "Cannot create the save directory, because \"{1}\""
-msgstr ""
-"Kan inte skapa katalogen\n"
-"%s\n"
-"Fel: %s"
+msgstr "Kan inte skapa sparandekatalogen, eftersom \"{1}\""
 
 #. mail:no-create-tmp-path primary
 #: mail/mail-errors.xml.h:103
-#, fuzzy
 msgid "Cannot create temporary save directory."
-msgstr "Kunde inte skapa temporär katalog: %s"
+msgstr "Kan inte skapa temporär sparandekatalog."
 
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:109
-#, fuzzy
 msgid "File exists but cannot overwrite it."
-msgstr "Filen finns, skriv över?"
+msgstr "Filen finns men kan inte skriva över den."
 
 #. mail:no-write-path-notfile secondary
 #: mail/mail-errors.xml.h:113
-#, fuzzy
 msgid "File exists but is not a regular file."
-msgstr "Filen \"%s\" finns inte eller är ingen vanlig fil."
+msgstr "Filen finns men är ingen vanlig fil."
 
 #. mail:no-delete-folder primary
 #: mail/mail-errors.xml.h:115
-#, fuzzy
 msgid "Cannot delete folder \"{0}\"."
-msgstr ""
-"Kan inte ta bort mapp:\n"
-"%s"
+msgstr "Kan inte ta bort mappen \"{0}\"."
 
 #. mail:no-delete-special-folder primary
 #: mail/mail-errors.xml.h:119
-#, fuzzy
 msgid "Cannot delete system folder \"{0}\"."
-msgstr "Kan inte ta bort mapp: %s: Det finns ingen sådan mapp"
+msgstr "Kan inte ta bort systemmappen \"{0}\"."
 
 #. mail:no-delete-special-folder secondary
 #. mail:no-rename-special-folder secondary
@@ -13163,9 +13294,8 @@ msgstr "Kan inte byta namn på mapp: %s: Det finns ingen sådan mapp"
 
 #. mail:ask-delete-folder title
 #: mail/mail-errors.xml.h:127
-#, fuzzy
 msgid "Delete \"{0}\"?"
-msgstr "Ta bort \"%s\""
+msgstr "Ta bort \"{0}\"?"
 
 #. mail:ask-delete-folder primary
 #: mail/mail-errors.xml.h:129
@@ -13331,8 +13461,8 @@ msgstr "Mappen \"%s\" finns inte."
 #. mail:vfolder-notexist secondary
 #: mail/mail-errors.xml.h:193
 msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+"This folder may have been added implicitly, go to the vFolder editor to add "
+"it explicitly, if required."
 msgstr ""
 
 #. mail:vfolder-notunique primary
@@ -13506,12 +13636,7 @@ msgstr "Filtrerar mapp"
 msgid "Fetching Mail"
 msgstr "Hämtar post"
 
-#: mail/mail-ops.c:556
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Misslyckades med att tillämpa utgående filter: %s"
-
-#: mail/mail-ops.c:581
+#: mail/mail-ops.c:542 mail/mail-ops.c:585
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13520,114 +13645,120 @@ msgstr ""
 "Misslyckades med att lägga till i %s: %s\n"
 "Lägger till i lokala \"Skickat\"-mappen istället."
 
-#: mail/mail-ops.c:590
+#. sending mail, filtering failed
+#: mail/mail-ops.c:564
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Misslyckades med att tillämpa utgående filter: %s"
+
+#: mail/mail-ops.c:602
 #, 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:687
+#: mail/mail-ops.c:702
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Skickar meddelande %d av %d"
 
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:727
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Misslyckades med att avkoda meddelandet."
 
-#: mail/mail-ops.c:720 mail/mail-send-recv.c:613
+#: mail/mail-ops.c:729 mail/mail-send-recv.c:613
 msgid "Cancelled."
 msgstr "Avbruten."
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:731
 msgid "Complete."
 msgstr "Färdig."
 
-#: mail/mail-ops.c:819
+#: mail/mail-ops.c:828
 msgid "Saving message to folder"
 msgstr "Sparar meddelande till mappen"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:913
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:913
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: mail/mail-ops.c:1130
+#: mail/mail-ops.c:1139
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1173
+#: mail/mail-ops.c:1182
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1245
+#: mail/mail-ops.c:1254
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagret %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1332
 #, c-format
 msgid "Removing folder %s"
 msgstr "Byter namn på mappen %s"
 
-#: mail/mail-ops.c:1417
+#: mail/mail-ops.c:1426
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/mail-ops.c:1482
+#: mail/mail-ops.c:1491
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1492
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/mail-ops.c:1538
+#: mail/mail-ops.c:1547
 msgid "Refreshing folder"
 msgstr "Uppdaterar mapp"
 
-#: mail/mail-ops.c:1574 mail/mail-ops.c:1625
+#: mail/mail-ops.c:1583 mail/mail-ops.c:1634
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1631
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tömmer papperskorgen i \"%s\""
 
-#: mail/mail-ops.c:1623
+#: mail/mail-ops.c:1632
 msgid "Local Folders"
 msgstr "Lokala mappar"
 
-#: mail/mail-ops.c:1706
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: mail/mail-ops.c:1778
+#: mail/mail-ops.c:1787
 #, 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:1864
+#: mail/mail-ops.c:1873
 #, 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:1914
+#: mail/mail-ops.c:1923
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13636,7 +13767,7 @@ msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1942
+#: mail/mail-ops.c:1951
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13645,11 +13776,11 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2013
+#: mail/mail-ops.c:2022
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: mail/mail-ops.c:2025
+#: mail/mail-ops.c:2034
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13658,22 +13789,22 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2044
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: mail/mail-ops.c:2185
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar från %s"
 
-#: mail/mail-ops.c:2185
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ansluter igen till %s"
 
-#: mail/mail-ops.c:2301
+#: mail/mail-ops.c:2310
 msgid "Checking Service"
 msgstr "Kontrollerar tjänst"
 
@@ -13762,8 +13893,8 @@ msgid "Invalid folder: `%s'"
 msgstr "Öppnar mappen %s"
 
 #: mail/mail-vfolder.c:90
-#, c-format
-msgid "Setting up vfolder: %s"
+#, fuzzy, c-format
+msgid "Setting up vFolder: %s"
 msgstr "Ställer in virtuell mapp: %s"
 
 #: mail/mail-vfolder.c:239
@@ -13776,17 +13907,15 @@ 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:969
-msgid "vFolders"
-msgstr "Virtuella mappar"
-
 #: mail/mail-vfolder.c:1008
-msgid "Edit VFolder"
+#, fuzzy
+msgid "Edit vFolder"
 msgstr "Redigera virtuell mapp"
 
 #: mail/mail-vfolder.c:1092
-msgid "New VFolder"
-msgstr "Ny virtuell mapp"
+#, fuzzy
+msgid "New vFolder"
+msgstr "_Ny mapp"
 
 #: mail/message-list.c:999
 msgid "Unseen"
@@ -13850,12 +13979,12 @@ msgstr "%d %b %H.%M"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2044
+#: mail/message-list.c:2046
 #, fuzzy
 msgid "Message List"
 msgstr "Meddelanden"
 
-#: mail/message-list.c:3381
+#: mail/message-list.c:3386
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
@@ -13948,6 +14077,25 @@ msgstr "Ämnet innehåller"
 msgid "Subject or Sender contains"
 msgstr "Ämnet innehåller"
 
+#: plugins/backup-restore/backup-restore.c:51
+#, fuzzy
+msgid "Select name of Evolution archive"
+msgstr "Utskrift av Mitt Evolution misslyckades"
+
+#: plugins/backup-restore/backup-restore.c:61
+#, fuzzy
+msgid "_Restart Evolution after backup"
+msgstr "_Evolution-attribut:"
+
+#: plugins/backup-restore/backup-restore.c:89
+msgid "Select Evolution archive to restore"
+msgstr ""
+
+#: plugins/backup-restore/backup-restore.c:97
+#, fuzzy
+msgid "_Restart Evolution after restore"
+msgstr "_Evolution-attribut:"
+
 #: plugins/backup-restore/backup.c:109
 #, fuzzy
 msgid "Backup Evolution directory"
@@ -13968,25 +14116,6 @@ msgstr "Grupprogramvarusviten Evolution"
 msgid "Restart Evolution"
 msgstr "Skriv ut Mitt Evolution"
 
-#: plugins/backup-restore/backup-restore.c:51
-#, fuzzy
-msgid "Select name of Evolution archive"
-msgstr "Utskrift av Mitt Evolution misslyckades"
-
-#: plugins/backup-restore/backup-restore.c:61
-#, fuzzy
-msgid "_Restart Evolution after backup"
-msgstr "_Evolution-attribut:"
-
-#: plugins/backup-restore/backup-restore.c:89
-msgid "Select Evolution archive to restore"
-msgstr ""
-
-#: plugins/backup-restore/backup-restore.c:97
-#, fuzzy
-msgid "_Restart Evolution after restore"
-msgstr "_Evolution-attribut:"
-
 #: plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 #, fuzzy
 msgid "Backup Settings..."
@@ -14105,8 +14234,37 @@ msgstr "Öppnar standarduppgiftsmappen"
 msgid "Mark as default folder"
 msgstr "Öppnar standarduppgiftsmappen"
 
+#. i18n: "Secure Password Authentication" is an Outlookism
+#: plugins/exchange-account-setup/exchange-account-setup.c:53
+#, fuzzy
+msgid "Secure Password"
+msgstr "Ange lösenord"
+
+#. i18n: "NTLM" probably doesn't translate
+#: plugins/exchange-account-setup/exchange-account-setup.c:56
+#, fuzzy
+msgid ""
+"This option will connect to the Exchange server using secure password (NTLM) "
+"authentication."
+msgstr ""
+"Detta alternativ kommer att ansluta till servern med Kerberos 4-"
+"autentisering."
+
+#: plugins/exchange-account-setup/exchange-account-setup.c:64
+#, fuzzy
+msgid "Plaintext Password"
+msgstr "Ange lösenord"
+
+#: plugins/exchange-account-setup/exchange-account-setup.c:66
+#, fuzzy
+msgid ""
+"This option will connect to the Exchange server using standard plaintext "
+"password authentication."
+msgstr ""
+"Detta alternativ ansluter till IMAP-servern med ett lösenord i klartext."
+
 #. Description section
-#: plugins/exchange-account-setup/exchange-account-setup.c:91
+#: plugins/exchange-account-setup/exchange-account-setup.c:113
 #, fuzzy
 msgid ""
 "The message specified below will be automatically sent to \n"
@@ -14115,17 +14273,17 @@ msgstr ""
 "Meddelandet nedan kommer automatiskt att skickas till varje person som "
 "skickar e-post till dig när du inte är inne på kontoret."
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:115
+#: plugins/exchange-account-setup/exchange-account-setup.c:140
 #, fuzzy
 msgid "I am in the office"
 msgstr "Jag är på kontoret för tillfället"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:129
+#: plugins/exchange-account-setup/exchange-account-setup.c:154
 #, fuzzy
 msgid "I am out of the office"
 msgstr "Jag är inte på kontoret för tillfället"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:143
+#: plugins/exchange-account-setup/exchange-account-setup.c:168
 #, fuzzy
 msgid "Out of office Message:"
 msgstr "<b>Inte inne-meddelande:</b>"
@@ -14135,16 +14293,26 @@ msgstr "<b>Inte inne-meddelande:</b>"
 msgid "Exchange Settings"
 msgstr "Väderinställningar"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:329
+#: plugins/exchange-account-setup/exchange-account-setup.c:332
+#: plugins/exchange-account-setup/exchange-ask-password.c:200
+msgid "_OWA Url:"
+msgstr ""
+
+#: plugins/exchange-account-setup/exchange-account-setup.c:340
 #: plugins/exchange-account-setup/exchange-ask-password.c:193
 #, fuzzy
 msgid "A_uthenticate"
 msgstr "Autentisering"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:336
-#: plugins/exchange-account-setup/exchange-ask-password.c:200
-msgid "_OWA Url:"
-msgstr ""
+#: plugins/exchange-account-setup/exchange-account-setup.c:457
+#, fuzzy
+msgid "Authentication Type"
+msgstr "_Autentiseringstyp: "
+
+#: plugins/exchange-account-setup/exchange-account-setup.c:471
+#, fuzzy
+msgid "Ch_eck for Supported Types"
+msgstr " _Kontrollera vilka typer som stöds "
 
 #: plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, fuzzy, c-format
@@ -14244,27 +14412,27 @@ msgid ""
 "imported"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1655
+#: plugins/itip-formatter/itip-formatter.c:1658
 #, fuzzy
 msgid "Meetings and Tasks"
 msgstr "Sammanträde - %s"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: plugins/itip-formatter/itip-formatter.c:1678
+#: plugins/itip-formatter/itip-formatter.c:1681
 #, fuzzy
 msgid "_Delete message after acting"
 msgstr "Skicka meddelandet nu"
 
 # Finns både med <b> och <span blah blah. Varför?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61078
-#: plugins/itip-formatter/itip-formatter.c:1688
+#: plugins/itip-formatter/itip-formatter.c:1691
 #, fuzzy
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr "<span weight=\"bold\">Grundläggande</span>"
 
 #. Source selector
-#: plugins/itip-formatter/itip-formatter.c:1701
+#: plugins/itip-formatter/itip-formatter.c:1704
 msgid "Select the calendars to search for meeting conflicts"
 msgstr ""
 
@@ -14576,8 +14744,8 @@ msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> har svarat på en uppgiftstilldelning."
 
 #. Comment
-#: plugins/itip-formatter/itip-view.c:890
-#: plugins/itip-formatter/itip-view.c:940
+#: plugins/itip-formatter/itip-view.c:892
+#: plugins/itip-formatter/itip-view.c:942
 #, fuzzy
 msgid "Comment:"
 msgstr ""
@@ -14824,6 +14992,32 @@ msgstr ""
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sAnge lösenord för %s (användare %s)"
 
+#. org.gnome.evolution.mail_shared_folder:invalid-user primary
+#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:2
+#, fuzzy
+msgid "Invalid user"
+msgstr "Ogiltigt syfte"
+
+#. org.gnome.evolution.mail_shared_folder:invalid-user secondary
+#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:4
+msgid ""
+"\n"
+"You cannot share folder with specified user \"{0}\" \n"
+msgstr ""
+
+#. org.gnome.evolution.mail_shared_folder:no-user primary
+#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:8
+#, fuzzy
+msgid "Specify User"
+msgstr "Specifikt huvud"
+
+#. org.gnome.evolution.mail_shared_folder:no-user secondary
+#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:10
+msgid ""
+"\n"
+"\tYou have to specify a user name whom you want to add to the list \n"
+msgstr ""
+
 #: plugins/shared-folder/properties.glade.h:2
 #, fuzzy
 msgid "<b>Users :</b>"
@@ -14884,96 +15078,135 @@ msgstr "Skuggning"
 msgid "Fall back to threading messages by sub_ject"
 msgstr "Vidarebefordrar meddelande utan ett ämne"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolutionskalet"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolutions testkomponent"
+
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "A GNOME Print description of the current printer settings"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Button style"
-msgstr ""
+#, fuzzy
+msgid "Configuration version"
+msgstr "Evolutions e-postkonfigurationsgränssnitt"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:3
-msgid "Buttons are visible"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
-msgid "Default width of the folder bar pane"
-msgstr "Växla om mappraden ska visas"
+msgid "Default sidebar width"
+msgstr "Standardprioritet:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window height"
 msgstr "Standardprioritet:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Default window width"
 msgstr "Standardprioritet:"
 
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+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
 #, fuzzy
-msgid "Evolution configuration version"
+msgid "Last upgraded configuration version"
 msgstr "Evolutions e-postkonfigurationsgränssnitt"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:8
-msgid "ID or alias of the component to be shown by default at start-up."
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
-msgid ""
-"If set to true, Evolution will start up in offline mode instead of online "
-"mode."
-msgstr ""
+#, fuzzy
+msgid "Printer settings"
+msgstr "Väderinställningar"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid ""
-"If set to true, the warning dialog in development versions of Evolution is "
-"not displayed."
+msgid "Skip development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
-#, fuzzy
-msgid "Last upgraded Evolution configuration version"
-msgstr "Evolutions e-postkonfigurationsgränssnitt"
+#: shell/apps_evolution_shell.schemas.in.in.h:11 shell/main.c:475
+msgid "Start in offline mode"
+msgstr "Starta i frånkopplat läge"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+"The configuration version of Evolution, with major/minor/configuration level"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:13
 #, fuzzy
-msgid "Printer settings"
-msgstr "Väderinställningar"
+msgid "The default height for the main window, in pixels."
+msgstr "Standardhöjd för meddelandefönstret"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid ""
-"The style of the displayed buttons. Can be text, icons, both, toolbar. If "
-"toolbar is set, the style of the toolbar is followed as determined by the "
-"GNOME setting."
-msgstr ""
+#, fuzzy
+msgid "The default width for the main window, in pixels."
+msgstr "Standardbredd för meddelandefönstret"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Toolbar is visible"
-msgstr ""
+#, fuzzy
+msgid "The default width for the sidebar, in pixels."
+msgstr "Växla om mappraden ska visas"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Whether Evolution should start up in offline mode"
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Whether the buttons should be visible."
+msgid ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buutons is determined "
+"by the GNOME toolbar setting."
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Whether the toolbar should be visible."
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether the window buttons should be visible."
 msgstr ""
 
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+#, fuzzy
+msgid "Window button style"
+msgstr "Föregående"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "Window buttons are visible"
+msgstr "Föregående"
+
 #: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "<b>Active Connections</b>"
@@ -14987,36 +15220,6 @@ msgstr "Aktiva anslutningar"
 msgid "Click OK to close these connections and go offline"
 msgstr "Klicka OK för att stänga dessa anslutningar och arbeta frånkopplad"
 
-#: shell/e-shell.c:597
-#, fuzzy
-msgid "Uknown system error."
-msgstr "Okänt fel"
-
-#: shell/e-shell.c:805 shell/e-shell.c:806
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:1249 widgets/misc/e-cell-date-edit.c:256
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:1251
-msgid "Invalid arguments"
-msgstr "Ogiltiga argument"
-
-#: shell/e-shell.c:1253
-msgid "Cannot register on OAF"
-msgstr "Kan inte registrera på OAF"
-
-#: shell/e-shell.c:1255
-msgid "Configuration Database not found"
-msgstr "Konfigurationsdatabasen hittades inte"
-
-#: shell/e-shell.c:1257
-msgid "Generic error"
-msgstr "Allmänt fel"
-
 #: shell/e-shell-folder-title-bar.c:586 shell/e-shell-folder-title-bar.c:587
 msgid "(Untitled)"
 msgstr "(Namnlös)"
@@ -15207,30 +15410,6 @@ msgstr "Mappnamnet kan inte innehålla tecknet \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" och \"..\" är reserverade mappnamn."
 
-#: shell/e-shell-window.c:341
-#, 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:349
-#, 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:356
-#, 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:708
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "E-post till %s"
-
 #: shell/e-shell-window-commands.c:67
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot-verktygen verkar inte vara installerade på detta system."
@@ -15251,7 +15430,7 @@ msgstr "Bug-buddy kunde inte köras."
 #. 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
+#: shell/e-shell-window-commands.c:426
 msgid "translator-credits"
 msgstr ""
 "Christian Rose\n"
@@ -15261,22 +15440,76 @@ msgstr ""
 "Andreas Hydén\n"
 "Skicka synpunkter på översättningen till sv@li.org"
 
-#: shell/e-shell-window-commands.c:439
+#: shell/e-shell-window-commands.c:440
 msgid "Groupware Suite"
 msgstr "Grupprogramvarusvit"
 
-#: shell/e-shell-window-commands.c:680
+#: shell/e-shell-window-commands.c:681
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: shell/e-shell-window-commands.c:693 ui/evolution.xml.h:51
+#: shell/e-shell-window-commands.c:694 ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
-#: shell/e-shell-window-commands.c:706 ui/evolution.xml.h:34
+#: shell/e-shell-window-commands.c:707 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
+#: shell/e-shell-window.c:341
+#, 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:349
+#, 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:356
+#, 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:708
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "E-post till %s"
+
+#: shell/e-shell.c:597
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Okänt fel"
+
+#: shell/e-shell.c:805 shell/e-shell.c:806
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:1249 widgets/misc/e-cell-date-edit.c:256
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:1251
+msgid "Invalid arguments"
+msgstr "Ogiltiga argument"
+
+#: shell/e-shell.c:1253
+msgid "Cannot register on OAF"
+msgstr "Kan inte registrera på OAF"
+
+#: shell/e-shell.c:1255
+msgid "Configuration Database not found"
+msgstr "Konfigurationsdatabasen hittades inte"
+
+#: shell/e-shell.c:1257
+msgid "Generic error"
+msgstr "Allmänt fel"
+
 #: shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Ny"
@@ -15340,20 +15573,6 @@ msgstr "Test"
 msgid "Create a new test item"
 msgstr "Skapa en ny uppgift"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolutionskalet"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolutions testkomponent"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klicka på \"Importera\" för att börja importera filen till Evolution. "
@@ -15472,10 +15691,6 @@ msgstr "Tala inte om för mig igen"
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:475
-msgid "Start in offline mode"
-msgstr "Starta i frånkopplat läge"
-
 #: shell/main.c:477
 msgid "Start in online mode"
 msgstr "Starta i anslutet läge"
@@ -15624,7 +15839,7 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/ca-trust-dialog.c:91
+#: smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -15632,6 +15847,20 @@ msgid ""
 "Edit trust settings:"
 msgstr ""
 
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:142
 #: smime/gui/certificate-manager.c:375 smime/gui/certificate-manager.c:383
 #: smime/gui/certificate-manager.c:595 smime/gui/certificate-manager.c:603
@@ -15672,20 +15901,6 @@ msgstr ""
 "Certifikatet har gått ut: %s\n"
 "Utfärdare: %s"
 
-#: smime/gui/cert-trust-dialog.c:145
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-
-#: smime/gui/cert-trust-dialog.c:149
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr ""
-
 #: smime/gui/component.c:45
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
@@ -15923,6 +16138,12 @@ msgstr "Redigera uppgift"
 msgid "dialog1"
 msgstr "dialog1"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Kort-ID finns redan"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d-%m-%Y"
@@ -16154,12 +16375,6 @@ msgstr "Ämnet är %s"
 msgid "Certificate Signature Value"
 msgstr "Certifikatsignaturfel"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Kort-ID finns redan"
-
 #: smime/lib/e-pkcs12.c:264
 msgid "PKCS12 File Password"
 msgstr ""
@@ -16298,9 +16513,9 @@ msgid "View the current contact"
 msgstr "Visa den aktuella kontakten"
 
 #: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
-#: ui/evolution-mail-global.xml.h:15 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:19
+#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-tasks.xml.h:19
 #: ui/evolution.xml.h:36
 msgid "_Actions"
 msgstr "_Åtgärder"
@@ -16313,7 +16528,7 @@ msgstr "_Vidarebefordra kontakt..."
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp..."
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:17
+#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:16
 msgid "_Preview Pane"
 msgstr "F_örhandsgranskningspanel"
 
@@ -16496,7 +16711,8 @@ msgid "Create or edit rules for filtering new mail"
 msgstr "Skapa eller redigera regler för filtrering av ny post"
 
 #: ui/evolution-mail-global.xml.h:5
-msgid "Create or edit virtual folder definitions"
+#, fuzzy
+msgid "Create or edit vFolder definitions"
 msgstr "Skapa eller redigera definitioner för virtuella mappar"
 
 #: ui/evolution-mail-global.xml.h:6
@@ -16532,14 +16748,15 @@ msgstr "Visa förhandsgranskningsfönster för meddelanden"
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prenumerera eller säg upp prenumeration på mappar på fjärrservrar"
 
-#: ui/evolution-mail-global.xml.h:14
-msgid "Virtual Folder _Editor..."
-msgstr "_Redigerare för virtuella mappar..."
-
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filter..."
 
+#: ui/evolution-mail-global.xml.h:18
+#, fuzzy
+msgid "vFolder _Editor..."
+msgstr "_Redigerare för virtuella mappar..."
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Ändra egenskaperna för denna mapp"
@@ -16639,33 +16856,6 @@ msgstr "_Omvänd markering"
 msgid "_Threaded Message List"
 msgstr "_Trådad meddelandelista"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:4
-msgid "Close"
-msgstr "Stäng"
-
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Stäng detta fönster"
-
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
-msgid "Main toolbar"
-msgstr "Huvudverktygsrad"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:37
-msgid "_Close"
-msgstr "S_täng"
-
-#: 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:39
-msgid "_File"
-msgstr "_Arkiv"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -16706,8 +16896,9 @@ msgid "Copy selected messages to another folder"
 msgstr "Kopiera markerade meddelanden till en annan mapp"
 
 #: ui/evolution-mail-message.xml.h:12
-msgid "Create _Virtual Folder From Message"
-msgstr "Skapa _virtuell mapp från meddelande"
+#, fuzzy
+msgid "Create _vFolder From Message"
+msgstr "_Skapa filter från meddelande"
 
 #: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
@@ -16726,19 +16917,23 @@ msgid "Create a rule to filter messages with this subject"
 msgstr "Skapa en regel för att filtrera meddelanden med detta ämne"
 
 #: ui/evolution-mail-message.xml.h:17
-msgid "Create a virtual folder for these recipients"
+#, fuzzy
+msgid "Create a vFolder for these recipients"
 msgstr "Skapa en virtuell mapp för dessa mottagare"
 
 #: ui/evolution-mail-message.xml.h:18
-msgid "Create a virtual folder for this mailing list"
+#, fuzzy
+msgid "Create a vFolder for this mailing list"
 msgstr "Skapa en virtuell mapp för denna sändlista"
 
 #: ui/evolution-mail-message.xml.h:19
-msgid "Create a virtual folder for this sender"
+#, fuzzy
+msgid "Create a vFolder for this sender"
 msgstr "Skapa en virtuell mapp för denna avsändare"
 
 #: ui/evolution-mail-message.xml.h:20
-msgid "Create a virtual folder for this subject"
+#, fuzzy
+msgid "Create a vFolder for this subject"
 msgstr "Skapa en virtuell mapp för detta ämne"
 
 #: ui/evolution-mail-message.xml.h:23
@@ -17010,74 +17205,105 @@ msgstr "Te_xtstorlek"
 msgid "Un-delete the selected messages"
 msgstr "Ångra borttagning av de markerade meddelandena"
 
-#: ui/evolution-mail-message.xml.h:103
-msgid "VFolder on Mailing _List..."
-msgstr "Virtuell mapp på _sändlista..."
-
 #: ui/evolution-mail-message.xml.h:104
-msgid "VFolder on Se_nder..."
-msgstr "Virtuell mapp på _avsändare..."
-
-#: ui/evolution-mail-message.xml.h:105
-msgid "VFolder on _Recipients..."
-msgstr "Virtuell mapp på _mottagare..."
-
-#: ui/evolution-mail-message.xml.h:106
-msgid "VFolder on _Subject..."
-msgstr "Virtuell mapp på _ämne..."
-
-#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr "_Bifogad"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Create Filter From Message"
 msgstr "_Skapa filter från meddelande"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Go To"
 msgstr "_Gå till"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "_Inuti"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Larger"
 msgstr "_Större"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Message Display"
 msgstr "M_eddelandevisning"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Next Message"
 msgstr "_Nästa meddelande"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Open Message"
 msgstr "_Öppna meddelande"
 
-#: ui/evolution-mail-message.xml.h:124
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Previous Message"
 msgstr "_Föregående meddelande"
 
-#: ui/evolution-mail-message.xml.h:126
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Quoted"
 msgstr "_Citerad"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:48
+#: ui/evolution-mail-message.xml.h:125 ui/evolution.xml.h:48
 msgid "_Tools"
 msgstr "V_erktyg"
 
-#: ui/evolution-mail-message.xml.h:130
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Undelete"
 msgstr "_Ångra borttagning"
 
+#: ui/evolution-mail-message.xml.h:127
+#, fuzzy
+msgid "vFolder on Mailing _List..."
+msgstr "Virtuell mapp på _sändlista..."
+
+#: ui/evolution-mail-message.xml.h:128
+#, fuzzy
+msgid "vFolder on Se_nder..."
+msgstr "Virtuell mapp på _avsändare..."
+
+#: ui/evolution-mail-message.xml.h:129
+#, fuzzy
+msgid "vFolder on _Recipients..."
+msgstr "Virtuell mapp på _mottagare..."
+
+#: ui/evolution-mail-message.xml.h:130
+#, fuzzy
+msgid "vFolder on _Subject..."
+msgstr "Virtuell mapp på _ämne..."
+
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Stäng"
+
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Stäng detta fönster"
+
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
+msgid "Main toolbar"
+msgstr "Huvudverktygsrad"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:37
+msgid "_Close"
+msgstr "S_täng"
+
+#: 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:39
+msgid "_File"
+msgstr "_Arkiv"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Bifoga"
@@ -17650,16 +17876,6 @@ msgstr "_Aktuell vy"
 msgid "Save Custom View..."
 msgstr "Spara anpassad vy..."
 
-#: 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"
-
 #. 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:415
@@ -17671,6 +17887,16 @@ msgstr "MTOTFLS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
+#: 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"
@@ -18167,6 +18393,201 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% färdigt)"
 
+#: widgets/misc/e-url-entry.c:107
+#, fuzzy
+msgid "click here to go to url"
+msgstr "<klicka här för att välja en mapp>"
+
+#~ msgid "Work week view"
+#~ msgstr "Arbetsveckovy"
+
+#~ msgid "Day view"
+#~ msgstr "Dagsvy"
+
+#~ msgid "Month view"
+#~ msgstr "Månadsvy"
+
+#~ msgid "Week view"
+#~ msgstr "Veckovy"
+
+#~ msgid "Send options"
+#~ msgstr "Alternativ för skickande"
+
+#~ msgid "Advanced  send options"
+#~ msgstr "Avancerade alternativ för skickande"
+
+#~ msgid "Advanced send options"
+#~ msgstr "Avancerade alternativ för skickande"
+
+#~ msgid "Web page:"
+#~ msgstr "Webbsida:"
+
+#~ msgid "Web page"
+#~ msgstr "Webbsida"
+
+#~ msgid "Open file"
+#~ msgstr "Öppna fil"
+
+#~ msgid "Create _vFolder From Search"
+#~ msgstr "Skapa virtuell mapp från sökning"
+
+#~ msgid "Create vFolder From Search..."
+#~ msgstr "Skapa virtuell mapp från sökning..."
+
+#~ msgid "Create vFolder From Search"
+#~ msgstr "Skapa virtuell mapp från sökning"
+
+#~ msgid "SSL is not supported in this build of Evolution"
+#~ msgstr "SSL stöds inte i detta bygge av Evolution"
+
+#~ msgid "_Standard Font:"
+#~ msgstr "_Standardtypsnitt:"
+
+#~ msgid "Select..."
+#~ msgstr "Välj..."
+
+#~ msgid "_Terminal Font:"
+#~ msgstr "_Terminaltypsnitt:"
+
+#~ msgid "T_ype:"
+#~ msgstr "T_yp:"
+
+#~ msgid "vFolder Sources"
+#~ msgstr "Källor för virtuella mappar"
+
+#~ msgid "Digital Signature"
+#~ msgstr "Digital signatur"
+
+#~ msgid "Encryption"
+#~ msgstr "Kryptering"
+
+#~ msgid "Find:"
+#~ msgstr "Sök:"
+
+#~ msgid "Empty _trash"
+#~ msgstr "Töm _papperskorgen"
+
+#~ msgid "_Open message"
+#~ msgstr "_Öppna meddelande"
+
+#, fuzzy
+#~ msgid "alarm "
+#~ msgstr "Alarm"
+
+#, fuzzy
+#~ msgid "recurrence "
+#~ msgstr "Upprepning"
+
+#, fuzzy
+#~ msgid "time-zone "
+#~ msgstr "Tidszon "
+
+#, fuzzy
+#~ msgid "meeting "
+#~ msgstr "Sammanträde"
+
+#~ msgid "empty"
+#~ msgstr "tom"
+
+#~ msgid ", %d events"
+#~ msgstr ", %d evenemang"
+
+#~ msgid "work week view :"
+#~ msgstr "arbetsveckovy:"
+
+#~ msgid "day view :"
+#~ msgstr "dagsvy:"
+
+#~ msgid "month view :"
+#~ msgstr "månadsvy:"
+
+#~ msgid "week view :"
+#~ msgstr "veckovy:"
+
+#~ msgid ")"
+#~ msgstr ")"
+
+#~ msgid "Position of the vertical pane in main view."
+#~ msgstr "Position för den vertikala panelen i huvudvyn."
+
+#~ 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 "Allocate less space to weekend appointments"
+#~ msgstr "Allokera mindre utrymme till helgmöten"
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#~ msgid "Days that are work days"
+#~ msgstr "Dagar som är arbetsdagar"
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#~ msgid "Default timezone for meetings"
+#~ msgstr "Standardtidszon för sammanträden"
+
+#~ msgid "Position of the horizontal pane in the month view"
+#~ msgstr "Position på den horisontella panelen i månadsvyn"
+
+#~ msgid "Position of the vertical pane"
+#~ msgstr "Position på den vertikala panelen"
+
+# Dessa meddelanden är bara <short>, <long> behövs nog också
+# http://bugzilla.ximian.com/show_bug.cgi?id=61075
+#~ msgid "Show where events end in week and month views"
+#~ msgstr "Visa var evenemang slutar i vecko- och månadsvyerna"
+
+#~ msgid "Units of default reminder"
+#~ msgstr "Enheter för standardpåminnelse"
+
+#~ msgid "Whether to ask for confirmation when folder is expunged"
+#~ msgstr "Huruvida det ska frågas efter bekräftelse vid tömning av mapp"
+
+# Konstigt...
+#~ msgid "option menu to choose alarm action"
+#~ msgstr "alternativmeny att välja alarmåtgärd"
+
+# Konstigt...
+#~ msgid "option menu to choose alarm relative"
+#~ msgstr "alternativmeny att välja alarmsläkting"
+
+# Konstigt...
+#~ msgid "option menu to choose alarm time"
+#~ msgstr "alternativmeny att välja alarmtid"
+
+# Konstigt...
+#~ msgid "option menu to choose alarm value units"
+#~ msgstr "alternativmeny att välja alarmvärdesenheter"
+
+# Finns både med <b> och <span blah blah. Varför?
+# http://bugzilla.ximian.com/show_bug.cgi?id=61078
+#~ msgid "<span weight=\"bold\">Basics</span>"
+#~ msgstr "<span weight=\"bold\">Grundläggande</span>"
+
+# Finns både med <b> och <span blah blah. Varför?
+# http://bugzilla.ximian.com/show_bug.cgi?id=61078
+#~ msgid "<span weight=\"bold\">Date and Time</span>"
+#~ msgstr "<span weight=\"bold\">Datum och tid</span>"
+
+#~ msgid "Create _Virtual Folder From Search..."
+#~ msgstr "Skapa _virtuell mapp från sökning..."
+
+#~ msgid "VFolders"
+#~ msgstr "Virtuella mappar"
+
+#~ msgid "Virtual _Folders"
+#~ msgstr "Virtuella _mappar"
+
+#~ msgid "New VFolder"
+#~ msgstr "Ny virtuell mapp"
+
+#~ msgid "Create _Virtual Folder From Message"
+#~ msgstr "Skapa _virtuell mapp från meddelande"
+
 #~ msgid "work week view:"
 #~ msgstr "arbetsveckovy:"
 
@@ -18893,12 +19314,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgstr "Kerberos 4"
 
 #~ msgid ""
-#~ "This option will connect to the server using Kerberos 4 authentication."
-#~ msgstr ""
-#~ "Detta alternativ kommer att ansluta till servern med Kerberos 4-"
-#~ "autentisering."
-
-#~ msgid ""
 #~ "Could not get Kerberos ticket:\n"
 #~ "%s"
 #~ msgstr ""
@@ -19228,9 +19643,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Path length exceeded"
 #~ msgstr "Sökvägslängd överskreds"
 
-#~ msgid "Invalid purpose"
-#~ msgstr "Ogiltigt syfte"
-
 #~ msgid "Certificate untrusted"
 #~ msgstr "Certifikatet opålitligt"
 
@@ -19392,11 +19804,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Password"
 #~ msgstr "Lösenord"
 
-#~ 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."
-
 #~ msgid "Operation cancelled"
 #~ msgstr "Åtgärden avbruten"
 
@@ -20666,9 +21073,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Assigned Task"
 #~ msgstr "Tilldelad uppgift"
 
-#~ msgid "Timezone"
-#~ msgstr "Tidszon"
-
 #~ msgid "Time zone"
 #~ msgstr "Tidszon"
 
@@ -21436,9 +21840,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "_Program"
 #~ msgstr "_Program"
 
-#~ msgid "Repeat the alarm"
-#~ msgstr "Upprepa larmet"
-
 #~ msgid "_Display"
 #~ msgstr "_Visning"
 
@@ -21593,9 +21994,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "_Modify"
 #~ msgstr "_Ändra"
 
-#~ msgid "_No recurrence"
-#~ msgstr "_Ingen upprepning"
-
 #~ msgid "_Simple recurrence"
 #~ msgstr "_Enkel upprepning"
 
@@ -22066,10 +22464,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgstr "Öppnar standarduppgiftsmappen"
 
 #, fuzzy
-#~ msgid "Whether to show the folder bar"
-#~ msgstr "Växla om mappraden ska visas"
-
-#, fuzzy
 #~ msgid "Whether to show the shortcut bar"
 #~ msgstr "Växla om genvägsraden ska visas"
 
@@ -22726,9 +23120,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "FBUrl"
 #~ msgstr "LU-Url"
 
-#~ msgid "Default server calendar"
-#~ msgstr "Standardserverkalender"
-
 #~ msgid "icsCalendar"
 #~ msgstr "icsKalender"
 
@@ -22988,9 +23379,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "_Save as..."
 #~ msgstr "_Spara som..."
 
-#~ msgid "Geographical Position"
-#~ msgstr "Geografisk position"
-
 #~ msgid "Print..."
 #~ msgstr "Skriv ut..."
 
@@ -23491,9 +23879,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Server Configuration"
 #~ msgstr "Serverkonfiguration"
 
-#~ msgid "_Authentication Type: "
-#~ msgstr "_Autentiseringstyp: "
-
 #~ msgid "_Authentication type: "
 #~ msgstr "_Autentiseringstyp: "
 
@@ -31364,9 +31749,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Patches of precipitation"
 #~ msgstr "Höga bankar med nederbörd"
 
-#~ msgid "Partial precipitation"
-#~ msgstr "Partiella bankar med nederbörd"
-
 #~ msgid "Unknown thunderstorm"
 #~ msgstr "Okänd åskstorm"
 
@@ -32242,9 +32624,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "_Gå till mapp..."
 
-#~ msgid "_New Folder"
-#~ msgstr "_Ny mapp"
-
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "_Ta bort en annan användares mapp"
 
@@ -33662,9 +34041,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Composer"
 #~ msgstr "Redigerare"
 
-#~ msgid "Confirm when Expunging a folder"
-#~ msgstr "Bekräfta vid tömning av mapp"
-
 #~ msgid "Default character encoding: "
 #~ msgstr "Standardteckenkodning: "
 
@@ -34027,9 +34403,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "New _Mail Message"
 #~ msgstr "Nytt e-_postmeddelande"
 
-#~ msgid "Create vFolder from Search"
-#~ msgstr "Skapa virtuell mapp från sökning"
-
 #~ msgid "Mark as Unim_portant"
 #~ msgstr "Markera som ovikti_gt"
 
@@ -34586,9 +34959,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "This is an event that can be added to your calendar."
 #~ msgstr "Detta är ett evenemang som kan läggas till i din kalender."
 
-#~ msgid "This is a meeting request."
-#~ msgstr "Detta är en sammanträdesbegäran."
-
 #~ msgid "This is one or more additions to a current meeting."
 #~ msgstr "Detta är en eller flera tillägg till ett aktuellt sammanträde."