Updated Swedish translation.

svn path=/trunk/; revision=6561

2 files changed, 1119 insertions, 1250 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 4e019da0ee..40bff196c7 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -4,6 +4,10 @@
 	glade file translation code. It can't cope with line
 	breaks in the node content!
 
+2000-11-13  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
 2000-11-10  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* no.po: Updated Norwegian translation.
diff --git a/po/sv.po b/po/sv.po
index 934c5fd111..6b0aa783a9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,19 +7,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2000-11-07 00:53+0100\n"
-"PO-Revision-Date: 2000-11-07 00:54+0100\n"
+"POT-Creation-Date: 2000-11-13 19:52+0100\n"
+"PO-Revision-Date: 2000-11-13 20:02+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3044
+#: addressbook/backend/ebook/e-card.c:3046
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: addressbook/backend/ebook/e-card.c:3048
 msgid ""
 "\n"
 "Name: "
@@ -27,7 +27,7 @@ msgstr ""
 "\n"
 "Namn: "
 
-#: addressbook/backend/ebook/e-card.c:3047
+#: addressbook/backend/ebook/e-card.c:3049
 msgid ""
 "\n"
 "  Prefix:     "
@@ -35,7 +35,7 @@ msgstr ""
 "\n"
 "  Prefix:     "
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3050
 msgid ""
 "\n"
 "  Given:      "
@@ -43,7 +43,7 @@ msgstr ""
 "\n"
 "  Förnamn:    "
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "  Additional: "
@@ -51,7 +51,7 @@ msgstr ""
 "\n"
 "  Andranamn:  "
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Family:     "
@@ -59,7 +59,7 @@ msgstr ""
 "\n"
 "  Efternamn:  "
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Suffix:     "
@@ -67,7 +67,7 @@ msgstr ""
 "\n"
 "  Suffix:     "
 
-#: addressbook/backend/ebook/e-card.c:3065
+#: addressbook/backend/ebook/e-card.c:3067
 msgid ""
 "\n"
 "Birth Date: "
@@ -75,7 +75,7 @@ msgstr ""
 "\n"
 "Födelsedatum: "
 
-#: addressbook/backend/ebook/e-card.c:3076
+#: addressbook/backend/ebook/e-card.c:3078
 msgid ""
 "\n"
 "Address:"
@@ -83,7 +83,7 @@ msgstr ""
 "\n"
 "Adress:"
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3080
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -91,7 +91,7 @@ msgstr ""
 "\n"
 "  Box:           "
 
-#: addressbook/backend/ebook/e-card.c:3079
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "  Ext:         "
@@ -99,7 +99,7 @@ msgstr ""
 "\n"
 "  Anknytning:    "
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3082
 msgid ""
 "\n"
 "  Street:      "
@@ -107,7 +107,7 @@ msgstr ""
 "\n"
 "  Gatuadress:    "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  City:        "
@@ -115,7 +115,7 @@ msgstr ""
 "\n"
 "  Ort:           "
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Region:      "
@@ -123,7 +123,7 @@ msgstr ""
 "\n"
 "  Region:        "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Postal Code: "
@@ -131,7 +131,7 @@ msgstr ""
 "\n"
 "  Postnummer:    "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  Country:     "
@@ -139,7 +139,7 @@ msgstr ""
 "\n"
 "  Land:          "
 
-#: addressbook/backend/ebook/e-card.c:3097
+#: addressbook/backend/ebook/e-card.c:3099
 msgid ""
 "\n"
 "Delivery Label: "
@@ -147,7 +147,7 @@ msgstr ""
 "\n"
 "Leveransetikett: "
 
-#: addressbook/backend/ebook/e-card.c:3109
+#: addressbook/backend/ebook/e-card.c:3111
 msgid ""
 "\n"
 "Telephones:\n"
@@ -155,7 +155,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3112
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephone:"
@@ -163,7 +163,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3136
+#: addressbook/backend/ebook/e-card.c:3138
 msgid ""
 "\n"
 "E-mail:\n"
@@ -171,7 +171,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3139
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:"
@@ -179,7 +179,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3158
+#: addressbook/backend/ebook/e-card.c:3160
 msgid ""
 "\n"
 "Mailer: "
@@ -187,7 +187,7 @@ msgstr ""
 "\n"
 "E-postprogram: "
 
-#: addressbook/backend/ebook/e-card.c:3164
+#: addressbook/backend/ebook/e-card.c:3166
 msgid ""
 "\n"
 "Time Zone: "
@@ -195,7 +195,7 @@ msgstr ""
 "\n"
 "Tidszon: "
 
-#: addressbook/backend/ebook/e-card.c:3172
+#: addressbook/backend/ebook/e-card.c:3174
 msgid ""
 "\n"
 "Geo Location: "
@@ -203,7 +203,7 @@ msgstr ""
 "\n"
 "Geografisk plats: "
 
-#: addressbook/backend/ebook/e-card.c:3176
+#: addressbook/backend/ebook/e-card.c:3178
 msgid ""
 "\n"
 "Business Role: "
@@ -211,7 +211,7 @@ msgstr ""
 "\n"
 "Yrkesroll: "
 
-#: addressbook/backend/ebook/e-card.c:3188
+#: addressbook/backend/ebook/e-card.c:3190
 msgid ""
 "\n"
 "Org: "
@@ -219,7 +219,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3189
+#: addressbook/backend/ebook/e-card.c:3191
 msgid ""
 "\n"
 "  Name:  "
@@ -227,7 +227,7 @@ msgstr ""
 "\n"
 "  Namn:    "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3192
 msgid ""
 "\n"
 "  Unit:  "
@@ -235,7 +235,7 @@ msgstr ""
 "\n"
 "  Enhet:   "
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "  Unit2: "
@@ -243,7 +243,7 @@ msgstr ""
 "\n"
 "  Enhet 2: "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Unit3: "
@@ -251,7 +251,7 @@ msgstr ""
 "\n"
 "  Enhet 3: "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit4: "
@@ -259,7 +259,7 @@ msgstr ""
 "\n"
 "  Enhet 4: "
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "Categories: "
@@ -267,7 +267,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "Comment: "
@@ -285,7 +285,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "Unique String: "
@@ -293,7 +293,7 @@ msgstr ""
 "\n"
 "Unik sträng: "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Public Key: "
@@ -305,10 +305,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:910
+#: addressbook/conduit/address-conduit.c:1012
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1091
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1092
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Kunde inte initiera Bonobo"
 
@@ -431,28 +431,28 @@ msgstr ""
 "Ett fel inträffade vid hämnting av\n"
 "pilotlista från gnome-pilot-demonen"
 
-#: addressbook/conduit/address-conduit.c:193
+#: addressbook/conduit/address-conduit.c:207
 msgid "Cursor could not be loaded\n"
 msgstr "Markören kunde inte läsas in\n"
 
-#: addressbook/conduit/address-conduit.c:206
+#: addressbook/conduit/address-conduit.c:220
 msgid "EBook not loaded\n"
 msgstr "EBook inte inläst\n"
 
-#: addressbook/conduit/address-conduit.c:490
+#: addressbook/conduit/address-conduit.c:579
 #: calendar/conduits/calendar/calendar-conduit.c:651
 #: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat server"
 msgstr "Kunde inte starta wombat-server"
 
-#: addressbook/conduit/address-conduit.c:491
+#: addressbook/conduit/address-conduit.c:580
 #: calendar/conduits/calendar/calendar-conduit.c:652
 #: calendar/conduits/todo/todo-conduit.c:525
 msgid "Could not start wombat"
 msgstr "Kunde inte starta wombat"
 
-#: addressbook/conduit/address-conduit.c:517
-#: addressbook/conduit/address-conduit.c:520
+#: addressbook/conduit/address-conduit.c:613
+#: addressbook/conduit/address-conduit.c:616
 msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte läsa pilotens adressprogramblock"
 
@@ -473,114 +473,105 @@ msgstr "Element(en) tillhör dessa kategorier:"
 msgid "Available Categories:"
 msgstr "Tillgängliga kategorier:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/contact-editor/e-contact-editor.c:1266
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
-#: addressbook/contact-editor/e-contact-editor.c:1339
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
 msgid "Business"
 msgstr "Företag"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1268
 msgid "Business 2"
 msgstr "Företag 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/contact-editor/e-contact-editor.c:1269
 msgid "Business Fax"
 msgstr "Företagsfax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/contact-editor/e-contact-editor.c:1270
 msgid "Callback"
 msgstr "Tillbakaringning"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/contact-editor/e-contact-editor.c:1272
 msgid "Company"
 msgstr "Företag"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1340
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
 msgid "Home"
 msgstr "Hem"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Home 2"
 msgstr "Hem 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1275
 msgid "Home Fax"
 msgstr "Fax hem"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: mail/mail-config.glade.h:28 mail/mail-config.glade.h:40
+#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1373
+#: mail/mail-config.glade.h:18
 msgid "Other"
 msgstr "Annat"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Other Fax"
 msgstr "Annan fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Pager"
 msgstr "Personsökare"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1281
 msgid "Primary"
 msgstr "Primär"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1296
+#: addressbook/contact-editor/e-contact-editor.c:1328
 msgid "Primary Email"
 msgstr "Primär e-post"
 
-#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/contact-editor/e-contact-editor.c:1329
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/contact-editor/e-contact-editor.c:1330
 msgid "Email 3"
 msgstr "E-post 3"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Är du säker på att du\n"
-"vill ta bort kontakten?"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:10
 msgid "Delete Contact?"
 msgstr "Ta bort kontakten?"
 
@@ -594,7 +585,7 @@ msgid "_Add"
 msgstr "_Lägg till"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-mail.xml.h:46
+#: ui/evolution-event-editor.xml.h:109 ui/evolution-mail.xml.h:47
 msgid "_Delete"
 msgstr "_Ta bort"
 
@@ -607,13 +598,14 @@ msgstr "Telefontyper"
 msgid "New phone type"
 msgstr "Ny telefontyp"
 
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/event-editor-dialog.glade.h:62 filter/filter.glade.h:12
-#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
-#: filter/filter.glade.h:26 mail/mail-config-druid.glade.h:22
-#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:22 mail/mail-config.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:53 filter/filter.glade.h:7
+#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Lägg till"
 
@@ -666,8 +658,7 @@ msgid "C_ontacts..."
 msgstr "_Kontakter..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:34
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
@@ -685,7 +676,6 @@ msgstr "_Adress..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
 #: calendar/gui/event-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:69
 msgid "General"
 msgstr "Allmänt"
 
@@ -730,68 +720,47 @@ msgid "No_tes:"
 msgstr "An_teckningar:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:36
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 msgid "Details"
 msgstr "Detaljer"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/contact-editor/fulladdr.glade.h:7
-#: addressbook/contact-editor/fulladdr.glade.h:19
+msgid "Address _2:"
+msgstr "Adress _2:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Kontrollera adress"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
-#: addressbook/contact-editor/fulladdr.glade.h:21
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr "_Land:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "_Address:"
 msgstr "_Adress:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
-#: addressbook/contact-editor/fulladdr.glade.h:22
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "_City:"
 msgstr "_Ort:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
-#: addressbook/contact-editor/fulladdr.glade.h:23
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_PO Box:"
 msgstr "_Box:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-#: addressbook/contact-editor/fulladdr.glade.h:18
-msgid "Address _2:"
-msgstr "Adress _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-#: addressbook/contact-editor/fulladdr.glade.h:24
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_State/Province:"
 msgstr "Del_stat/Provins:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "USA"
-msgstr "USA"
-
 #: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "Finland"
-msgstr "Finland"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
-#: addressbook/contact-editor/fulladdr.glade.h:25
 msgid "_ZIP Code:"
 msgstr "_Postnummer:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:17
-#: addressbook/contact-editor/fulladdr.glade.h:20
-msgid "Countr_y:"
-msgstr "_Land:"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -851,7 +820,7 @@ msgstr "_Efternamn:"
 msgid "_Suffix:"
 msgstr "_Suffix:"
 
-#: addressbook/gui/component/addressbook.c:265
+#: addressbook/gui/component/addressbook.c:266
 msgid "As _Minicards"
 msgstr "Som _minikort"
 
@@ -860,16 +829,16 @@ msgstr "Som _minikort"
 #. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:271
+#: addressbook/gui/component/addressbook.c:272
 #: ui/evolution-addressbook.xml.h:7
 msgid "As _Table"
 msgstr "Som _tabell"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:392
 msgid "Unable to open addressbook"
 msgstr "Kan inte öppna adressboken"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:397
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -890,27 +859,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:501
+#: addressbook/gui/component/addressbook.c:507 mail/folder-browser.c:152
 msgid "Show All"
 msgstr "Visa alla"
 
-#: addressbook/gui/component/addressbook.c:503
+#: addressbook/gui/component/addressbook.c:509 mail/folder-browser.c:154
 msgid "Advanced..."
 msgstr "Avancerat..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:539
 msgid "Any field contains"
 msgstr "Något fält innehåller"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:540
 msgid "Name contains"
 msgstr "Namnet innehåller"
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:541
 msgid "Email contains"
 msgstr "E-postadressen innehåller"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:627
 msgid "The URI that the Folder Browser will display"
 msgstr "URI:n som mappbläddraren kommer att visa"
 
@@ -919,182 +888,65 @@ msgid "External Directories"
 msgstr "Externa kataloger"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: addressbook/gui/component/ldap-server-dialog.glade.h:12
