Updated Swedish translation.

svn path=/trunk/; revision=7500

2 files changed, 1684 insertions, 1558 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index d7cab8e5da..110621fa6e 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-15  Richard Hult  <rhult@codefactory.se>
+
+	* sv.po: Updated Swedish translation.
+
 2001-01-11  Héctor García Álvarez <hector@scouts-es.org>
 
         * es.po: Updated Spanish translation.
diff --git a/po/sv.po b/po/sv.po
index 7936aa5a51..ea64060854 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,16 +1,16 @@
 # Swedish translation of Evolution.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Andreas Hyden <a.hyden@cyberpoint.se>, 2000.
-# Richard Hult <rhult@codefactory.se>, 2000.
+# Richard Hult <rhult@codefactory.se>, 2000-2001.
 # Christian Rose <menthos@menthos.com>, 2000.
 #
-# $Id: sv.po,v 1.53 2001/01/09 12:42:06 kmaraas Exp $
+# $Id: sv.po,v 1.54 2001/01/15 13:59:43 rhult Exp $
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
+"POT-Creation-Date: 2001-01-15 14:41+0100\n"
 "PO-Revision-Date: 2001-01-03 23:43+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
@@ -30,7 +30,7 @@ msgstr ""
 "\n"
 "Namn: "
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
@@ -38,7 +38,7 @@ msgstr ""
 "\n"
 "  Prefix:     "
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
@@ -46,7 +46,7 @@ msgstr ""
 "\n"
 "  Förnamn:    "
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
@@ -54,7 +54,7 @@ msgstr ""
 "\n"
 "  Andranamn:  "
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
@@ -62,7 +62,7 @@ msgstr ""
 "\n"
 "  Efternamn:  "
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
@@ -70,7 +70,7 @@ msgstr ""
 "\n"
 "  Suffix:     "
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
@@ -78,7 +78,7 @@ msgstr ""
 "\n"
 "Födelsedatum: "
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
@@ -86,7 +86,7 @@ msgstr ""
 "\n"
 "Adress:"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -94,7 +94,7 @@ msgstr ""
 "\n"
 "  Box:           "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
@@ -102,7 +102,7 @@ msgstr ""
 "\n"
 "  Anknytning:    "
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
@@ -110,7 +110,7 @@ msgstr ""
 "\n"
 "  Gatuadress:    "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
@@ -118,7 +118,7 @@ msgstr ""
 "\n"
 "  Ort:           "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
@@ -126,7 +126,7 @@ msgstr ""
 "\n"
 "  Region:        "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
@@ -134,7 +134,7 @@ msgstr ""
 "\n"
 "  Postnummer:    "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
@@ -142,7 +142,7 @@ msgstr ""
 "\n"
 "  Land:          "
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
@@ -150,7 +150,7 @@ msgstr ""
 "\n"
 "Leveransetikett: "
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
@@ -158,7 +158,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
@@ -166,7 +166,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
@@ -174,7 +174,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
@@ -182,7 +182,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
@@ -190,7 +190,7 @@ msgstr ""
 "\n"
 "E-postprogram: "
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
@@ -198,7 +198,7 @@ msgstr ""
 "\n"
 "Tidszon: "
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
@@ -206,7 +206,7 @@ msgstr ""
 "\n"
 "Geografisk plats: "
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
@@ -214,7 +214,7 @@ msgstr ""
 "\n"
 "Yrkesroll: "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
@@ -222,7 +222,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
@@ -230,7 +230,7 @@ msgstr ""
 "\n"
 "  Namn:    "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
@@ -238,7 +238,7 @@ msgstr ""
 "\n"
 "  Enhet:   "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
@@ -246,7 +246,7 @@ msgstr ""
 "\n"
 "  Enhet 2: "
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
@@ -254,7 +254,7 @@ msgstr ""
 "\n"
 "  Enhet 3: "
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
@@ -262,7 +262,7 @@ msgstr ""
 "\n"
 "  Enhet 4: "
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
@@ -270,7 +270,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -288,7 +288,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
@@ -296,7 +296,7 @@ msgstr ""
 "\n"
 "Unik sträng: "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 msgid ""
 "\n"
 "Public Key: "
@@ -308,10 +308,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1083
+#: addressbook/conduit/address-conduit.c:1084
 #: addressbook/gui/component/addressbook-factory.c:38
 #: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "Kunde inte initiera Bonobo"
 
@@ -442,28 +442,28 @@ msgstr "Markören kunde inte läsas in\n"
 msgid "EBook not loaded\n"
 msgstr "EBook inte inläst\n"
 
-#: addressbook/conduit/address-conduit.c:646
+#: addressbook/conduit/address-conduit.c:647
 #: calendar/conduits/calendar/calendar-conduit.c:730
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Kunde inte starta wombat-server"
 
-#: addressbook/conduit/address-conduit.c:647
+#: addressbook/conduit/address-conduit.c:648
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Kunde inte starta wombat"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:680
+#: addressbook/conduit/address-conduit.c:683
 msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte läsa pilotens adressprogramblock"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Ta bort kontakten?"
 
@@ -477,7 +477,7 @@ msgid "_Add"
 msgstr "_Lägg till"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:55
 msgid "_Delete"
 msgstr "_Ta bort"
 
@@ -491,13 +491,12 @@ msgid "New phone type"
 msgstr "Ny telefontyp"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
+#: po/tmp/addressbook-config.glade.h:6 po/tmp/event-editor-dialog.glade.h:7
+#: po/tmp/filter.glade.h:6 po/tmp/mail-config.glade.h:10
 msgid "Add"
 msgstr "Lägg till"
 
@@ -555,7 +554,7 @@ msgid "C_ontacts..."
 msgstr "_Kontakter..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+#: po/tmp/event-editor-dialog.glade.h:9 po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
@@ -572,8 +571,7 @@ msgid "_Address..."
 msgstr "_Adress..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
+#: po/tmp/event-editor-dialog.glade.h:16 po/tmp/mail-config.glade.h:31
 msgid "General"
 msgstr "Allmänt"
 
@@ -618,24 +616,28 @@ msgid "No_tes:"
 msgstr "An_teckningar:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Detaljer"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "Företag"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "Företag 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "Företagsfax"
 
@@ -644,6 +646,7 @@ msgid "Callback"
 msgstr "Tillbakaringning"
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "Bil"
 
@@ -653,28 +656,33 @@ msgstr "Företag"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Hem"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "Hem 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "Fax hem"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "Annat"
 
@@ -683,10 +691,12 @@ msgid "Other Fax"
 msgstr "Annan fax"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "Personsökare"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "Primär"
 
@@ -703,58 +713,60 @@ msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "E-post 3"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: po/tmp/fulladdr.glade.h:6
 msgid "Address _2:"
 msgstr "Adress _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: po/tmp/fulladdr.glade.h:7
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Kontrollera adress"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: po/tmp/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "_Land:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: po/tmp/fulladdr.glade.h:10
 msgid "Finland"
 msgstr "Finland"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: po/tmp/fulladdr.glade.h:11
 msgid "USA"
 msgstr "USA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Adress:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Ort:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:14
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Box:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:15
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "Del_stat/Provins:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:16
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_Postnummer:"
 
@@ -826,18 +838,18 @@ msgid "As _Minicards"
 msgstr "Som _minikort"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Som _tabell"
 
 #: addressbook/gui/component/addressbook.c:374
-#, fuzzy, c-format
+#, c-format
 msgid "Enter password for %s"
-msgstr "Var vänlig och ange NNTP-lösenordet för %s@%s"
+msgstr "Ange lösenord %s"
 
 #: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
@@ -864,27 +876,27 @@ msgstr ""
 "vill kunna använda LDAP måste du hämta och installera\n"
 "OpenLDAP och kompilera om och installera Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr "Visa alla"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr "Avancerat..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr "Något fält innehåller"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr "Namnet innehåller"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr "E-postadressen innehåller"
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "URI:n som mappbläddraren kommer att visa"
 
@@ -909,9 +921,9 @@ msgid "None (anonymous mode)"
 msgstr "Ingen (anonymt läge)"
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:248
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr "Lösenord"
 
@@ -944,12 +956,11 @@ msgid "Bind DN:"
 msgstr "Bind-DN:"
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr "Kom ihåg detta lösenord"
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
+#: po/tmp/mail-config.glade.h:32
 msgid "Host:"
 msgstr "Värd:"
 
@@ -966,12 +977,12 @@ msgid "Search Scope:"
 msgstr "Sökomfattning:"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+#: po/tmp/mail-config.glade.h:14
 msgid "Authentication:"
 msgstr "Autentisering:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+#: po/tmp/mail-config.glade.h:51
 msgid "Path:"
 msgstr "Sökväg:"
 
@@ -996,63 +1007,61 @@ msgstr ""
 "den."
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:45
+#: po/tmp/mail-config.glade.h:44
 msgid "Name:"
 msgstr "Namn:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
+#: po/tmp/addressbook-config.glade.h:7
 msgid "Addressbook Sources"
 msgstr "Adressbokskällor"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
+#: calendar/gui/e-calendar-table.c:381 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:13
+#: po/tmp/evolution-addressbook.xml.h:8 po/tmp/evolution-event-editor.xml.h:19
+#: po/tmp/evolution-mail.xml.h:11 po/tmp/filter.glade.h:7
+#: po/tmp/mail-config.glade.h:24
 msgid "Delete"
 msgstr "Ta bort"
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
+#: mail/folder-browser.c:659 po/tmp/addressbook-config.glade.h:9
+#: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:27
 msgid "Edit"
 msgstr "Redigera"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+#: po/tmp/addressbook-config.glade.h:10
 msgid "Name"
 msgstr "Namn"
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: po/tmp/addressbook-config.glade.h:11
 msgid "URI"
 msgstr "URI"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Sök..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: po/tmp/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Mottagare"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: po/tmp/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Markera namn"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-#, fuzzy
+#: po/tmp/select-names.glade.h:9
 msgid "Select name from:"
-msgstr "Välj namn från listan:"
+msgstr "Välj namn från:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
@@ -1060,127 +1069,175 @@ msgid "Search"
 msgstr "Sök"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:6
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:7
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr "a"
 
-#: addressbook/gui/widgets/alphabet.glade.h:8
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: addressbook/gui/widgets/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: addressbook/gui/widgets/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: addressbook/gui/widgets/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-addressbook-view.c:469
 #: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Spara som VCard"
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+msgid "Email"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+msgid "Department"
+msgstr "Avdelning"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+msgid "Office"
+msgstr "Kontor"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+msgid "Title"
+msgstr "Titel"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+msgid "Profession"
+msgstr "Yrke"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+msgid "Manager"
+msgstr "Manager"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+msgid "Nickname"
+msgstr "Smeknamn"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+msgid "Spouse"
+msgstr "Partner"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+msgid "Note"
+msgstr "Notering"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Spara i adressboken"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1195,175 +1252,174 @@ msgstr ""
 "Dubbelklicka här för att skapa en ny kontakt."
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:6
+#: po/tmp/e-contact-print.glade.h:6
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:7
+#: po/tmp/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:8
+#: po/tmp/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr "Tomma blanketter vid slutet:"
 
-#: addressbook/printing/e-contact-print.glade.h:9
+#: po/tmp/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "Meddelandetext"
 
-#: addressbook/printing/e-contact-print.glade.h:10
+#: po/tmp/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Underst:"
 
-#: addressbook/printing/e-contact-print.glade.h:11
+#: po/tmp/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Dimensioner:"
 
-#: addressbook/printing/e-contact-print.glade.h:12
+#: po/tmp/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Typsnitt..."
 
-#: addressbook/printing/e-contact-print.glade.h:13
+#: po/tmp/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: addressbook/printing/e-contact-print.glade.h:14
+#: po/tmp/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Sidfot:"
 
-#: addressbook/printing/e-contact-print.glade.h:15
+#: po/tmp/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Format"
 
-#: addressbook/printing/e-contact-print.glade.h:16
+#: po/tmp/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "Rubrik"
 
-#: addressbook/printing/e-contact-print.glade.h:17
+#: po/tmp/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "Rubrik/sidfot"
 
-#: addressbook/printing/e-contact-print.glade.h:18
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "Rubriker"
 
-#: addressbook/printing/e-contact-print.glade.h:19
+#: po/tmp/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "Rubriker för varje brev"
 
-#: addressbook/printing/e-contact-print.glade.h:20
+#: po/tmp/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "Höjd:"
 
-#: addressbook/printing/e-contact-print.glade.h:21
+#: po/tmp/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "Följ omedelbart efter varandra"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "Inkludera:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: po/tmp/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Liggande"
 
-#: addressbook/printing/e-contact-print.glade.h:24
+#: po/tmp/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Vänster:"
 
-#: addressbook/printing/e-contact-print.glade.h:25
+#: po/tmp/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "Brevflikar på sidan"
 
-#: addressbook/printing/e-contact-print.glade.h:26
+#: po/tmp/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Marginaler"
 
-#: addressbook/printing/e-contact-print.glade.h:27
+#: po/tmp/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Antal kolumner:"
 
-#: addressbook/printing/e-contact-print.glade.h:28
+#: po/tmp/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Alternativ"
 
-#: addressbook/printing/e-contact-print.glade.h:29
+#: po/tmp/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Orientering"
 
-#: addressbook/printing/e-contact-print.glade.h:30
+#: po/tmp/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Sida"
 
-#: addressbook/printing/e-contact-print.glade.h:31
+#: po/tmp/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Sidinställningar:"
 
-#: addressbook/printing/e-contact-print.glade.h:32
+#: po/tmp/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Papper"
 
-#: addressbook/printing/e-contact-print.glade.h:33
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Papperskälla:"
 
-#: addressbook/printing/e-contact-print.glade.h:34
+#: po/tmp/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Stående"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Förhandsgranska:"
 
-#: addressbook/printing/e-contact-print.glade.h:36
+#: po/tmp/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Skriv ut med grå skuggning"
 
-#: addressbook/printing/e-contact-print.glade.h:37
+#: po/tmp/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Vänd jämna sidor"
 
-#: addressbook/printing/e-contact-print.glade.h:38
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Höger:"
 
-#: addressbook/printing/e-contact-print.glade.h:39
+#: po/tmp/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Sektioner:"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "Skuggning"
 
-#: addressbook/printing/e-contact-print.glade.h:41
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Storlek:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "Börja på en ny sida"
 
-#: addressbook/printing/e-contact-print.glade.h:43
+#: po/tmp/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Stil:"
 
-#: addressbook/printing/e-contact-print.glade.h:44
+#: po/tmp/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Överst:"
 
-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
+#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config.glade.h:72
 msgid "Type:"
 msgstr "Typ:"
 
-#: addressbook/printing/e-contact-print.glade.h:46
+#: po/tmp/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Bredd:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
+#: po/tmp/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "label26"
 
@@ -1398,68 +1454,12 @@ msgstr "Konfigurationsverktyg för evolutions att-göra-kanal.\n"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunde inte läsa pilotens att-göra-programblock"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-#, fuzzy
-msgid "Calendar Server"
-msgstr "Kalender"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Kan inte initiera Evolutions komponent för e-postsammanfattning."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolutions kalenderkanal"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Konfigurationsverktyg för evolutions kalenderkanal.\n"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr "Påminnelse om ditt möte den "
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876 po/tmp/alarm-notify.glade.h:8
 msgid "Snooze"
 msgstr "Slumra"
 
