Updated Norwegian (bokmål) translation.

2001-01-09  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian (bokmål) translation.

svn path=/trunk/; revision=7317

1 files changed, 1275 insertions, 921 deletions

diff --git a/po/sv.po b/po/sv.po
index 2316a0172d..7936aa5a51 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,13 +4,13 @@
 # Richard Hult <rhult@codefactory.se>, 2000.
 # Christian Rose <menthos@menthos.com>, 2000.
 #
-# $Id: sv.po,v 1.52 2001/01/03 22:47:02 menthos Exp $
+# $Id: sv.po,v 1.53 2001/01/09 12:42:06 kmaraas Exp $
 #
 #: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-01-03 23:42+0100\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2001-01-03 23:43+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -460,27 +460,10 @@ msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte läsa pilotens adressprogramblock"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/categories-strings.h:7
-msgid "categories"
-msgstr "kategorier"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "Element(en) tillhör dessa kategorier:"
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "Tillgängliga kategorier:"
-
-#.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Ta bort kontakten?"
 
@@ -494,7 +477,7 @@ msgid "_Add"
 msgstr "_Lägg till"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:53
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr "_Ta bort"
 
@@ -508,12 +491,13 @@ msgid "New phone type"
 msgstr "Ny telefontyp"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: po/tmp/addressbook-config.glade.h:6 po/tmp/event-editor-dialog.glade.h:7
-#: po/tmp/filter.glade.h:6 po/tmp/mail-config.glade.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
+#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr "Lägg till"
 
@@ -571,7 +555,7 @@ msgid "C_ontacts..."
 msgstr "_Kontakter..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/task-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
@@ -588,7 +572,8 @@ msgid "_Address..."
 msgstr "_Adress..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:15
+#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "Allmänt"
 
@@ -633,7 +618,7 @@ msgid "No_tes:"
 msgstr "An_teckningar:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: po/tmp/task-editor-dialog.glade.h:13
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Detaljer"
 
@@ -689,7 +674,7 @@ msgstr "Mobil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: po/tmp/mail-config.glade.h:17
+#: mail/mail-config.glade.h:17
 msgid "Other"
 msgstr "Annat"
 
@@ -726,50 +711,50 @@ msgid "Email 3"
 msgstr "E-post 3"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/fulladdr.glade.h:6
+#: addressbook/contact-editor/fulladdr.glade.h:6
 msgid "Address _2:"
 msgstr "Adress _2:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "Canada"
 msgstr "Kanada"
 
-#: po/tmp/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Kontrollera adress"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "_Land:"
 
-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "Finland"
 msgstr "Finland"
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "USA"
 msgstr "USA"
 
-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Adress:"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Ort:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Box:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "Del_stat/Provins:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_Postnummer:"
 
@@ -836,24 +821,29 @@ msgstr "_Efternamn:"
 msgid "_Suffix:"
 msgstr "_Suffix:"
 
-#: addressbook/gui/component/addressbook.c:230
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "Som _minikort"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:236
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Som _tabell"
 
-#: addressbook/gui/component/addressbook.c:347
+#: addressbook/gui/component/addressbook.c:374
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "Var vänlig och ange NNTP-lösenordet för %s@%s"
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "Kan inte öppna adressboken"
 
-#: addressbook/gui/component/addressbook.c:352
+#: addressbook/gui/component/addressbook.c:407
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -874,27 +864,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:473 mail/folder-browser.c:178
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 msgid "Show All"
 msgstr "Visa alla"
 
-#: addressbook/gui/component/addressbook.c:475 mail/folder-browser.c:180
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr "Avancerat..."
 
-#: addressbook/gui/component/addressbook.c:505
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr "Något fält innehåller"
 
-#: addressbook/gui/component/addressbook.c:506
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr "Namnet innehåller"
 
-#: addressbook/gui/component/addressbook.c:507
+#: addressbook/gui/component/addressbook.c:562
 msgid "Email contains"
 msgstr "E-postadressen innehåller"
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "URI:n som mappbläddraren kommer att visa"
 
@@ -959,6 +949,7 @@ msgid "Remember this password"
 msgstr "Kom ihåg detta lösenord"
 
 #: addressbook/gui/component/addressbook-config.c:360
+#: mail/mail-config-druid.glade.h:34
 msgid "Host:"
 msgstr "Värd:"
 
@@ -975,12 +966,12 @@ msgid "Search Scope:"
 msgstr "Sökomfattning:"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-gui.c:943
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Autentisering:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-gui.c:934
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Sökväg:"
 
@@ -988,15 +979,15 @@ msgstr "Sökväg:"
 msgid "Create path if it doesn't exist."
 msgstr "Skapa sökvägen om den inte finns."
 
-#: addressbook/gui/component/addressbook-config.c:589
+#: addressbook/gui/component/addressbook-config.c:593
 msgid "Edit Addressbook"
 msgstr "Redigera adressbok"
 
-#: addressbook/gui/component/addressbook-config.c:591
+#: addressbook/gui/component/addressbook-config.c:595
 msgid "Add Addressbook"
 msgstr "Lägg till adressbok"
 
-#: addressbook/gui/component/addressbook-config.c:607
+#: addressbook/gui/component/addressbook-config.c:611
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -1004,59 +995,63 @@ msgstr ""
 "Markera den typ av adressbok du har och ange den relevanta informationen om "
 "den."
 
-#: addressbook/gui/component/addressbook-config.c:612
+#: addressbook/gui/component/addressbook-config.c:616
+#: mail/mail-config-druid.glade.h:45
 msgid "Name:"
 msgstr "Namn:"
 
-#: addressbook/gui/component/addressbook-config.c:613
-#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: po/tmp/addressbook-config.glade.h:7
+#: addressbook/gui/component/addressbook-config.glade.h:7
 msgid "Addressbook Sources"
 msgstr "Adressbokskällor"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:10
-#: mail/folder-browser.c:644 mail/mail-view.c:150
-#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:12
-#: po/tmp/evolution-addressbook.xml.h:8 po/tmp/evolution-event-editor.xml.h:19
-#: po/tmp/evolution-mail.xml.h:11 po/tmp/filter.glade.h:7
-#: po/tmp/mail-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#: calendar/gui/e-calendar-table.c:342
+#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
+#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
+#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
+#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
 msgid "Delete"
 msgstr "Ta bort"
 
-#: mail/folder-browser.c:630 po/tmp/addressbook-config.glade.h:9
-#: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:9
+#: addressbook/gui/component/addressbook-config.glade.h:9
+#: filter/filter.glade.h:8 mail/folder-browser.c:671
+#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Redigera"
 
-#: po/tmp/addressbook-config.glade.h:10
+#: addressbook/gui/component/addressbook-config.glade.h:10
 msgid "Name"
 msgstr "Namn"
 
-#: po/tmp/addressbook-config.glade.h:11
+#: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "URI"
 msgstr "URI"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Find..."
 msgstr "Sök..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Mottagare"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Markera namn"
 
-#: po/tmp/select-names.glade.h:9
-msgid "Select name from List:"
+#: addressbook/gui/component/select-names/select-names.glade.h:9
+#, fuzzy
+msgid "Select name from:"
 msgstr "Välj namn från listan:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
@@ -1065,114 +1060,114 @@ msgid "Search"
 msgstr "Sök"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/alphabet.glade.h:6
+#: addressbook/gui/widgets/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: po/tmp/alphabet.glade.h:7
+#: addressbook/gui/widgets/alphabet.glade.h:7
 msgid "a"
 msgstr "a"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
@@ -1200,174 +1195,175 @@ msgstr ""
 "Dubbelklicka här för att skapa en ny kontakt."
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/e-contact-print.glade.h:6
+#: addressbook/printing/e-contact-print.glade.h:6
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr "Tomma blanketter vid slutet:"
 