-#: composer/e-msg-composer-attachment.glade.h:9
-#: composer/e-msg-composer-attachment.glade.h:12
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "Description:"
 msgstr "Beskrivning:"
 
 #: addressbook/gui/component/ldap-server-dialog.glade.h:8
-#: addressbook/gui/component/ldap-server-dialog.glade.h:13
 msgid "LDAP Server:"
 msgstr "LDAP-server:"
 
 #: addressbook/gui/component/ldap-server-dialog.glade.h:9
-#: addressbook/gui/component/ldap-server-dialog.glade.h:15
+#: mail/mail-config-druid.glade.h:37
+msgid "Name:"
+msgstr "Namn:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:10
 msgid "Port Number:"
 msgstr "Portnummer:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
-#: addressbook/gui/component/ldap-server-dialog.glade.h:16
+#: addressbook/gui/component/ldap-server-dialog.glade.h:11
 msgid "Root DN:"
 msgstr "Rot-DN:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-#: addressbook/gui/component/ldap-server-dialog.glade.h:14
-#: mail/mail-config-druid.glade.h:49
-msgid "Name:"
-msgstr "Namn:"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/component/select-names/select-names.glade.h:7
-#: addressbook/gui/component/select-names/select-names.glade.h:13
-msgid "Select Names"
-msgstr "Markera namn"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-#: addressbook/gui/component/select-names/select-names.glade.h:11
 msgid "Find..."
 msgstr "Sök..."
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+msgid "Message Recipients"
+msgstr "Mottagare"
+
 #: addressbook/gui/component/select-names/select-names.glade.h:9
-#: addressbook/gui/component/select-names/select-names.glade.h:14
-msgid "Select name from List:"
-msgstr "Välj namn från listan:"
+msgid "Select Names"
+msgstr "Markera namn"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:10
-#: addressbook/gui/component/select-names/select-names.glade.h:12
-msgid "Message Recipients"
-msgstr "Mottagare"
+msgid "Select name from List:"
+msgstr "Välj namn från listan:"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/widgets/alphabet.glade.h:7
-#: addressbook/gui/widgets/alphabet.glade.h:36
-msgid "window2"
-msgstr "window2"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-#: addressbook/gui/widgets/alphabet.glade.h:35
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:33
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:34
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/alphabet.glade.h:8
+msgid "window2"
+msgstr "window2"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:415
 #: addressbook/gui/widgets/e-minicard.c:338
@@ -1119,234 +971,184 @@ msgstr ""
 "\n"
 "Dubbelklicka här för att skapa en ny kontakt."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:697 mail/mail-search-dialogue.c:102
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "Sök"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/printing/e-contact-print.glade.h:7
-#: addressbook/printing/e-contact-print.glade.h:82
-msgid "Page Setup:"
-msgstr "Sidinställningar:"
+msgid "10 pt. Tahoma"
+msgstr "10 pt. Tahoma"
 
 #: addressbook/printing/e-contact-print.glade.h:8
-#: addressbook/printing/e-contact-print.glade.h:94
-msgid "Style name:"
-msgstr "Stil:"
+msgid "8 pt. Tahoma"
+msgstr "8 pt. Tahoma"
 
 #: addressbook/printing/e-contact-print.glade.h:9
-#: addressbook/printing/e-contact-print.glade.h:86
-msgid "Preview:"
-msgstr "Förhandsgranska:"
+msgid "Blank forms at end:"
+msgstr "Tomma blanketter vid slutet:"
 
 #: addressbook/printing/e-contact-print.glade.h:10
-#: addressbook/printing/e-contact-print.glade.h:79
-msgid "Options"
-msgstr "Alternativ"
+msgid "Body"
+msgstr "Meddelandetext"
 
 #: addressbook/printing/e-contact-print.glade.h:11
-#: addressbook/printing/e-contact-print.glade.h:73
-msgid "Include:"
-msgstr "Inkludera:"
+msgid "Bottom:"
+msgstr "Underst:"
 
 #: addressbook/printing/e-contact-print.glade.h:12
-#: addressbook/printing/e-contact-print.glade.h:90
-msgid "Sections:"
-msgstr "Sektioner:"
+msgid "Dimensions:"
+msgstr "Dimensioner:"
 
 #: addressbook/printing/e-contact-print.glade.h:13
-#: addressbook/printing/e-contact-print.glade.h:72
-msgid "Immediately follow each other"
-msgstr "Följ omedelbart efter varandra"
+msgid "Font..."
+msgstr "Typsnitt..."
 
 #: addressbook/printing/e-contact-print.glade.h:14
-#: addressbook/printing/e-contact-print.glade.h:76
-msgid "Letter tabs on side"
-msgstr "Brevflikar på sidan"
+msgid "Fonts"
+msgstr "Typsnitt"
 
 #: addressbook/printing/e-contact-print.glade.h:15
-#: addressbook/printing/e-contact-print.glade.h:70
-msgid "Headings for each letter"
-msgstr "Rubriker för varje brev"
+msgid "Footer:"
+msgstr "Sidfot:"
 
 #: addressbook/printing/e-contact-print.glade.h:16
-#: addressbook/printing/e-contact-print.glade.h:93
-msgid "Start on a new page"
-msgstr "Börja på en ny sida"
+msgid "Format"
+msgstr "Format"
 
 #: addressbook/printing/e-contact-print.glade.h:17
-#: addressbook/printing/e-contact-print.glade.h:78
-msgid "Number of columns:"
-msgstr "Antal kolumner:"
+msgid "Header"
+msgstr "Rubrik"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: addressbook/printing/e-contact-print.glade.h:59
-msgid "Blank forms at end:"
-msgstr "Tomma blanketter vid slutet:"
+msgid "Header/Footer"
+msgstr "Rubrik/sidfot"
 
 #: addressbook/printing/e-contact-print.glade.h:19
-#: addressbook/printing/e-contact-print.glade.h:64
-msgid "Fonts"
-msgstr "Typsnitt"
+msgid "Headings"
+msgstr "Rubriker"
 
 #: addressbook/printing/e-contact-print.glade.h:20
+msgid "Headings for each letter"
+msgstr "Rubriker för varje brev"
+
 #: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-#: addressbook/printing/e-contact-print.glade.h:63
-msgid "Font..."
-msgstr "Typsnitt..."
+msgid "Height:"
+msgstr "Höjd:"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: addressbook/printing/e-contact-print.glade.h:69
-msgid "Headings"
-msgstr "Rubriker"
+msgid "Immediately follow each other"
+msgstr "Följ omedelbart efter varandra"
 
 #: addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/printing/e-contact-print.glade.h:57
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
+msgid "Include:"
+msgstr "Inkludera:"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: addressbook/printing/e-contact-print.glade.h:60
-msgid "Body"
-msgstr "Meddelandetext"
+msgid "Landscape"
+msgstr "Liggande"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: addressbook/printing/e-contact-print.glade.h:58
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
+msgid "Left:"
+msgstr "Vänster:"
 
 #: addressbook/printing/e-contact-print.glade.h:26
-#: addressbook/printing/e-contact-print.glade.h:91
-msgid "Shading"
-msgstr "Skuggning"
+msgid "Letter tabs on side"
+msgstr "Brevflikar på sidan"
 
 #: addressbook/printing/e-contact-print.glade.h:27
-#: addressbook/printing/e-contact-print.glade.h:87
-msgid "Print using gray shading"
-msgstr "Skriv ut med grå skuggning"
+msgid "Margins"
+msgstr "Marginaler"
 
 #: addressbook/printing/e-contact-print.glade.h:28
-#: addressbook/printing/e-contact-print.glade.h:66
-msgid "Format"
-msgstr "Format"
+msgid "Number of columns:"
+msgstr "Antal kolumner:"
 
 #: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-#: addressbook/printing/e-contact-print.glade.h:83
-msgid "Paper"
-msgstr "Papper"
+msgid "Options"
+msgstr "Alternativ"
 
 #: addressbook/printing/e-contact-print.glade.h:30
-#: addressbook/printing/e-contact-print.glade.h:96
-#: mail/mail-config-druid.glade.h:78
-msgid "Type:"
-msgstr "Typ:"
+msgid "Orientation"
+msgstr "Orientering"
 
 #: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-#: addressbook/printing/e-contact-print.glade.h:98
-msgid "label26"
-msgstr "label26"
+msgid "Page"
+msgstr "Sida"
 
 #: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-#: addressbook/printing/e-contact-print.glade.h:62
-msgid "Dimensions:"
-msgstr "Dimensioner:"
+msgid "Page Setup:"
+msgstr "Sidinställningar:"
 
 #: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-#: addressbook/printing/e-contact-print.glade.h:97
-msgid "Width:"
-msgstr "Bredd:"
+msgid "Paper"
+msgstr "Papper"
 
 #: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-#: addressbook/printing/e-contact-print.glade.h:71
-msgid "Height:"
-msgstr "Höjd:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-#: addressbook/printing/e-contact-print.glade.h:84
 msgid "Paper source:"
 msgstr "Papperskälla:"
 
+#: addressbook/printing/e-contact-print.glade.h:35
+msgid "Portrait"
+msgstr "Stående"
+
 #: addressbook/printing/e-contact-print.glade.h:36
-#: addressbook/printing/e-contact-print.glade.h:77
-msgid "Margins"
-msgstr "Marginaler"
+msgid "Preview:"
+msgstr "Förhandsgranska:"
 
 #: addressbook/printing/e-contact-print.glade.h:37
-#: addressbook/printing/e-contact-print.glade.h:95
-msgid "Top:"
-msgstr "Överst:"
+msgid "Print using gray shading"
+msgstr "Skriv ut med grå skuggning"
 
 #: addressbook/printing/e-contact-print.glade.h:38
-#: addressbook/printing/e-contact-print.glade.h:61
-msgid "Bottom:"
-msgstr "Underst:"
+msgid "Reverse on even pages"
+msgstr "Vänd jämna sidor"
 
 #: addressbook/printing/e-contact-print.glade.h:39
-#: addressbook/printing/e-contact-print.glade.h:75
-msgid "Left:"
-msgstr "Vänster:"
-
-#: addressbook/printing/e-contact-print.glade.h:40
-#: addressbook/printing/e-contact-print.glade.h:89
 msgid "Right:"
 msgstr "Höger:"
 
+#: addressbook/printing/e-contact-print.glade.h:40
+msgid "Sections:"
+msgstr "Sektioner:"
+
 #: addressbook/printing/e-contact-print.glade.h:41
-#: addressbook/printing/e-contact-print.glade.h:81
-msgid "Page"
-msgstr "Sida"
+msgid "Shading"
+msgstr "Skuggning"
 
 #: addressbook/printing/e-contact-print.glade.h:42
-#: addressbook/printing/e-contact-print.glade.h:92
 msgid "Size:"
 msgstr "Storlek:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-#: addressbook/printing/e-contact-print.glade.h:80
-msgid "Orientation"
-msgstr "Orientering"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-#: addressbook/printing/e-contact-print.glade.h:85
-msgid "Portrait"
-msgstr "Stående"
+#: addressbook/printing/e-contact-print.glade.h:43
+msgid "Start on a new page"
+msgstr "Börja på en ny sida"
 
-#: addressbook/printing/e-contact-print.glade.h:49
-#: addressbook/printing/e-contact-print.glade.h:74
-msgid "Landscape"
-msgstr "Liggande"
+#: addressbook/printing/e-contact-print.glade.h:44
+msgid "Style name:"
+msgstr "Stil:"
 
-#: addressbook/printing/e-contact-print.glade.h:52
-#: addressbook/printing/e-contact-print.glade.h:67
-msgid "Header"
-msgstr "Rubrik"
+#: addressbook/printing/e-contact-print.glade.h:45
+msgid "Top:"
+msgstr "Överst:"
 
-#: addressbook/printing/e-contact-print.glade.h:53
-#: addressbook/printing/e-contact-print.glade.h:65
-msgid "Footer:"
-msgstr "Sidfot:"
+#: addressbook/printing/e-contact-print.glade.h:46
+#: mail/mail-config-druid.glade.h:66
+msgid "Type:"
+msgstr "Typ:"
 
-#: addressbook/printing/e-contact-print.glade.h:55
-#: addressbook/printing/e-contact-print.glade.h:88
-msgid "Reverse on even pages"
-msgstr "Vänd jämna sidor"
+#: addressbook/printing/e-contact-print.glade.h:47
+msgid "Width:"
+msgstr "Bredd:"
 
-#: addressbook/printing/e-contact-print.glade.h:56
-#: addressbook/printing/e-contact-print.glade.h:68
-msgid "Header/Footer"
-msgstr "Rubrik/sidfot"
+#: addressbook/printing/e-contact-print.glade.h:48
+msgid "label26"
+msgstr "label26"
 
 #: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
 msgid "am"
@@ -1356,6 +1158,10 @@ msgstr "fm"
 msgid "pm"
 msgstr "em"
 
+#: calendar/cal-util/timeutil.c:100
+msgid "h"
+msgstr "h"
+
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolutions kalenderkanal"
@@ -1459,17 +1265,14 @@ msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I.%M.%S %p"
 
 #: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Public"
 msgstr "Publikt"
 
 #: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
@@ -1577,456 +1380,302 @@ msgid "No summary available."
 msgstr "Ingen sammanfattning finns tillgänglig."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: calendar/gui/dialogs/alarm-notify.glade.h:11
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-message-composer.xml.h:10 ui/evolution-subscribe.xml.h:8
 msgid "Close"
 msgstr "Stäng"
 
 #: calendar/gui/dialogs/alarm-notify.glade.h:8