@@ -1489,7 +1489,7 @@ msgstr ""
 "OAF-installation."
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:328
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1497,60 +1497,57 @@ msgstr "%a %Y-%m-%d"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:332 calendar/gui/calendar-model.c:762
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y-%m-%d %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:765
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I.%M.%S %p"
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:370 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "Publikt"
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:373 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:376 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:379 calendar/gui/calendar-model.c:547
 msgid "Unknown"
 msgstr "Okänt"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:467
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:467
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:469
 msgid "E"
 msgstr "Ö"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:469
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:541
 msgid "Transparent"
 msgstr "Genomskinlig"
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:544
 msgid "Opaque"
 msgstr "Ogenomskinlig"
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:770
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1562,7 +1559,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:871 calendar/gui/calendar-model.c:919
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1570,27 +1567,27 @@ msgstr "%Y-%m-%d"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:865
+#: calendar/gui/calendar-model.c:889
 msgid "%I:%M:%S %p%n"
 msgstr "%I.%M.%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:868
+#: calendar/gui/calendar-model.c:892
 msgid "%H:%M:%S%n"
 msgstr "%H.%M.%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:872
+#: calendar/gui/calendar-model.c:896
 msgid "%I:%M %p%n"
 msgstr "%I.%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:899
 msgid "%H:%M%n"
 msgstr "%H.%M%n"
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1019
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1600,40 +1597,53 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1059
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentvärdet måste vara mellan 0 och 100"
 
-#: calendar/gui/calendar-model.c:1075
+#: calendar/gui/calendar-model.c:1099
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteten måste vara mellan 1 och 9"
 
-#: calendar/gui/calendar-summary.c:81
-#, fuzzy
+#: calendar/gui/calendar-summary.c:93
 msgid "%A, %e %B %Y"
-msgstr "%A %d %B %Y"
+msgstr "%A, %d %B %Y"
 
-#: calendar/gui/calendar-summary.c:224
-#, fuzzy
+#: calendar/gui/calendar-summary.c:134 calendar/gui/calendar-summary.c:140
+msgid "%I:%M%p"
+msgstr "%I.%M%p"
+
+#: calendar/gui/calendar-summary.c:299
 msgid "<b>Error loading calendar</b>"
-msgstr "Fel vid inläsning av filen: %s"
+msgstr "<b>Fel vid inläsning av kalender</b>"
 
-#: calendar/gui/calendar-summary.c:229
+#: calendar/gui/calendar-summary.c:304
 msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr ""
+msgstr "<b>Fel vid inläsning av kalender:<br>Kalendern upptagen."
 
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:310
 msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr ""
+msgstr "<b>Fel vid inläsning av kalender:<br>Stödjer inte metoden."
 
-#: calendar/gui/calendar-summary.c:293
-#, fuzzy
+#: calendar/gui/calendar-summary.c:476
+msgid "Display"
+msgstr "Visa"
+
+#: calendar/gui/calendar-summary.c:481
+msgid "Show appointments"
+msgstr "Visa möten"
+
+#: calendar/gui/calendar-summary.c:489
+msgid "Show tasks"
+msgstr "Visa uppgifter"
+
+#: calendar/gui/calendar-summary.c:581
 msgid "Loading Calendar"
-msgstr "Skriv ut kalender"
+msgstr "Läser kalender"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
-msgstr "URI:t som kalendern kommer att visa"
+msgstr "URI:n som kalendern kommer att visa"
 
 #: calendar/gui/dialogs/alarm-notify-dialog.c:183
 msgid "Alarm on %A %b %d %Y %H:%M"
@@ -1648,271 +1658,258 @@ msgid "No summary available."
 msgstr "Ingen sammanfattning finns tillgänglig."
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
+#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
+#: po/tmp/evolution-event-editor.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:8
+#: po/tmp/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "Stäng"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Redigera möte"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Slumringstid (minuter)"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: po/tmp/cal-prefs-dialog.glade.h:6
 msgid "05 minutes"
 msgstr "05 minuter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: po/tmp/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr "10 minuter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: po/tmp/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 timmar (fm/em)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: po/tmp/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr "15 minuter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: po/tmp/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 timmar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: po/tmp/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr "30 minuter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: po/tmp/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr "60 minuter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: po/tmp/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr "Ljudalarm stängs av efter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: po/tmp/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "Ljudalarm"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: po/tmp/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "Pip när alarmfönster visas."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: po/tmp/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: po/tmp/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Kalenderinställningar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: po/tmp/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Färger"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: po/tmp/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "Tryck ihop helger"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: po/tmp/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "Alternativ för datumnavigerare"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: po/tmp/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "Standardvärden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: po/tmp/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Visningsalternativ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/e-calendar-table.c:158 po/tmp/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Förfallodatum"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: po/tmp/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr "Aktivera slummer i"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: po/tmp/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Dagen slutar:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: po/tmp/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "Första dagen i veckan:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/gnome-month-item.c:741
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
 msgid "Fri"
 msgstr "fre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:28
 msgid "Friday"
 msgstr "fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: po/tmp/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr "Markera"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: po/tmp/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr "objekt som ska ha utförts idag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: po/tmp/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr "Objekt som ska ha utförts idag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: po/tmp/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr "objekt som inte ska utföras än"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: po/tmp/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr "Obejkt som inte ska utföras än:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
 msgid "Mon"
 msgstr "mån"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:35
 msgid "Monday"
 msgstr "måndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: po/tmp/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr "objekt som skulle ha utförts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: po/tmp/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr "Objekt som skulle ha utförts:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: po/tmp/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr "Välj en färg"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
+#: calendar/gui/e-calendar-table.c:161 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: po/tmp/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Påminn mig om alla möten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: po/tmp/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr "Påminnare"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
 msgid "Sat"
 msgstr "lör"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:43
 msgid "Saturday"
 msgstr "lördag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: po/tmp/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr "Visa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: po/tmp/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Visa sluttiderna på möten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: po/tmp/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Visa veckonummer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: po/tmp/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Dagen startar:"
 
 #. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
 msgid "Sun"
 msgstr "sön"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
+#: calendar/gui/event-editor.c:440 po/tmp/cal-prefs-dialog.glade.h:49
 msgid "Sunday"
 msgstr "söndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: po/tmp/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "Uppgiftsyta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
 msgid "Thu"
 msgstr "tor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:52
 msgid "Thursday"
 msgstr "torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: po/tmp/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr "Tid till förfallodatum"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: po/tmp/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "Tidsdivisioner:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: po/tmp/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
 msgid "Tue"
 msgstr "tis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:57
 msgid "Tuesday"
 msgstr "tisdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: po/tmp/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Visuella alarm"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
 msgid "Wed"
 msgstr "ons"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:60
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: po/tmp/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "Arbetsvecka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: po/tmp/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "minuter innan de sker."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: po/tmp/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "sekunder."
 
@@ -1944,138 +1941,185 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Är du säker på att du vill ta bort denna namnlösa dagbokspost?"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: po/tmp/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
 msgstr "% färdig_t:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: po/tmp/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "K_lassifikation:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: po/tmp/task-editor-dialog.glade.h:9
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: po/tmp/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Färdigt"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: po/tmp/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "Datum utfört:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: po/tmp/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Hög"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: po/tmp/task-editor-dialog.glade.h:15
 msgid "In Progress"
 msgstr "Pågår"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: po/tmp/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Låg"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
+#: po/tmp/mail-config.glade.h:46 po/tmp/task-editor-dialog.glade.h:17
+#: shell/e-shell-view.c:1089 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: po/tmp/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: po/tmp/task-editor-dialog.glade.h:19
 msgid "Not Started"
 msgstr "Inte startad"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: po/tmp/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "S_ammanfattning"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: po/tmp/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Sta_rtdatum:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Uppgift"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "Undefined"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:27
 msgid "_Contacts..."
 msgstr "_Kontakter..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: po/tmp/task-editor-dialog.glade.h:28
 msgid "_Due Date:"
 msgstr "Förfallo_datum:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#: po/tmp/task-editor-dialog.glade.h:29
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
+#: po/tmp/task-editor-dialog.glade.h:30
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+#: po/tmp/task-editor-dialog.glade.h:31
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
-#: calendar/gui/dialogs/task-editor.c:681
+#: calendar/gui/dialogs/task-editor.c:689
 msgid "Edit Task"
 msgstr "Redigera uppgift"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:336
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:342
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:345
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:348
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagbokspost - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
+#: calendar/gui/dialogs/task-editor.c:1292 calendar/gui/event-editor.c:3269
 msgid "Do you want to save changes?"
 msgstr "Vill du spara ändringar?"
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:153
+msgid "Categories"
+msgstr "Kategorier"
+
+#: calendar/gui/e-calendar-table.c:154 po/tmp/event-editor-dialog.glade.h:10
+msgid "Classification"
+msgstr "Klassifikation"
+
+#: calendar/gui/e-calendar-table.c:155
+msgid "Completion Date"
+msgstr "Färdigdatum"
+
+#: calendar/gui/e-calendar-table.c:156
+msgid "End Date"
+msgstr "Slutdatum"
+
+#: calendar/gui/e-calendar-table.c:157
+msgid "Start Date"
+msgstr "Startdatum"
+
+#: calendar/gui/e-calendar-table.c:159
+msgid "Geographical Position"
+msgstr "Geografisk position"
+
+#: calendar/gui/e-calendar-table.c:160
+msgid "Precent complete"
+msgstr "Procent klar"
+
+#: calendar/gui/e-calendar-table.c:162
+msgid "Summary"
+msgstr "Sammanfattning"
+
+#: calendar/gui/e-calendar-table.c:163
+msgid "Transparency"
+msgstr "Genomskinlighet"
+
+#: calendar/gui/e-calendar-table.c:164
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-calendar-table.c:165
+msgid "Alarms"
+msgstr "Alarm"
+
+#: calendar/gui/e-calendar-table.c:375
 msgid "Open..."
 msgstr "Öppna..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:376
 msgid "Open the task"
 msgstr "Öppna uppgiften"
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:378
 msgid "Mark Complete"
 msgstr "Markera som färdig"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:379
 msgid "Mark the task complete"
 msgstr "Markera uppgiften som färdig"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:382
 msgid "Delete the task"
 msgstr "Ta bort uppgiften"
 
@@ -2086,21 +2130,21 @@ msgstr "%02i minutdivisioner"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1213
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1227
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1240
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
@@ -2117,34 +2161,58 @@ msgstr "fm"
 msgid "pm"
 msgstr "em"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:2950 calendar/gui/e-day-view.c:2957
+#: calendar/gui/e-day-view.c:2966 calendar/gui/e-week-view.c:3170
+#: calendar/gui/e-week-view.c:3177 calendar/gui/e-week-view.c:3186
 msgid "New appointment..."
 msgstr "Nytt möte..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-day-view.c:2961
+#: calendar/gui/e-week-view.c:3174 calendar/gui/e-week-view.c:3181
 msgid "Edit this appointment..."
 msgstr "Redigera detta möte..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3175
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Ta bort detta möte"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3182
 msgid "Make this appointment movable"
 msgstr "Gör detta möte flyttbart"
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:2963 calendar/gui/e-week-view.c:3183
 msgid "Delete this occurrence"
 msgstr "Ta bort denna förekomst"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3184
 msgid "Delete all occurrences"
 msgstr "Ta bort alla förekomster"
 
+#: calendar/gui/e-tasks.c:156 calendar/gui/e-tasks.c:573
+#: calendar/gui/e-tasks.c:608
+msgid "All"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:162
+msgid "Category:"
+msgstr "Kategori:"
+
+#: calendar/gui/e-tasks.c:333
+#, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Kunde inte läsa in uppgifterna i \"%s\""
+
+#: calendar/gui/e-tasks.c:345
+#, c-format
+msgid "Could not create a tasks file in `%s'"
+msgstr "Kunde inte skapa en uppgiftsfil i \"%s\""
+
+#: calendar/gui/e-tasks.c:358 calendar/gui/gnome-cal.c:731
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "Metoden som krävs för att läsa in \"%s\" stöds inte"
+
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
@@ -2153,288 +2221,269 @@ msgid "%d %B"
 msgstr "%d %B"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: po/tmp/event-editor-dialog.glade.h:6
 msgid "A_ll day event"
 msgstr "He_ldagsarrangemang"
 
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: po/tmp/event-editor-dialog.glade.h:8
 msgid "Appointment Basics"
 msgstr "Grundläggande mötessaker"
 
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Classification"
-msgstr "Klassifikation"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
+#: po/tmp/event-editor-dialog.glade.h:11
 msgid "Custom recurrence"
 msgstr "Anpassad upprepning"
 
-#: calendar/gui/event-editor-dialog.glade.h:11
+#: po/tmp/event-editor-dialog.glade.h:12
 msgid "Days"
 msgstr "dag"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
+#: po/tmp/event-editor-dialog.glade.h:14
 msgid "Every"
 msgstr "Var"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "Exceptions"
 msgstr "Undantag"
 
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: po/tmp/event-editor-dialog.glade.h:17
 msgid "Hours"
 msgstr "timme"
 
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:18
 msgid "Mail _to:"
 msgstr "E-posta _till:"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
+#: po/tmp/event-editor-dialog.glade.h:19
 msgid "Minutes"
 msgstr "minut"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
+#: po/tmp/event-editor-dialog.glade.h:20
 msgid "Modify"
 msgstr "Ändra"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
+#: po/tmp/event-editor-dialog.glade.h:21
 msgid "No recurrence"
 msgstr "Ingen upprepning"
 
-#: calendar/gui/event-editor-dialog.glade.h:21
+#: po/tmp/event-editor-dialog.glade.h:22
 msgid "Preview"
 msgstr "Förhandsgranska"
 
-#: calendar/gui/event-editor-dialog.glade.h:22
+#: po/tmp/event-editor-dialog.glade.h:23
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: calendar/gui/event-editor-dialog.glade.h:23
+#: po/tmp/event-editor-dialog.glade.h:24
 msgid "Pu_blic"
 msgstr "Pu_blikt"
 
-#: calendar/gui/event-editor-dialog.glade.h:24
+#: po/tmp/event-editor-dialog.glade.h:25
 msgid "Recurrence"
 msgstr "Upprepning"
 
-#: calendar/gui/event-editor-dialog.glade.h:25
+#: po/tmp/event-editor-dialog.glade.h:26
 msgid "Recurrence Rule"
 msgstr "Upprepningsregel"
 
-#: calendar/gui/event-editor-dialog.glade.h:26
+#: po/tmp/event-editor-dialog.glade.h:27
 msgid "Reminder"
 msgstr "Påminnare"
 
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: po/tmp/event-editor-dialog.glade.h:28
 msgid "Simple recurrence"
 msgstr "Enkel upprepning"
 
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: po/tmp/event-editor-dialog.glade.h:29
 msgid "Su_mmary:"
 msgstr "Sa_mmanfattning:"
 
-#: calendar/gui/event-editor-dialog.glade.h:29
+#: po/tmp/event-editor-dialog.glade.h:30
 msgid "Time"
 msgstr "Tid"
 
-#: calendar/gui/event-editor-dialog.glade.h:30
+#: po/tmp/event-editor-dialog.glade.h:31
 msgid "_Audio"
 msgstr "_Ljud"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
+#: po/tmp/event-editor-dialog.glade.h:32
 msgid "_Confidential"
 msgstr "_Konfidentiellt"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_Contacts"
+msgstr "_Kontakter"
+
+#: po/tmp/event-editor-dialog.glade.h:34
 msgid "_Display"
 msgstr "_Visa"
 