-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "Meddelandetext"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Underst:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Dimensioner:"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Typsnitt..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Sidfot:"
 
-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Format"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "Rubrik"
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "Rubrik/sidfot"
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "Rubriker"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "Rubriker för varje brev"
 
-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "Höjd:"
 
-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "Följ omedelbart efter varandra"
 
-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "Inkludera:"
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Liggande"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Vänster:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "Brevflikar på sidan"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Marginaler"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Antal kolumner:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Alternativ"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Orientering"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Sida"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Sidinställningar:"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Papper"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Papperskälla:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Stående"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Förhandsgranska:"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Skriv ut med grå skuggning"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Vänd jämna sidor"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Höger:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Sektioner:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "Skuggning"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Storlek:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "Börja på en ny sida"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Stil:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Överst:"
 
-#: po/tmp/e-contact-print.glade.h:45
+#: addressbook/printing/e-contact-print.glade.h:45
+#: mail/mail-config-druid.glade.h:75
 msgid "Type:"
 msgstr "Typ:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Bredd:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "label26"
 
@@ -1402,6 +1398,77 @@ msgstr "Konfigurationsverktyg för evolutions att-göra-kanal.\n"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunde inte läsa pilotens att-göra-programblock"
 
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
+msgid "Calendar Repository"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "Kalender"
+
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Kan inte initiera Evolutions komponent för e-postsammanfattning."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolutions kalenderkanal"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Konfigurationsverktyg för evolutions kalenderkanal.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
+#: calendar/gui/alarm-notify.c:940
+msgid "Reminder of your appointment at "
+msgstr "Påminnelse om ditt möte den "
+
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "Slumra"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
+#: mail/mail-search-dialogue.c:104
+msgid "Ok"
+msgstr "Ok"
+
 #: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Filen hittades inte"
@@ -1440,15 +1507,18 @@ msgstr "%a %Y-%m-%d %H.%M.%S"
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I.%M.%S %p"
 
-#: calendar/gui/calendar-model.c:346 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:346
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "Publikt"
 
-#: calendar/gui/calendar-model.c:349 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:349
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:352 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:352
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
@@ -1538,6 +1608,29 @@ msgstr "Procentvärdet måste vara mellan 0 och 100"
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteten måste vara mellan 1 och 9"
 
+#: calendar/gui/calendar-summary.c:81
+#, fuzzy
+msgid "%A, %e %B %Y"
+msgstr "%A %d %B %Y"
+
+#: calendar/gui/calendar-summary.c:224
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr "Fel vid inläsning av filen: %s"
+
+#: calendar/gui/calendar-summary.c:229
+msgid "<b>Error loading calendar:<br>Calendar in use."
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:235
+msgid "<b>Error loading calendar:<br>Method not supported"
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:293
+#, fuzzy
+msgid "Loading Calendar"
+msgstr "Skriv ut kalender"
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "URI:t som kalendern kommer att visa"
@@ -1555,262 +1648,271 @@ msgid "No summary available."
 msgstr "Ingen sammanfattning finns tillgänglig."
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
-#: po/tmp/evolution-event-editor.xml.h:13
-#: po/tmp/evolution-message-composer.xml.h:8
-#: po/tmp/evolution-subscribe.xml.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:6
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "Stäng"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Redigera möte"
 
-#: po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Slumra"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Slumringstid (minuter)"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "05 minutes"
 msgstr "05 minuter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr "10 minuter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 timmar (fm/em)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr "15 minuter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 timmar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr "30 minuter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr "60 minuter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr "Ljudalarm stängs av efter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "Ljudalarm"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "Pip när alarmfönster visas."
 
-#: po/tmp/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Kalender"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Kalenderinställningar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Färger"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "Tryck ihop helger"
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "Alternativ för datumnavigerare"
 
-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "Standardvärden"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Visningsalternativ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Förfallodatum"
 
-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr "Aktivera slummer i"
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Dagen slutar:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "Första dagen i veckan:"
 
-#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/gnome-month-item.c:741
 msgid "Fri"
 msgstr "fre"
 
-#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/event-editor.c:433
 msgid "Friday"
 msgstr "fredag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr "Markera"
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr "objekt som ska ha utförts idag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr "Objekt som ska ha utförts idag:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr "objekt som inte ska utföras än"
 
-#: po/tmp/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr "Obejkt som inte ska utföras än:"
 
-#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/gnome-month-item.c:737
 msgid "Mon"
 msgstr "mån"
 
-#: calendar/gui/event-editor.c:429 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/event-editor.c:429
 msgid "Monday"
 msgstr "måndag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr "objekt som skulle ha utförts"
 
-#: po/tmp/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr "Objekt som skulle ha utförts:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr "Välj en färg"
 
-#: filter/libfilter-i18n.h:31 po/tmp/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
 msgid "Priority"
 msgstr "Prioritet"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Påminn mig om alla möten"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr "Påminnare"
 
-#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/gnome-month-item.c:742
 msgid "Sat"
 msgstr "lör"
 
-#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/event-editor.c:434
 msgid "Saturday"
 msgstr "lördag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr "Visa"
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Visa sluttiderna på möten"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Visa veckonummer"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Dagen startar:"
 
 #. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/gnome-month-item.c:736
 msgid "Sun"
 msgstr "sön"
 
-#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/event-editor.c:435
 msgid "Sunday"
 msgstr "söndag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "Uppgiftsyta"
 
-#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/gnome-month-item.c:740
 msgid "Thu"
 msgstr "tor"
 
-#: calendar/gui/event-editor.c:432 po/tmp/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:432
 msgid "Thursday"
 msgstr "torsdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr "Tid till förfallodatum"
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "Tidsdivisioner:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: calendar/gui/gnome-month-item.c:738
 msgid "Tue"
 msgstr "tis"
 
-#: calendar/gui/event-editor.c:430 po/tmp/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/event-editor.c:430
 msgid "Tuesday"
 msgstr "tisdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Visuella alarm"
 
-#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: calendar/gui/gnome-month-item.c:739
 msgid "Wed"
 msgstr "ons"
 
-#: calendar/gui/event-editor.c:431 po/tmp/cal-prefs-dialog.glade.h:60
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: calendar/gui/event-editor.c:431
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "Arbetsvecka"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "minuter innan de sker."
 
-#: po/tmp/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "sekunder."
 
@@ -1842,90 +1944,91 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Är du säker på att du vill ta bort denna namnlösa dagbokspost?"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/task-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
 msgstr "% färdig_t:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "K_lassifikation:"
 
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Färdigt"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "Datum utfört:"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Hög"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 msgid "In Progress"
 msgstr "Pågår"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Låg"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
 #: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
 #: widgets/misc/e-dateedit.c:1445
 msgid "None"
 msgstr "Ingen"
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "Normal"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid "Not Started"
 msgstr "Inte startad"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "S_ammanfattning"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Sta_rtdatum:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Uppgift"
 
-#: po/tmp/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: po/tmp/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 msgid "_Contacts..."
 msgstr "_Kontakter..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr "Förfallo_datum:"
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "_Status:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
@@ -2026,7 +2129,7 @@ msgid "Edit this appointment..."
 msgstr "Redigera detta möte..."
 
 #: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: po/tmp/evolution-event-editor.xml.h:20
+#: ui/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Ta bort detta möte"
 
@@ -2050,162 +2153,162 @@ msgid "%d %B"
 msgstr "%d %B"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/event-editor-dialog.glade.h:6
+#: calendar/gui/event-editor-dialog.glade.h:6
 msgid "A_ll day event"
 msgstr "He_ldagsarrangemang"
 