-#: calendar/gui/dialogs/alarm-notify.glade.h:13 calendar/gui/gnome-cal.c:1458
-msgid "Snooze"
-msgstr "Slumra"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-#: calendar/gui/dialogs/alarm-notify.glade.h:12
 msgid "Edit appointment"
 msgstr "Redigera möte"
 
+#: calendar/gui/dialogs/alarm-notify.glade.h:9 calendar/gui/gnome-cal.c:1466
+msgid "Snooze"
+msgstr "Slumra"
+
 #: calendar/gui/dialogs/alarm-notify.glade.h:10
-#: calendar/gui/dialogs/alarm-notify.glade.h:14
 msgid "Snooze time (minutes)"
 msgstr "Slumringstid (minuter)"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
-msgid "Calendar Preferences"
-msgstr "Kalenderinställningar"
+msgid "12 hour (am/pm)"
+msgstr "12 timmar (fm/em)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:111
-msgid "Work week"
-msgstr "Arbetsvecka"
+msgid "24 hour"
+msgstr "24 timmar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:90
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "mån"
+msgid "Alarms timeout after"
+msgstr "Ljudalarm stängs av efter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:108
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "tis"
+msgid "Audio Alarms"
+msgstr "Ljudalarm"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:110
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "ons"
+msgid "Beep when alarm windows appear."
+msgstr "Pip när alarmfönster visas."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:104
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "tor"
+msgid "Calendar"
+msgstr "Kalender"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:84
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "fre"
+msgid "Calendar Preferences"
+msgstr "Kalenderinställningar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:97
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "lör"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14 calendar/gui/prop.c:528
+msgid "Colors"
+msgstr "Färger"
 
-#. Initialize by default to three-letter day names
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:102
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "sön"
+msgid "Compress weekends"
+msgstr "Tryck ihop helger"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
-msgid "First day of week:"
-msgstr "Första dagen i veckan:"
+msgid "Date navigator options"
+msgstr "Alternativ för datumnavigerare"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/event-editor.c:368 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "måndag"
+#. populate default frame/box
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 calendar/gui/prop.c:842
+msgid "Defaults"
+msgstr "Standardvärden"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/event-editor.c:369
-msgid "Tuesday"
-msgstr "tisdag"
+msgid "Display options"
+msgstr "Visningsalternativ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/event-editor.c:370
-msgid "Wednesday"
-msgstr "onsdag"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 calendar/gui/prop.c:610
+msgid "Due Date"
+msgstr "Förfallodatum"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/event-editor.c:371
-msgid "Thursday"
-msgstr "torsdag"
+msgid "Enable snoozing for"
+msgstr "Aktivera slummer i"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/event-editor.c:372
-msgid "Friday"
-msgstr "fredag"
+msgid "End of day:"
+msgstr "Dagen slutar:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/event-editor.c:373
-msgid "Saturday"
-msgstr "lördag"
+msgid "First day of week:"
+msgstr "Första dagen i veckan:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:374 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "söndag"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:101
-msgid "Start of day:"
-msgstr "Dagen startar:"
+msgid "Highlight"
+msgstr "Markera"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:82
-msgid "End of day:"
-msgstr "Dagen slutar:"
+msgid "Items Due Today"
+msgstr "objekt som ska ha utförts idag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
-msgid "Display options"
-msgstr "Visningsalternativ"
+msgid "Items Due Today:"
+msgstr "Objekt som ska ha utförts idag:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:106
-msgid "Time divisions:"
-msgstr "Tidsdivisioner:"
+msgid "Items Not Yet Due"
+msgstr "objekt som inte ska utföras än"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:107
-msgid "Time format:"
-msgstr "Tidsformat:"
+msgid "Items Not Yet Due:"
+msgstr "Obejkt som inte ska utföras än:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:99
-msgid "Show appointment end times"
-msgstr "Visa sluttiderna på möten"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "mån"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
-msgid "Compress weekends"
-msgstr "Tryck ihop helger"
+msgid "Overdue Items"
+msgstr "objekt som skulle ha utförts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
-msgid "12 hour (am/pm)"
-msgstr "12 timmar (fm/em)"
+msgid "Overdue Items:"
+msgstr "Objekt som skulle ha utförts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
-msgid "24 hour"
-msgstr "24 timmar"
+msgid "Pick a color"
+msgstr "Välj en färg"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "60 minutes"
-msgstr "60 minuter"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 calendar/gui/prop.c:611
+#: filter/libfilter-i18n.h:18
+msgid "Priority"
+msgstr "Prioritet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "30 minutes"
-msgstr "30 minuter"
+msgid "Remind me of all appointments"
+msgstr "Påminn mig om alla möten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "15 minutes"
-msgstr "15 minuter"
+msgid "Reminders"
+msgstr "Påminnare"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "10 minutes"
-msgstr "10 minuter"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "lör"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "05 minutes"
-msgstr "05 minuter"
+msgid "Show"
+msgstr "Visa"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
-msgid "Date navigator options"
-msgstr "Alternativ för datumnavigerare"
+msgid "Show appointment end times"
+msgstr "Visa sluttiderna på möten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:100
 msgid "Show week numbers"
 msgstr "Visa veckonummer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
-msgid "Calendar"
-msgstr "Kalender"
+msgid "Start of day:"
+msgstr "Dagen startar:"
 
+#. Initialize by default to three-letter day names
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:98
-msgid "Show"
-msgstr "Visa"
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "sön"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:80 calendar/gui/prop.c:610
-msgid "Due Date"
-msgstr "Förfallodatum"
+msgid "TaskPad"
+msgstr "Uppgiftsyta"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:105 calendar/gui/prop.c:612
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "tor"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:612
 msgid "Time Until Due"
 msgstr "Tid till förfallodatum"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:94 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:18
-msgid "Priority"
-msgstr "Prioritet"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
-msgid "Highlight"
-msgstr "Markera"
+msgid "Time divisions:"
+msgstr "Tidsdivisioner:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:91
-msgid "Overdue Items"
-msgstr "objekt som skulle ha utförts"
+msgid "Time format:"
+msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:86
-msgid "Items Due Today"
-msgstr "objekt som ska ha utförts idag"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "tis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:88
-msgid "Items Not Yet Due"
-msgstr "objekt som inte ska utföras än"
+msgid "Visual Alarms"
+msgstr "Visuella alarm"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:75 calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Färger"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "ons"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:93
-msgid "Pick a color"
-msgstr "Välj en färg"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:89
-msgid "Items Not Yet Due:"
-msgstr "Obejkt som inte ska utföras än:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:87
-msgid "Items Due Today:"
-msgstr "Objekt som ska ha utförts idag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:92
-msgid "Overdue Items:"
-msgstr "Objekt som skulle ha utförts:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:103
-msgid "TaskPad"
-msgstr "Uppgiftsyta"
-
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:78 calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr "Standardvärden"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:95
-msgid "Remind me of all appointments"
-msgstr "Påminn mig om alla möten"
+msgid "Work week"
+msgstr "Arbetsvecka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:112
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "minutes before they occur."
 msgstr "minuter innan de sker."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:109
-msgid "Visual Alarms"
-msgstr "Visuella alarm"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
-msgid "Beep when alarm windows appear."
-msgstr "Pip när alarmfönster visas."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
-msgid "Audio Alarms"
-msgstr "Ljudalarm"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
-msgid "Alarms timeout after"
-msgstr "Ljudalarm stängs av efter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:113
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "seconds."
 msgstr "sekunder."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
-msgid "Enable snoozing for"
-msgstr "Aktivera slummer i"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:96
-msgid "Reminders"
-msgstr "Påminnare"
-
 #: calendar/gui/dialogs/task-editor.c:655
 msgid "Edit Task"
 msgstr "Redigera uppgift"
 
-#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:307
+#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:316
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:313
+#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:322
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:316
+#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:325
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:319
+#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:328
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagbokspost - %s"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:45
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
+msgid "% Comp_lete:"
+msgstr "% färdig_t:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:37
-msgid "S_ummary"
-msgstr "S_ammanfattning"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:38
-msgid "Sta_rt Date:"
-msgstr "Sta_rtdatum:"
+msgid "C_lassification:"
+msgstr "K_lassifikation:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:42
-msgid "_Due Date:"
-msgstr "Förfallo_datum:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:32
-msgid "% Comp_lete:"
-msgstr "% färdig_t:"
+msgid "Date Completed:"
+msgstr "Datum utfört:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:44
-msgid "_Status:"
-msgstr "_Status:"
+msgid "S_ummary"
+msgstr "S_ammanfattning"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Not Started"
-msgstr "Inte startad"
+msgid "Sta_rt Date:"
+msgstr "Sta_rtdatum:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "In Progress"
-msgstr "Pågår"
+msgid "Task"
+msgstr "Uppgift"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "Completed"
-msgstr "Färdigt"
+msgid "URL:"
+msgstr "URL:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Cancelled"
-msgstr "Avbruten"
+msgid "_Contacts..."
+msgstr "_Kontakter..."
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:43
-msgid "_Priority:"
-msgstr "_Prioritet:"
+msgid "_Due Date:"
+msgstr "Förfallo_datum:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "High"
-msgstr "Hög"
+msgid "_Priority:"
+msgstr "_Prioritet:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Normal"
-msgstr "Normal"
+msgid "_Status:"
+msgstr "_Status:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Low"
-msgstr "Låg"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:33
-msgid "C_lassification:"
-msgstr "K_lassifikation:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: shell/e-shell-view.c:1017 widgets/misc/e-dateedit.c:212
-#: widgets/misc/e-dateedit.c:371 widgets/misc/e-dateedit.c:1171
-msgid "None"
-msgstr "Ingen"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:41
-msgid "_Contacts..."
-msgstr "_Kontakter..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:39
-msgid "Task"
-msgstr "Uppgift"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:35
-msgid "Date Completed:"
-msgstr "Datum utfört:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:40
-msgid "URL:"
-msgstr "URL:"
+msgid "task-editor-dialog"
+msgstr "task-editor-dialog"
 
 #: calendar/gui/e-calendar-table.c:294
 msgid "Open..."
@@ -2045,14 +1694,11 @@ msgid "Mark the task complete"
 msgstr "Markera uppgiften som färdig"
 
 #: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:55
-#: calendar/gui/event-editor-dialog.glade.h:66 filter/filter.glade.h:14
-#: filter/filter.glade.h:19 filter/filter.glade.h:27 filter/libfilter-i18n.h:8
-#: mail/folder-browser.c:507 mail/mail-config-druid.glade.h:35
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-config.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:55 filter/filter.glade.h:8
+#: filter/libfilter-i18n.h:8 mail/folder-browser.c:476
+#: mail/mail-config-druid.glade.h:23 mail/mail-config.glade.h:9
 #: mail/mail-view.c:165 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-mail.xml.h:11
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-mail.xml.h:12
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -2067,50 +1713,50 @@ 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:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1173
 #: 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:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1187
 #: 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:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1200
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
+#: calendar/gui/e-day-view.c:2631 calendar/gui/e-day-view.c:2638
+#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2930
+#: calendar/gui/e-week-view.c:2937 calendar/gui/e-week-view.c:2946
 msgid "New appointment..."
 msgstr "Nytt möte..."
 
-#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
+#: calendar/gui/e-day-view.c:2635 calendar/gui/e-day-view.c:2642
+#: calendar/gui/e-week-view.c:2934 calendar/gui/e-week-view.c:2941
 msgid "Edit this appointment..."
 msgstr "Redigera detta möte..."
 
-#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
+#: calendar/gui/e-day-view.c:2636 calendar/gui/e-week-view.c:2935
 #: ui/evolution-event-editor.xml.h:21
 msgid "Delete this appointment"
 msgstr "Ta bort detta möte"
 
-#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2643 calendar/gui/e-week-view.c:2942
 msgid "Make this appointment movable"
 msgstr "Gör detta möte flyttbart"
 
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2644 calendar/gui/e-week-view.c:2943
 msgid "Delete this occurrence"
 msgstr "Ta bort denna förekomst"
 
-#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2645 calendar/gui/e-week-view.c:2944
 msgid "Delete all occurrences"
 msgstr "Ta bort alla förekomster"
 
@@ -2121,32 +1767,64 @@ msgstr "Ta bort alla förekomster"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:301
+#: calendar/gui/event-editor.c:310
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: calendar/gui/event-editor.c:346
+#: calendar/gui/event-editor.c:365
 msgid "on"
 msgstr "vid"
 
-#: calendar/gui/event-editor.c:367 calendar/gui/getdate.y:424
+#: calendar/gui/event-editor.c:389 calendar/gui/getdate.y:424
 #: filter/filter-datespec.c:65
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/event-editor.c:417
+#: calendar/gui/event-editor.c:390 calendar/gui/prop.c:354
+msgid "Monday"
+msgstr "måndag"
+
+#: calendar/gui/event-editor.c:391
+msgid "Tuesday"
+msgstr "tisdag"
+
+#: calendar/gui/event-editor.c:392
+msgid "Wednesday"
+msgstr "onsdag"
+
+#: calendar/gui/event-editor.c:393
+msgid "Thursday"
+msgstr "torsdag"
+
+#: calendar/gui/event-editor.c:394
+msgid "Friday"
+msgstr "fredag"
+
+#: calendar/gui/event-editor.c:395
+msgid "Saturday"
+msgstr "lördag"
+
+#: calendar/gui/event-editor.c:396 calendar/gui/prop.c:353
+msgid "Sunday"
+msgstr "söndag"
+
+#: calendar/gui/event-editor.c:514
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/event-editor.c:424
+#: calendar/gui/event-editor.c:521
 msgid "th"
 msgstr ":e"
 