-#: calendar/gui/event-editor-dialog.glade.h:33
+#: po/tmp/event-editor-dialog.glade.h:35
 msgid "_End time:"
 msgstr "Slutti_d:"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
+#: po/tmp/event-editor-dialog.glade.h:36
 msgid "_Mail"
 msgstr "_E-post"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
+#: po/tmp/event-editor-dialog.glade.h:37
 msgid "_Program"
 msgstr "_Program"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
+#: po/tmp/event-editor-dialog.glade.h:38
 msgid "_Run program:"
 msgstr "_Kör program:"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
+#: po/tmp/event-editor-dialog.glade.h:39
 msgid "_Start time:"
 msgstr "_Starttid:"
 
-#: calendar/gui/event-editor-dialog.glade.h:38
+#: po/tmp/event-editor-dialog.glade.h:40
 msgid "_Starting date:"
 msgstr "_Startdatum:"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
+#: po/tmp/event-editor-dialog.glade.h:41
 msgid "day(s)"
 msgstr "dag"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: po/tmp/event-editor-dialog.glade.h:42
 msgid "event-editor-dialog"
 msgstr "event-editor-dialog"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
+#: po/tmp/event-editor-dialog.glade.h:43
 msgid "for"
 msgstr "i"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
+#: po/tmp/event-editor-dialog.glade.h:44
 msgid "forever"
 msgstr "för alltid"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: po/tmp/event-editor-dialog.glade.h:45
 msgid "label21"
 msgstr "label21"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: po/tmp/event-editor-dialog.glade.h:46
 msgid "month(s)"
 msgstr "månad"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "until"
 msgstr "till"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: po/tmp/event-editor-dialog.glade.h:48
 msgid "week(s)"
 msgstr "vecka"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: po/tmp/event-editor-dialog.glade.h:49
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/event-editor.c:325
+#: calendar/gui/event-editor.c:330
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: calendar/gui/event-editor.c:403
+#: calendar/gui/event-editor.c:408
 msgid "on"
 msgstr "vid"
 
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:433 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:560
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:567
 msgid "th"
 msgstr ":e"
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:721
 msgid "occurrences"
 msgstr "förekomster"
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:838
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Detta möte har upprepningsregler som inte kan redigeras med Evolution."
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3092 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/gnome-cal.c:676
+#: calendar/gui/gnome-cal.c:709
 #, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Kunde inte läsa in kalendern i \"%s\""
+msgid "Could not load the folder in `%s'"
+msgstr "Kunde inte läsa in mappen i \"%s\""
 
-#: calendar/gui/gnome-cal.c:687
+#: calendar/gui/gnome-cal.c:720
 #, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Kunde inte skapa en kalender i \"%s\""
-
-#: calendar/gui/gnome-cal.c:698
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Metoden som krävs för att läsa in \"%s\" stöds inte"
+msgid "Could not create a folder in `%s'"
+msgstr "Kunde inte skapa en mapp i \"%s\""
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:6
 msgid "April"
 msgstr "april"
 
-#: calendar/gui/goto-dialog.glade.h:7
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:7
 msgid "August"
 msgstr "augusti"
 
-#: calendar/gui/goto-dialog.glade.h:8
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:8
 msgid "December"
 msgstr "december"
 
-#: calendar/gui/goto-dialog.glade.h:9
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:9
 msgid "February"
 msgstr "februari"
 
-#: calendar/gui/goto-dialog.glade.h:10
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:10
 msgid "Go To Date"
 msgstr "Gå till datum"
 
-#: calendar/gui/goto-dialog.glade.h:11
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:11
 msgid "Go To Today"
 msgstr "Gå till idag"
 
-#: calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:12
 msgid "January"
 msgstr "januari"
 
-#: calendar/gui/goto-dialog.glade.h:13
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:13
 msgid "July"
 msgstr "juli"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:14
 msgid "June"
 msgstr "juni"
 
-#: calendar/gui/goto-dialog.glade.h:15
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:15
 msgid "March"
 msgstr "mars"
 
-#: calendar/gui/goto-dialog.glade.h:16
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:16
 msgid "May"
-msgstr "måndag"
+msgstr "maj"
 
-#: calendar/gui/goto-dialog.glade.h:17
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:17
 msgid "November"
 msgstr "november"
 
-#: calendar/gui/goto-dialog.glade.h:18
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:18
 msgid "October"
 msgstr "oktober"
 
-#: calendar/gui/goto-dialog.glade.h:19
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:19
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/main.c:49
+#: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
 msgstr "Kunde inte initiera GNOME"
 
@@ -2626,10 +2675,14 @@ msgstr "Aktuellt år (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1042
 msgid "Print Preview"
 msgstr "Förhandsgranska"
 