-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Appointment Basics"
 msgstr "Grundläggande mötessaker"
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "Klassifikation"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Custom recurrence"
 msgstr "Anpassad upprepning"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:11
 msgid "Days"
 msgstr "dag"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "Every"
 msgstr "Var"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Exceptions"
 msgstr "Undantag"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "timme"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr "E-posta _till:"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Minutes"
 msgstr "minut"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Modify"
 msgstr "Ändra"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "No recurrence"
 msgstr "Ingen upprepning"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:21
 msgid "Preview"
 msgstr "Förhandsgranska"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Pu_blic"
 msgstr "Pu_blikt"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Recurrence"
 msgstr "Upprepning"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:25
 msgid "Recurrence Rule"
 msgstr "Upprepningsregel"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "Påminnare"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:27
 msgid "Simple recurrence"
 msgstr "Enkel upprepning"
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr "Sa_mmanfattning:"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Tid"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_Audio"
 msgstr "_Ljud"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "_Konfidentiellt"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "_Visa"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_End time:"
 msgstr "Slutti_d:"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "_E-post"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Program"
 msgstr "_Program"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "_Kör program:"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "_Start time:"
 msgstr "_Starttid:"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "_Startdatum:"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr "dag"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "event-editor-dialog"
 msgstr "event-editor-dialog"
 
-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "for"
 msgstr "i"
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "forever"
 msgstr "för alltid"
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "label21"
 msgstr "label21"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "månad"
 
-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "until"
 msgstr "till"
 
-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "vecka"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "år"
 
@@ -2257,6 +2360,80 @@ msgstr "Kunde inte skapa en kalender i \"%s\""
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som krävs för att läsa in \"%s\" stöds inte"
 
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+msgid "April"
+msgstr "april"
+
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "August"
+msgstr "augusti"
+
+#: calendar/gui/goto-dialog.glade.h:8
+#, fuzzy
+msgid "December"
+msgstr "december"
+
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "February"
+msgstr "februari"
+
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "Go To Date"
+msgstr "Gå till datum"
+
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "Go To Today"
+msgstr "Gå till idag"
+
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "January"
+msgstr "januari"
+
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "July"
+msgstr "juli"
+
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "June"
+msgstr "juni"
+
+#: calendar/gui/goto-dialog.glade.h:15
+#, fuzzy
+msgid "March"
+msgstr "mars"
+
+#: calendar/gui/goto-dialog.glade.h:16
+#, fuzzy
+msgid "May"
+msgstr "måndag"
+
+#: calendar/gui/goto-dialog.glade.h:17
+#, fuzzy
+msgid "November"
+msgstr "november"
+
+#: calendar/gui/goto-dialog.glade.h:18
+#, fuzzy
+msgid "October"
+msgstr "oktober"
+
+#: calendar/gui/goto-dialog.glade.h:19
+#, fuzzy
+msgid "September"
+msgstr "september"
+
 #: calendar/gui/main.c:49
 msgid "Could not initialize GNOME"
 msgstr "Kunde inte initiera GNOME"
@@ -2449,7 +2626,7 @@ msgstr "Aktuellt år (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:980
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "Förhandsgranska"
 
@@ -2668,7 +2845,7 @@ msgstr "Oväntat OK-svar från IMAP-servern: %s"
 msgid "Could not load summary for %s"
 msgstr "Kunde inte läsa in sammanfattning för %s"
 
-#: camel/providers/imap/camel-imap-folder.c:533
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
@@ -3183,6 +3360,7 @@ msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3232,8 +3410,14 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "E-postleverans via programmet sendmail"
 
+#: camel/providers/smtp/camel-smtp-provider.c:34
+#: mail/mail-config-druid.glade.h:59
+msgid "SMTP"
+msgstr "SMTP"
+
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "För leverans av e-post genom anslutning till ett fjärr-epostnav som använder "
 "SMTP."
@@ -3257,6 +3441,7 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:292
 #: camel/providers/smtp/camel-smtp-transport.c:297
+#: mail/mail-config-druid.glade.h:16
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
@@ -3399,11 +3584,11 @@ msgid "attachment"
 msgstr "bilaga"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: po/tmp/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: composer/e-msg-composer-attachment-bar.c:460 po/tmp/filter.glade.h:14
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
 #: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Ta bort"
@@ -3421,18 +3606,18 @@ msgid "Attach a file to the message"
 msgstr "Bifoga en fil till meddelandet"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "Egenskaper hos bilagan"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Filnamn:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "MIME-typ:"
 
@@ -3715,7 +3900,7 @@ msgstr "inkommande"
 msgid "outgoing"
 msgstr "utgående"
 
-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#: filter/filter-editor.c:456 filter/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "Redigera filter"
 
@@ -3809,14 +3994,8 @@ msgstr "Ta bort villkor"
 msgid "Replied to"
 msgstr "Svarade till"
 
-#: filter/filter-system-flag.c:64
-msgid "Deleted"
-msgstr "Borttagen"
-
-#: filter/filter-system-flag.c:65
-msgid "Draft"
-msgstr "Mall"
-
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
 #: filter/filter-system-flag.c:66
 msgid "Important"
 msgstr "Viktigt"
@@ -3825,27 +4004,27 @@ msgstr "Viktigt"
 msgid "Read"
 msgstr "Läs"
 
-#: po/tmp/filter.glade.h:10
+#: filter/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Redigera virtuella mappar"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Filterregler"
 
-#: po/tmp/filter.glade.h:12
+#: filter/filter.glade.h:12
 msgid "Incoming"
 msgstr "Inkommande"
 
-#: po/tmp/filter.glade.h:13
+#: filter/filter.glade.h:13
 msgid "Outgoing"
 msgstr "Utgående"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Virtuella mappar"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "Källor för virtuella mappar"
 
@@ -4034,173 +4213,210 @@ msgstr "Lägg till regel för virtuell mapp"
 msgid "Edit VFolder Rule"
 msgstr "Redigera regel för virtuell mapp"
 
-#: mail/component-factory.c:239
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan inte initiera Evolutions e-postkomponent."
 
-#: mail/component-factory.c:278
+#: mail/component-factory.c:316
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lagring hos skal"
 
-#: mail/folder-browser.c:182 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:19
+#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Spara"
 
-#: mail/folder-browser.c:195
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr "Meddelandetexten eller ämnet innehåller"
 
-#: mail/folder-browser.c:196
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr "Meddelandetexten innehåller"
 
-#: mail/folder-browser.c:197
+#: mail/folder-browser.c:238
 msgid "Subject contains"
 msgstr "Ämnesraden innehåller"
 
-#: mail/folder-browser.c:198
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr "Meddelandetexten innehåller inte"
 
-#: mail/folder-browser.c:199
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr "Ämnesraden innehåller inte"
 
-#: mail/folder-browser.c:602
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr "Virtuell mapp på ämnesrad"
 
-#: mail/folder-browser.c:603
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr "Virtuell mapp på avsändare"
 
-#: mail/folder-browser.c:604
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr "Virtuell mapp på mottagare"
 
-#: mail/folder-browser.c:606
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr "Filtrera på ämnesrad"
 
-#: mail/folder-browser.c:607
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr "Filtrera på avsändare"
 
-#: mail/folder-browser.c:608
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr "Filtrera på mottagare"
 
-#: mail/folder-browser.c:609 mail/folder-browser.c:738
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr "Filtrera på sändlista"
 
-#: mail/folder-browser.c:614
+#: mail/folder-browser.c:655
 msgid "Show all hidden"
 msgstr "Visa alla gömda"
 
-#: mail/folder-browser.c:616
+#: mail/folder-browser.c:657
 msgid "Hide selected"
 msgstr "Göm markerade"
 
 #. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:619
+#: mail/folder-browser.c:660
 msgid "Hide read"
 msgstr "Göm lästa"
 