-#: calendar/gui/event-editor.c:547
-msgid "ocurrences"
-msgstr "inträffanden"
+#: calendar/gui/event-editor.c:675
+msgid "occurrences"
+msgstr "förekomster"
 
-#: calendar/gui/event-editor.c:2481 calendar/gui/print.c:1085
+#: calendar/gui/event-editor.c:792
+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:2820 calendar/gui/print.c:1085
 #: calendar/gui/print.c:1087 calendar/gui/print.c:1088
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
@@ -2169,53 +1847,43 @@ msgstr "%a %d %b %Y"
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/event-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:93
 msgid "event-editor-dialog"
 msgstr "event-editor-dialog"
 
 #: calendar/gui/event-editor-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:38
-#: calendar/gui/event-editor-dialog.glade.h:79
 msgid "Su_mmary:"
 msgstr "Sa_mmanfattning:"
 
 #: calendar/gui/event-editor-dialog.glade.h:9
-#: calendar/gui/event-editor-dialog.glade.h:83
 msgid "Time"
 msgstr "Tid"
 
 #: calendar/gui/event-editor-dialog.glade.h:10
-#: calendar/gui/event-editor-dialog.glade.h:91
 msgid "_Start time:"
 msgstr "_Starttid:"
 
 #: calendar/gui/event-editor-dialog.glade.h:11
-#: calendar/gui/event-editor-dialog.glade.h:87
 msgid "_End time:"
 msgstr "Slutti_d:"
 
 #: calendar/gui/event-editor-dialog.glade.h:12
-#: calendar/gui/event-editor-dialog.glade.h:61
 msgid "A_ll day event"
 msgstr "He_ldagsarrangemang"
 
 #: calendar/gui/event-editor-dialog.glade.h:13
-#: calendar/gui/event-editor-dialog.glade.h:64
 msgid "Classification"
 msgstr "Klassifikation"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor-dialog.glade.h:74
 msgid "Pu_blic"
 msgstr "Pu_blikt"
 
 #: calendar/gui/event-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:73
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
 #: calendar/gui/event-editor-dialog.glade.h:16
-#: calendar/gui/event-editor-dialog.glade.h:85
 msgid "_Confidential"
 msgstr "_Konfidentiellt"
 
@@ -2241,72 +1909,58 @@ msgid "Days"
 msgstr "dag"
 
 #: calendar/gui/event-editor-dialog.glade.h:30
-#: calendar/gui/event-editor-dialog.glade.h:86
 msgid "_Display"
 msgstr "_Visa"
 
 #: calendar/gui/event-editor-dialog.glade.h:31
-#: calendar/gui/event-editor-dialog.glade.h:89
 msgid "_Program"
 msgstr "_Program"
 
 #: calendar/gui/event-editor-dialog.glade.h:32
-#: calendar/gui/event-editor-dialog.glade.h:88
 msgid "_Mail"
 msgstr "_E-post"
 
 #: calendar/gui/event-editor-dialog.glade.h:33
-#: calendar/gui/event-editor-dialog.glade.h:70
 msgid "Mail _to:"
 msgstr "E-posta _till:"
 
 #: calendar/gui/event-editor-dialog.glade.h:34
-#: calendar/gui/event-editor-dialog.glade.h:90
 msgid "_Run program:"
 msgstr "_Kör program:"
 
 #: calendar/gui/event-editor-dialog.glade.h:35
-#: calendar/gui/event-editor-dialog.glade.h:84
 msgid "_Audio"
 msgstr "_Ljud"
 
 #: calendar/gui/event-editor-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:77
 msgid "Reminder"
 msgstr "Påminnare"
 
 #: calendar/gui/event-editor-dialog.glade.h:37
-#: calendar/gui/event-editor-dialog.glade.h:63
 msgid "Appointment Basics"
 msgstr "Grundläggande mötessaker"
 
 #: calendar/gui/event-editor-dialog.glade.h:39
-#: calendar/gui/event-editor-dialog.glade.h:92
 msgid "_Starting date:"
 msgstr "_Startdatum:"
 
 #: calendar/gui/event-editor-dialog.glade.h:40
-#: calendar/gui/event-editor-dialog.glade.h:76
 msgid "Recurrence Rule"
 msgstr "Upprepningsregel"
 
 #: calendar/gui/event-editor-dialog.glade.h:41
-#: calendar/gui/event-editor-dialog.glade.h:72
 msgid "No recurrence"
 msgstr "Ingen upprepning"
 
 #: calendar/gui/event-editor-dialog.glade.h:42
-#: calendar/gui/event-editor-dialog.glade.h:78
 msgid "Simple recurrence"
 msgstr "Enkel upprepning"
 
 #: calendar/gui/event-editor-dialog.glade.h:43
-#: calendar/gui/event-editor-dialog.glade.h:65
 msgid "Custom recurrence"
 msgstr "Anpassad upprepning"
 
 #: calendar/gui/event-editor-dialog.glade.h:44
-#: calendar/gui/event-editor-dialog.glade.h:67
 msgid "Every"
 msgstr "Var"
 
@@ -2339,47 +1993,25 @@ msgid "forever"
 msgstr "för alltid"
 
 #: calendar/gui/event-editor-dialog.glade.h:52
-#: calendar/gui/event-editor-dialog.glade.h:68
 msgid "Exceptions"
 msgstr "Undantag"
 
 #: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/event-editor-dialog.glade.h:71
 msgid "Modify"
 msgstr "Ändra"
 
 #: calendar/gui/event-editor-dialog.glade.h:56
-#: calendar/gui/event-editor-dialog.glade.h:94
 msgid "label21"
 msgstr "label21"
 
 #: calendar/gui/event-editor-dialog.glade.h:57
-msgid ""
-"This appointment has custom recurrence rules that cannot be edited by "
-"Evolution.\n"
-"\n"
-"However, the appointment will recur at the appropriate time and will be "
-"displayed properly in the calendar views."
-msgstr ""
-"Det här mötet har anpassade upprepningsregler som inte kan redigeras av "
-"Evolution.\n"
-"\n"
-"Mötet kommer dock att dyka upp vid den angivna tiden och kommer att visas "
-"korrekt i kalendervyerna."
+msgid "Preview"
+msgstr "Förhandsgranska"
 
-#: calendar/gui/event-editor-dialog.glade.h:60
-#: calendar/gui/event-editor-dialog.glade.h:75
+#: calendar/gui/event-editor-dialog.glade.h:58
 msgid "Recurrence"
 msgstr "Upprepning"
 
-#: calendar/gui/event-editor-dialog.glade.h:80
-msgid ""
-"This appointment has custom recurrence rules that cannot be edited by "
-"Evolution."
-msgstr ""
-"Detta möte har anpassade upprepningsregler som inte kan redigeras med "
-"Evolution."
-
 #: calendar/gui/getdate.y:391
 msgid "january"
 msgstr "januari"
@@ -2614,29 +2246,29 @@ msgstr "Prioritet:"
 msgid "Item Comments:"
 msgstr "Objektkommentarer:"
 
-#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
-#: calendar/gui/gnome-cal.c:1522
+#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
+#: calendar/gui/gnome-cal.c:1530
 msgid "Reminder of your appointment at "
 msgstr "Påminnelse om ditt möte den "
 
-#: calendar/gui/gnome-cal.c:1144
+#: calendar/gui/gnome-cal.c:1152
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr "Kunde inte läsa in kalendern i \"%s\""
 
-#: calendar/gui/gnome-cal.c:1155
+#: calendar/gui/gnome-cal.c:1163
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Kunde inte skapa en kalender i \"%s\""
 
-#: calendar/gui/gnome-cal.c:1166
+#: calendar/gui/gnome-cal.c:1174
 #, 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"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
-#: mail/mail-search-dialogue.c:102
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "Ok"
 
@@ -2965,11 +2597,11 @@ msgstr "Aktivera slummer i "
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:326 widgets/misc/e-calendar-item.c:416
+#: calendar/gui/weekday-picker.c:345 widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
-#: calendar/gui/weekday-picker.c:328 calendar/gui/weekday-picker.c:418
+#: calendar/gui/weekday-picker.c:347 calendar/gui/weekday-picker.c:437
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
@@ -3681,16 +3313,16 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:301 mail/mail-display.c:116
+#: composer/e-msg-composer-attachment-bar.c:301 mail/mail-display.c:117
 msgid "attachment"
 msgstr "bilaga"
 
 #: composer/e-msg-composer-attachment-bar.c:397
+#: ui/evolution-message-composer.xml.h:8
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: composer/e-msg-composer-attachment-bar.c:444 filter/filter.glade.h:22
-#: filter/filter.glade.h:25 filter/filter.glade.h:32
+#: composer/e-msg-composer-attachment-bar.c:444 filter/filter.glade.h:13
 #: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Ta bort"
@@ -3708,59 +3340,56 @@ msgid "Attach a file to the message"
 msgstr "Bifoga en fil till meddelandet"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: composer/e-msg-composer-attachment.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:11
 msgid "Attachment properties"
 msgstr "Egenskaper hos bilagan"
 
-#: composer/e-msg-composer-attachment.glade.h:8
-#: composer/e-msg-composer-attachment.glade.h:14
-msgid "MIME type:"
-msgstr "MIME-typ:"
-
-#: composer/e-msg-composer-attachment.glade.h:10
-#: composer/e-msg-composer-attachment.glade.h:13
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "File name:"
 msgstr "Filnamn:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
-#: mail/mail-format.c:589
+#: composer/e-msg-composer-attachment.glade.h:10
+msgid "MIME type:"
+msgstr "MIME-typ:"
+
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
+#: mail/mail-format.c:599
 msgid "From:"
 msgstr "Från:"
 
-#: composer/e-msg-composer-hdrs.c:243
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr "Klicka här för att ta fram adressboken"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:291
 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:300 mail/mail-format.c:602
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:603
 msgid "To:"
 msgstr "Till:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: composer/e-msg-composer-hdrs.c:305 mail/mail-format.c:609
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:605
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:301
 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:311
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:307
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3768,15 +3397,15 @@ 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:318 mail/mail-format.c:614
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:607
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "Ange ämnet på brevet"
 
-#: composer/e-msg-composer.c:332
+#: composer/e-msg-composer.c:426
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3785,38 +3414,38 @@ msgstr ""
 "Kunde inte öppna signaturfilen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:488
+#: composer/e-msg-composer.c:593
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: composer/e-msg-composer.c:499
+#: composer/e-msg-composer.c:604
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fel vid sparande av filen: %s"
 
-#: composer/e-msg-composer.c:519
+#: composer/e-msg-composer.c:624
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid inläsning av filen: %s"
 
-#: composer/e-msg-composer.c:541
+#: composer/e-msg-composer.c:646
 msgid "Saving changes to message..."
 msgstr "Sparar ändringar i meddelandet..."
 
-#: composer/e-msg-composer.c:543
+#: composer/e-msg-composer.c:648
 msgid "Save changes to message..."
 msgstr "Sparar ändringar i meddelande..."
 
-#: composer/e-msg-composer.c:584
+#: composer/e-msg-composer.c:689
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Fel vid sparande av alster i \"Drafts\": %s"
 
-#: composer/e-msg-composer.c:628 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:733 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:634
+#: composer/e-msg-composer.c:739
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3826,27 +3455,27 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:761
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:887
 msgid "That file does not exist."
 msgstr "Den filen finns inte."
 
-#: composer/e-msg-composer.c:792
+#: composer/e-msg-composer.c:897
 msgid "That is not a regular file."
 msgstr "Det är ingen vanlig fil."
 
-#: composer/e-msg-composer.c:802
+#: composer/e-msg-composer.c:907
 msgid "That file exists but is not readable."
 msgstr "Den filen finns, men är inte läsbar."
 
-#: composer/e-msg-composer.c:812
+#: composer/e-msg-composer.c:917
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Filen verkade åtkomlig, men open(2) misslyckades."
 
-#: composer/e-msg-composer.c:834
+#: composer/e-msg-composer.c:939
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3854,15 +3483,15 @@ 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:855
+#: composer/e-msg-composer.c:960
 msgid "An error occurred while reading the file."
 msgstr "Ett fel uppstod vid läsning av filen."
 
-#: composer/e-msg-composer.c:1239
+#: composer/e-msg-composer.c:1337
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:1313
+#: composer/e-msg-composer.c:1411
 msgid "Could not create composer window."
 msgstr "Kunde inte skapa fönster för meddelanderedigering."
 
@@ -3956,8 +3585,8 @@ msgstr "Jämför med"
 msgid "<click here to select a date>"
 msgstr "<klicka här för att välja ett datum>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:289
-#: mail/mail-autofilter.c:338
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:284
+#: mail/mail-autofilter.c:333
 msgid "Add Filter Rule"
 msgstr "Lägg till filterregel"
 
@@ -3965,12 +3594,7 @@ msgstr "Lägg till filterregel"
 msgid "Edit Filter Rule"
 msgstr "Redigera filterregel"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: filter/filter-editor.c:456 filter/filter.glade.h:7 filter/filter.glade.h:29