+#: calendar/gui/tasks-control.c:105
+msgid "The URI of the tasks folder to display"
+msgstr "URI:t som uppgiftsmappen ska visa"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
@@ -2721,51 +2774,56 @@ msgstr "Kunde inte läsa in %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunde inte läsa in %s: Ingen initialiseringskod i modulen."
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr "%s-server %s"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-tjänst för %s på %s"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:315
+msgid "Connection cancelled"
+msgstr "Anslutning avbruten"
+
+#: camel/camel-remote-store.c:318 camel/camel-remote-store.c:331
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunde inte ansluta till %s (port %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:319 camel/camel-remote-store.c:332
 msgid "(unknown host)"
 msgstr "(okänd värd)"
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr "Servern kopplade ifrån."
+#: camel/camel-remote-store.c:423 camel/camel-remote-store.c:485
+#: camel/camel-remote-store.c:553
+msgid "Operation cancelled"
+msgstr "Operation avbruten"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL:en \"%s\" behöver ett användarnamn"
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL:en \"%s\" behöver ett värdnamn"
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL:en \"%s\" behöver en sökväg"
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr "Det finns ingen värd med namnet %s."
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Kunde temporärt inte slå upp värdnamnet %s."
@@ -2784,17 +2842,17 @@ msgstr ""
 "Kunde inte skapa katalogen %s:\n"
 "%s"
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL-strängen \"%s\" innehåller inget protokoll"
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL-strängen \"%s\" innehåller ett ogiltigt protokoll"
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Portnumret i URL:en \"%s\" består inte av siffror"
@@ -2812,30 +2870,30 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr "Felaktigt autentiseringssvar från servern."
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:233
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Oväntat svar från IMAP-servern: %s"
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:241
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommandot misslyckades: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:242 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:288
 msgid "Server response ended too soon."
 msgstr "Serversvaret tog slut för tidigt."
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:424
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP-serversvaret innehöll inte %s-information"
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:460
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Oväntat OK-svar från IMAP-servern: %s"
@@ -2845,7 +2903,7 @@ msgstr "Oväntat OK-svar från IMAP-servern: %s"
 msgid "Could not load summary for %s"
 msgstr "Kunde inte läsa in sammanfattning för %s"
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:625
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
@@ -2857,28 +2915,28 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "För läsande och lagrande av e-post på IMAP-servrar."
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:250
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Det här alternativet ansluter till IMAP-servern med ett lösenord i klartext."
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:259
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:261
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Detta alternativ kommer att ansluta till IMAP-servern med Kerberos "
 "4-autentisering."
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:335
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVar vänlig och ange IMAP-lösenordet för %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:363
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2889,34 +2947,34 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:619
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kunde inte skapa katalogen %s: %s"
 
 #: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
-msgstr "Brevlådekataloger i UNIX-MH-format (CamelLocal-version)"
+msgid "MH-format mail directories"
+msgstr "Brevlådekataloger i MH-format"
 
 #: camel/providers/local/camel-local-provider.c:37
 msgid "For storing local mail in MH-like mail directories"
 msgstr "För lagrande av e-post i MH-liknande brevlådekataloger"
 
 #: camel/providers/local/camel-local-provider.c:47
-msgid "UNIX mbox-format mail files (CamelLocal version)"
-msgstr "Brevlådefiler i UNIX-mbox-format (CamelLocal-version)"
+msgid "Standard Unix mailbox file"
+msgstr "Standard Unix brevlådefil"
 
 #: camel/providers/local/camel-local-provider.c:48
 msgid "For storing local mail in standard mbox format"
 msgstr "För lagrande av e-post i standard-mbox-format"
 
 #: camel/providers/local/camel-local-provider.c:58
-msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
-msgstr "UNIX-brevfiler i qmail-brevlådekatalogformat (CamelLocal-version)"
+msgid "Qmail maildir-format mail files"
+msgstr "Brevlådefiler i Qmail maildir-format"
 
 #: camel/providers/local/camel-local-provider.c:59
 msgid "For storing local mail in qmail maildir directories"
-msgstr "För lagrande av e-post i MH-liknande brevlådekataloger"
+msgstr "För lagrande av e-post i qmail maildir-liknande kataloger"
 
 #: camel/providers/local/camel-local-store.c:122
 #, c-format
@@ -3250,8 +3308,8 @@ msgstr ""
 "Det här alternativet kommer att autentisera med NNTP-servern genom att "
 "använda ett klartextlösenord."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Kan inte öppna eller skapa .newsrc-fil för %s: %s"
@@ -3282,7 +3340,7 @@ msgstr ""
 "För anslutning till POP-servrar. POP-protokollet kan även användas för att "
 "hämta e-post från vissa webb-epostleverantörer och slutna e-postsystem."
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3291,7 +3349,7 @@ msgstr ""
 "klartextlösenord. Det här är det enda alternativet som stöds hos många "
 "POP-servrar."
 
-#: camel/providers/pop3/camel-pop3-store.c:160
+#: camel/providers/pop3/camel-pop3-store.c:158
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -3301,29 +3359,29 @@ msgstr ""
 "ett krypterat lösenord via APOP-protokollet. Det här kanske inte fungerar "
 "för alla användare även med servrar som sägs stöda detta."
 
-#: camel/providers/pop3/camel-pop3-store.c:172
+#: camel/providers/pop3/camel-pop3-store.c:170
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Det här kommer att ansluta till POP-servern och använda Kerberos 4 för att "
 "autentisera med den."
 
-#: camel/providers/pop3/camel-pop3-store.c:217
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kunde inte autentisera till KPOP-server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:337
+#: camel/providers/pop3/camel-pop3-store.c:335
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Kunde inte ansluta till POP-servern på %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:375
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVar vänlig och ange ett POP3-lösenord för %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:410
+#: camel/providers/pop3/camel-pop3-store.c:394
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3332,12 +3390,12 @@ msgstr ""
 "Kunde inte ansluta till POP-servern,\n"
 "Fel vid skickande av filnamn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:413
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr "(Okänd)"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3345,7 +3403,7 @@ msgstr ""
 "Kan inte ansluta till POP-servern.\n"
 "Inget stöd för begärd autentiseringsmekanism."
 
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3354,13 +3412,13 @@ msgstr ""
 "Kan inte ansluta till POP-server.\n"
 "Fel vid skickande av lösenord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:63
+#: po/tmp/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3410,28 +3468,22 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "E-postleverans via programmet sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr "SMTP"
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
-#, fuzzy
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "För leverans av e-post genom anslutning till ett fjärr-epostnav som använder "
 "SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Fel på välkomstsvar: %s: möjligtvis inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 msgid "No authentication required"
 msgstr "Ingen autentisering krävs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
@@ -3439,109 +3491,109 @@ msgstr ""
 "Det här alternativet kommer att ansluta till SMTP-servern utan någon form av "
 "autentisering. Detta bör fungera för anslutning till de flesta SMTP-servrar."
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
+#: po/tmp/mail-config.glade.h:15
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 "Detta alternativ kommer att ansluta till SMTP-servern med "
 "CRAM-MD5-autentisering."
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-epostleverans via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan inte skicka meddelande: avsändaradressen är inte angiven."
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan inte skicka meddelande: avsändaradressen är inte giltig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan inte skicka meddelande: inga mottagare är angivna."
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Tidsgränsen för HELO-begäran passerades: %s: inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Fel i HELO-svar: %s: inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 "Tidsgränsen för MAIL FROM-begäran passerades: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Fel i MAIL FROM-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tidsgränsen för RCPT TO-begäran passerades: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:574
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Fel i RCPT TO-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:605
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tidsgränsen för DATA-begäran passerades: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:621
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Fel i DATA-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:636
+#: camel/providers/smtp/camel-smtp-transport.c:654
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Tidsgränsen för DATA-skickande passerades: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:670
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Fel i DATA-svar: meddelandeslut: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:694
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsgränsen för RSET-begäran passerades: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:710
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:733
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Tidsgränsen för QUIT-begäran passerades: %s: inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:749
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Fel i QUIT-svar: %s: inte ödesdigert"
@@ -3584,12 +3636,12 @@ msgid "attachment"
 msgstr "bilaga"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 po/tmp/filter.glade.h:14
+#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -3606,55 +3658,55 @@ msgid "Attach a file to the message"
 msgstr "Bifoga en fil till meddelandet"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:6
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "Egenskaper hos bilagan"
 
-#: composer/e-msg-composer-attachment.glade.h:8
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Filnamn:"
 
-#: composer/e-msg-composer-attachment.glade.h:9
+#: po/tmp/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "MIME-typ:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "Från:"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "Klicka här för att ta fram adressboken"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 msgid "Enter the identity you wish to send this message from"
 msgstr "Ange den identitet som du vill skicka detta meddelande ifrån"
 
-#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "Till:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Ange adresserna som ska få en kopia av meddelandet"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3662,11 +3714,11 @@ msgstr ""
 "Ange adresserna till de som ska ta emot en extra kopia av meddelandet utan "
 "att visas i mottagarlistan av meddelandet."
 
-#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "Ange ämnet på brevet"
 
@@ -3706,11 +3758,11 @@ msgstr "Sparar ändringar i meddelande..."
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Fel vid sparande av alster i \"Drafts\": %s"
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:754 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:760
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3720,27 +3772,27 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:785
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:911
 msgid "That file does not exist."
 msgstr "Den filen finns inte."
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:921
 msgid "That is not a regular file."
 msgstr "Det är ingen vanlig fil."
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:931
 msgid "That file exists but is not readable."
 msgstr "Den filen finns, men är inte läsbar."
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:941
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Filen verkade åtkomlig, men open(2) misslyckades."
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:963
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3748,19 +3800,19 @@ msgstr ""
 "Filen är mycket stor (större än 100kB).\n"
 "Är du säker på att du vill infoga den?"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:984
 msgid "An error occurred while reading the file."
 msgstr "Ett fel uppstod vid läsning av filen."
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1364
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1441
 msgid "Could not create composer window."
 msgstr "Kunde inte skapa fönster för meddelanderedigering."
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:345
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan inte initiera Evolutions e-postredigerare."
 
@@ -3900,7 +3952,7 @@ msgstr "inkommande"
 msgid "outgoing"
 msgstr "utgående"
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "Redigera filter"
 
@@ -4004,186 +4056,191 @@ msgstr "Viktigt"
 msgid "Read"
 msgstr "Läs"
 
-#: filter/filter.glade.h:10
+#: po/tmp/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Redigera virtuella mappar"
 
-#: filter/filter.glade.h:11
+#: po/tmp/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Filterregler"
 
-#: filter/filter.glade.h:12
+#: po/tmp/filter.glade.h:12
 msgid "Incoming"
 msgstr "Inkommande"
 
-#: filter/filter.glade.h:13
+#: po/tmp/filter.glade.h:13
 msgid "Outgoing"
 msgstr "Utgående"
 
-#: filter/filter.glade.h:15
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Virtuella mappar"
 
-#: filter/filter.glade.h:16
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "Källor för virtuella mappar"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "efter"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Tilldela färg"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Tilldela poäng"
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr "före"
-
-#: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr "innehåller"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Kopiera till mapp"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Ankomstdatum"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Avsändningsdatum"
 
+#: filter/libfilter-i18n.h:8
+msgid "Expression"
+msgstr "Uttryck"
+
+#: filter/libfilter-i18n.h:9
+msgid "Forward to Address"
+msgstr "Vidarebefordra till adress"
+
+#: filter/libfilter-i18n.h:10
+msgid "Message Body"
+msgstr "Meddelandetext"
+
 #: filter/libfilter-i18n.h:11
-msgid "does not contain"
-msgstr "innehåller inte"
+msgid "Message Header"
+msgstr "Meddelandehuvud"
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
-msgstr "slutar inte med"
+msgid "Message was received"
+msgstr "Meddelandet mottogs"
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
-msgstr "finns inte"
+msgid "Message was sent"
+msgstr "Meddelandet skickades"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
-msgstr "låter inte som"
+msgid "Move to Folder"
+msgstr "Flytta till mapp"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
-msgstr "börjar inte med"
+msgid "Recipients"
+msgstr "Mottagare"
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
-msgstr "slutar med"
+msgid "Regex Match"
+msgstr "Sökning med reguljärt uttryck"
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
-msgstr "finns"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1107
+msgid "Score"
+msgstr "Poäng"
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
-msgstr "Uttryck"
+msgid "Sender"
+msgstr "Avsändare"
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
-msgstr "Vidarebefordra till adress"
+msgid "Set Status"
+msgstr "Ställ in status"
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
-msgstr "är"
+msgid "Source"
+msgstr "Källa"
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
-msgstr "är större än"
+msgid "Specific header"
+msgstr "Specifikt huvud"
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr "är mindre än"
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1107
+msgid "Status"
+msgstr "Status"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
-msgstr "är inte"
+msgid "Stop Processing"
+msgstr "Stoppa behandling"
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
-msgstr "Meddelandetext"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1108
+msgid "Subject"
+msgstr "Ämne"
 
 #: filter/libfilter-i18n.h:25
-msgid "Message Header"
-msgstr "Meddelandehuvud"
+msgid "after"
+msgstr "efter"
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
-msgstr "Meddelandet mottogs"
+msgid "before"
+msgstr "före"
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
-msgstr "Meddelandet skickades"
+msgid "contains"
+msgstr "innehåller"
 
 #: filter/libfilter-i18n.h:28
-msgid "Move to Folder"
-msgstr "Flytta till mapp"
+msgid "does not contain"
+msgstr "innehåller inte"
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
-msgstr "den eller efter"
+msgid "does not end with"
+msgstr "slutar inte med"
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
-msgstr "den eller innan"
+msgid "does not exist"
+msgstr "finns inte"
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
+msgstr "låter inte som"
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
-msgstr "Mottagare"
+msgid "does not start with"
+msgstr "börjar inte med"
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
-msgstr "Sökning med reguljärt uttryck"
+msgid "ends with"
+msgstr "slutar med"
 
 #: filter/libfilter-i18n.h:34
-msgid "Sender"
-msgstr "Avsändare"
+msgid "exists"
+msgstr "finns"
 
 #: filter/libfilter-i18n.h:35
-msgid "Set Status"
-msgstr "Ställ in status"
+msgid "is greater than"
+msgstr "är större än"
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
-msgstr "låter som"
+msgid "is less than"
+msgstr "är mindre än"
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
-msgstr "Källa"
+msgid "is not"
+msgstr "är inte"
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
-msgstr "Specifikt huvud"
+msgid "is"
+msgstr "är"
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
-msgstr "börjar med"
+msgid "on or after"
+msgstr "den eller efter"
 
 #: filter/libfilter-i18n.h:40
-msgid "Status"
-msgstr "Status"
+msgid "on or before"
+msgstr "den eller innan"
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
-msgstr "Stoppa behandling"
+msgid "sounds like"
+msgstr "låter som"
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "Ämne"
+msgid "starts with"
+msgstr "börjar med"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4201,10 +4258,6 @@ msgstr "Lägg till regel"
 msgid "Edit Score Rule"
 msgstr "Redigera poängregel"
 
-#: filter/score-rule.c:192 filter/score-rule.c:194
-msgid "Score"
-msgstr "Poäng"
-
 #: filter/vfolder-editor.c:155
 msgid "Add VFolder Rule"
 msgstr "Lägg till regel för virtuell mapp"
@@ -4213,209 +4266,174 @@ msgstr "Lägg till regel för virtuell mapp"
 msgid "Edit VFolder Rule"
 msgstr "Redigera regel för virtuell mapp"
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:282
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan inte initiera Evolutions e-postkomponent."
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:318
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lagring hos skal"
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "Spara"
+#: mail/folder-browser.c:225
+msgid "Store search as vFolder"
+msgstr "Lagra sökning som vMapp"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "Meddelandetexten eller ämnet innehåller"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "Meddelandetexten innehåller"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "Ämnesraden innehåller"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "Meddelandetexten innehåller inte"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "Ämnesraden innehåller inte"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr "Virtuell mapp på ämnesrad"
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr "Virtuell mapp på avsändare"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr "Virtuell mapp på mottagare"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr "Filtrera på ämnesrad"
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr "Filtrera på avsändare"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr "Filtrera på mottagare"
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr "Filtrera på sändlista"
 
-#: mail/folder-browser.c:655
-msgid "Show all hidden"
-msgstr "Visa alla gömda"
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr "Göm markerade"
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-msgid "Hide read"
-msgstr "Göm lästa"
-
-#: mail/folder-browser.c:661
-msgid "Hide deleted"
-msgstr "Göm borttagna"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-msgid "Hide Subject"
-msgstr "Göm ämnesrad"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-msgid "Hide from Sender"
-msgstr "Göm för avsändaren"
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658 po/tmp/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "Öppna"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
+#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
+#: po/tmp/evolution-mail.xml.h:33
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "Svara till avsändaren"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
+#: po/tmp/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
+#: po/tmp/evolution-mail.xml.h:19
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666 po/tmp/evolution-mail.xml.h:20
 msgid "Forward inline"
 msgstr "Vidarebefordra inuti"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr "Markera som läst"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr "Markera som oläst"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 msgid "Move to Folder..."
 msgstr "Flytta till mapp..."
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 msgid "Copy to Folder..."
 msgstr "Kopiera till mapp..."
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 msgid "Undelete"
 msgstr "Ångra borttagning"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr "Tillämpa filter"
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr "Skapa regel från meddelande"
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
-msgid "Hide Messages"
-msgstr "Göm meddelanden"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrera på sändlista (%s)"
 
-#: mail/folder-browser.c:787
-#, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Göm ämnesraden \"%s\""
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr "Göm för avsändaren <%s>"
-
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: mail/local-config.glade.h:6
-#, fuzzy
+#: po/tmp/local-config.glade.h:6
 msgid "Current store format:"
-msgstr "Hämta lagringsutrymme för \"%s\""
+msgstr "Aktuellt lagringsformat:"
 
-#: mail/local-config.glade.h:7
-#, fuzzy
+#: po/tmp/local-config.glade.h:7
 msgid "Mailbox Format"
-msgstr "Brevlådesammanfattning"
+msgstr "Brevlådeformat"
 
-#: mail/local-config.glade.h:8
-#, fuzzy
+#: po/tmp/local-config.glade.h:8
 msgid "New store format:"
-msgstr "Typ av diskussionsgruppskälla:"
+msgstr "Nytt lagringsformat:"
 
-#: mail/local-config.glade.h:9
-msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
+#: po/tmp/local-config.glade.h:9
+msgid "Note: When converting between mailbox formats, a failure\n"
 msgstr ""
 
-#: mail/local-config.glade.h:10
+#: po/tmp/local-config.glade.h:12
 msgid "maildir"
-msgstr ""
+msgstr "maildir"
 
-#: mail/local-config.glade.h:11
+#: po/tmp/local-config.glade.h:13
 msgid "mbox"
-msgstr ""
+msgstr "mbox"
 
-#: mail/local-config.glade.h:12
-#, fuzzy
+#: po/tmp/local-config.glade.h:14
 msgid "mh"
-msgstr "h"
+msgstr "mh"
+
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:341
+msgid "Evolution Account Manager"
+msgstr "Evolution Kontohantering"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:605
+msgid "Evolution Account Editor"
+msgstr "Evolution kontoeditor"
 
 #: mail/mail-autofilter.c:71
 #, c-format
@@ -4437,7 +4455,7 @@ msgstr "Hämta e-post från %s"
 msgid "%s mailing list"
 msgstr "Sändlistan %s"
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:82
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4449,7 +4467,7 @@ msgstr ""
 "ta emot eller skriva nya brev.\n"
 "Vill du konfigurera det nu?"
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:135
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4457,7 +4475,7 @@ msgstr ""
 "Du måste konfigurera en identititet\n"
 "innan du kan skriva brev."
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:147
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4465,19 +4483,15 @@ msgstr ""
 "Du måste konfigurera en e-posttransport\n"
 "innan du kan skriva brev."
 
-#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
-msgid "You have no mail sources configured"
-msgstr "Du har inte konfigurerat några e-postkällor"
-
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:222
 msgid "You have not set a mail transport method"
 msgstr "Du har inte angivit någon e-posttransportmetod"
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:231
 msgid "You have no Outbox configured"
 msgstr "Du har inte angivit någon utkorg"
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:258
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4485,23 +4499,28 @@ msgstr ""
 "Detta meddelande har ingen ämnesrad.\n"
 "Vill du verkligen skicka?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:318
+msgid "You must configure an account before you can send this email."
+msgstr ""
+"Du måste konfigurera ett konto innan du kan skicka brevet."
+
+#: mail/mail-callbacks.c:338
 msgid "You must specify recipients in order to send this message."
 msgstr "Du måste ange mottagare för att kunna skicka detta meddelande."
 
-#: mail/mail-callbacks.c:530
+#: mail/mail-callbacks.c:567
 msgid "Forwarded message:\n"
 msgstr "Vidarebefordrat meddelande:\n"
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:648
 msgid "Move message(s) to"
 msgstr "Flytta meddelande(n) till"
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:650
 msgid "Copy message(s) to"
 msgstr "Kopiera meddelande(n) till"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:785
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4509,11 +4528,11 @@ msgstr ""
 "Du kan bara redigera meddelanden\n"
 "som du sparat i mappen Drafts."
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:818 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:822 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4521,15 +4540,15 @@ msgstr ""
 "Det finns redan en fil med det namnet.\n"
 "Ska den skrivas över?"
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:867
 msgid "Save Message As..."
 msgstr "Spara meddelande som..."
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:869
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:953
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4538,466 +4557,250 @@ msgstr ""
 "Fel vid läsning av filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1002
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1049
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: mail/mail-config-druid.glade.h:6
-#, fuzzy
+#: po/tmp/mail-config.glade.h:6
 msgid "Account"
-msgstr "Konton"
+msgstr "Konto"
 
-#: mail/mail-config-druid.glade.h:7
+#: po/tmp/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Kontoinformation"
 
-#: mail/mail-config-druid.glade.h:8
+#: po/tmp/mail-config.glade.h:8
 msgid "Account Management"
 msgstr "Kontohantering"
 
-#: mail/mail-config-druid.glade.h:9
-#, fuzzy
+#: po/tmp/mail-config.glade.h:9
 msgid "Account Properties"
-msgstr "Egenskaper hos bilagan"
+msgstr "Kontoegenskaper"
 
-#: mail/mail-config-druid.glade.h:11
-#, fuzzy
+#: po/tmp/mail-config.glade.h:11
 msgid "Advanced"
-msgstr "Avancerat..."
+msgstr "Avancerat"
 
-#: mail/mail-config-druid.glade.h:12
-#, fuzzy
+#: po/tmp/mail-config.glade.h:12
 msgid "Authentication"
-msgstr "Autentisering:"
+msgstr "Autentisering"
 
-#: mail/mail-config-druid.glade.h:13
-#, fuzzy
+#: po/tmp/mail-config.glade.h:13
 msgid "Authentication Type:"
-msgstr "Autentisering:"
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
+msgstr "Autentiseringstyp:"
 
-#: mail/mail-config-druid.glade.h:17
-#, fuzzy
+#: po/tmp/mail-config.glade.h:16
 msgid "Congratulations, your mail configuration is complete.\n"
-msgstr "Gratulerar, din e-postkonfiguration är färdig."
+msgstr "Gratulerar, din e-postkonfiguration är färdig.\n"
 
-#: mail/mail-config-druid.glade.h:23
+#: po/tmp/mail-config.glade.h:22
 msgid "DIGEST-MD5"
-msgstr ""
+msgstr "DIGEST-MD5"
 
-#: mail/mail-config-druid.glade.h:24
+#: po/tmp/mail-config.glade.h:23
 msgid "Default"
 msgstr "Standard"
 
-#: mail/mail-config-druid.glade.h:26
-#, fuzzy
-msgid "Delete mail from server"
-msgstr "Ta inte bort meddelanden från servern"
-
-#: mail/mail-config-druid.glade.h:27
+#: po/tmp/mail-config.glade.h:25
 msgid "Done"
 msgstr "Klar"
 
-#: mail/mail-config-druid.glade.h:28
-#, fuzzy
+#: po/tmp/mail-config.glade.h:26
 msgid "E-Mail Address:"
 msgstr "E-postadress:"
 
-#: mail/mail-config-druid.glade.h:30
+#: po/tmp/mail-config.glade.h:28
 msgid "Email Address:"
 msgstr "E-postadress:"
 
-#: mail/mail-config-druid.glade.h:31
+#: po/tmp/mail-config.glade.h:29
 msgid "Evolution Mail Configuration"
 msgstr "Evolution e-postkonfiguration"
 
-#: mail/mail-config-druid.glade.h:32
+#: po/tmp/mail-config.glade.h:30
 msgid "Full Name:"
 msgstr "Fullständigt namn:"
 
-#: mail/mail-config-druid.glade.h:35
-#, fuzzy
+#: po/tmp/mail-config.glade.h:33
 msgid "Hostname:"
 msgstr "Värd:"
 
-#: mail/mail-config-druid.glade.h:36
-msgid "IMAP"
-msgstr "IMAP"
-
-#: mail/mail-config-druid.glade.h:37
+#: po/tmp/mail-config.glade.h:34
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config-druid.glade.h:38
+#: po/tmp/mail-config.glade.h:35
 msgid "Incoming Mail Server"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:39
-#, fuzzy
+#: po/tmp/mail-config.glade.h:36
+msgid "Keep mail on server"
+msgstr "Spara meddelanden på servern"
+
+#: po/tmp/mail-config.glade.h:37
 msgid "Kerberos"
-msgstr "Kerberos 4"
+msgstr "Kerberos"
 
-#: mail/mail-config-druid.glade.h:40
+#: po/tmp/mail-config.glade.h:38
 msgid "Mail"
 msgstr "E-post"
 
-#: mail/mail-config-druid.glade.h:41
-#, fuzzy
+#: po/tmp/mail-config.glade.h:39
 msgid "Mail Account"
-msgstr "Konton"
+msgstr "Epostkonton"
 
-#: mail/mail-config-druid.glade.h:42
+#: po/tmp/mail-config.glade.h:40
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: mail/mail-config-druid.glade.h:43
+#: po/tmp/mail-config.glade.h:41
 msgid "Mail Configuration Druid"
 msgstr "E-postkonfigurationsguide"
 
-#: mail/mail-config-druid.glade.h:44
+#: po/tmp/mail-config.glade.h:42
 msgid "Make this my default account"
 msgstr "Gör detta till mitt standardkonto"
 
-#: mail/mail-config-druid.glade.h:46
+#: po/tmp/mail-config.glade.h:43
+msgid "Miscellaneous"
+msgstr "Diverse"
+
+#: po/tmp/mail-config.glade.h:45
 msgid "News"
 msgstr "Diskussionsgrupper"
 
-#: mail/mail-config-druid.glade.h:48
+#: po/tmp/mail-config.glade.h:47
 msgid "Optional"
 msgstr "Valfri"
 
-#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+#: po/tmp/mail-config.glade.h:48
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config-druid.glade.h:50
+#: po/tmp/mail-config.glade.h:49
 msgid "Outgoing Mail Server"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:51
+#: po/tmp/mail-config.glade.h:50
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: mail/mail-config-druid.glade.h:53
+#: po/tmp/mail-config.glade.h:52
 msgid "Plain Text"
-msgstr ""
+msgstr "Vanlig text"
 
-#: mail/mail-config-druid.glade.h:54
+#: po/tmp/mail-config.glade.h:53
 msgid "Receiving Email"
 msgstr "Tar emot e-post"
 
-#: mail/mail-config-druid.glade.h:55
-#, fuzzy
+#: po/tmp/mail-config.glade.h:54
 msgid "Remember my password"
-msgstr "Kom ihåg detta lösenord"
+msgstr "Kom ihåg mitt lösenord"
 
-#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+#: mail/mail-format.c:626 po/tmp/mail-config.glade.h:55
 msgid "Reply-To:"
 msgstr "Svara-Till:"
 
-#: mail/mail-config-druid.glade.h:57
-msgid "Reply-to:"
-msgstr "Svara-till:"
-
-#: mail/mail-config-druid.glade.h:58
+#: po/tmp/mail-config.glade.h:56
 msgid "Required"
 msgstr "Krävs"
 
-#: mail/mail-config-druid.glade.h:60
-#, fuzzy
+#: po/tmp/mail-config.glade.h:57
+msgid "SMTP"
+msgstr "SMTP"
+
+#: po/tmp/mail-config.glade.h:58
 msgid "Save password"
-msgstr "Spara som VCard"
+msgstr "Spara lösenord"
 
-#: mail/mail-config-druid.glade.h:61
-#, fuzzy
+#: po/tmp/mail-config.glade.h:59
 msgid "Select signature file"
-msgstr "Signaturfil:"
+msgstr "Välj signaturfil"
 
-#: mail/mail-config-druid.glade.h:62
+#: po/tmp/mail-config.glade.h:60
 msgid "Sending Email"
 msgstr "Skickar e-post"
 
-#: mail/mail-config-druid.glade.h:64
+#: po/tmp/mail-config.glade.h:62
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config-druid.glade.h:65
-#, fuzzy
-msgid "Server Timeouts"
-msgstr "Servertyp: "
-
-#: mail/mail-config-druid.glade.h:66
+#: po/tmp/mail-config.glade.h:63
 msgid "Server Type: "
 msgstr "Servertyp: "
 
-#: mail/mail-config-druid.glade.h:67
-#, fuzzy
+#: po/tmp/mail-config.glade.h:64
 msgid "Server requires authentication"
-msgstr "SMTP-servern kräver autentisering"
+msgstr "Servern kräver autentisering"
 
-#: mail/mail-config-druid.glade.h:68
-#, fuzzy
+#: po/tmp/mail-config.glade.h:65
 msgid "Servers"
-msgstr "Server:"
+msgstr "Servrar"
 
-#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+#: po/tmp/mail-config.glade.h:66
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config-druid.glade.h:70
-#, fuzzy
+#: po/tmp/mail-config.glade.h:67
 msgid "Signature:"
-msgstr "Signaturfil:"
+msgstr "Signatur:"
 
-#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+#: po/tmp/mail-config.glade.h:68
 msgid "Sources"
 msgstr "Källor"
 
-#: mail/mail-config-druid.glade.h:72
-#, fuzzy
+#: po/tmp/mail-config.glade.h:69
 msgid "This server requires a secure connection (SSL)"
-msgstr "SMTP-servern kräver autentisering"
+msgstr "Servern kräver en säker anslutning (SSL)"
 
-#: mail/mail-config-druid.glade.h:73
-#, fuzzy
+#: po/tmp/mail-config.glade.h:70
 msgid "Type"
-msgstr "Typ:"
+msgstr "Typ"
 
-#: mail/mail-config-druid.glade.h:74
+#: po/tmp/mail-config.glade.h:71
 msgid ""
 "Type the name by which you would like to refer to these servers. For "
 "example: \"Work\" or \"Home\"."
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:76
-#, fuzzy
+#: po/tmp/mail-config.glade.h:73
 msgid "User Information"
-msgstr "Ingen information"
+msgstr "Användarinformation"
 
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+#: po/tmp/mail-config.glade.h:74
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: mail/mail-config-druid.glade.h:78
-#, fuzzy
+#: po/tmp/mail-config.glade.h:75
 msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr "Välkommen till Evolutions guide för e-postkonfiguration!\n"
-
-#: mail/mail-config-druid.glade.h:81
-#, fuzzy
-msgid "minute(s)"
-msgstr "minuter"
-
-#: mail/mail-config-gui.c:433
-msgid ""
-"Enter your name and email address to be used in outgoing mail. You may also, "
-"optionally, enter the name of your organization, and the name of a file to "
-"read your signature from."
-msgstr ""
-"Ange ditt namn och din e-postadress för utgående post. Du kan också, om du "
-"vill, ange namnet på din organisation och en fil att läsa din signatur från."
-
-#: mail/mail-config-gui.c:446
-msgid "Full name:"
-msgstr "Fullständigt namn:"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "E-postadress:"
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-msgid "Signature File"
-msgstr "Signaturfil"
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Server:"
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-msgstr "Detektera vilka typer som stöds..."
-
-#: mail/mail-config-gui.c:991
-msgid "Don't delete messages from server"
-msgstr "Ta inte bort meddelanden från servern"
-
-#: mail/mail-config-gui.c:1003
-msgid "Test Settings"
-msgstr "Testa inställningarna"
+msgstr "Välkommen till Evolutions guide för e-postkonfiguration.\n"
 
-#: mail/mail-config-gui.c:1130
-msgid "Mail source type:"
-msgstr "Typ av e-postkälla:"
-
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-druid.c:346
+#, c-format
 msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
-"Välj den typ av e-postserver som du har och ange den relevanta informationen "
-"om den.\n"
-"\n"
-"Om servern kräver autentisering kan du klicka på knappen \"Detektera vilka "
-"typer som stöds...\" när du har angett den andra informationen."
-
-#: mail/mail-config-gui.c:1154
-msgid "News source type:"
-msgstr "Typ av diskussionsgruppskälla:"
 
-#: mail/mail-config-gui.c:1159
+#: mail/mail-config-druid.c:612
+#, c-format
 msgid ""
-"Select the kind of news server you have, and enter the relevant information "
-"about it.\n"
-"\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
-"Välj den typ av diskussionsgruppsserver som du har och ange den relevanta "
-"informationen om den.\n"
-"\n"
-"Om servern kräver autentisering kan du klicka på knappen \"Detektera de "
-"typer som stöds...\" när du har angett den andra informationen."
-
-#: mail/mail-config-gui.c:1178
-msgid "Mail transport type:"
-msgstr "Typ av e-posttransport:"
 
-#: mail/mail-config-gui.c:1183
-#, fuzzy
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
+#. set window title
+#: mail/mail-config-druid.c:889
+msgid "Evolution Account Wizard"
 msgstr ""
-"Välj den typ av e-postserver som du har och ange den relevanta informationen "
-"om den.\n"
-"\n"
-"Om servern kräver autentisering kan du klicka på knappen \"Detektera vilka "
-"typer som stöds...\" när du har angett den andra informationen."
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr "Lägg till identitet"
-
-#: mail/mail-config-gui.c:1235
-msgid "Edit Identity"
-msgstr "Redigera identitet"
-
-#: mail/mail-config-gui.c:1333
-msgid "Add Source"
-msgstr "Lägg till källa"
-
-#: mail/mail-config-gui.c:1335
-msgid "Edit Source"
-msgstr "Redigera källa"
-
-#: mail/mail-config-gui.c:1430
-msgid "Add News Server"
-msgstr "Lägg till diskussionsgruppsserver"
-
-#: mail/mail-config-gui.c:1432
-msgid "Edit News Server"
-msgstr "Redigera diskussionsgruppsserver"
-
-#: mail/mail-config-gui.c:2253
-#, c-format
-msgid "Testing \"%s\""
-msgstr "Testar \"%s\""
-
-#: mail/mail-config-gui.c:2255
-#, c-format
-msgid "Test connection to \"%s\""
-msgstr "Testa anslutning till \"%s\""
-
-#: mail/mail-config-gui.c:2296
-msgid "The connection was successful!"
-msgstr "Anslutningen lyckades!"
-
-#: mail/mail-config-gui.c:2346
-#, c-format
-msgid "Querying authorization capabilities of \"%s\""
-msgstr "Frågar efter autentiseringsmöjligheterna hos \"%s\""
-
-#: mail/mail-config-gui.c:2348
-#, c-format
-msgid "Query authorization at \"%s\""
-msgstr "Fråga efter autentisering hos \"%s\""
-
-#: mail/mail-config.glade.h:7
-msgid "Address"
-msgstr "Adress"
-
-#: mail/mail-config.glade.h:10
-msgid "Identities"
-msgstr "Identiteter"
-
-#: mail/mail-config.glade.h:11
-msgid "Mail Sources"
-msgstr "E-postkällor"
-
-#: mail/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "E-posttransport"
-
-#: mail/mail-config.glade.h:13
-msgid "Mark message as seen [ms]: "
-msgstr "Markera meddelanden som lästa [ms]: "
-
-#: mail/mail-config.glade.h:14
-msgid "News Servers"
-msgstr "Diskussionsgruppsservrar"
-
-#: mail/mail-config.glade.h:15
-msgid "News Sources"
-msgstr "Diskussionsgruppskällor"
-
-#: mail/mail-config.glade.h:16
-msgid "Organization"
-msgstr "Organisation"
-
-#: mail/mail-config.glade.h:18
-msgid "Send messages in HTML format"
-msgstr "Skicka meddelanden som HTML"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr "Ange din lösenordsfras för PGP/GPG."
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
-msgstr "Inget lösenord angavs."
-
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Kunde inte skapa rör till GPG/PGP: %s"
-
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
-msgstr "Inget GPG/PGP-program finns tillgängligt."
-
-#: mail/mail-crypto.c:953
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Kunde inte skapa temporär fil: %s"
 
 #: mail/mail-display.c:98
 #, c-format
@@ -5035,65 +4838,61 @@ msgstr "Öppna i %s..."
 msgid "View Inline"
 msgstr "Visa inuti"
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr "Externt visningsprogram"
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visa inuti (med %s)"
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "Göm"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr "Det finns inget stöd för GPG/PGP i denna kopia av Evolution."
-
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr "Krypterat meddelande visas inte"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr "Krypterat meddelande"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr "Klicka på ikonen för att dekryptera."
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pekare till lokal fil (%s) giltig på platsen \"%s\""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okänd extern data (typen \"%s\")"
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Den %s skrev %s:\n"
@@ -5153,7 +4952,7 @@ msgstr "Registrerar lokal mapp"
 msgid "Register local folder"
 msgstr "Registrera lokal mapp"
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5185,159 +4984,155 @@ msgstr ""
 msgid "Working"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:89
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Hämtar e-post från %s"
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:91
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Hämta e-post från %s"
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:336
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Det finns ingen ny e-post på %s."
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:406
 msgid "Filtering email on demand"
 msgstr "Filtrerar e-post vid behov"
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:408
 msgid "Filter email on demand"
 msgstr "Filtrera e-post vid behov"
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:552
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Skickar \"%s\""
 
-#: mail/mail-ops.c:553
-#, fuzzy
+#: mail/mail-ops.c:554
 msgid "Sending message"
-msgstr "Skicka detta meddelande nu"
+msgstr "Skickar meddelande"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:670
 msgid "Sending queue"
 msgstr "Skickar kö"
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:672
 msgid "Send queue"
 msgstr "Skicka kö"
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:813 mail/mail-ops.c:820
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Tillägger \"%s\""
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:817 mail/mail-ops.c:823
 msgid "Appending a message without a subject"
 msgstr "Tillägger ett meddelande utan en ämnesrad"
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:906
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Flyttar meddelanden från \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:908
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopierar meddelanden från \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:911
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytta meddelanden från \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:913
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiera meddelanden från \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kopierar"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:967
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s meddelande %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1108 mail/subscribe-dialog.c:348
 msgid "(No description)"
 msgstr "(Ingen beskrivning)"
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1173
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1214 mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1336
-#, fuzzy
+#: mail/mail-ops.c:1345
 msgid "Synchronising folder"
-msgstr "Omkonfigurerar mapp"
+msgstr "Synkroniserar mapp"
 
-#: mail/mail-ops.c:1386
-#, fuzzy
+#: mail/mail-ops.c:1395
 msgid "Expunging folder"
-msgstr "Öppnar mappen %s"
+msgstr "Tömmer mapp"
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1443
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1506
 msgid "Retrieving messages"
 msgstr "Hämtar meddelanden"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1516
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Hämtar meddelande nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1664
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Läser in mappen %s för %s"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1666
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "Läs in mappen %s för %s"
 
-#: mail/mail-ops.c:1823
-#, fuzzy
+#: mail/mail-ops.c:1832
 msgid "Saving messages"
-msgstr "Kopierar meddelanden"
+msgstr "Sparar meddelanden"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1911
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Kan inte spara grupplistefilen för %s: %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1924
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Sparar meddelande %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1938
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5348,7 +5143,7 @@ msgstr "Fel vid sparande av filen: %s"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "Inkomplett meddelande skrevs på rör!"
 
@@ -5458,111 +5253,182 @@ msgstr "Ny virtuell mapp"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Svara"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:43
 msgid "Reply to the sender of this message"
 msgstr "Svara till avsändaren av det här meddelandet"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:42
 msgid "Reply to all recipients of this message"
 msgstr "Svara till alla mottagare av det här meddelandet"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 po/tmp/evolution-mail.xml.h:21
 msgid "Forward this message"
 msgstr "Vidarebefordra detta meddelande"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:37
 msgid "Print the selected message"
 msgstr "Skriv ut det markerade meddelandet"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Ta bort detta meddelande"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:594
 msgid "Unseen"
 msgstr "Oläst"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:597
 msgid "Seen"
 msgstr "Läst"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:600
 msgid "Answered"
 msgstr "Besvarad"
 
-#: mail/message-list.c:881
+#: mail/message-list.c:885
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:893 mail/message-list.c:909
+#: mail/message-list.c:897 mail/message-list.c:913
 #, c-format
 msgid "%s, et al."
 msgstr "%s m.fl."
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:900 mail/message-list.c:916
 msgid "<unknown>"
 msgstr "<okänt>"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:969
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:972
+#: mail/message-list.c:976
 msgid "Today %l:%M %p"
 msgstr "Idag %I.%M"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:985
 msgid "Yesterday %l:%M %p"
 msgstr "Igår %I.%M"
 
-#: mail/message-list.c:993
+#: mail/message-list.c:997
 msgid "%a %l:%M %p"
 msgstr "%a %I.%M"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1005
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %I:%M"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1007
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1107
+msgid "Flagged"
+msgstr "Flaggad"
+
+#: mail/message-list.c:1107
+msgid "Attachment"
+msgstr "Bilaga"
+
+#: mail/message-list.c:1108
+msgid "From"
+msgstr "Från"
+
+#: mail/message-list.c:1108
+msgid "Date"
+msgstr "Datum"
+
+#: mail/message-list.c:1108
+msgid "Received"
+msgstr "Mottaget"
+
+#: mail/message-list.c:1109
+msgid "To"
+msgstr "Till"
+
+#: mail/message-list.c:1109
+msgid "Size"
+msgstr "Storlek"
+
+#: mail/openpgp-utils.c:76
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase%s%s"
+msgstr "Ange din lösenordsfras för PGP/GPG."
+
+#: mail/openpgp-utils.c:77
+#, fuzzy
+msgid " for "
+msgstr "i"
+
+#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
+#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1044
+msgid "No GPG/PGP program available."
+msgstr "Inget GPG/PGP-program finns tillgängligt."
+
+#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
+#: mail/openpgp-utils.c:894
+msgid "No password provided."
+msgstr "Inget lösenord angavs."
+
+#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
+#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1050
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Kunde inte skapa rör till GPG/PGP: %s"
+
+#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1061
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Kunde inte skapa temporär fil: %s"
+
+#: mail/subscribe-dialog.c:63 shell/e-storage-set-view.c:44
+msgid "Folder"
+msgstr "Mapp"
+
+#: mail/subscribe-dialog.c:64
+msgid "Store"
+msgstr "Lagringsutrymme"
+
+#: mail/subscribe-dialog.c:146
 msgid "Display folders starting with:"
 msgstr "Visa mappar som börjar med:"
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:179
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "Hämtar lagringsutrymme för \"%s\""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:182
 #, c-format
 msgid "Get store for \"%s\""
 msgstr "Hämta lagringsutrymme för \"%s\""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:290
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Prenumerar på mappen \"%s\""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Säger upp prenumeration på mappen \"%s\""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:298
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Prenumerera på mappen \"%s\""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:301
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Säg upp prenumeration på mappen \"%s\""
@@ -5677,19 +5543,20 @@ msgstr "Ny..."
 msgid "(Untitled)"
 msgstr "(Namnlös)"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy hittades inte i din $PATH."
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kunde inte köras."
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5699,7 +5566,7 @@ msgstr ""
 "för e-post, kalender- och kontakthantering\n"
 "inom GNOME-skrivbordsmiljön."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:334
 msgid "Go to folder..."
 msgstr "Gå till mapp..."
 
@@ -5707,11 +5574,11 @@ msgstr "Gå till mapp..."
 msgid "(No folder displayed)"
 msgstr "(Ingen mapp visas)"
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "Mappar"
 
-#: shell/e-shell-view.c:1077
+#: shell/e-shell-view.c:1093
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
@@ -5721,7 +5588,7 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan inte lägga upp lokal plats för sparande -- %s"
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5730,15 +5597,15 @@ msgstr ""
 "Hoppsan! Vyn för \"%s\" dog oväntat. :-(\n"
 "Det här betyder antagligen att komponenten %s har kraschat."
 
-#: shell/e-shortcuts-view.c:122
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr "Skapa en ny genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Gruppnamn:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -5747,51 +5614,61 @@ msgstr ""
 "Vill du verkligen ta bort gruppen\n"
 "\"%s\" från genvägsraden?"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr "Ta inte bort"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "_Små ikoner"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "Visa genvägarna som små ikoner"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "S_tora ikoner"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Visa genvägarna som stora ikoner"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "_Ny grupp..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "Skapa en ny genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr "Ta bo_rt denna grupp..."
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr "Ta bort denna genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "Visa _genvägsraden"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "Visa _genvägsraden"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Aktivera"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Aktivera denna genväg"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Ta bort denna genväg från genvägsraden"
 
@@ -5799,12 +5676,13 @@ msgstr "Ta bort denna genväg från genvägsraden"
 msgid "Error saving shortcuts."
 msgstr "Fel vid sparande av genvägar."
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
-#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
+#: po/tmp/evolution-event-editor.xml.h:125
+#: po/tmp/evolution-message-composer.xml.h:49 po/tmp/evolution.xml.h:36
+#: shell/e-storage-set-view.c:335
 msgid "_View"
 msgstr "_Visa"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:335
 msgid "View the selected folder"
 msgstr "Visa den markade mappen"
 
@@ -5918,1105 +5796,1158 @@ msgstr "Stäng av."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet."
 
-#: ui/evolution-addressbook.xml.h:7
+#: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Skapa en ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:9
+#: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Ta bort en kontakt"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Sök"
 
-#: ui/evolution-addressbook.xml.h:11
+#: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Sök efter en kontakt"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Ny"
 
-#: ui/evolution-addressbook.xml.h:14
+#: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
-#: ui/evolution-addressbook.xml.h:15
+#: po/tmp/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:16
+#: po/tmp/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Stoppa inläsning"
 
-#: ui/evolution-addressbook.xml.h:17
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Visa alla"
 
-#: ui/evolution-addressbook.xml.h:18
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Visa alla kontakter"
 
-#: ui/evolution-addressbook.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:19
 msgid "_Addressbook Configuration..."
 msgstr "_Adressbokskonfiguration..."
 
-#: ui/evolution-addressbook.xml.h:20
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "Skriv _ut kontakter..."
 
-#: ui/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "_Sök kontakter"
 
-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
+#: po/tmp/evolution-addressbook.xml.h:22
+#: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_Verktyg"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.xml.h:6
+#: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 dagar"
 
-#: ui/evolution-calendar.xml.h:7
+#: po/tmp/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Ändra inställningar"
 
-#: ui/evolution-calendar.xml.h:8
+#: po/tmp/evolution-calendar.xml.h:8
 msgid "Ca_lendar"
 msgstr "Ka_lender"
 
-#: ui/evolution-calendar.xml.h:9
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Inställningar för kalendern..."
 
-#: ui/evolution-calendar.xml.h:10
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt möte"
 
-#: ui/evolution-calendar.xml.h:11
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Skapa en ny kalender"
 
-#: ui/evolution-calendar.xml.h:12
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:13
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Gå bakåt i tiden"
 
-#: ui/evolution-calendar.xml.h:14
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Gå framåt i tiden"
 
-#: ui/evolution-calendar.xml.h:15
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Gå till"
 
-#: ui/evolution-calendar.xml.h:16
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Gå till ett specifikt datum"
 
-#: ui/evolution-calendar.xml.h:17
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Gå till nuvarande tid"
 
-#: ui/evolution-calendar.xml.h:18
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Månad"
 
-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "Nästa"
 
-#: ui/evolution-calendar.xml.h:21
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Öppna en kalender"
 
-#: ui/evolution-calendar.xml.h:22
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Föreg"
 
-#: ui/evolution-calendar.xml.h:24
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Skriv ut denna kalender"
 
-#: ui/evolution-calendar.xml.h:25
+#: po/tmp/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr "Spara kalender som något annat"
 
-#: ui/evolution-calendar.xml.h:26
+#: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Visa 1 dag"
 
-#: ui/evolution-calendar.xml.h:27
+#: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Visa 1 månad"
 
-#: ui/evolution-calendar.xml.h:28
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Visa 1 vecka"
 
-#: ui/evolution-calendar.xml.h:29
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Visa arbetsveckan"
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Idag"
 
-#: ui/evolution-calendar.xml.h:31
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Vecka"
 
-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:33
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution-calendar.xml.h:33
+#: po/tmp/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_Öppna kalender"
 
-#: ui/evolution-calendar.xml.h:34
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "Skriv _ut denna kalender"
 
-#: ui/evolution-calendar.xml.h:35
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: ui/evolution-contact-editor.xml.h:7
+#: po/tmp/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Ta bort detta objekt"
 
-#: ui/evolution-contact-editor.xml.h:8
+#: po/tmp/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "Ta bort..."
 
-#: ui/evolution-contact-editor.xml.h:9
+#: po/tmp/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Hjälp"
 
-#: ui/evolution-contact-editor.xml.h:10
+#: po/tmp/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr "Skriv ut ku_vert..."
 
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
+#: po/tmp/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:81
 msgid "Print this item"
 msgstr "Skriv ut detta objekt"
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:82
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Spara so_m..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
 msgid "Save and Close"
 msgstr "Spara och stäng"
 
-#: ui/evolution-contact-editor.xml.h:15
+#: po/tmp/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr "Spara kontakten och stäng dialogrutan"
 
-#: ui/evolution-contact-editor.xml.h:16
+#: po/tmp/evolution-contact-editor.xml.h:16
 msgid "Se_nd contact to other..."
 msgstr "Skicka kontakte_n till annan..."
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:98
 msgid "See online help"
 msgstr "Se online-hjälpen"
 
-#: ui/evolution-contact-editor.xml.h:18
+#: po/tmp/evolution-contact-editor.xml.h:18
 msgid "Send _message to contact..."
 msgstr "Skicka _meddelande till kontakt..."
 
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
+#: po/tmp/evolution-contact-editor.xml.h:19
+#: po/tmp/evolution-event-editor.xml.h:110
+#: po/tmp/evolution-message-composer.xml.h:43
+#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:26
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ui/evolution-contact-editor.xml.h:20
+#: po/tmp/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:47
 msgid "_Save"
 msgstr "_Spara"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-event-editor.xml.h:6
+#: po/tmp/evolution-event-editor.xml.h:6
 msgid "About this application"
 msgstr "Om detta program"
 
-#: ui/evolution-event-editor.xml.h:7
+#: po/tmp/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Om..."
 
-#: ui/evolution-event-editor.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "_Åtgärder"
 
-#: ui/evolution-event-editor.xml.h:9
+#: po/tmp/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "_Töm"
 
-#: ui/evolution-event-editor.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: ui/evolution-event-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "Töm"
 
-#: ui/evolution-event-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "Töm markeringen"
 
-#: ui/evolution-event-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Stäng detta möte"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
 msgid "Copy"
 msgstr "Kopiera"
 
-#: ui/evolution-event-editor.xml.h:16
+#: po/tmp/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Koiera markeringen"
 
-#: ui/evolution-event-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: ui/evolution-event-editor.xml.h:18
+#: po/tmp/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Klipp ut markeringen"
 
-#: ui/evolution-event-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "Kasta XML"
 
-#: ui/evolution-event-editor.xml.h:22
+#: po/tmp/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Kasta användargränssnittsbeskrivningen i XML"
 
-#: ui/evolution-event-editor.xml.h:23
+#: po/tmp/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: Adress_bok..."
 
-#: ui/evolution-event-editor.xml.h:24
+#: po/tmp/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: V_älj formulär..."
 
-#: ui/evolution-event-editor.xml.h:25
+#: po/tmp/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: _Kontrollera namn"
 
-#: ui/evolution-event-editor.xml.h:26
+#: po/tmp/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: Kopier_a till mapp..."
 
-#: ui/evolution-event-editor.xml.h:27
+#: po/tmp/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: Ut_forma ett formulär..."
 
-#: ui/evolution-event-editor.xml.h:28
+#: po/tmp/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: Ange utskrifts_stiler"
 
-#: ui/evolution-event-editor.xml.h:29
+#: po/tmp/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: _Utforma detta formulär"
 
-#: ui/evolution-event-editor.xml.h:30
+#: po/tmp/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: Fö_rsta objektet i mappen"
 
-#: ui/evolution-event-editor.xml.h:31
+#: po/tmp/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: _Vidarebefordra"
 
-#: ui/evolution-event-editor.xml.h:32
+#: po/tmp/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Vidarebefordra som v_Calendar"
 
-#: ui/evolution-event-editor.xml.h:33
+#: po/tmp/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: Hjälp"
 
-#: ui/evolution-event-editor.xml.h:34
+#: po/tmp/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: Oav_slutad uppgift"
 
-#: ui/evolution-event-editor.xml.h:35
+#: po/tmp/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "FIXME: Infoga fil"
 
-#: ui/evolution-event-editor.xml.h:36
+#: po/tmp/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: Obj_ekt..."
 
-#: ui/evolution-event-editor.xml.h:37
+#: po/tmp/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: Klistra in _special... "
 
-#: ui/evolution-event-editor.xml.h:38
+#: po/tmp/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Förhands_granska"
 
-#: ui/evolution-event-editor.xml.h:39
+#: po/tmp/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: Pu_blicera formulär som..."
 
-#: ui/evolution-event-editor.xml.h:40
+#: po/tmp/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: Publicera _formulär..."
 
-#: ui/evolution-event-editor.xml.h:41
+#: po/tmp/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: _Upprepning..."
 
-#: ui/evolution-event-editor.xml.h:42
+#: po/tmp/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: S_kicka"
 
-#: ui/evolution-event-editor.xml.h:43
+#: po/tmp/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Spara bilagor..."
 
-#: ui/evolution-event-editor.xml.h:44
+#: po/tmp/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Skri_ptfelsökare"
 
-#: ui/evolution-event-editor.xml.h:45
+#: po/tmp/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Uppgifts_begäran"
 
-#: ui/evolution-event-editor.xml.h:46
+#: po/tmp/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: _Kontakt"
 
-#: ui/evolution-event-editor.xml.h:47
+#: po/tmp/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: _Anpassa..."
 
-#: ui/evolution-event-editor.xml.h:48
+#: po/tmp/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: _Fil..."
 
-#: ui/evolution-event-editor.xml.h:49
+#: po/tmp/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: _Typsnitt..."
 
-#: ui/evolution-event-editor.xml.h:50
+#: po/tmp/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "FIXME: _Formatering"
 
-#: ui/evolution-event-editor.xml.h:51
+#: po/tmp/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: Objek_t"
 
-#: ui/evolution-event-editor.xml.h:52
+#: po/tmp/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: _Dagbokspost"
 
-#: ui/evolution-event-editor.xml.h:53
+#: po/tmp/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: _Sista objektet i mappen"
 
-#: ui/evolution-event-editor.xml.h:54
+#: po/tmp/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: _Posta meddelande"
 
-#: ui/evolution-event-editor.xml.h:55
+#: po/tmp/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: _Minneslappsstil"
 
-#: ui/evolution-event-editor.xml.h:56
+#: po/tmp/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: _Flytta till mapp..."
 
-#: ui/evolution-event-editor.xml.h:57
+#: po/tmp/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Nytt möte"
 
-#: ui/evolution-event-editor.xml.h:58
+#: po/tmp/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: _Anteckning"
 
-#: ui/evolution-event-editor.xml.h:59
+#: po/tmp/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Objekt..."
 
-#: ui/evolution-event-editor.xml.h:60
+#: po/tmp/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: St_ycke..."
 
-#: ui/evolution-event-editor.xml.h:61
+#: po/tmp/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: _Stavning..."
 
-#: ui/evolution-event-editor.xml.h:62
+#: po/tmp/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: _Standard"
 
-#: ui/evolution-event-editor.xml.h:63
+#: po/tmp/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: _Uppgift"
 
-#: ui/evolution-event-editor.xml.h:64
+#: po/tmp/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: _Oläst objekt"
 
-#: ui/evolution-event-editor.xml.h:65
+#: po/tmp/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr "FIXME: vad ska vi stoppa här?"
 
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: ui/evolution-event-editor.xml.h:68
+#: po/tmp/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Sök igen"
 
-#: ui/evolution-event-editor.xml.h:69
+#: po/tmp/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Sök ige_n..."
 
-#: ui/evolution-event-editor.xml.h:70
+#: po/tmp/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Gå till nästa objekt"
 
-#: ui/evolution-event-editor.xml.h:71
+#: po/tmp/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Gå till föregående objekt"
 
-#: ui/evolution-event-editor.xml.h:72
+#: po/tmp/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "Ändra filens egenskaper"
 
-#: ui/evolution-event-editor.xml.h:73
+#: po/tmp/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "N_ästa"
 
-#: ui/evolution-event-editor.xml.h:75
+#: po/tmp/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Klistra in"
 
-#: ui/evolution-event-editor.xml.h:76
+#: po/tmp/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Klistra in från urklipp"
 
-#: ui/evolution-event-editor.xml.h:77
+#: po/tmp/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "Före_gående"
 
-#: ui/evolution-event-editor.xml.h:78
+#: po/tmp/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Föregående"
 
-#: ui/evolution-event-editor.xml.h:79
+#: po/tmp/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "Skrivar_inställning..."
 
-#: ui/evolution-event-editor.xml.h:80
+#: po/tmp/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Skrivarinställningar"
 
-#: ui/evolution-event-editor.xml.h:83
+#: po/tmp/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ui/evolution-event-editor.xml.h:84
+#: po/tmp/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Gör om"
 
-#: ui/evolution-event-editor.xml.h:85
+#: po/tmp/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Gör om den ångrade åtgärden"
 
-#: ui/evolution-event-editor.xml.h:86
+#: po/tmp/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Ersätt"
 
-#: ui/evolution-event-editor.xml.h:87
+#: po/tmp/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "Ersätt en sträng"
 
-#: ui/evolution-event-editor.xml.h:91
+#: po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:19
+msgid "Save"
+msgstr "Spara"
+
+#: po/tmp/evolution-event-editor.xml.h:91
 msgid "Save the appointment and close the dialog box"
 msgstr "Spara mötet och stäng dialogrutan"
 
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Save the current file"
 msgstr "Spara aktuell fil"
 
-#: ui/evolution-event-editor.xml.h:93
+#: po/tmp/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
 msgstr "Boka möte"
 
-#: ui/evolution-event-editor.xml.h:94
+#: po/tmp/evolution-event-editor.xml.h:94
 msgid "Schedule _Meeting"
 msgstr "Boka _möte"
 
-#: ui/evolution-event-editor.xml.h:95
+#: po/tmp/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr "Boka någon typ av möte"
 
-#: ui/evolution-event-editor.xml.h:96
+#: po/tmp/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "Sök igen efter samma sträng"
 
-#: ui/evolution-event-editor.xml.h:97
+#: po/tmp/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Sök efter en sträng"
 
-#: ui/evolution-event-editor.xml.h:99
+#: po/tmp/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "Markera allt"
 
-#: ui/evolution-event-editor.xml.h:100
+#: po/tmp/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Markera alltihop"
 
-#: ui/evolution-event-editor.xml.h:101
+#: po/tmp/evolution-event-editor.xml.h:101
 msgid "Setup the page settings for your current printer"
 msgstr "Ställ in sidinställningarna för din aktuella skrivare"
 
-#: ui/evolution-event-editor.xml.h:102
+#: po/tmp/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "Ångra"
 
-#: ui/evolution-event-editor.xml.h:103
+#: po/tmp/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Ångra den senaste åtgärden"
 
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-message-composer.xml.h:39
 msgid "_About..."
 msgstr "_Om..."
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:40
 msgid "_Close"
 msgstr "S_täng"
 
-#: ui/evolution-event-editor.xml.h:106
+#: po/tmp/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:41
 msgid "_Debug"
 msgstr "Fels_ök"
 
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
+#: po/tmp/evolution-event-editor.xml.h:109
+#: po/tmp/evolution-message-composer.xml.h:42
+#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:25
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: ui/evolution-event-editor.xml.h:111
+#: po/tmp/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_Sök..."
 
-#: ui/evolution-event-editor.xml.h:112
+#: po/tmp/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_Formulär"
 
-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:44 po/tmp/evolution.xml.h:29
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ui/evolution-event-editor.xml.h:114
+#: po/tmp/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: ui/evolution-event-editor.xml.h:115
+#: po/tmp/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Objekt"
 
-#: ui/evolution-event-editor.xml.h:116
+#: po/tmp/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: ui/evolution-event-editor.xml.h:117
+#: po/tmp/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: ui/evolution-event-editor.xml.h:118
+#: po/tmp/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
-#: ui/evolution-event-editor.xml.h:119
+#: po/tmp/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "_Gör om"
 
-#: ui/evolution-event-editor.xml.h:120
+#: po/tmp/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "_Ersätt..."
 
-#: ui/evolution-event-editor.xml.h:122
+#: po/tmp/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "_Verktygsrader"
 
-#: ui/evolution-event-editor.xml.h:124
+#: po/tmp/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "_Ångra"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.xml.h:6
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "Skriv"
 
-#: ui/evolution-mail.xml.h:7
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Skriv ett nytt meddelande"
 
-#: ui/evolution-mail.xml.h:9
+#: po/tmp/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Kopiera meddelandet till en ny mapp"
 
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
+#: po/tmp/evolution-mail.xml.h:10
+#, fuzzy
+msgid "Create Rule"
+msgstr "Skapa \"%s\""
+
+#: po/tmp/evolution-mail.xml.h:13
+#, fuzzy
+msgid "Expunge"
+msgstr "V_erkställ tömning"
+
+#: po/tmp/evolution-mail.xml.h:14
+#, fuzzy
+msgid "Expunge this folder"
+msgstr "Öppnar mappen %s"
+
+#: po/tmp/evolution-mail.xml.h:15 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "Ma_pp"
 
-#: ui/evolution-mail.xml.h:14
+#: po/tmp/evolution-mail.xml.h:16
 msgid "Fi_lter on Sender"
 msgstr "Fi_ltrera på avsändare"
 
-#: ui/evolution-mail.xml.h:15
+#: po/tmp/evolution-mail.xml.h:17
 msgid "Filter on Rec_ipients"
 msgstr "Filtrera på _mottagare"
 
-#: ui/evolution-mail.xml.h:16
+#: po/tmp/evolution-mail.xml.h:18
 msgid "Forget _Passwords"
 msgstr "Glöm _lösenord"
 
-#: ui/evolution-mail.xml.h:20
+#: po/tmp/evolution-mail.xml.h:22
 msgid "Get Mail"
 msgstr "Hämta e-post"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Hide _Deleted messages"
+#: po/tmp/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "Göm _markerade meddelanden"
+
+#: po/tmp/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Deleted Messages"
 msgstr "Göm _borttagna meddelanden"
 
-#: ui/evolution-mail.xml.h:23
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Hide _Read messages"
 msgstr "Göm _lästa meddelanden"
 
-#: ui/evolution-mail.xml.h:24
-msgid "Hide _Selected messages"
-msgstr "Göm _markerade meddelanden"
-
-#: ui/evolution-mail.xml.h:25
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Mail _Filters..."
 msgstr "E-post_filter..."
 
-#: ui/evolution-mail.xml.h:26
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Manage Subscriptions..."
 msgstr "Hantera prenumerationer..."
 
-#: ui/evolution-mail.xml.h:27
+#: po/tmp/evolution-mail.xml.h:28
 msgid "Mar_k As Read"
 msgstr "Mar_kera som läst"
 
-#: ui/evolution-mail.xml.h:28
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Mark As U_nread"
 msgstr "Markera som _oläst"
 
-#: ui/evolution-mail.xml.h:29
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Move"
 msgstr "Flytta"
 
-#: ui/evolution-mail.xml.h:30
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Move message to a new folder"
 msgstr "Flytta meddelandet till en ny mapp"
 
-#: ui/evolution-mail.xml.h:31
+#: po/tmp/evolution-mail.xml.h:32
 msgid "Previews the message to be printed"
 msgstr "Förhandsgranskar meddelandet som ska skrivas ut"
 
-#: ui/evolution-mail.xml.h:33
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Print Preview of message..."
 msgstr "Förhandsgranska meddelande..."
 
-#: ui/evolution-mail.xml.h:34
+#: po/tmp/evolution-mail.xml.h:35
 msgid "Print message to the printer"
 msgstr "Skriv ut meddelande på skrivaren"
 
-#: ui/evolution-mail.xml.h:35
+#: po/tmp/evolution-mail.xml.h:36
 msgid "Print message..."
 msgstr "Skriv ut meddelande..."
 
-#: ui/evolution-mail.xml.h:39
+#: po/tmp/evolution-mail.xml.h:40
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: ui/evolution-mail.xml.h:40
+#: po/tmp/evolution-mail.xml.h:41
 msgid "Reply to _Sender"
 msgstr "Svara till av_sändaren"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
+#: po/tmp/evolution-mail.xml.h:44
+#, fuzzy
+msgid "S_ource"
+msgstr "Källa"
+
+#: po/tmp/evolution-mail.xml.h:45 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Markera _alla"
 
-#: ui/evolution-mail.xml.h:44
+#: po/tmp/evolution-mail.xml.h:46
 msgid "Send queued mail and retrieve new mail"
 msgstr "Skicka kölagd e-post och hämta ny e-post"
 
-#: ui/evolution-mail.xml.h:45
-msgid "Show _All messages"
+#: po/tmp/evolution-mail.xml.h:47
+#, fuzzy
+msgid "Show _All Messages"
 msgstr "Visa _alla meddelanden"
 
-#: ui/evolution-mail.xml.h:46
+#: po/tmp/evolution-mail.xml.h:48
 msgid "Threaded Message list"
 msgstr "Trådad meddelandelista"
 
-#: ui/evolution-mail.xml.h:47
+#: po/tmp/evolution-mail.xml.h:49
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på avsä_ndare"
 
-#: ui/evolution-mail.xml.h:48
+#: po/tmp/evolution-mail.xml.h:50
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på mottaga_re"
 
-#: ui/evolution-mail.xml.h:49
+#: po/tmp/evolution-mail.xml.h:51
 msgid "View Raw Message Source"
 msgstr "Visa rå meddelandekälla"
 
-#: ui/evolution-mail.xml.h:50
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Apply Filters"
 msgstr "Tillämp_a filter"
 
-#: ui/evolution-mail.xml.h:51
+#: po/tmp/evolution-mail.xml.h:53
 msgid "_Configure Folder"
 msgstr "_Konfigura mapp"
 
-#: ui/evolution-mail.xml.h:52
+#: po/tmp/evolution-mail.xml.h:54
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: ui/evolution-mail.xml.h:54
+#: po/tmp/evolution-mail.xml.h:56
 msgid "_Edit Message"
 msgstr "R_edigera meddelande"
 
-#: ui/evolution-mail.xml.h:55
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Expunge"
 msgstr "V_erkställ tömning"
 
-#: ui/evolution-mail.xml.h:56
+#: po/tmp/evolution-mail.xml.h:58
 msgid "_Filter on Subject"
 msgstr "_Filtrera på ämne"
 
-#: ui/evolution-mail.xml.h:57
+#: po/tmp/evolution-mail.xml.h:59
 msgid "_Forward"
 msgstr "Vidarebe_fordra"
 
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
+#: po/tmp/evolution-mail.xml.h:60 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "Om_vänd markering"
 
-#: ui/evolution-mail.xml.h:59
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Mail Configuration..."
 msgstr "_E-postkonfiguration..."
 
-#: ui/evolution-mail.xml.h:60
+#: po/tmp/evolution-mail.xml.h:62
 msgid "_Message"
 msgstr "_Meddelande"
 
-#: ui/evolution-mail.xml.h:61
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp..."
 
-#: ui/evolution-mail.xml.h:62
+#: po/tmp/evolution-mail.xml.h:64
 msgid "_Open in New Window"
 msgstr "_Öppna i nytt fönster"
 
-#: ui/evolution-mail.xml.h:63
+#: po/tmp/evolution-mail.xml.h:65
 msgid "_Print Message"
 msgstr "Skriv _ut meddelande"
 
-#: ui/evolution-mail.xml.h:64
+#: po/tmp/evolution-mail.xml.h:66
 msgid "_Save Message As..."
 msgstr "Spara meddelande so_m..."
 
-#: ui/evolution-mail.xml.h:65
-msgid "_Source"
-msgstr "_Källa"
-
-#: ui/evolution-mail.xml.h:66
+#: po/tmp/evolution-mail.xml.h:67
 msgid "_Threaded"
 msgstr "_Trådat"
 
-#: ui/evolution-mail.xml.h:67
+#: po/tmp/evolution-mail.xml.h:68
 msgid "_Undelete"
 msgstr "_Ångra borttagning"
 
-#: ui/evolution-mail.xml.h:68
+#: po/tmp/evolution-mail.xml.h:69
 msgid "_VFolder on Subject"
 msgstr "_Virtuell mapp på ämne"
 
-#: ui/evolution-mail.xml.h:69
+#: po/tmp/evolution-mail.xml.h:70
 msgid "_Virtual Folder Editor..."
 msgstr "Editor för _virtuella mappar..."
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-message-composer.xml.h:6
+#: po/tmp/evolution-message-composer.xml.h:6
 msgid "Attach"
 msgstr "Bifoga"
 
-#: ui/evolution-message-composer.xml.h:9
+#: po/tmp/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Stäng aktuell fil"
 
-#: ui/evolution-message-composer.xml.h:10
+#: po/tmp/evolution-message-composer.xml.h:10
 msgid "Encrypt this message with PGP"
 msgstr "Kryptera detta meddelande med PGP"
 
-#: ui/evolution-message-composer.xml.h:12
+#: po/tmp/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:13
 msgid "Insert a file as text into the message"
 msgstr "Infoga en fil som text i meddelandet"
 
-#: ui/evolution-message-composer.xml.h:14
+#: po/tmp/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr "Infoga textfil..."
 
-#: ui/evolution-message-composer.xml.h:16
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Open a file"
 msgstr "Öppna en fil"
 
-#: ui/evolution-message-composer.xml.h:17
+#: po/tmp/evolution-message-composer.xml.h:17
 msgid "PGP Encrypt"
 msgstr "PGP-kryptera"
 
-#: ui/evolution-message-composer.xml.h:18
+#: po/tmp/evolution-message-composer.xml.h:18
 msgid "PGP Sign"
 msgstr "PGP-signera"
 
-#: ui/evolution-message-composer.xml.h:20
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Spara som"
 
-#: ui/evolution-message-composer.xml.h:22
+#: po/tmp/evolution-message-composer.xml.h:22
+#, fuzzy
+msgid "Save _Draft"
+msgstr "Mall"
+
+#: po/tmp/evolution-message-composer.xml.h:23
 msgid "Save in _folder... (FIXME)"
 msgstr "Spara i map_p... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:23
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Save in folder..."
 msgstr "Spara i mapp..."
 
-#: ui/evolution-message-composer.xml.h:25
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Save the current file with a different name"
 msgstr "Spara aktuell fil med ett annat namn"
 
-#: ui/evolution-message-composer.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:27
 msgid "Save the message in a specified folder"
 msgstr "Spara meddelandet i angiven mapp"
 
-#: ui/evolution-message-composer.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send"
 msgstr "Skicka"
 
-#: ui/evolution-message-composer.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send _Later"
 msgstr "Skicka senar_e"
 
-#: ui/evolution-message-composer.xml.h:29
+#: po/tmp/evolution-message-composer.xml.h:30
 msgid "Send _later"
 msgstr "Skicka senar_e"
 
-#: ui/evolution-message-composer.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Send the mail in HTML format"
 msgstr "Skicka brevet i HTML-format"
 
-#: ui/evolution-message-composer.xml.h:31
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Send the message later"
 msgstr "Skicka meddelandet senare"
 
-#: ui/evolution-message-composer.xml.h:32
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Send the message now"
 msgstr "Skicka meddelandet nu"
 
-#: ui/evolution-message-composer.xml.h:33
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "Send this message now"
 msgstr "Skicka detta meddelande nu"
 
-#: ui/evolution-message-composer.xml.h:34
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "Show / hide attachments"
 msgstr "Visa/göm bilaga"
 
-#: ui/evolution-message-composer.xml.h:35
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "Show _attachments"
 msgstr "Visa _bilagor"
 
-#: ui/evolution-message-composer.xml.h:36
+#: po/tmp/evolution-message-composer.xml.h:37
 msgid "Show attachments"
 msgstr "Visa bilagor"
 
-#: ui/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-message-composer.xml.h:38
 msgid "Sign this message with your PGP key"
 msgstr "Signera detta meddelande med din PGP-nyckel"
 
-#: ui/evolution-message-composer.xml.h:44
+#: po/tmp/evolution-message-composer.xml.h:45
 msgid "_Insert text file... (FIXME)"
 msgstr "_Infoga textfil... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:45
+#: po/tmp/evolution-message-composer.xml.h:46
 msgid "_Open..."
 msgstr "_Öppna..."
 
-#: ui/evolution-message-composer.xml.h:47
+#: po/tmp/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Säkerhet"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-subscribe.xml.h:6
+#: po/tmp/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr "Lägg till mapp till din lista över prenumererade mappar"
 
-#: ui/evolution-subscribe.xml.h:9
+#: po/tmp/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Uppdatera lista"
 
-#: ui/evolution-subscribe.xml.h:10
+#: po/tmp/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Uppdatera listan med mappar"
 
-#: ui/evolution-subscribe.xml.h:11
+#: po/tmp/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Ta bort mapp från din lista över prenumererade mappar"
 
-#: ui/evolution-subscribe.xml.h:13
+#: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: ui/evolution-subscribe.xml.h:14
+#: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Säg upp prenumeration"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.xml.h:6
+#: po/tmp/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "Visa en annan mapp"
 
-#: ui/evolution.xml.h:7
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Avsluta"
 
-#: ui/evolution.xml.h:8
+#: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Evolution-genväg för _rader"
 
-#: ui/evolution.xml.h:9
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Avlsuta programmet"
 
-#: ui/evolution.xml.h:10
+#: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "Komma i _gång"
 
-#: ui/evolution.xml.h:11
+#: po/tmp/evolution.xml.h:11
+msgid "Import an external file format"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:12
 msgid "Show information about Evolution"
 msgstr "Visa information om Evolution"
 
-#: ui/evolution.xml.h:12
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Folder Bar"
 msgstr "Visa _mappraden"
 
-#: ui/evolution.xml.h:13
+#: po/tmp/evolution.xml.h:14
 msgid "Show the _Shortcut Bar"
 msgstr "Visa _genvägsraden"
 
-#: ui/evolution.xml.h:14
+#: po/tmp/evolution.xml.h:15
 msgid "Submit _Bug Report"
 msgstr "Skicka _felrapport"
 
-#: ui/evolution.xml.h:15
+#: po/tmp/evolution.xml.h:16
 msgid "Submit bug report using Bug Buddy."
 msgstr "Skicka felrapport med Bug-Buddy."
 
-#: ui/evolution.xml.h:16
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the folder bar"
 msgstr "Växla om mappraden ska visas"
 
-#: ui/evolution.xml.h:17
+#: po/tmp/evolution.xml.h:18
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Växla om genvägsraden ska visas"
 
-#: ui/evolution.xml.h:18
+#: po/tmp/evolution.xml.h:19
 msgid "Using the C_ontact Manager"
 msgstr "Använda k_ontakthanteraren"
 
-#: ui/evolution.xml.h:19
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Calendar"
 msgstr "Använda _kalendern"
 
-#: ui/evolution.xml.h:20
+#: po/tmp/evolution.xml.h:21
 msgid "Using the _Mailer"
 msgstr "Använda _e-postdelen"
 
-#: ui/evolution.xml.h:21
+#: po/tmp/evolution.xml.h:22
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ui/evolution.xml.h:22
+#: po/tmp/evolution.xml.h:23
 msgid "_Appointment (FIXME)"
 msgstr "_Möte (FIXME)"
 
-#: ui/evolution.xml.h:23
+#: po/tmp/evolution.xml.h:24
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-#: ui/evolution.xml.h:26
+#: po/tmp/evolution.xml.h:27
 msgid "_Folder"
 msgstr "_Mapp"
 
-#: ui/evolution.xml.h:27
+#: po/tmp/evolution.xml.h:28
 msgid "_Go to Folder..."
 msgstr "_Gå till mapp..."
 
-#: ui/evolution.xml.h:29
+#: po/tmp/evolution.xml.h:30
+msgid "_Import file"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:31
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
+#: po/tmp/evolution.xml.h:32
+#, fuzzy
+msgid "_Mail message"
 msgstr "_Posta meddelande (FIXME)"
 
-#: ui/evolution.xml.h:32
+#: po/tmp/evolution.xml.h:34
 msgid "_Settings"
 msgstr "_Inställningar"
 
-#: ui/evolution.xml.h:33
+#: po/tmp/evolution.xml.h:35
 msgid "_Task (FIXME)"
 msgstr "_Uppgift (FIXME)"
 
@@ -7114,7 +7045,7 @@ msgstr "MTOTFLS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:111
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
@@ -7139,8 +7070,217 @@ msgstr "%I.%M %p"
 msgid "Group %i"
 msgstr "Grupp %i"
 
-#~ msgid "categories"
-#~ msgstr "kategorier"
+#, fuzzy
+#~ msgid "Calendar Server"
+#~ msgstr "Kalender"
+
+#, fuzzy
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Kan inte initiera Evolutions komponent för e-postsammanfattning."
+
+#, fuzzy
+#~ msgid "Evolution calendar iTip/iMip viewer"
+#~ msgstr "Evolutions kalenderkanal"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Konfigurationsverktyg för evolutions kalenderkanal.\n"
+
+#~ msgid "Server disconnected."
+#~ msgstr "Servern kopplade ifrån."
+
+#~ msgid "UNIX MH-format mail directories (CamelLocal version)"
+#~ msgstr "Brevlådekataloger i UNIX-MH-format (CamelLocal-version)"
+
+#~ msgid "UNIX mbox-format mail files (CamelLocal version)"
+#~ msgstr "Brevlådefiler i UNIX-mbox-format (CamelLocal-version)"
+
+#~ msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+#~ msgstr "UNIX-brevfiler i qmail-brevlådekatalogformat (CamelLocal-version)"
+
+#~ msgid "Show all hidden"
+#~ msgstr "Visa alla gömda"
+
+#~ msgid "Hide selected"
+#~ msgstr "Göm markerade"
+
+#~ msgid "Hide read"
+#~ msgstr "Göm lästa"
+
+#~ msgid "Hide deleted"
+#~ msgstr "Göm borttagna"
+
+#~ msgid "Hide Subject"
+#~ msgstr "Göm ämnesrad"
+
+#~ msgid "Hide from Sender"
+#~ msgstr "Göm för avsändaren"
+
+#~ msgid "Hide Messages"
+#~ msgstr "Göm meddelanden"
+
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Göm ämnesraden \"%s\""
+
+#~ msgid "Hide from Sender <%s>"
+#~ msgstr "Göm för avsändaren <%s>"
+
+#~ msgid "You have no mail sources configured"
+#~ msgstr "Du har inte konfigurerat några e-postkällor"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "Reply-to:"
+#~ msgstr "Svara-till:"
+
+#, fuzzy
+#~ msgid "Server Timeouts"
+#~ msgstr "Servertyp: "
+
+#, fuzzy
+#~ msgid "minute(s)"
+#~ msgstr "minuter"
+
+#~ msgid ""
+#~ "Enter your name and email address to be used in outgoing mail. You may also, "
+#~ "optionally, enter the name of your organization, and the name of a file to "
+#~ "read your signature from."
+#~ msgstr ""
+#~ "Ange ditt namn och din e-postadress för utgående post. Du kan också, om du "
+#~ "vill, ange namnet på din organisation och en fil att läsa din signatur från."
+
+#~ msgid "Full name:"
+#~ msgstr "Fullständigt namn:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-postadress:"
+
+#~ msgid "Signature File"
+#~ msgstr "Signaturfil"
+
+#~ msgid "Server:"
+#~ msgstr "Server:"
+
+#~ msgid "Detect supported types..."
+#~ msgstr "Detektera vilka typer som stöds..."
+
+#~ msgid "Don't delete messages from server"
+#~ msgstr "Ta inte bort meddelanden från servern"
+
+#~ msgid "Test Settings"
+#~ msgstr "Testa inställningarna"
+
+#~ msgid "Mail source type:"
+#~ msgstr "Typ av e-postkälla:"
+
+#~ msgid ""
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
+#~ "\n"
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
+#~ msgstr ""
+#~ "Välj den typ av e-postserver som du har och ange den relevanta informationen "
+#~ "om den.\n"
+#~ "\n"
+#~ "Om servern kräver autentisering kan du klicka på knappen \"Detektera vilka "
+#~ "typer som stöds...\" när du har angett den andra informationen."
+
+#~ msgid "News source type:"
+#~ msgstr "Typ av diskussionsgruppskälla:"
+
+#~ msgid ""
+#~ "Select the kind of news server you have, and enter the relevant information "
+#~ "about it.\n"
+#~ "\n"
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
+#~ msgstr ""
+#~ "Välj den typ av diskussionsgruppsserver som du har och ange den relevanta "
+#~ "informationen om den.\n"
+#~ "\n"
+#~ "Om servern kräver autentisering kan du klicka på knappen \"Detektera de "
+#~ "typer som stöds...\" när du har angett den andra informationen."
+
+#~ msgid "Mail transport type:"
+#~ msgstr "Typ av e-posttransport:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
+#~ msgstr ""
+#~ "Välj den typ av e-postserver som du har och ange den relevanta informationen "
+#~ "om den.\n"
+#~ "\n"
+#~ "Om servern kräver autentisering kan du klicka på knappen \"Detektera vilka "
+#~ "typer som stöds...\" när du har angett den andra informationen."
+
+#~ msgid "Add Identity"
+#~ msgstr "Lägg till identitet"
+
+#~ msgid "Edit Identity"
+#~ msgstr "Redigera identitet"
+
+#~ msgid "Add Source"
+#~ msgstr "Lägg till källa"
+
+#~ msgid "Edit Source"
+#~ msgstr "Redigera källa"
+
+#~ msgid "Add News Server"
+#~ msgstr "Lägg till diskussionsgruppsserver"
+
+#~ msgid "Edit News Server"
+#~ msgstr "Redigera diskussionsgruppsserver"
+
+#~ msgid "Testing \"%s\""
+#~ msgstr "Testar \"%s\""
+
+#~ msgid "Test connection to \"%s\""
+#~ msgstr "Testa anslutning till \"%s\""
+
+#~ msgid "The connection was successful!"
+#~ msgstr "Anslutningen lyckades!"
+
+#~ msgid "Querying authorization capabilities of \"%s\""
+#~ msgstr "Frågar efter autentiseringsmöjligheterna hos \"%s\""
+
+#~ msgid "Query authorization at \"%s\""
+#~ msgstr "Fråga efter autentisering hos \"%s\""
+
+#~ msgid "Address"
+#~ msgstr "Adress"
+
+#~ msgid "Identities"
+#~ msgstr "Identiteter"
+
+#~ msgid "Mail Sources"
+#~ msgstr "E-postkällor"
+
+#~ msgid "Mail Transport"
+#~ msgstr "E-posttransport"
+
+#~ msgid "Mark message as seen [ms]: "
+#~ msgstr "Markera meddelanden som lästa [ms]: "
+
+#~ msgid "News Servers"
+#~ msgstr "Diskussionsgruppsservrar"
+
+#~ msgid "News Sources"
+#~ msgstr "Diskussionsgruppskällor"
+
+#~ msgid "Send messages in HTML format"
+#~ msgstr "Skicka meddelanden som HTML"
+
+#~ msgid "No GPG/PGP support available in this copy of Evolution."
+#~ msgstr "Det finns inget stöd för GPG/PGP i denna kopia av Evolution."
+
+#~ msgid "_Source"
+#~ msgstr "_Källa"
 
 #~ msgid "Item(s) belong to these categories:"
 #~ msgstr "Element(en) tillhör dessa kategorier:"
@@ -7151,9 +7291,6 @@ msgstr "Grupp %i"
 #~ msgid "Deleted"
 #~ msgstr "Borttagen"
 
-#~ msgid "Draft"
-#~ msgstr "Mall"
-
 #~ msgid "Mail Source"
 #~ msgstr "E-postkälla"
 
@@ -7188,9 +7325,6 @@ msgstr "Grupp %i"
 #~ msgid "Creating \"%s\""
 #~ msgstr "Skapar \"%s\""
 
-#~ msgid "Create \"%s\""
-#~ msgstr "Skapa \"%s\""
-
 #~ msgid "Exception while reporting result to shell component listener."
 #~ msgstr "Undantag vid rapportering av resultat till skalkomponentslyssnaren."
 
@@ -7452,9 +7586,6 @@ msgstr "Grupp %i"
 #~ msgid "Cannot get message: %s"
 #~ msgstr "Kan inte hämta meddelande: %s"
 
-#~ msgid "UNIX mbox-format mail files"
-#~ msgstr "Brevlådefiler i UNIX-mbox-format"
-
 #~ msgid ""
 #~ "For reading mail delivered by the local system, and for storing mail on "
 #~ "local disk."
@@ -7486,9 +7617,6 @@ msgstr "Grupp %i"
 #~ msgid "Cannot append message to mh folder: %s"
 #~ msgstr "Kan inte lägga till meddelande i mh-mapp: %s"
 
-#~ msgid "UNIX MH-format mail directories"
-#~ msgstr "Brevlådekataloger i UNIX-MH-format"
-
 #~ msgid "Could not rename folder `%s': %s"
 #~ msgstr "Kunde inte byta namn på mappen \"%s\": %s"
 
@@ -7516,9 +7644,6 @@ msgstr "Grupp %i"
 #~ msgid "Sets something as bold"
 #~ msgstr "Sätt någonting till fetstil"
 
-#~ msgid "Flagged"
-#~ msgstr "Flaggad"
-
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Kan inte initiera Evolutions hashfunktion för e-postlagring."
 
@@ -7684,9 +7809,6 @@ msgstr "Grupp %i"
 #~ msgid "Preferences"
 #~ msgstr "Inställningar"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarm"
-
 #~ msgid "Alarm Properties"
 #~ msgstr "Egenskaper för alarm"