-#: mail/folder-browser.c:620
+#: mail/folder-browser.c:661
 msgid "Hide deleted"
 msgstr "Göm borttagna"
 
-#: mail/folder-browser.c:622 mail/folder-browser.c:749
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
 msgid "Hide Subject"
 msgstr "Göm ämnesrad"
 
-#: mail/folder-browser.c:624 mail/folder-browser.c:755
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
 msgid "Hide from Sender"
 msgstr "Göm för avsändaren"
 
-#: mail/folder-browser.c:629 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "Öppna"
 
-#: mail/folder-browser.c:631
+#: mail/folder-browser.c:672
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: mail/folder-browser.c:632 mail/mail-view.c:148
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:32
+#: mail/folder-browser.c:673 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:32
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:634
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr "Svara till avsändaren"
 
-#: mail/folder-browser.c:635 mail/mail-view.c:141
-#: po/tmp/evolution-mail.xml.h:38
+#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: mail/folder-browser.c:636 mail/mail-view.c:144
-#: po/tmp/evolution-mail.xml.h:17
+#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: mail/folder-browser.c:637 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 msgid "Forward inline"
 msgstr "Vidarebefordra inuti"
 
-#: mail/folder-browser.c:639
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr "Markera som läst"
 
-#: mail/folder-browser.c:640
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr "Markera som oläst"
 
-#: mail/folder-browser.c:642
+#: mail/folder-browser.c:683
 msgid "Move to Folder..."
 msgstr "Flytta till mapp..."
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:684
 msgid "Copy to Folder..."
 msgstr "Kopiera till mapp..."
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:686
 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:649
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr "Tillämpa filter"
 
-#: mail/folder-browser.c:651 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "Skapa regel från meddelande"
 
-#: mail/folder-browser.c:652 po/tmp/evolution-mail.xml.h:21
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
 msgid "Hide Messages"
 msgstr "Göm meddelanden"
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrera på sändlista (%s)"
 
-#: mail/folder-browser.c:746
+#: mail/folder-browser.c:787
 #, c-format
 msgid "Hide Subject \"%s\""
 msgstr "Göm ämnesraden \"%s\""
 
-#: mail/folder-browser.c:752
+#: mail/folder-browser.c:793
 #, c-format
 msgid "Hide from Sender <%s>"
 msgstr "Göm för avsändaren <%s>"
 
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: mail/local-config.glade.h:6
+#, fuzzy
+msgid "Current store format:"
+msgstr "Hämta lagringsutrymme för \"%s\""
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "Brevlådesammanfattning"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "Typ av diskussionsgruppskälla:"
+
+#: mail/local-config.glade.h:9
+msgid ""
+"Note: When converting between mailbox formats, a failure (such as lack of "
+"disk space) may not be automatically recoverable.  Please use this feature "
+"with care."
+msgstr ""
+
+#: mail/local-config.glade.h:10
+msgid "maildir"
+msgstr ""
+
+#: mail/local-config.glade.h:11
+msgid "mbox"
+msgstr ""
+
+#: mail/local-config.glade.h:12
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4269,23 +4485,23 @@ msgstr ""
 "Detta meddelande har ingen ämnesrad.\n"
 "Vill du verkligen skicka?"
 
-#: mail/mail-callbacks.c:289
+#: mail/mail-callbacks.c:312
 msgid "You must specify recipients in order to send this message."
 msgstr "Du måste ange mottagare för att kunna skicka detta meddelande."
 
-#: mail/mail-callbacks.c:509
+#: mail/mail-callbacks.c:530
 msgid "Forwarded message:\n"
 msgstr "Vidarebefordrat meddelande:\n"
 
-#: mail/mail-callbacks.c:590
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr "Flytta meddelande(n) till"
 
-#: mail/mail-callbacks.c:592
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr "Kopiera meddelande(n) till"
 
-#: mail/mail-callbacks.c:727
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4293,11 +4509,11 @@ msgstr ""
 "Du kan bara redigera meddelanden\n"
 "som du sparat i mappen Drafts."
 
-#: mail/mail-callbacks.c:760 mail/mail-display.c:79
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: mail/mail-callbacks.c:764 mail/mail-display.c:83
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4305,15 +4521,15 @@ msgstr ""
 "Det finns redan en fil med det namnet.\n"
 "Ska den skrivas över?"
 
-#: mail/mail-callbacks.c:809
+#: mail/mail-callbacks.c:830
 msgid "Save Message As..."
 msgstr "Spara meddelande som..."
 
-#: mail/mail-callbacks.c:811
+#: mail/mail-callbacks.c:832
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:895
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4322,45 +4538,266 @@ msgstr ""
 "Fel vid läsning av filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:940
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/mail-callbacks.c:987
+#: mail/mail-callbacks.c:1008
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/mail-config-druid.glade.h:6
+#: mail/mail-config-druid.glade.h:6
+#, fuzzy
+msgid "Account"
+msgstr "Konton"
+
+#: mail/mail-config-druid.glade.h:7
+msgid "Account Information"
+msgstr "Kontoinformation"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr "Kontohantering"
+
+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "Egenskaper hos bilagan"
+
+#: mail/mail-config-druid.glade.h:11
+#, fuzzy
+msgid "Advanced"
+msgstr "Avancerat..."
+
+#: mail/mail-config-druid.glade.h:12
+#, fuzzy
+msgid "Authentication"
+msgstr "Autentisering:"
+
+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "Autentisering:"
+
+#: mail/mail-config-druid.glade.h:15
+msgid "Automatically check mail every "
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:17
+#, fuzzy
+msgid "Congratulations, your mail configuration is complete.\n"
+msgstr "Gratulerar, din e-postkonfiguration är färdig."
+
+#: mail/mail-config-druid.glade.h:23
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:24
+msgid "Default"
+msgstr "Standard"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "Ta inte bort meddelanden från servern"
+
+#: mail/mail-config-druid.glade.h:27
+msgid "Done"
+msgstr "Klar"
+
+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "E-postadress:"
+
+#: mail/mail-config-druid.glade.h:30
+msgid "Email Address:"
+msgstr "E-postadress:"
+
+#: mail/mail-config-druid.glade.h:31
+msgid "Evolution Mail Configuration"
+msgstr "Evolution e-postkonfiguration"
+
+#: mail/mail-config-druid.glade.h:32
+msgid "Full Name:"
+msgstr "Fullständigt namn:"
+
+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "Värd:"
+
+#: mail/mail-config-druid.glade.h:36
+msgid "IMAP"
+msgstr "IMAP"
+
+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr "Identitet"
 