+#: filter/filter-editor.c:456 filter/filter.glade.h:10
 msgid "Edit Filters"
 msgstr "Redigera filter"
 
@@ -4053,34 +3677,24 @@ msgstr "Lägg till villkor"
 msgid "Remove criterion"
 msgstr "Ta bort villkor"
 
-#: filter/filter.glade.h:8
-msgid ""
-"Incoming\n"
-"Outgoing\n"
-msgstr ""
-"Inkommande\n"
-"Utgående\n"
-
-#: filter/filter.glade.h:11 filter/filter.glade.h:31
-msgid "Filter Rules"
-msgstr "Filterregler"
-
-#: filter/filter.glade.h:13 filter/filter.glade.h:18 filter/filter.glade.h:28
-#: mail/folder-browser.c:494 mail/mail-config-druid.glade.h:38
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23 mail/mail-config.glade.h:32
+#: filter/filter.glade.h:9 mail/folder-browser.c:463
+#: mail/mail-config-druid.glade.h:26 mail/mail-config.glade.h:10
 msgid "Edit"
 msgstr "Redigera"
 
-#: filter/filter.glade.h:15 filter/filter.glade.h:30
+#: filter/filter.glade.h:11
 msgid "Edit VFolders"
 msgstr "Redigera virtuella mappar"
 
-#: filter/filter.glade.h:16 filter/filter.glade.h:33
+#: filter/filter.glade.h:12
+msgid "Filter Rules"
+msgstr "Filterregler"
+
+#: filter/filter.glade.h:14
 msgid "Virtual Folders"
 msgstr "Virtuella mappar"
 
-#: filter/filter.glade.h:20 filter/filter.glade.h:23 filter/filter.glade.h:34
+#: filter/filter.glade.h:15
 msgid "vFolder Sources"
 msgstr "Källor för virtuella mappar"
 
@@ -4301,127 +3915,116 @@ msgstr "Kan inte initiera Evolutions hashfunktion för e-postlagring."
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lagring hos skal"
 
-#: mail/folder-browser.c:143
+#: mail/folder-browser.c:156 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save"
+msgstr "Spara"
+
+#: mail/folder-browser.c:169
 msgid "Body or subject contains"
 msgstr "Meddelandetexten eller ämnet innehåller"
 
-#: mail/folder-browser.c:144
+#: mail/folder-browser.c:170
 msgid "Body contains"
 msgstr "Meddelandetexten innehåller"
 
-#: mail/folder-browser.c:145
+#: mail/folder-browser.c:171
 msgid "Subject contains"
 msgstr "Ämnesraden innehåller"
 
-#: mail/folder-browser.c:146
+#: mail/folder-browser.c:172
 msgid "Body does not contain"
 msgstr "Meddelandetexten innehåller inte"
 
-#: mail/folder-browser.c:147
+#: mail/folder-browser.c:173
 msgid "Subject does not contain"
 msgstr "Ämnesraden innehåller inte"
 
-#: mail/folder-browser.c:148
-msgid "Custom search"
-msgstr "Anpassad sökning"
-
-#: mail/folder-browser.c:320
-msgid "Custom"
-msgstr "Anpassad"
-
-#: mail/folder-browser.c:482
+#: mail/folder-browser.c:451
 msgid "VFolder on Subject"
 msgstr "Virtuell mapp på ämnesrad"
 
-#: mail/folder-browser.c:483
+#: mail/folder-browser.c:452
 msgid "VFolder on Sender"
 msgstr "Virtuell mapp på avsändare"
 
-#: mail/folder-browser.c:484
+#: mail/folder-browser.c:453
 msgid "VFolder on Recipients"
 msgstr "Virtuell mapp på mottagare"
 
-#: mail/folder-browser.c:486
+#: mail/folder-browser.c:455
 msgid "Filter on Subject"
 msgstr "Filtrera på ämnesrad"
 
-#: mail/folder-browser.c:487
+#: mail/folder-browser.c:456
 msgid "Filter on Sender"
 msgstr "Filtrera på avsändare"
 
-#: mail/folder-browser.c:488
+#: mail/folder-browser.c:457
 msgid "Filter on Recipients"
 msgstr "Filtrera på mottagare"
 
-#: mail/folder-browser.c:489 mail/folder-browser.c:572
+#: mail/folder-browser.c:458 mail/folder-browser.c:541
 msgid "Filter on Mailing List"
 msgstr "Filtrera på sändlista"
 
-#: mail/folder-browser.c:493
+#: mail/folder-browser.c:462 ui/evolution-message-composer.xml.h:16
 msgid "Open"
 msgstr "Öppna"
 
-#: mail/folder-browser.c:495 mail/mail-view.c:163
+#: mail/folder-browser.c:464 mail/mail-view.c:163
 #: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:28
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:497
+#: mail/folder-browser.c:466
 msgid "Reply to Sender"
 msgstr "Svara till avsändaren"
 
-#: mail/folder-browser.c:498 mail/mail-view.c:156 ui/evolution-mail.xml.h:33
+#: mail/folder-browser.c:467 mail/mail-view.c:156 ui/evolution-mail.xml.h:34
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: mail/folder-browser.c:499 mail/mail-view.c:159 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:468 mail/mail-view.c:159 ui/evolution-mail.xml.h:18
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: mail/folder-browser.c:502
+#: mail/folder-browser.c:471
 msgid "Mark as Read"
 msgstr "Markera som läst"
 
-#: mail/folder-browser.c:503
+#: mail/folder-browser.c:472
 msgid "Mark as Unread"
 msgstr "Markera som oläst"
 
-#: mail/folder-browser.c:505
+#: mail/folder-browser.c:474
 msgid "Move to Folder..."
 msgstr "Flytta till mapp..."
 
-#: mail/folder-browser.c:506
+#: mail/folder-browser.c:475
 msgid "Copy to Folder..."
 msgstr "Kopiera till mapp..."
 
-#: mail/folder-browser.c:508
+#: mail/folder-browser.c:477
 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:512
+#: mail/folder-browser.c:481
 msgid "Apply Filters"
 msgstr "Tillämpa filter"
 
-#: mail/folder-browser.c:514
+#: mail/folder-browser.c:483 ui/evolution-mail.xml.h:11
 msgid "Create Rule From Message"
 msgstr "Skapa regel från meddelande"
 
-#: mail/folder-browser.c:574
+#: mail/folder-browser.c:543
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrera på sändlista (%s)"
 
-#: mail/folder-browser.c:695
-msgid "Full Search"
-msgstr "Fullständig sökning"
-
-#: mail/folder-browser.c:700 ui/evolution-event-editor.xml.h:91
-msgid "Save"
-msgstr "Spara"
-
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4432,12 +4035,12 @@ msgstr "Skicka e-post till %s"
 msgid "Subject is %s"
 msgstr "Ämnesraden är %s"
 
-#: mail/mail-autofilter.c:232
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Hämta e-post från %s"
 
-#: mail/mail-autofilter.c:334
+#: mail/mail-autofilter.c:329
 #, c-format
 msgid "%s mailing list"
 msgstr "Sändlistan %s"
@@ -4544,32 +4147,31 @@ msgstr "Fullständigt namn:"
 msgid "Email address:"
 msgstr "E-postadress:"
 
-#: mail/mail-config-druid.glade.h:53 mail/mail-config-gui.c:484
+#: mail/mail-config-druid.glade.h:41 mail/mail-config-gui.c:484
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config-druid.glade.h:75 mail/mail-config-gui.c:495
+#: mail/mail-config-druid.glade.h:63 mail/mail-config-gui.c:495
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
-#: mail/mail-config.glade.h:42
+#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:20
 msgid "Signature File"
 msgstr "Signaturfil"
 
-#: mail/mail-config-druid.glade.h:74 mail/mail-config-gui.c:906
+#: mail/mail-config-druid.glade.h:62 mail/mail-config-gui.c:906
 msgid "Server:"
 msgstr "Server:"
 
-#: mail/mail-config-druid.glade.h:79 mail/mail-config-gui.c:912
+#: mail/mail-config-druid.glade.h:67 mail/mail-config-gui.c:912
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: mail/mail-config-druid.glade.h:55 mail/mail-config-gui.c:918
+#: mail/mail-config-druid.glade.h:43 mail/mail-config-gui.c:918
 msgid "Path:"
 msgstr "Sökväg:"
 
-#: mail/mail-config-druid.glade.h:26 mail/mail-config-gui.c:927
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:927
 msgid "Authentication:"
 msgstr "Autentisering:"
 
@@ -4577,11 +4179,11 @@ msgstr "Autentisering:"
 msgid "Detect supported types..."
 msgstr "Detektera vilka typer som stöds..."
 
-#: mail/mail-config-druid.glade.h:36 mail/mail-config-gui.c:967
+#: mail/mail-config-druid.glade.h:24 mail/mail-config-gui.c:967
 msgid "Don't delete messages from server"
 msgstr "Ta inte bort meddelanden från servern"
 
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:979
+#: mail/mail-config-druid.glade.h:65 mail/mail-config-gui.c:979
 msgid "Test Settings"
 msgstr "Testa inställningarna"
 
@@ -4674,137 +4276,107 @@ msgid "Query authorization at \"%s\""
 msgstr "Fråga efter autentisering hos \"%s\""
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16 mail/mail-config-druid.glade.h:46
-msgid "Mail Configuration"
-msgstr "E-postkonfiguration"
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-"Välkommen till Evolutions guide för e-postkonfiguration!\n"
-"Efter att ha fyllt i en del information om dina\n"
-"e-postinställningar kan du börja skicka och ta emot e-post\n"
-"direkt. Klicka på \"Nästa\" för att fortsätta."
-
-#: mail/mail-config-druid.glade.h:13 mail/mail-config-druid.glade.h:44
-msgid "Identity"
-msgstr "Identitet"
-
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr "E-postkälla"
-
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-#: mail/mail-config.glade.h:35
-msgid "Mail Transport"
-msgstr "E-posttransport"
-
-#: mail/mail-config-druid.glade.h:17
-msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
-msgstr ""
-"Din e-postkonfiguration är nu klar.\n"
-"Klicka på \"Slutför\" för att spara dina nya inställningar"
-
-#: mail/mail-config-druid.glade.h:19
+#: mail/mail-config-druid.glade.h:7
 msgid "Account Information"
 msgstr "Kontoinformation"
 
-#: mail/mail-config-druid.glade.h:20
+#: mail/mail-config-druid.glade.h:8
 msgid "Account Management"
 msgstr "Kontohantering"
 
-#: mail/mail-config-druid.glade.h:21
+#: mail/mail-config-druid.glade.h:9
 msgid "Accounts"
 msgstr "Konton"
 
-#: mail/mail-config-druid.glade.h:23
+#: mail/mail-config-druid.glade.h:11
 msgid "Add Optional Fields..."
 msgstr "Lägg till valfria fält..."
 
-#: mail/mail-config-druid.glade.h:24
+#: mail/mail-config-druid.glade.h:12
 msgid "Additional Identity Fields"
 msgstr "Extra identitetsfält"
 
-#: mail/mail-config-druid.glade.h:25
+#: mail/mail-config-druid.glade.h:13
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config-druid.glade.h:27
+#: mail/mail-config-druid.glade.h:15
 msgid "Browse..."
 msgstr "Bläddra..."
 
-#: mail/mail-config-druid.glade.h:28
+#: mail/mail-config-druid.glade.h:16
 msgid "Congratulations, your mail configuration is complete."
 msgstr "Gratulerar, din e-postkonfiguration är färdig."
 
-#: mail/mail-config-druid.glade.h:34
+#: mail/mail-config-druid.glade.h:22
 msgid "Default"
 msgstr "Standard"
 
-#: mail/mail-config-druid.glade.h:37
+#: mail/mail-config-druid.glade.h:25
 msgid "Done"
 msgstr "Klar"
 
-#: mail/mail-config-druid.glade.h:39
+#: mail/mail-config-druid.glade.h:27
 msgid "Edit Mail Configuration Settings"
 msgstr "Redigera e-postkonfigurationsinställningar"
 
-#: mail/mail-config-druid.glade.h:40
+#: mail/mail-config-druid.glade.h:28
 msgid "Email Address:"
 msgstr "E-postadress:"
 
-#: mail/mail-config-druid.glade.h:41
+#: mail/mail-config-druid.glade.h:29
 msgid "Evolution Mail Configuration"
 msgstr "Evolution e-postkonfiguration"
 
-#: mail/mail-config-druid.glade.h:42
+#: mail/mail-config-druid.glade.h:30
 msgid "Full Name:"
 msgstr "Fullständigt namn:"
 
-#: mail/mail-config-druid.glade.h:43
+#: mail/mail-config-druid.glade.h:31
 msgid "IMAP"
 msgstr "IMAP"
 
-#: mail/mail-config-druid.glade.h:45
+#: mail/mail-config-druid.glade.h:32
+msgid "Identity"
+msgstr "Identitet"
+
+#: mail/mail-config-druid.glade.h:33
 msgid "Mail"
 msgstr "E-post"
 
-#: mail/mail-config-druid.glade.h:47
+#: mail/mail-config-druid.glade.h:34
+msgid "Mail Configuration"
+msgstr "E-postkonfiguration"
+
+#: mail/mail-config-druid.glade.h:35
 msgid "Mail Configuration Druid"
 msgstr "E-postkonfigurationsguide"
 