-#: po/tmp/mail-config-druid.glade.h:7
+#: mail/mail-config-druid.glade.h:38
+msgid "Incoming Mail Server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:39
+#, fuzzy
+msgid "Kerberos"
+msgstr "Kerberos 4"
+
+#: mail/mail-config-druid.glade.h:40
+msgid "Mail"
+msgstr "E-post"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "Konton"
+
+#: mail/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "E-postkälla"
+#: mail/mail-config-druid.glade.h:43
+msgid "Mail Configuration Druid"
+msgstr "E-postkonfigurationsguide"
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "E-posttransport"
+#: mail/mail-config-druid.glade.h:44
+msgid "Make this my default account"
+msgstr "Gör detta till mitt standardkonto"
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
-msgstr "Välkommen till Evolutions guide för e-postkonfiguration!\n"
+#: mail/mail-config-druid.glade.h:46
+msgid "News"
+msgstr "Diskussionsgrupper"
+
+#: mail/mail-config-druid.glade.h:48
+msgid "Optional"
+msgstr "Valfri"
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "Organisation:"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:51
+msgid "Password:"
+msgstr "Lösenord:"
+
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr "Tar emot e-post"
+
+#: mail/mail-config-druid.glade.h:55
+#, fuzzy
+msgid "Remember my password"
+msgstr "Kom ihåg detta lösenord"
+
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+msgid "Reply-To:"
+msgstr "Svara-Till:"
+
+#: mail/mail-config-druid.glade.h:57
+msgid "Reply-to:"
+msgstr "Svara-till:"
+
+#: mail/mail-config-druid.glade.h:58
+msgid "Required"
+msgstr "Krävs"
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "Spara som VCard"
+
+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "Signaturfil:"
+
+#: mail/mail-config-druid.glade.h:62
+msgid "Sending Email"
+msgstr "Skickar e-post"
+
+#: mail/mail-config-druid.glade.h:64
+msgid "Server Configuration"
+msgstr "Serverkonfiguration"
+
+#: mail/mail-config-druid.glade.h:65
+#, fuzzy
+msgid "Server Timeouts"
+msgstr "Servertyp: "
+
+#: mail/mail-config-druid.glade.h:66
+msgid "Server Type: "
+msgstr "Servertyp: "
+
+#: mail/mail-config-druid.glade.h:67
+#, fuzzy
+msgid "Server requires authentication"
+msgstr "SMTP-servern kräver autentisering"
+
+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Server:"
+
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "Signaturfil:"
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "Signaturfil:"
+
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Källor"
+
+#: mail/mail-config-druid.glade.h:72
+#, fuzzy
+msgid "This server requires a secure connection (SSL)"
+msgstr "SMTP-servern kräver autentisering"
+
+#: mail/mail-config-druid.glade.h:73
+#, fuzzy
+msgid "Type"
+msgstr "Typ:"
+
+#: mail/mail-config-druid.glade.h:74
 msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
+"Type the name by which you would like to refer to these servers. For "
+"example: \"Work\" or \"Home\"."
 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:76
+#, fuzzy
+msgid "User Information"
+msgstr "Ingen information"
+
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "Användarnamn:"
+
+#: mail/mail-config-druid.glade.h:78
+#, fuzzy
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+msgstr "Välkommen till Evolutions guide för e-postkonfiguration!\n"
+
+#: mail/mail-config-druid.glade.h:81
+#, fuzzy
+msgid "minute(s)"
+msgstr "minuter"
 
 #: mail/mail-config-gui.c:433
 msgid ""
@@ -4379,15 +4816,7 @@ msgstr "Fullständigt namn:"
 msgid "Email address:"
 msgstr "E-postadress:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Signaturfil:"
-
-#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
+#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Signaturfil"
 
@@ -4395,10 +4824,6 @@ msgstr "Signaturfil"
 msgid "Server:"
 msgstr "Server:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Användarnamn:"
-
 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Detektera vilka typer som stöds..."
@@ -4415,7 +4840,7 @@ msgstr "Testa inställningarna"
 msgid "Mail source type:"
 msgstr "Typ av e-postkälla:"
 
-#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
+#: mail/mail-config-gui.c:1135
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4451,6 +4876,20 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "Typ av e-posttransport:"
 
+#: mail/mail-config-gui.c:1183
+#, fuzzy
+msgid ""
+"Select the kind of mail server you have, and enter the relevant information "
+"about it.\n"
+"If the server requires authentication, you can click the \"Detect supported "
+"types...\" button after entering the other information."
+msgstr ""
+"Välj den typ av e-postserver som du har och ange den relevanta informationen "
+"om den.\n"
+"\n"
+"Om servern kräver autentisering kan du klicka på knappen \"Detektera vilka "
+"typer som stöds...\" när du har angett den andra informationen."
+
 #: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "Lägg till identitet"
@@ -4499,42 +4938,42 @@ msgstr "Frågar efter autentiseringsmöjligheterna hos \"%s\""
 msgid "Query authorization at \"%s\""
 msgstr "Fråga efter autentisering hos \"%s\""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "Adress"
 
-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10
 msgid "Identities"
 msgstr "Identiteter"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "E-postkällor"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "E-posttransport"
+
+#: mail/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "Markera meddelanden som lästa [ms]: "
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Diskussionsgruppsservrar"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Diskussionsgruppskällor"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 msgid "Organization"
 msgstr "Organisation"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Skicka meddelanden som HTML"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Källor"
-
 #: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
 #: mail/mail-crypto.c:781
 msgid "Please enter your PGP/GPG passphrase."
@@ -4614,10 +5053,6 @@ msgstr "Göm"
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr "Svara-Till:"
-
 #: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "Det finns inget stöd för GPG/PGP i denna kopia av Evolution."
@@ -4727,6 +5162,29 @@ msgstr ""
 "Kan inte registrera mappen \"%s\":\n"
 "%s"
 
+#: mail/mail-mt.c:85
+#, fuzzy, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Fel vid \"%s\":\n"
+"%s"
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Fel vid förberedelse av %s:\n"
+"%s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "Flyttar"
+
 #: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
@@ -4750,168 +5208,141 @@ msgstr "Filtrerar e-post vid behov"
 msgid "Filter email on demand"
 msgstr "Filtrera e-post vid behov"
 
-#: mail/mail-ops.c:544
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Skickar \"%s\""
 
-#: mail/mail-ops.c:549
-msgid "Sending a message without a subject"
-msgstr "Skickar ett meddelande utan en ämnesrad"
-
-#: mail/mail-ops.c:552
-#, c-format
-msgid "Send \"%s\""
-msgstr "Skicka \"%s\""
-
-#: mail/mail-ops.c:555
-msgid "Send a message without a subject"
-msgstr "Skicka ett meddelande utan en ämnesrad"
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "Skicka detta meddelande nu"
 
-#: mail/mail-ops.c:725
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr "Skickar kö"
 
-#: mail/mail-ops.c:727
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr "Skicka kö"
 
-#: mail/mail-ops.c:860 mail/mail-ops.c:867
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Tillägger \"%s\""
 
-#: mail/mail-ops.c:864 mail/mail-ops.c:870
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr "Tillägger ett meddelande utan en ämnesrad"
 
-#: mail/mail-ops.c:953
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Flyttar meddelanden från \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:955
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopierar meddelanden från \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytta meddelanden från \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:960
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiera meddelanden från \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:991
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:994
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "Kopierar"
 
-#: mail/mail-ops.c:1014
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s meddelande %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1093
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "Märker meddelanden i mappen \"%s\""
-
-#: mail/mail-ops.c:1096
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "Märk meddelanden i mappen \"%s\""
-
-#: mail/mail-ops.c:1127
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "Märker meddelande %d av %d"
-
-#: mail/mail-ops.c:1256
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
-#: mail/mail-ops.c:1258
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr "Genomsök mappar i \"%s\""
-
-#: mail/mail-ops.c:1327 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(Ingen beskrivning)"
 
-#: mail/mail-ops.c:1415
+#: mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1453 mail/mail-ops.c:1523
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1599
-#, c-format
-msgid "Creating \"%s\""
-msgstr "Skapar \"%s\""
-
-#: mail/mail-ops.c:1601
-#, c-format
-msgid "Create \"%s\""
-msgstr "Skapa \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
+msgstr "Omkonfigurerar mapp"
 
-#: mail/mail-ops.c:1649
-msgid "Exception while reporting result to shell component listener."
-msgstr "Undantag vid rapportering av resultat till skalkomponentslyssnaren."
+#: mail/mail-ops.c:1386
+#, fuzzy
+msgid "Expunging folder"
+msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1787
+#: mail/mail-ops.c:1434
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1497
 msgid "Retrieving messages"
 msgstr "Hämtar meddelanden"
 
-#: mail/mail-ops.c:1860
+#: mail/mail-ops.c:1507
 #, 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:2008