-#: mail/mail-config-druid.glade.h:48
+#: mail/mail-config-druid.glade.h:36
 msgid "Make this my default account"
 msgstr "Gör detta till mitt standardkonto"
 
-#: mail/mail-config-druid.glade.h:50
+#: mail/mail-config-druid.glade.h:38
 msgid "News"
 msgstr "Diskussionsgrupper"
 
-#: mail/mail-config-druid.glade.h:51
+#: mail/mail-config-druid.glade.h:39
 msgid "Optional"
 msgstr "Valfri"
 
-#: mail/mail-config-druid.glade.h:52
+#: mail/mail-config-druid.glade.h:40
 msgid "Optional Information"
 msgstr "Valfri information"
 
-#: mail/mail-config-druid.glade.h:54
+#: mail/mail-config-druid.glade.h:42
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: mail/mail-config-druid.glade.h:56
+#: mail/mail-config-druid.glade.h:44
 msgid ""
 "Please enter information about your incoming mail server below. If you don't "
 "know what"
@@ -4812,7 +4384,7 @@ msgstr ""
 "Var vänlig och ange information om din server för inkommande e-post nedan. "
 "Om du inte vet vad"
 
-#: mail/mail-config-druid.glade.h:58
+#: mail/mail-config-druid.glade.h:46
 msgid ""
 "Please enter information about your outgoing mail protocol below. If you "
 "don't know "
@@ -4820,7 +4392,7 @@ msgstr ""
 "Var vänlig och ange information om din server för utgående e-post nedan. Om "
 "du inte vet "
 
-#: mail/mail-config-druid.glade.h:60
+#: mail/mail-config-druid.glade.h:48
 msgid ""
 "Please enter your name and email address below. The &quot;optional&quot; "
 "fields below do not "
@@ -4828,112 +4400,109 @@ msgstr ""
 "Var vänlig och ange ditt namn och din e-postadress nedan. Fälten "
 "&quot;optional&quot; nedan "
 
-#: mail/mail-config-druid.glade.h:62
+#: mail/mail-config-druid.glade.h:50
 msgid "Preferred type: "
 msgstr "Typ som föredras: "
 
-#: mail/mail-config-druid.glade.h:63
+#: mail/mail-config-druid.glade.h:51
 msgid "Receiving Email"
 msgstr "Tar emot e-post"
 
-#: mail/mail-config-druid.glade.h:64
+#: mail/mail-config-druid.glade.h:52
 msgid "Receiving Mail"
 msgstr "Tar emot e-post"
 
-#: mail/mail-config-druid.glade.h:65
+#: mail/mail-config-druid.glade.h:53
 msgid "Remember my password"
 msgstr "Kom ihåg mitt lösenord"
 
-#: mail/mail-config-druid.glade.h:66
+#: mail/mail-config-druid.glade.h:54
 msgid "Reply-to:"
 msgstr "Svara-till:"
 
-#: mail/mail-config-druid.glade.h:67
+#: mail/mail-config-druid.glade.h:55
 msgid "Required"
 msgstr "Krävs"
 
-#: mail/mail-config-druid.glade.h:68
+#: mail/mail-config-druid.glade.h:56
 msgid "SMTP"
 msgstr "SMTP"
 
-#: mail/mail-config-druid.glade.h:69
+#: mail/mail-config-druid.glade.h:57
 msgid "SMTP server requires authentication"
 msgstr "SMTP-servern kräver autentisering"
 
-#: mail/mail-config-druid.glade.h:70
+#: mail/mail-config-druid.glade.h:58
 msgid "Sending Email"
 msgstr "Skickar e-post"
 
-#: mail/mail-config-druid.glade.h:71
+#: mail/mail-config-druid.glade.h:59
 msgid "Sending Mail"
 msgstr "Skickar e-post"
 
-#: mail/mail-config-druid.glade.h:72
+#: mail/mail-config-druid.glade.h:60
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config-druid.glade.h:73
+#: mail/mail-config-druid.glade.h:61
 msgid "Server Type: "
 msgstr "Servertyp: "
 
-#: mail/mail-config-druid.glade.h:76 mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:43
+#: mail/mail-config-druid.glade.h:64 mail/mail-config.glade.h:21
 msgid "Sources"
 msgstr "Källor"
 
-#: mail/mail-config-druid.glade.h:80
+#: mail/mail-config-druid.glade.h:68
 msgid "Welcome to the Evolution Mail Configuration Druid! "
 msgstr "Välkommen till Evolutions guide för e-postkonfiguration! "
 
-#: mail/mail-config-druid.glade.h:86
+#: mail/mail-config-druid.glade.h:74
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming"
 msgstr "Du är nästan färdig med e-postkonfigurationen. Identiteten "
 
-#: mail/mail-config-druid.glade.h:90
+#: mail/mail-config-druid.glade.h:78
 msgid "Your mail server supports the following types of authentication. Please"
 msgstr ""
 "Din e-postserver stöder följande typer av autentisering. Var vänlig och"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
-#: mail/mail-config.glade.h:33
-msgid "Identities"
-msgstr "Identiteter"
-
-#: mail/mail-config.glade.h:8 mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:8
 msgid "Address"
 msgstr "Adress"
 
-#: mail/mail-config.glade.h:9 mail/mail-config.glade.h:39
-msgid "Organization"
-msgstr "Organisation"
+#: mail/mail-config.glade.h:11
+msgid "Identities"
+msgstr "Identiteter"
 
-#: mail/mail-config.glade.h:19 mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:12
 msgid "Mail Sources"
 msgstr "E-postkällor"
 
-#: mail/mail-config.glade.h:21 mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:13
+msgid "Mail Transport"
+msgstr "E-posttransport"
+
+#: mail/mail-config.glade.h:14
+msgid "Mark message as seen [ms]: "
+msgstr "Markera meddelanden som lästa [ms]: "
+
+#: mail/mail-config.glade.h:15
 msgid "News Servers"
 msgstr "Diskussionsgruppsservrar"
 
-#: mail/mail-config.glade.h:25 mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:16
 msgid "News Sources"
 msgstr "Diskussionsgruppskällor"
 
-#: mail/mail-config.glade.h:26 mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:17
+msgid "Organization"
+msgstr "Organisation"
+
+#: mail/mail-config.glade.h:19
 msgid "Send messages in HTML format"
 msgstr "Skicka meddelanden som HTML"
 
-#: mail/mail-config.glade.h:27 mail/mail-config.glade.h:36
-msgid "Mark message as seen [ms]: "
-msgstr "Markera meddelanden som lästa [ms]: "
-
 #: mail/mail-crypto.c:136
 #, c-format
 msgid "Couldn't create pipe to %s: %s"
@@ -4966,11 +4535,11 @@ msgstr "Kunde inte skapa rör till GPG/PGP: %s"
 msgid "No GPG/PGP program available."
 msgstr "Inget GPG/PGP-program finns tillgängligt."
 
-#: mail/mail-display.c:66
+#: mail/mail-display.c:67
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: mail/mail-display.c:70
+#: mail/mail-display.c:71
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4978,7 +4547,7 @@ msgstr ""
 "Det finns redan en fil med det namnet.\n"
 "Ska den skrivas över?"
 
-#: mail/mail-display.c:84
+#: mail/mail-display.c:85
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4987,43 +4556,43 @@ msgstr ""
 "Kunde inte öppna filen %s:\n"
 "%s"
 
-#: mail/mail-display.c:96
+#: mail/mail-display.c:97
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: mail/mail-display.c:192
+#: mail/mail-display.c:193
 msgid "Save Attachment"
 msgstr "Spara bilaga"
 
-#: mail/mail-display.c:232
+#: mail/mail-display.c:233
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunde inte skapa temporär katalog: %s"
 
-#: mail/mail-display.c:274
+#: mail/mail-display.c:275
 msgid "Save to Disk..."
 msgstr "Spara till disk..."
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:277
 #, c-format
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:279
 msgid "View Inline"
 msgstr "Visa inuti"
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:303
 msgid "External Viewer"
 msgstr "Externt visningsprogram"
 
-#: mail/mail-display.c:325
+#: mail/mail-display.c:326
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visa inuti (med %s)"
 
-#: mail/mail-display.c:329
+#: mail/mail-display.c:330
 msgid "Hide"
 msgstr "Göm"
 
@@ -5032,47 +4601,47 @@ msgstr "Göm"
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/mail-format.c:595
+#: mail/mail-format.c:601
 msgid "Reply-To:"
 msgstr "Svara-Till:"
 
-#: mail/mail-format.c:835
+#: mail/mail-format.c:823
 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:847
+#: mail/mail-format.c:835
 msgid "Encrypted message not displayed"
 msgstr "Krypterat meddelande visas inte"
 
-#: mail/mail-format.c:853
+#: mail/mail-format.c:841
 msgid "Encrypted message"
 msgstr "Krypterat meddelande"
 
-#: mail/mail-format.c:854
+#: mail/mail-format.c:842
 msgid "Click icon to decrypt."
 msgstr "Klicka på ikonen för att dekryptera."
 
-#: mail/mail-format.c:1456
+#: mail/mail-format.c:1444
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/mail-format.c:1468
+#: mail/mail-format.c:1456
 #, 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:1472