+#: mail/mail-ops.c:1655
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Läser in mappen %s för %s"
 
-#: mail/mail-ops.c:2010
+#: mail/mail-ops.c:1657
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "Läs in mappen %s för %s"
 
-#: mail/mail-ops.c:2179
-#, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Sparar meddelanden från mappen \"%s\""
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "Kopierar meddelanden"
 
-#: mail/mail-ops.c:2182
-#, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "Spara meddelanden från mappen \"%s\""
+#: mail/mail-ops.c:1902
+#, fuzzy, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Kan inte spara grupplistefilen för %s: %s"
 
-#: mail/mail-ops.c:2225
+#: mail/mail-ops.c:1915
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Sparar meddelande %d av %d (uid \"%s\")"
 
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
+#: mail/mail-ops.c:1929
+#, fuzzy, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "Fel vid sparande av filen: %s"
 
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
@@ -5027,27 +5458,27 @@ msgstr "Ny virtuell mapp"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Svara"
 
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:42
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Svara till avsändaren av det här meddelandet"
 
-#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:41
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Svara till alla mottagare av det här meddelandet"
 
-#: mail/mail-view.c:144 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Vidarebefordra detta meddelande"
 
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:36
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "Skriv ut det markerade meddelandet"
 
-#: mail/mail-view.c:150 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Ta bort detta meddelande"
 
@@ -5102,14 +5533,6 @@ msgstr "%d %b %I:%M"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2347
-msgid "Rebuilding message view"
-msgstr "Bygger om meddelandevyn"
-
-#: mail/message-list.c:2349
-msgid "Rebuild message view"
-msgstr "Bygg om meddelandevyn"
-
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
 msgstr "Visa mappar som börjar med:"
@@ -5376,9 +5799,8 @@ msgstr "Ta bort denna genväg från genvägsraden"
 msgid "Error saving shortcuts."
 msgstr "Fel vid sparande av genvägar."
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:48 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
+#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
 msgid "_View"
 msgstr "_Visa"
 
@@ -5496,1120 +5918,1105 @@ msgstr "Stäng av."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet."
 
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Skapa en ny kontakt"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Ta bort en kontakt"
 
-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-event-editor.xml.h:67
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Sök"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Sök efter en kontakt"
 
-#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Ny"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
-#: po/tmp/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Stopp"
 
-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Stoppa inläsning"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Visa alla"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Visa alla kontakter"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:19
 msgid "_Addressbook Configuration..."
 msgstr "_Adressbokskonfiguration..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "Skriv _ut kontakter..."
 
-#: po/tmp/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "_Sök kontakter"
 
-#: po/tmp/evolution-addressbook.xml.h:22
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_Verktyg"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 dagar"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Ändra inställningar"
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:8
 msgid "Ca_lendar"
 msgstr "Ka_lender"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Inställningar för kalendern..."
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt möte"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Skapa en ny kalender"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dag"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Gå bakåt i tiden"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Gå framåt i tiden"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Gå till"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Gå till ett specifikt datum"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Gå till nuvarande tid"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Månad"
 
-#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
+#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "Nästa"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Öppna en kalender"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Föreg"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Skriv ut denna kalender"
 
-#: po/tmp/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr "Spara kalender som något annat"
 
-#: po/tmp/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Visa 1 dag"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Visa 1 månad"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Visa 1 vecka"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Visa arbetsveckan"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Idag"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Vecka"
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
 msgid "_New"
 msgstr "_Ny"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_Öppna kalender"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "Skriv _ut denna kalender"
 
-#: po/tmp/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:35
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Ta bort detta objekt"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "Ta bort..."
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Hjälp"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr "Skriv ut ku_vert..."
 
-#: po/tmp/evolution-contact-editor.xml.h:11
-#: po/tmp/evolution-event-editor.xml.h:81
+#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
 msgid "Print this item"
 msgstr "Skriv ut detta objekt"
 
-#: po/tmp/evolution-contact-editor.xml.h:12
-#: po/tmp/evolution-event-editor.xml.h:82
+#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:21
+#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Spara so_m..."
 
-#: po/tmp/evolution-contact-editor.xml.h:14
-#: po/tmp/evolution-event-editor.xml.h:90
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
 msgid "Save and Close"
 msgstr "Spara och stäng"
 
-#: po/tmp/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr "Spara kontakten och stäng dialogrutan"
 
-#: po/tmp/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-editor.xml.h:16
 msgid "Se_nd contact to other..."
 msgstr "Skicka kontakte_n till annan..."
 
-#: po/tmp/evolution-contact-editor.xml.h:17
-#: po/tmp/evolution-event-editor.xml.h:98
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
 msgid "See online help"
 msgstr "Se online-hjälpen"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:18
 msgid "Send _message to contact..."
 msgstr "Skicka _meddelande till kontakt..."
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:42
-#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
+#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
+#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Arkiv"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:46
+#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Save"
 msgstr "_Spara"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:6
 msgid "About this application"
 msgstr "Om detta program"
 
-#: po/tmp/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Om..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "_Åtgärder"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "_Töm"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "Töm"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "Töm markeringen"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Stäng detta möte"
 
-#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
 msgid "Copy"
 msgstr "Kopiera"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Koiera markeringen"
 
-#: po/tmp/evolution-event-editor.xml.h:17
+#: ui/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: po/tmp/evolution-event-editor.xml.h:18
+#: ui/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Klipp ut markeringen"
 
-#: po/tmp/evolution-event-editor.xml.h:21
+#: ui/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "Kasta XML"
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Kasta användargränssnittsbeskrivningen i XML"
 
-#: po/tmp/evolution-event-editor.xml.h:23
+#: ui/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: Adress_bok..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: V_älj formulär..."
 
-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: _Kontrollera namn"
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: Kopier_a till mapp..."
 
-#: po/tmp/evolution-event-editor.xml.h:27
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: Ut_forma ett formulär..."
 
-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: Ange utskrifts_stiler"
 
-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: _Utforma detta formulär"
 
-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: Fö_rsta objektet i mappen"
 
-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: _Vidarebefordra"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Vidarebefordra som v_Calendar"
 
-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: Hjälp"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: Oav_slutad uppgift"
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "FIXME: Infoga fil"
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: Obj_ekt..."
 
-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: Klistra in _special... "
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Förhands_granska"
 
-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: Pu_blicera formulär som..."
 
-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: Publicera _formulär..."
 
-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: _Upprepning..."
 
-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: S_kicka"
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Spara bilagor..."
 
-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Skri_ptfelsökare"
 
-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Uppgifts_begäran"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: _Kontakt"
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: _Anpassa..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: _Fil..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: _Typsnitt..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "FIXME: _Formatering"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: Objek_t"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: _Dagbokspost"
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: _Sista objektet i mappen"
 
-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: _Posta meddelande"
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: _Minneslappsstil"
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: _Flytta till mapp..."
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Nytt möte"
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: _Anteckning"
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Objekt..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: St_ycke..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: _Stavning..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: _Standard"
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: _Uppgift"
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: _Oläst objekt"
 
-#: po/tmp/evolution-event-editor.xml.h:65
+#: ui/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr "FIXME: vad ska vi stoppa här?"
 
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:11
+#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: po/tmp/evolution-event-editor.xml.h:68
+#: ui/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Sök igen"
 
-#: po/tmp/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Sök ige_n..."
 
-#: po/tmp/evolution-event-editor.xml.h:70
+#: ui/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Gå till nästa objekt"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Gå till föregående objekt"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "Ändra filens egenskaper"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "N_ästa"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Klistra in"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Klistra in från urklipp"
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "Före_gående"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Föregående"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "Skrivar_inställning..."
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Skrivarinställningar"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Gör om"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Gör om den ångrade åtgärden"
 
-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Ersätt"
 
-#: po/tmp/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "Ersätt en sträng"
 
-#: po/tmp/evolution-event-editor.xml.h:91
+#: ui/evolution-event-editor.xml.h:91
 msgid "Save the appointment and close the dialog box"
 msgstr "Spara mötet och stäng dialogrutan"
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 msgid "Save the current file"
 msgstr "Spara aktuell fil"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
 msgstr "Boka möte"
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:94
 msgid "Schedule _Meeting"
 msgstr "Boka _möte"
 
-#: po/tmp/evolution-event-editor.xml.h:95
+#: ui/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr "Boka någon typ av möte"
 
-#: po/tmp/evolution-event-editor.xml.h:96
+#: ui/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "Sök igen efter samma sträng"
 
-#: po/tmp/evolution-event-editor.xml.h:97
+#: ui/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Sök efter en sträng"
 
-#: po/tmp/evolution-event-editor.xml.h:99
+#: ui/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "Markera allt"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Markera alltihop"
 
-#: po/tmp/evolution-event-editor.xml.h:101
+#: ui/evolution-event-editor.xml.h:101
 msgid "Setup the page settings for your current printer"
 msgstr "Ställ in sidinställningarna för din aktuella skrivare"
 
-#: po/tmp/evolution-event-editor.xml.h:102
+#: ui/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "Ångra"
 
-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Ångra den senaste åtgärden"
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:38
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 msgid "_About..."
 msgstr "_Om..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:39
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 msgid "_Close"
 msgstr "S_täng"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
 msgid "_Debug"
 msgstr "Fels_ök"
 
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:41
-#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
+#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_Sök..."
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_Formulär"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
+#: ui/evolution.xml.h:28
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Objekt"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "_Gör om"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "_Ersätt..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "_Verktygsrader"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "_Ångra"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "Skriv"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Skriv ett nytt meddelande"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Kopiera meddelandet till en ny mapp"
 
-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
+#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "Ma_pp"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Fi_ltrera på avsändare"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filtrera på _mottagare"
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Glöm _lösenord"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Hämta e-post"
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:22
 msgid "Hide _Deleted messages"
 msgstr "Göm _borttagna meddelanden"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:23
 msgid "Hide _Read messages"
 msgstr "Göm _lästa meddelanden"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:24
 msgid "Hide _Selected messages"
 msgstr "Göm _markerade meddelanden"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:25
 msgid "Mail _Filters..."
 msgstr "E-post_filter..."
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:26
 msgid "Manage Subscriptions..."
 msgstr "Hantera prenumerationer..."
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr "Mar_kera som läst"
 
-#: po/tmp/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr "Markera som _oläst"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "Flytta"
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "Flytta meddelandet till en ny mapp"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr "Förhandsgranskar meddelandet som ska skrivas ut"
 
-#: po/tmp/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr "Förhandsgranska meddelande..."
 
-#: po/tmp/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr "Skriv ut meddelande på skrivaren"
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:35
 msgid "Print message..."
 msgstr "Skriv ut meddelande..."
 
-#: po/tmp/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr "Svara till av_sändaren"
 
-#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Markera _alla"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr "Skicka kölagd e-post och hämta ny e-post"
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:45
 msgid "Show _All messages"
 msgstr "Visa _alla meddelanden"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr "Trådad meddelandelista"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på avsä_ndare"
 
-#: po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på mottaga_re"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr "Visa rå meddelandekälla"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr "Tillämp_a filter"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "_Konfigura mapp"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:52
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: po/tmp/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "R_edigera meddelande"
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr "V_erkställ tömning"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr "_Filtrera på ämne"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "Vidarebe_fordra"
 
-#: po/tmp/evolution-mail.xml.h:58 po/tmp/evolution-subscribe.xml.h:17
+#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "Om_vänd markering"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:59
 msgid "_Mail Configuration..."
 msgstr "_E-postkonfiguration..."
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr "_Meddelande"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:61
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp..."
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr "_Öppna i nytt fönster"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "Skriv _ut meddelande"
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:64
 msgid "_Save Message As..."
 msgstr "Spara meddelande so_m..."
 
-#: po/tmp/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:65
 msgid "_Source"
 msgstr "_Källa"
 
-#: po/tmp/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr "_Trådat"
 
-#: po/tmp/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:67
 msgid "_Undelete"
 msgstr "_Ångra borttagning"
 
-#: po/tmp/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr "_Virtuell mapp på ämne"
 
-#: po/tmp/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:69
 msgid "_Virtual Folder Editor..."
 msgstr "Editor för _virtuella mappar..."
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:6
 msgid "Attach"
 msgstr "Bifoga"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Stäng aktuell fil"
 
-#: po/tmp/evolution-message-composer.xml.h:10
+#: ui/evolution-message-composer.xml.h:10
 msgid "Encrypt this message with PGP"
 msgstr "Kryptera detta meddelande med PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:13
 msgid "Insert a file as text into the message"
 msgstr "Infoga en fil som text i meddelandet"
 
-#: po/tmp/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr "Infoga textfil..."
 
-#: po/tmp/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:16
 msgid "Open a file"
 msgstr "Öppna en fil"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
 msgid "PGP Encrypt"
 msgstr "PGP-kryptera"
 
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:18
 msgid "PGP Sign"
 msgstr "PGP-signera"
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Spara som"
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr "Spara i map_p... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Spara i mapp..."
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Spara aktuell fil med ett annat namn"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Spara meddelandet i angiven mapp"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Skicka"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Skicka senar_e"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Skicka senar_e"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Skicka brevet i HTML-format"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Skicka meddelandet senare"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send the message now"
 msgstr "Skicka meddelandet nu"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:33
 msgid "Send this message now"
 msgstr "Skicka detta meddelande nu"
 
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show / hide attachments"
 msgstr "Visa/göm bilaga"
 
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show _attachments"
 msgstr "Visa _bilagor"
 
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:36
 msgid "Show attachments"
 msgstr "Visa bilagor"
 
-#: po/tmp/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your PGP key"
 msgstr "Signera detta meddelande med din PGP-nyckel"
 
-#: po/tmp/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr "_Infoga textfil... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Öppna..."
 
-#: po/tmp/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Security"
 msgstr "_Säkerhet"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr "Lägg till mapp till din lista över prenumererade mappar"
 
-#: po/tmp/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Uppdatera lista"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Uppdatera listan med mappar"
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Ta bort mapp från din lista över prenumererade mappar"
 
-#: po/tmp/evolution-subscribe.xml.h:13
+#: ui/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Säg upp prenumeration"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution.xml.h:6
+#: ui/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "Visa en annan mapp"
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Avsluta"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Evolution-genväg för _rader"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Avlsuta programmet"
 
-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "Komma i _gång"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Visa information om Evolution"
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Visa _mappraden"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Visa _genvägsraden"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr "Skicka _felrapport"
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:15
 msgid "Submit bug report using Bug Buddy."
 msgstr "Skicka felrapport med Bug-Buddy."
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Växla om mappraden ska visas"
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Växla om genvägsraden ska visas"
 
-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "Använda k_ontakthanteraren"
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Använda _kalendern"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "Använda _e-postdelen"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Möte (FIXME)"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Mapp"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Gå till mapp..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Index"
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "_Posta meddelande (FIXME)"
 
-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_Inställningar"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "_Uppgift (FIXME)"
 
@@ -6707,7 +7114,7 @@ msgstr "MTOTFLS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
@@ -6732,6 +7139,73 @@ msgstr "%I.%M %p"
 msgid "Group %i"
 msgstr "Grupp %i"
 
+#~ msgid "categories"
+#~ msgstr "kategorier"
+
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "Element(en) tillhör dessa kategorier:"
+
+#~ msgid "Available Categories:"
+#~ msgstr "Tillgängliga kategorier:"
+
+#~ msgid "Deleted"
+#~ msgstr "Borttagen"
+
+#~ msgid "Draft"
+#~ msgstr "Mall"
+
+#~ 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 "Sending a message without a subject"
+#~ msgstr "Skickar ett meddelande utan en ämnesrad"
+
+#~ msgid "Send \"%s\""
+#~ msgstr "Skicka \"%s\""
+
+#~ msgid "Send a message without a subject"
+#~ msgstr "Skicka ett meddelande utan en ämnesrad"
+
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "Märker meddelanden i mappen \"%s\""
+
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "Märk meddelanden i mappen \"%s\""
+
+#~ msgid "Marking message %d of %d"
+#~ msgstr "Märker meddelande %d av %d"
+
+#~ msgid "Scan folders in \"%s\""
+#~ msgstr "Genomsök mappar i \"%s\""
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "Skapar \"%s\""
+
+#~ msgid "Create \"%s\""
+#~ msgstr "Skapa \"%s\""
+
+#~ msgid "Exception while reporting result to shell component listener."
+#~ msgstr "Undantag vid rapportering av resultat till skalkomponentslyssnaren."
+
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "Sparar meddelanden från mappen \"%s\""
+
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Spara meddelanden från mappen \"%s\""
+
+#~ msgid "Rebuilding message view"
+#~ msgstr "Bygger om meddelandevyn"
+
+#~ msgid "Rebuild message view"
+#~ msgstr "Bygg om meddelandevyn"
+
 #~ msgid "External Directories"
 #~ msgstr "Externa kataloger"
 
@@ -6768,9 +7242,6 @@ msgstr "Grupp %i"
 #~ msgid "To-Do item that is overdue:"
 #~ msgstr "Att-göra-objekt som skulle ha utförts:"
 
-#~ msgid "Reminder of your appointment at "
-#~ msgstr "Påminnelse om ditt möte den "
-
 #~ msgid "Expunging \"%s\""
 #~ msgstr "Tömmer \"%s\""
 
@@ -6858,9 +7329,6 @@ msgstr "Grupp %i"
 #~ msgid "Year:"
 #~ msgstr "År:"
 
-#~ msgid "Go to date"
-#~ msgstr "Gå till datum"
-
 #~ msgid ""
 #~ "Please select the date you want to go to.\n"
 #~ "When you click on a day, you will be taken\n"
@@ -6870,54 +7338,18 @@ msgstr "Grupp %i"
 #~ "När du klickar på en dag kommer du att tas\n"
 #~ "till det datumet."
 
-#~ msgid "Go to today"
-#~ msgstr "Gå till idag"
-
 #~ msgid "_Mail Configuration"
 #~ msgstr "_E-postkonfiguration"
 
 #~ msgid "_Save Calendar As"
 #~ msgstr "_Spara kalendern som"
 
-#~ msgid "january"
-#~ msgstr "januari"
-
-#~ msgid "february"
-#~ msgstr "februari"
-
-#~ msgid "march"
-#~ msgstr "mars"
-
-#~ msgid "april"
-#~ msgstr "april"
-
 #~ msgid "may"
 #~ msgstr "maj"
 
-#~ msgid "june"
-#~ msgstr "juni"
-
-#~ msgid "july"
-#~ msgstr "juli"
-
-#~ msgid "august"
-#~ msgstr "augusti"
-
-#~ msgid "september"
-#~ msgstr "september"
-
 #~ msgid "sept"
 #~ msgstr "sept"
 
-#~ msgid "october"
-#~ msgstr "oktober"
-
-#~ msgid "november"
-#~ msgstr "november"
-
-#~ msgid "december"
-#~ msgstr "december"
-
 #~ msgid "sunday"
 #~ msgstr "söndag"
 
@@ -7087,9 +7519,6 @@ msgstr "Grupp %i"
 #~ msgid "Flagged"
 #~ msgstr "Flaggad"
 
-#~ msgid "Cannot initialize Evolution's mail summary component."
-#~ msgstr "Kan inte initiera Evolutions komponent för e-postsammanfattning."
-
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Kan inte initiera Evolutions hashfunktion för e-postlagring."
 
@@ -7105,15 +7534,6 @@ msgstr "Grupp %i"
 #~ msgid "matches regex"
 #~ msgstr "matchar reguljära uttrycket"
 
-#~ msgid "Account Information"
-#~ msgstr "Kontoinformation"
-
-#~ msgid "Account Management"
-#~ msgstr "Kontohantering"
-
-#~ msgid "Accounts"
-#~ msgstr "Konton"
-
 #~ msgid "Add Optional Fields..."
 #~ msgstr "Lägg till valfria fält..."
 
@@ -7123,51 +7543,12 @@ msgstr "Grupp %i"
 #~ msgid "Browse..."
 #~ msgstr "Bläddra..."
 
-#~ msgid "Congratulations, your mail configuration is complete."
-#~ msgstr "Gratulerar, din e-postkonfiguration är färdig."
-
-#~ msgid "Default"
-#~ msgstr "Standard"
-
-#~ msgid "Done"
-#~ msgstr "Klar"
-
 #~ msgid "Edit Mail Configuration Settings"
 #~ msgstr "Redigera e-postkonfigurationsinställningar"
 
-#~ msgid "Email Address:"
-#~ msgstr "E-postadress:"
-
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Evolution e-postkonfiguration"
-
-#~ msgid "Full Name:"
-#~ msgstr "Fullständigt namn:"
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "Mail"
-#~ msgstr "E-post"
-
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "E-postkonfigurationsguide"
-
-#~ msgid "Make this my default account"
-#~ msgstr "Gör detta till mitt standardkonto"
-
-#~ msgid "News"
-#~ msgstr "Diskussionsgrupper"
-
-#~ msgid "Optional"
-#~ msgstr "Valfri"
-
 #~ msgid "Optional Information"
 #~ msgstr "Valfri information"
 
-#~ msgid "Password:"
-#~ msgstr "Lösenord:"
-
 #~ msgid ""
 #~ "Please enter information about your incoming mail server below. If you don't "
 #~ "know what"
@@ -7192,36 +7573,12 @@ msgstr "Grupp %i"
 #~ msgid "Preferred type: "
 #~ msgstr "Typ som föredras: "
 
-#~ msgid "Receiving Email"
-#~ msgstr "Tar emot e-post"
-
 #~ msgid "Receiving Mail"
 #~ msgstr "Tar emot e-post"
 
-#~ msgid "Reply-to:"
-#~ msgstr "Svara-till:"
-
-#~ msgid "Required"
-#~ msgstr "Krävs"
-
-#~ msgid "SMTP"
-#~ msgstr "SMTP"
-
-#~ msgid "SMTP server requires authentication"
-#~ msgstr "SMTP-servern kräver autentisering"
-
-#~ msgid "Sending Email"
-#~ msgstr "Skickar e-post"
-
 #~ msgid "Sending Mail"
 #~ msgstr "Skickar e-post"
 
-#~ msgid "Server Configuration"
-#~ msgstr "Serverkonfiguration"
-
-#~ msgid "Server Type: "
-#~ msgstr "Servertyp: "
-
 #~ msgid ""
 #~ "You are almost done with the mail configuration process. The identity, "
 #~ "incoming"
@@ -7351,9 +7708,6 @@ msgstr "Grupp %i"
 #~ msgid "View message sources from \"%s\""
 #~ msgstr "Visa meddelandekällor från \"%s\""
 
-#~ msgid "Mailbox summary"
-#~ msgstr "Brevlådesammanfattning"
-
 #~ msgid "Threading message list"
 #~ msgstr "Trådar meddelandelista"