+#: mail/mail-format.c:1460
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/mail-format.c:1506
+#: mail/mail-format.c:1494
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okänd extern data (typen \"%s\")"
 
-#: mail/mail-format.c:1511
+#: mail/mail-format.c:1499
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
@@ -5150,241 +4719,241 @@ msgstr "Filtrerar e-post vid behov"
 msgid "Filter email on demand"
 msgstr "Filtrera e-post vid behov"
 
-#: mail/mail-ops.c:500
+#: mail/mail-ops.c:503
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Skickar \"%s\""
 
-#: mail/mail-ops.c:505
+#: mail/mail-ops.c:508
 msgid "Sending a message without a subject"
 msgstr "Skickar ett meddelande utan en ämnesrad"
 
-#: mail/mail-ops.c:508
+#: mail/mail-ops.c:511
 #, c-format
 msgid "Send \"%s\""
 msgstr "Skicka \"%s\""
 
-#: mail/mail-ops.c:511
+#: mail/mail-ops.c:514
 msgid "Send a message without a subject"
 msgstr "Skicka ett meddelande utan en ämnesrad"
 
-#: mail/mail-ops.c:682
+#: mail/mail-ops.c:685
 msgid "Sending queue"
 msgstr "Skickar kö"
 
-#: mail/mail-ops.c:684
+#: mail/mail-ops.c:687
 msgid "Send queue"
 msgstr "Skicka kö"
 
-#: mail/mail-ops.c:820 mail/mail-ops.c:827
+#: mail/mail-ops.c:823 mail/mail-ops.c:830
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Tillägger \"%s\""
 
-#: mail/mail-ops.c:824 mail/mail-ops.c:830
+#: mail/mail-ops.c:827 mail/mail-ops.c:833
 msgid "Appending a message without a subject"
 msgstr "Tillägger ett meddelande utan en ämnesrad"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:905
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Tömmer \"%s\""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:907
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Töm \"%s\""
 
-#: mail/mail-ops.c:963
+#: mail/mail-ops.c:966
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Flyttar meddelanden från \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:965
+#: mail/mail-ops.c:968
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopierar meddelanden från \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:968
+#: mail/mail-ops.c:971
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytta meddelanden från \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:970
+#: mail/mail-ops.c:973
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiera meddelanden från \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:1004
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:1004
+#: mail/mail-ops.c:1007
 msgid "Copying"
 msgstr "Kopierar"
 
-#: mail/mail-ops.c:1024
+#: mail/mail-ops.c:1027
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s meddelande %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1103
+#: mail/mail-ops.c:1106
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Märker meddelanden i mappen \"%s\""
 
-#: mail/mail-ops.c:1106
+#: mail/mail-ops.c:1109
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Märk meddelanden i mappen \"%s\""
 
-#: mail/mail-ops.c:1137
+#: mail/mail-ops.c:1140
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Märker meddelande %d av %d"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1263
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skannar mappar i \"%s\""
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1265
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Skanna mappar i \"%s\""
 
-#: mail/mail-ops.c:1331 mail/subscribe-dialog.c:324
+#: mail/mail-ops.c:1334 mail/subscribe-dialog.c:324
 msgid "(No description)"
 msgstr "(Ingen beskrivning)"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1395
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Bifogar meddelanden i mappen \"%s\""
 
-#: mail/mail-ops.c:1395
+#: mail/mail-ops.c:1398
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Bifoga meddelanden i \"%s\""
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1501
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Vidarebefordra meddelanden \"%s\""
 
-#: mail/mail-ops.c:1503
+#: mail/mail-ops.c:1506
 msgid "Forwarding a message without a subject"
 msgstr "Vidarebefordrar meddelande utan en ämnesrad"
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1509
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Vidarebefordra meddelande \"%s\""
 
-#: mail/mail-ops.c:1511
+#: mail/mail-ops.c:1514
 msgid "Forward a message without a subject"
 msgstr "Vidarebefordra ett meddelande utan en ämnesrad"
 
-#: mail/mail-ops.c:1548
+#: mail/mail-ops.c:1551
 #, 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:1565
+#: mail/mail-ops.c:1568
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 "Misslyckades med att generera mime-del från meddelande när ett "
 "vidarebefordrat meddelande skulle genereras."
 
-#: mail/mail-ops.c:1651
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Laddar \"%s\""
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1656
 #, c-format
 msgid "Load \"%s\""
 msgstr "Ladda \"%s\""
 
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1758
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Skapar \"%s\""
 
-#: mail/mail-ops.c:1757
+#: mail/mail-ops.c:1760
 #, c-format
 msgid "Create \"%s\""
 msgstr "Skapa \"%s\""
 
-#: mail/mail-ops.c:1805
+#: mail/mail-ops.c:1808
 msgid "Exception while reporting result to shell component listener."
 msgstr "Undantag vid rapportering av resultat till skalkomponentslyssnaren."
 
-#: mail/mail-ops.c:1851
+#: mail/mail-ops.c:1854
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synkroniserar \"%s\""
 
-#: mail/mail-ops.c:1853
+#: mail/mail-ops.c:1856
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Synkronisera \"%s\""
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1920
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Visar meddelande-UID \"%s\""
 
-#: mail/mail-ops.c:1920
+#: mail/mail-ops.c:1923
 msgid "Clearing message display"
 msgstr "Tömmer meddelandevisningen"
 
-#: mail/mail-ops.c:1923
+#: mail/mail-ops.c:1926
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Visa meddelande-UID \"%s\""
 
-#: mail/mail-ops.c:1926
+#: mail/mail-ops.c:1929
 msgid "Clear message display"
 msgstr "Töm meddelandevisning"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2042
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Öppnar meddelanden från mappen \"%s\""
 
-#: mail/mail-ops.c:2042
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Öppnar meddelanden från \"%s\""
 
-#: mail/mail-ops.c:2146
+#: mail/mail-ops.c:2149
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Laddar mappen %s"
 
-#: mail/mail-ops.c:2148
+#: mail/mail-ops.c:2151
 #, c-format
 msgid "Load %s Folder"
 msgstr "Ladda mappen %s"
 
-#: mail/mail-ops.c:2215
+#: mail/mail-ops.c:2218
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Visar meddelanden från mappen \"%s\""
 
-#: mail/mail-ops.c:2218
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Visa meddelanden från \"%s\""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2247
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Hämtar meddelande %d av %d (uid \"%s\")"
 
-#: mail/mail-search-dialogue.c:102
+#: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -5466,25 +5035,25 @@ msgstr "Skriver meddelande %d av %d"
 msgid "Saving changes to %s"
 msgstr "Sparar ändringar i %s"
 
-#: mail/mail-tools.c:364
+#: mail/mail-tools.c:367
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (vidarebefordrat meddelande)"
 
-#: mail/mail-tools.c:373
+#: mail/mail-tools.c:377
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (inget ämne)"
 
-#: mail/mail-tools.c:410
+#: mail/mail-tools.c:416
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidarebefordrat meddelande - %s"
 
-#: mail/mail-tools.c:412
+#: mail/mail-tools.c:418
 msgid "Forwarded message (no subject)"
 msgstr "Vidarebefordrat meddelande (inget ämne)"
 
-#: mail/mail-tools.c:515
+#: mail/mail-tools.c:521
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5503,27 +5072,27 @@ msgstr "Ny virtuell mapp"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 ui/evolution-mail.xml.h:32
+#: mail/mail-view.c:153 ui/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "Svara"
 
-#: mail/mail-view.c:153 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:153 ui/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr "Svara till avsändaren av det här meddelandet"
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "Svara till alla mottagare av det här meddelandet"
 
-#: mail/mail-view.c:159 ui/evolution-mail.xml.h:18
+#: mail/mail-view.c:159 ui/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Vidarebefordra detta meddelande"
 
-#: mail/mail-view.c:163 ui/evolution-mail.xml.h:31
+#: mail/mail-view.c:163 ui/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Skriv ut det markerade meddelandet"
 
-#: mail/mail-view.c:165 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:165 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Ta bort detta meddelande"
 
@@ -5729,7 +5298,12 @@ msgstr "(Ingen mapp visas)"
 msgid "Folders"
 msgstr "Mappar"
 
-#: shell/e-shell-view.c:1021
+#: shell/e-shell-view.c:1002 widgets/misc/e-dateedit.c:212
+#: widgets/misc/e-dateedit.c:371 widgets/misc/e-dateedit.c:1171
+msgid "None"
+msgstr "Ingen"
+
+#: shell/e-shell-view.c:1006
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
@@ -5866,7 +5440,7 @@ msgid "The specified type is not supported in this storage"
 msgstr "Den angivna typen stöds inte i detta lager"
 
 #: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:126
-#: ui/evolution.xml.h:37
+#: ui/evolution-message-composer.xml.h:46 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Visa"
 
@@ -5956,7 +5530,7 @@ msgstr "Skapa en ny kontakt"
 msgid "Delete a contact"
 msgstr "Ta bort en kontakt"
 
-#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:70
+#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:68
 msgid "Find"
 msgstr "Sök"
 
@@ -6061,7 +5635,7 @@ msgstr "Månad"
 msgid "New Ca_lendar"
 msgstr "Ny ka_lender"
 
-#: ui/evolution-calendar.xml.h:21 ui/evolution-event-editor.xml.h:77
+#: ui/evolution-calendar.xml.h:21 ui/evolution-event-editor.xml.h:75
 msgid "Next"
 msgstr "Nästa"
 
@@ -6078,8 +5652,8 @@ msgid "Print this calendar"
 msgstr "Skriv ut denna kalender"
 
 #: ui/evolution-calendar.xml.h:26
-msgid "Save calendar As something else"
-msgstr "Spara kalendern som något annat"
+msgid "Save calendar as something else"
+msgstr "Spara kalender som något annat"
 
 #: ui/evolution-calendar.xml.h:27
 msgid "Show 1 day"
@@ -6105,7 +5679,7 @@ msgstr "Idag"
 msgid "Week"
 msgstr "Vecka"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution.xml.h:33
+#: ui/evolution-calendar.xml.h:33 ui/evolution.xml.h:34
 msgid "_New"
 msgstr "_Ny"
 
@@ -6145,19 +5719,20 @@ msgstr "Hjälp"
 msgid "Print En_velope..."
 msgstr "Skriv ut ku_vert..."
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:84
+#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
 msgid "Print this item"
 msgstr "Skriv ut detta objekt"
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:85
+#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:83
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:92
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save _As..."
 msgstr "Spara so_m..."
 
-#: ui/evolution-contact-editor.xml.h:15 ui/evolution-event-editor.xml.h:93
+#: ui/evolution-contact-editor.xml.h:15 ui/evolution-event-editor.xml.h:91
 msgid "Save and Close"
 msgstr "Spara och stäng"
 
@@ -6165,20 +5740,30 @@ msgstr "Spara och stäng"
 msgid "Save the contact and close the dialog box"
 msgstr "Spara kontakten och stäng dialogrutan"
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:99
+#: ui/evolution-contact-editor.xml.h:17
+msgid "Se_nd contact to other..."
+msgstr "Skicka kontakte_n till annan..."
+
+#: ui/evolution-contact-editor.xml.h:18 ui/evolution-event-editor.xml.h:99
 msgid "See online help"
 msgstr "Se online-hjälpen"
 
-#: ui/evolution-contact-editor.xml.h:18 ui/evolution-event-editor.xml.h:111
-#: ui/evolution-subscribe.xml.h:17 ui/evolution.xml.h:27
+#: ui/evolution-contact-editor.xml.h:19
+msgid "Send _message to contact..."
+msgstr "Skicka _meddelande till kontakt..."
+
+#: ui/evolution-contact-editor.xml.h:20 ui/evolution-event-editor.xml.h:111
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ui/evolution-contact-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:21
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: ui/evolution-contact-editor.xml.h:20 ui/evolution-event-editor.xml.h:122
+#: ui/evolution-contact-editor.xml.h:22 ui/evolution-event-editor.xml.h:122
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Save"
 msgstr "_Spara"
 
@@ -6328,181 +5913,181 @@ msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Spara bilagor..."
 
 #: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: Schedule Meeting"
-msgstr "FIXME: Boka möte"
-
-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: Schedule _Meeting"
-msgstr "FIXME: Boka _möte"
-
-#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Skri_ptfelsökare"
 
-#: ui/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Uppgifts_begäran"
 
-#: ui/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Contact"
 msgstr "FIXME: _Kontakt"
 
-#: ui/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _Customize..."
 msgstr "FIXME: _Anpassa..."
 
-#: ui/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _File..."
 msgstr "FIXME: _Fil..."
 
-#: ui/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Font..."
 msgstr "FIXME: _Typsnitt..."
 
-#: ui/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Formatting"
 msgstr "FIXME: _Formatering"
 
-#: ui/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Item"
 msgstr "FIXME: Objek_t"
 
-#: ui/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: _Dagbokspost"
 
-#: ui/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: _Sista objektet i mappen"
 
-#: ui/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: _Posta meddelande"
 
-#: ui/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: _Minneslappsstil"
 
-#: ui/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: _Flytta till mapp..."
 
-#: ui/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Nytt möte"
 
-#: ui/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Note"
 msgstr "FIXME: _Anteckning"
 
-#: ui/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Objekt..."
 
-#: ui/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: St_ycke..."
 
-#: ui/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: _Stavning..."
 
-#: ui/evolution-event-editor.xml.h:65
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Standard"
 msgstr "FIXME: _Standard"
 
-#: ui/evolution-event-editor.xml.h:66
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Task"
 msgstr "FIXME: _Uppgift"
 
-#: ui/evolution-event-editor.xml.h:67
+#: ui/evolution-event-editor.xml.h:65
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: _Oläst objekt"
 
-#: ui/evolution-event-editor.xml.h:68
+#: ui/evolution-event-editor.xml.h:66
 msgid "FIXME: what goes here?"
 msgstr "FIXME: vad ska vi stoppa här?"
 
-#: ui/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-message-composer.xml.h:12
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: ui/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:69
 msgid "Find Again"
 msgstr "Sök igen"
 
-#: ui/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:70
 msgid "Find _Again"
 msgstr "Sök ige_n..."
 
-#: ui/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the next item"
 msgstr "Gå till nästa objekt"
 
-#: ui/evolution-event-editor.xml.h:74
+#: ui/evolution-event-editor.xml.h:72
 msgid "Go to the previous item"
 msgstr "Gå till föregående objekt"
 
-#: ui/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:73
 msgid "Modify the file's properties"
 msgstr "Ändra filens egenskaper"
 
-#: ui/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:74
 msgid "N_ext"
 msgstr "N_ästa"
 
-#: ui/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:76
 msgid "Paste"
 msgstr "Klistra in"
 
-#: ui/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:77
 msgid "Paste the clipboard"
 msgstr "Klistra in från urklipp"
 
-#: ui/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:78
 msgid "Pre_vious"
 msgstr "Före_gående"
 
-#: ui/evolution-event-editor.xml.h:81
+#: ui/evolution-event-editor.xml.h:79
 msgid "Previous"
 msgstr "Föregående"
 
-#: ui/evolution-event-editor.xml.h:82
+#: ui/evolution-event-editor.xml.h:80
 msgid "Print S_etup..."
 msgstr "Skrivar_inställning..."
 
-#: ui/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:81
 msgid "Print Setup"
 msgstr "Skrivarinställningar"
 
-#: ui/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:84
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ui/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:85
 msgid "Redo"
 msgstr "Gör om"
 
-#: ui/evolution-event-editor.xml.h:88
+#: ui/evolution-event-editor.xml.h:86
 msgid "Redo the undone action"
 msgstr "Gör om den ångrade åtgärden"
 
-#: ui/evolution-event-editor.xml.h:89
+#: ui/evolution-event-editor.xml.h:87
 msgid "Replace"
 msgstr "Ersätt"
 
-#: ui/evolution-event-editor.xml.h:90
+#: ui/evolution-event-editor.xml.h:88
 msgid "Replace a string"
 msgstr "Ersätt en sträng"
 
-#: ui/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:92
 msgid "Save the appointment and close the dialog box"
 msgstr "Spara mötet och stäng dialogrutan"
 
-#: ui/evolution-event-editor.xml.h:95
+#: ui/evolution-event-editor.xml.h:93 ui/evolution-message-composer.xml.h:23
 msgid "Save the current file"
 msgstr "Spara aktuell fil"
 
+#: ui/evolution-event-editor.xml.h:94
+msgid "Schedule Meeting"
+msgstr "Boka möte"
+
+#: ui/evolution-event-editor.xml.h:95
+msgid "Schedule _Meeting"
+msgstr "Boka _möte"
+
 #: ui/evolution-event-editor.xml.h:96
 msgid "Schedule some sort of a meeting"
 msgstr "Boka någon typ av möte"
@@ -6535,11 +6120,11 @@ msgstr "Ångra"
 msgid "Undo the last action"
 msgstr "Ångra den senaste åtgärden"
 
-#: ui/evolution-event-editor.xml.h:105
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:37
 msgid "_About..."
 msgstr "_Om..."
 
-#: ui/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106 ui/evolution-message-composer.xml.h:38
 msgid "_Close"
 msgstr "S_täng"
 
@@ -6547,12 +6132,12 @@ msgstr "S_täng"
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: ui/evolution-event-editor.xml.h:108
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
 msgid "_Debug"
 msgstr "Fels_ök"
 
-#: ui/evolution-event-editor.xml.h:110 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:26
+#: ui/evolution-event-editor.xml.h:110 ui/evolution-message-composer.xml.h:40
+#: ui/evolution-subscribe.xml.h:16 ui/evolution.xml.h:27
 msgid "_Edit"
 msgstr "R_edigera"
 
@@ -6564,7 +6149,8 @@ msgstr "_Sök..."
 msgid "_Forms"
 msgstr "_Formulär"
 
-#: ui/evolution-event-editor.xml.h:114 ui/evolution.xml.h:30
+#: ui/evolution-event-editor.xml.h:114 ui/evolution-message-composer.xml.h:42
+#: ui/evolution.xml.h:31
 msgid "_Help"
 msgstr "_Hjälp"
 
@@ -6621,159 +6207,159 @@ msgstr "Skriv ett nytt meddelande"
 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:9
+#: ui/evolution-mail.xml.h:14 ui/evolution-subscribe.xml.h:9
 msgid "F_older"
 msgstr "Ma_pp"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:15
 msgid "Fi_lter on Sender"
 msgstr "Fi_ltrera på avsändare"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:16
 msgid "Filter on Rec_ipients"
 msgstr "Filtrera på _mottagare"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:17
 msgid "Forget _Passwords"
 msgstr "Glöm _lösenord"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Hämta e-post"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:21
 msgid "Mail _Filters..."
 msgstr "E-post_filter..."
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
 msgid "Manage Subscriptions..."
 msgstr "Hantera prenumerationer..."
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
 msgstr "Mar_kera som läst"
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:24
 msgid "Mark As U_nread"
 msgstr "Markera som _oläst"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "Flytta"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr "Flytta meddelandet till en ny mapp"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:27
 msgid "Previews the message to be printed"
 msgstr "Förhandsgranskar meddelandet som ska skrivas ut"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:29
 msgid "Print Preview of message..."
 msgstr "Förhandsgranska meddelande..."
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr "Skriv ut meddelande på skrivaren"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:31
 msgid "Print message..."
 msgstr "Skriv ut meddelande..."
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:35
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:36
 msgid "Reply to _Sender"
 msgstr "Svara till av_sändaren"
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:13
+#: ui/evolution-mail.xml.h:39 ui/evolution-subscribe.xml.h:13
 msgid "Select _All"
 msgstr "Markera _alla"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:40
 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:40
+#: ui/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr "Trådad meddelandelista"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på avsä_ndare"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på mottaga_re"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:44
 msgid "_Apply Filters"
 msgstr "Tillämp_a filter"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:45
 msgid "_Configure Folder"
 msgstr "_Konfigura mapp"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:46
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:48
 msgid "_Edit Message"
 msgstr "R_edigera meddelande"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:49
 msgid "_Expunge"
 msgstr "V_erkställ tömning"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:50
 msgid "_Filter on Subject"
 msgstr "_Filtrera på ämne"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:51
 msgid "_Forward"
 msgstr "Vidarebe_fordra"
 
-#: ui/evolution-mail.xml.h:51 ui/evolution-subscribe.xml.h:18
+#: ui/evolution-mail.xml.h:52 ui/evolution-subscribe.xml.h:18
 msgid "_Invert Selection"
 msgstr "Om_vänd markering"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:53
 msgid "_Mail Configuration..."
 msgstr "_E-postkonfiguration..."
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:54
 msgid "_Message"
 msgstr "_Meddelande"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:55
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp..."
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:56
 msgid "_Open in New Window"
 msgstr "_Öppna i nytt fönster"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:57
 msgid "_Print Message"
 msgstr "Skriv _ut meddelande"
 
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:58
 msgid "_Threaded"
 msgstr "_Trådat"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:59
 msgid "_Undelete"
 msgstr "_Ångra borttagning"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:60
 msgid "_VFolder on Subject"
 msgstr "_Virtuell mapp på ämne"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:61
 msgid "_Virtual Folder Editor..."
 msgstr "Editor för _virtuella mappar..."
 
@@ -6782,6 +6368,111 @@ msgstr "Editor för _virtuella mappar..."
 #. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
+#: ui/evolution-message-composer.xml.h:7
+msgid "Attach"
+msgstr "Bifoga"
+
+#: ui/evolution-message-composer.xml.h:9
+msgid "Bold"
+msgstr "Fet"
+
+#: ui/evolution-message-composer.xml.h:11
+msgid "Close the current file"
+msgstr "Stäng aktuell fil"
+
+#: ui/evolution-message-composer.xml.h:13
+msgid "HTML"
+msgstr "HTML"
+
+#: ui/evolution-message-composer.xml.h:14
+msgid "Insert a file as text into the message"
+msgstr "Infoga en fil som text i meddelandet"
+
+#: ui/evolution-message-composer.xml.h:15
+msgid "Insert text file..."
+msgstr "Infoga textfil..."
+
+#: ui/evolution-message-composer.xml.h:17
+msgid "Open a file"
+msgstr "Öppna en fil"
+
+#: ui/evolution-message-composer.xml.h:19
+msgid "Save As"
+msgstr "Spara som"
+
+#: ui/evolution-message-composer.xml.h:21
+msgid "Save in _folder... (FIXME)"
+msgstr "Spara i map_p... (FIXME)"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save in folder..."
+msgstr "Spara i mapp..."
+
+#: ui/evolution-message-composer.xml.h:24
+msgid "Save the current file with a different name"
+msgstr "Spara aktuell fil med ett annat namn"
+
+#: ui/evolution-message-composer.xml.h:25
+msgid "Save the message in a specified folder"
+msgstr "Spara meddelandet i angiven mapp"
+
+#: ui/evolution-message-composer.xml.h:26
+msgid "Send"
+msgstr "Skicka"
+
+#: ui/evolution-message-composer.xml.h:27
+msgid "Send _Later"
+msgstr "Skicka senar_e"
+
+#: ui/evolution-message-composer.xml.h:28
+msgid "Send _later"
+msgstr "Skicka senar_e"
+
+#: ui/evolution-message-composer.xml.h:29
+msgid "Send the mail in HTML format"
+msgstr "Skicka brevet i HTML-format"
+
+#: ui/evolution-message-composer.xml.h:30
+msgid "Send the message later"
+msgstr "Skicka meddelandet senare"
+
+#: ui/evolution-message-composer.xml.h:31
+msgid "Send the message now"
+msgstr "Skicka meddelandet nu"
+
+#: ui/evolution-message-composer.xml.h:32
+msgid "Send this message now"
+msgstr "Skicka detta meddelande nu"
+
+#: ui/evolution-message-composer.xml.h:33
+msgid "Sets something as bold"
+msgstr "Sätt någonting till fetstil"
+
+#: ui/evolution-message-composer.xml.h:34
+msgid "Show / hide attachments"
+msgstr "Visa/göm bilaga"
+
+#: ui/evolution-message-composer.xml.h:35
+msgid "Show _attachments"
+msgstr "Visa _bilagor"
+
+#: ui/evolution-message-composer.xml.h:36
+msgid "Show attachments"
+msgstr "Visa bilagor"
+
+#: ui/evolution-message-composer.xml.h:43
+msgid "_Insert text file... (FIXME)"
+msgstr "_Infoga textfil... (FIXME)"
+
+#: ui/evolution-message-composer.xml.h:44
+msgid "_Open..."
+msgstr "_Öppna..."
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
 #: ui/evolution-subscribe.xml.h:7
 msgid "Add folder to your list of subscribed folders"
 msgstr "Lägg till mapp till din lista över prenumererade mappar"
@@ -6848,69 +6539,69 @@ msgid "Show the _Shortcut Bar"
 msgstr "Visa _genvägsraden"
 
 #: ui/evolution.xml.h:16
+msgid "Submit _Bug Report"
+msgstr "Skicka _felrapport"
+
+#: ui/evolution.xml.h:17
 msgid "Submit bug report using Bug Buddy"
 msgstr "Skicka felrapport med Bug-Buddy"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:18
 msgid "Toggle whether to show the folder bar"
 msgstr "Växla om mappraden ska visas"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Växla om genvägsraden ska visas"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:20
 msgid "Using the C_ontact Manager"
 msgstr "Använda k_ontakthanteraren"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Using the _Calendar"
 msgstr "Använda _kalendern"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "Using the _Mailer"
 msgstr "Använda _e-postdelen"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:23
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:24
 msgid "_Appointment (FIXME)"
 msgstr "_Möte (FIXME)"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Create New Folder..."
 msgstr "_Skapa ny mapp..."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:29
 msgid "_Folder"
 msgstr "_Mapp"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:30
 msgid "_Go to Folder..."
 msgstr "_Gå till mapp..."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:32
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
 msgid "_Mail message (FIXME)"
 msgstr "_Posta meddelande (FIXME)"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:35
 msgid "_Settings"
 msgstr "_Inställningar"
 
-#: ui/evolution.xml.h:35
-msgid "_Submit Bug Report"
-msgstr "_Skicka felrapport"
-
 #: ui/evolution.xml.h:36
 msgid "_Task (FIXME)"
 msgstr "_Uppgift (FIXME)"
@@ -7030,6 +6721,183 @@ msgstr "Nu"
 msgid "Group %i"
 msgstr "Grupp %i"
 
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Är du säker på att du\n"
+#~ "vill ta bort kontakten?"
+
+#~ msgid "USA"
+#~ msgstr "USA"
+
+#~ msgid "Canada"
+#~ msgstr "Kanada"
+
+#~ msgid "Finland"
+#~ msgstr "Finland"
+
+#~ msgid "a"
+#~ msgstr "a"
+
+#~ msgid "b"
+#~ msgstr "b"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "d"
+#~ msgstr "d"
+
+#~ msgid "e"
+#~ msgstr "e"
+
+#~ msgid "f"
+#~ msgstr "f"
+
+#~ msgid "g"
+#~ msgstr "g"
+
+#~ msgid "i"
+#~ msgstr "i"
+
+#~ msgid "j"
+#~ msgstr "j"
+
+#~ msgid "k"
+#~ msgstr "k"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "m"
+#~ msgstr "m"
+
+#~ msgid "n"
+#~ msgstr "n"
+
+#~ msgid "o"
+#~ msgstr "o"
+
+#~ msgid "p"
+#~ msgstr "p"
+
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "r"
+#~ msgstr "r"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "u"
+#~ msgstr "u"
+
+#~ msgid "v"
+#~ msgstr "v"
+
+#~ msgid "w"
+#~ msgstr "w"
+
+#~ msgid "x"
+#~ msgstr "x"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "z"
+#~ msgstr "z"
+
+#~ msgid "60 minutes"
+#~ msgstr "60 minuter"
+
+#~ msgid "30 minutes"
+#~ msgstr "30 minuter"
+
+#~ msgid "15 minutes"
+#~ msgstr "15 minuter"
+
+#~ msgid "10 minutes"
+#~ msgstr "10 minuter"
+
+#~ msgid "05 minutes"
+#~ msgstr "05 minuter"
+
+#~ msgid "Not Started"
+#~ msgstr "Inte startad"
+
+#~ msgid "In Progress"
+#~ msgstr "Pågår"
+
+#~ msgid "Completed"
+#~ msgstr "Färdigt"
+
+#~ msgid "Cancelled"
+#~ msgstr "Avbruten"
+
+#~ msgid "High"
+#~ msgstr "Hög"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Low"
+#~ msgstr "Låg"
+
+#~ msgid ""
+#~ "This appointment has custom recurrence rules that cannot be edited by "
+#~ "Evolution.\n"
+#~ "\n"
+#~ "However, the appointment will recur at the appropriate time and will be "
+#~ "displayed properly in the calendar views."
+#~ msgstr ""
+#~ "Det här mötet har anpassade upprepningsregler som inte kan redigeras av "
+#~ "Evolution.\n"
+#~ "\n"
+#~ "Mötet kommer dock att dyka upp vid den angivna tiden och kommer att visas "
+#~ "korrekt i kalendervyerna."
+
+#~ msgid ""
+#~ "Incoming\n"
+#~ "Outgoing\n"
+#~ msgstr ""
+#~ "Inkommande\n"
+#~ "Utgående\n"
+
+#~ msgid "Custom search"
+#~ msgstr "Anpassad sökning"
+
+#~ msgid "Custom"
+#~ msgstr "Anpassad"
+
+#~ msgid "Full Search"
+#~ msgstr "Fullständig sökning"
+
+#~ msgid ""
+#~ "Welcome to the Evolution Mail configuration wizard!\n"
+#~ "By filling in some information about your email\n"
+#~ "settings, you can start sending and receiving email\n"
+#~ "right away. Click Next to continue."
+#~ msgstr ""
+#~ "Välkommen till Evolutions guide för e-postkonfiguration!\n"
+#~ "Efter att ha fyllt i en del information om dina\n"
+#~ "e-postinställningar kan du börja skicka och ta emot e-post\n"
+#~ "direkt. Klicka på \"Nästa\" för att fortsätta."
+
+#~ msgid "Mail Source"
+#~ msgstr "E-postkälla"
+
+#~ msgid ""
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
+#~ msgstr ""
+#~ "Din e-postkonfiguration är nu klar.\n"
+#~ "Klicka på \"Slutför\" för att spara dina nya inställningar"
+
 #~ msgid "Recur on the"
 #~ msgstr "Upprepa den"
 
@@ -7066,9 +6934,6 @@ msgstr "Grupp %i"
 #~ msgid "Copy Message"
 #~ msgstr "Kopiera meddelande"
 
-#~ msgid "Save _As"
-#~ msgstr "Spara so_m"
-
 #~ msgid "Quick Search"
 #~ msgstr "Snabbsökning"