Update

svn path=/trunk/; revision=7535

2 files changed, 691 insertions, 743 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 6fa3f8a9c6..76f2633a73 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,6 +1,6 @@
 2001-01-16  Martin Norbäck  <d95mback@dtek.chalmers.se>
 
-	* sv.po: Updated Swedish translation.
+	* sv.po: Updated Swedish translation, using xml-i18n-update.
 
 2001-01-16  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
 
diff --git a/po/sv.po b/po/sv.po
index b4508f9d03..92d69399fa 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,13 +5,13 @@
 # Christian Rose <menthos@menthos.com>, 2000.
 # Martin Norbäck <d95mback@dtek.chalmers.se>, 2001.
 #
-# $Id: sv.po,v 1.55 2001/01/16 14:25:33 mback Exp $
+# $Id: sv.po,v 1.56 2001/01/16 16:56:22 mback Exp $
 #
 #: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-01-16 13:49+0100\n"
+"POT-Creation-Date: 2001-01-16 17:54+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,11 +460,7 @@ msgstr "Kunde inte starta wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte läsa pilotens adressprogramblock"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * 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:1
 msgid "Delete Contact?"
 msgstr "Ta bort kontakten?"
 
@@ -478,7 +474,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:54
+#: ui/evolution-event-editor.xml.h:103 ui/evolution-mail.xml.h:49
 msgid "_Delete"
 msgstr "_Ta bort"
 
@@ -491,13 +487,10 @@ msgstr "Telefontyper"
 msgid "New phone type"
 msgstr "Ny telefontyp"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: po/tmp/addressbook-config.glade.h:6 po/tmp/event-editor-dialog.glade.h:7
-#: po/tmp/filter.glade.h:6 po/tmp/mail-config.glade.h:10
+#: addressbook/gui/component/addressbook-config.glade.h:1
+#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: mail/mail-config.glade.h:5
 msgid "Add"
 msgstr "Lägg till"
 
@@ -555,7 +548,8 @@ msgid "C_ontacts..."
 msgstr "_Kontakter..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/event-editor-dialog.glade.h:9 po/tmp/task-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/event-editor-dialog.glade.h:4
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
@@ -572,7 +566,7 @@ msgid "_Address..."
 msgstr "_Adress..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:16 po/tmp/mail-config.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:11 mail/mail-config.glade.h:26
 msgid "General"
 msgstr "Allmänt"
 
@@ -617,7 +611,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:9
 msgid "Details"
 msgstr "Detaljer"
 
@@ -723,51 +717,47 @@ msgstr "E-post 2"
 msgid "Email 3"
 msgstr "E-post 3"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/fulladdr.glade.h:6
+#: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adress _2:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Kanada"
 
-#: po/tmp/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Kontrollera adress"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Land:"
 
-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finland"
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "USA"
 
-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adress:"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Ort:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Box:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "Del_stat/Provins:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_Postnummer:"
 
@@ -838,12 +828,8 @@ msgstr "_Suffix:"
 msgid "As _Minicards"
 msgstr "Som _minikort"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: po/tmp/evolution-addressbook.xml.h:6
+#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Som _tabell"
 
@@ -961,7 +947,7 @@ msgid "Remember this password"
 msgstr "Kom ihåg detta lösenord"
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: po/tmp/mail-config.glade.h:32
+#: mail/mail-config.glade.h:27
 msgid "Host:"
 msgstr "Värd:"
 
@@ -978,12 +964,12 @@ msgid "Search Scope:"
 msgstr "Sökomfattning:"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:9
 msgid "Authentication:"
 msgstr "Autentisering:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: po/tmp/mail-config.glade.h:51
+#: mail/mail-config.glade.h:46
 msgid "Path:"
 msgstr "Sökväg:"
 
@@ -1008,59 +994,57 @@ msgstr ""
 "den."
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: po/tmp/mail-config.glade.h:44
+#: mail/mail-config.glade.h:39
 msgid "Name:"
 msgstr "Namn:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: po/tmp/addressbook-config.glade.h:7
+#: addressbook/gui/component/addressbook-config.glade.h:2
 msgid "Addressbook Sources"
 msgstr "Adressbokskällor"
 
-#: calendar/gui/e-calendar-table.c:381 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:13
-#: po/tmp/evolution-addressbook.xml.h:8 po/tmp/evolution-event-editor.xml.h:19
-#: po/tmp/evolution-mail.xml.h:11 po/tmp/filter.glade.h:7
-#: po/tmp/mail-config.glade.h:24
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/event-editor-dialog.glade.h:8 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:7 mail/folder-browser.c:673
+#: mail/mail-config.glade.h:19 mail/mail-view.c:150
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:14
+#: ui/evolution-mail.xml.h:6
 msgid "Delete"
 msgstr "Ta bort"
 
-#: mail/folder-browser.c:659 po/tmp/addressbook-config.glade.h:9
-#: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:27
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#: filter/filter.glade.h:3 mail/folder-browser.c:659
+#: mail/mail-config.glade.h:22
 msgid "Edit"
 msgstr "Redigera"
 
+#: addressbook/gui/component/addressbook-config.glade.h:5
 #: addressbook/gui/widgets/e-addressbook-view.c:565
-#: po/tmp/addressbook-config.glade.h:10
 msgid "Name"
 msgstr "Namn"
 
-#: po/tmp/addressbook-config.glade.h:11
+#: addressbook/gui/component/addressbook-config.glade.h:6
 msgid "URI"
 msgstr "URI"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * 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:1
 msgid "Find..."
 msgstr "Sök..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Message Recipients"
 msgstr "Mottagare"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Markera namn"
 
-#: po/tmp/select-names.glade.h:9
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Select name from:"
 msgstr "Välj namn från:"
 
@@ -1069,115 +1053,111 @@ msgstr "Välj namn från:"
 msgid "Search"
 msgstr "Sök"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/alphabet.glade.h:6
+#: addressbook/gui/widgets/alphabet.glade.h:1
 msgid "123"
 msgstr "123"
 
-#: po/tmp/alphabet.glade.h:7
+#: addressbook/gui/widgets/alphabet.glade.h:2
 msgid "a"
 msgstr "a"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:3
 msgid "b"
 msgstr "b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:4
 msgid "c"
 msgstr "c"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:5
 msgid "d"
 msgstr "d"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:6
 msgid "e"
 msgstr "e"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:7
 msgid "f"
 msgstr "f"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "g"
 msgstr "g"
 
-#: po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "i"
 msgstr "i"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "j"
 msgstr "j"
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "k"
 msgstr "k"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "l"
 msgstr "l"
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "m"
 msgstr "m"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "n"
 msgstr "n"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "o"
 msgstr "o"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "p"
 msgstr "p"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "q"
 msgstr "q"
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "r"
 msgstr "r"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "t"
 msgstr "t"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "u"
 msgstr "u"
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "v"
 msgstr "v"
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "w"
 msgstr "w"
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "x"
 msgstr "x"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "y"
 msgstr "y"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "z"
 msgstr "z"
 
@@ -1252,175 +1232,171 @@ msgstr ""
 "\n"
 "Dubbelklicka här för att skapa en ny kontakt."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * 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:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:3
 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:4
 msgid "Body"
 msgstr "Meddelandetext"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "Underst:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Dimensioner:"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "Font..."
 msgstr "Typsnitt..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "Sidfot:"
 
-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "Format"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
 msgstr "Rubrik"
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "Rubrik/sidfot"
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "Rubriker"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:14
 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:15
 msgid "Height:"
 msgstr "Höjd:"
 
-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:16
 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:17
 msgid "Include:"
 msgstr "Inkludera:"
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "Liggande"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Vänster:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "Brevflikar på sidan"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Marginaler"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
 msgstr "Antal kolumner:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Alternativ"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Orientation"
 msgstr "Orientering"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "Sida"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "Sidinställningar:"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Papper"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "Papperskälla:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "Stående"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "Förhandsgranska:"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:31
 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:32
 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:33
 msgid "Right:"
 msgstr "Höger:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "Sektioner:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Skuggning"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
 msgstr "Storlek:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:37
 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:38
 msgid "Style name:"
 msgstr "Stil:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "Överst:"
 
-#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config.glade.h:72
+#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:67
 msgid "Type:"
 msgstr "Typ:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Bredd:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "label26"
 msgstr "label26"
 
@@ -1460,7 +1436,7 @@ msgstr "Kunde inte läsa pilotens att-göra-programblock"
 msgid "Reminder of your appointment at "
 msgstr "Påminnelse om ditt möte den "
 
-#: calendar/gui/alarm-notify.c:876 po/tmp/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
 msgid "Snooze"
 msgstr "Slumra"
 
@@ -1508,15 +1484,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:370 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:370
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
 msgid "Public"
 msgstr "Publikt"
 
-#: calendar/gui/calendar-model.c:373 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:373
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:376 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:376
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
@@ -1658,259 +1637,266 @@ msgstr "Avisering om ditt möte på %A %d %b %Y %H.%M"
 msgid "No summary available."
 msgstr "Ingen sammanfattning finns tillgänglig."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * 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:1
+#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
 msgid "Close"
 msgstr "Stäng"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:2
 msgid "Edit appointment"
 msgstr "Redigera möte"
 
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:4
 msgid "Snooze time (minutes)"
 msgstr "Slumringstid (minuter)"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * 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:1
 msgid "05 minutes"
 msgstr "05 minuter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "10 minutes"
 msgstr "10 minuter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 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:4
 msgid "15 minutes"
 msgstr "15 minuter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "24 hour"
 msgstr "24 timmar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "30 minutes"
 msgstr "30 minuter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "60 minutes"
 msgstr "60 minuter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 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:9
 msgid "Audio Alarms"
 msgstr "Ljudalarm"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 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:11
 msgid "Calendar"
 msgstr "Kalender"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Calendar Preferences"
 msgstr "Kalenderinställningar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Colors"
 msgstr "Färger"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Compress weekends"
 msgstr "Tryck ihop helger"
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 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:16
 msgid "Defaults"
 msgstr "Standardvärden"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Display options"
 msgstr "Visningsalternativ"
 
-#: calendar/gui/e-calendar-table.c:158 po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/e-calendar-table.c:158
 msgid "Due Date"
 msgstr "Förfallodatum"
 
-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Enable snoozing for"
 msgstr "Aktivera slummer i"
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Dagen slutar:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 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:22
+#: calendar/gui/gnome-month-item.c:741
 msgid "Fri"
 msgstr "fre"
 
-#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/event-editor.c:438
 msgid "Friday"
 msgstr "fredag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Highlight"
 msgstr "Markera"
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 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:26
 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:27
 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:28
 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:29
+#: calendar/gui/gnome-month-item.c:737
 msgid "Mon"
 msgstr "mån"
 
-#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:434
 msgid "Monday"
 msgstr "måndag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 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:32
 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:33
 msgid "Pick a color"
 msgstr "Välj en färg"
 
-#: calendar/gui/e-calendar-table.c:161 po/tmp/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/e-calendar-table.c:161
 msgid "Priority"
 msgstr "Prioritet"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 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:36
 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:37
+#: calendar/gui/gnome-month-item.c:742
 msgid "Sat"
 msgstr "lör"
 
-#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/event-editor.c:439
 msgid "Saturday"
 msgstr "lördag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Show"
 msgstr "Visa"
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 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:41
 msgid "Show week numbers"
 msgstr "Visa veckonummer"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 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:43
+#: calendar/gui/gnome-month-item.c:736
 msgid "Sun"
 msgstr "sön"
 
-#: calendar/gui/event-editor.c:440 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/event-editor.c:440
 msgid "Sunday"
 msgstr "söndag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 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:46
+#: calendar/gui/gnome-month-item.c:740
 msgid "Thu"
 msgstr "tor"
 
-#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/event-editor.c:437
 msgid "Thursday"
 msgstr "torsdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 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:49
 msgid "Time divisions:"
 msgstr "Tidsdivisioner:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 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:51
+#: calendar/gui/gnome-month-item.c:738
 msgid "Tue"
 msgstr "tis"
 
-#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:435
 msgid "Tuesday"
 msgstr "tisdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 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:54
+#: calendar/gui/gnome-month-item.c:739
 msgid "Wed"
 msgstr "ons"
 
-#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:60
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/event-editor.c:436
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work week"
 msgstr "Arbetsvecka"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 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:58
 msgid "seconds."
 msgstr "sekunder."
 
@@ -1941,95 +1927,93 @@ msgstr "Är du säker på att du vill ta bort dagboksposten \"%s\"?"
 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.
-#. * 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:2
+#, no-c-format
 msgid "% Comp_lete:"
 msgstr "% färdig_t:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
 msgid "C_lassification:"
 msgstr "K_lassifikation:"
 
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
 msgid "Completed"
 msgstr "Färdigt"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Date Completed:"
 msgstr "Datum utfört:"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "High"
 msgstr "Hög"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 msgid "In Progress"
 msgstr "Pågår"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 msgid "Low"
 msgstr "Låg"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: po/tmp/mail-config.glade.h:46 po/tmp/task-editor-dialog.glade.h:17
-#: shell/e-shell-view.c:1089 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: mail/mail-config.glade.h:41 shell/e-shell-view.c:1089
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
 msgid "None"
 msgstr "Ingen"
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 msgid "Normal"
 msgstr "Normal"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 msgid "Not Started"
 msgstr "Inte startad"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "S_ummary"
 msgstr "S_ammanfattning"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid "Sta_rt Date:"
 msgstr "Sta_rtdatum:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
 msgid "Task"
 msgstr "Uppgift"
 
-#: po/tmp/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
 msgid "URL:"
 msgstr "URL:"
 
-#: po/tmp/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "Undefined"
 msgstr "Odefinierad"
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "_Contacts..."
 msgstr "_Kontakter..."
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "_Due Date:"
 msgstr "Förfallo_datum:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 msgid "_Status:"
 msgstr "_Status:"
 
-#: po/tmp/task-editor-dialog.glade.h:31
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
@@ -2064,7 +2048,8 @@ msgstr "Vill du spara ändringar?"
 msgid "Categories"
 msgstr "Kategorier"
 
-#: calendar/gui/e-calendar-table.c:154 po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/event-editor-dialog.glade.h:5
 msgid "Classification"
 msgstr "Klassifikation"
 
@@ -2174,7 +2159,7 @@ msgid "Edit this appointment..."
 msgstr "Redigera detta möte..."
 
 #: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3175
-#: po/tmp/evolution-event-editor.xml.h:20
+#: ui/evolution-event-editor.xml.h:15
 msgid "Delete this appointment"
 msgstr "Ta bort detta möte"
 
@@ -2221,163 +2206,159 @@ msgstr "Metoden som krävs för att läsa in \"%s\" stöds inte"
 msgid "%d %B"
 msgstr "%d %B"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * 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:1
 msgid "A_ll day event"
 msgstr "He_ldagsarrangemang"
 
-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:3
 msgid "Appointment Basics"
 msgstr "Grundläggande mötessaker"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Custom recurrence"
 msgstr "Anpassad upprepning"
 
-#: po/tmp/event-editor-dialog.glade.h:12
+#: calendar/gui/event-editor-dialog.glade.h:7
 msgid "Days"
 msgstr "dag"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:9
 msgid "Every"
 msgstr "Var"
 
-#: po/tmp/event-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Exceptions"
 msgstr "Undantag"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:12
 msgid "Hours"
 msgstr "timme"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "Mail _to:"
 msgstr "E-posta _till:"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Minutes"
 msgstr "minut"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:15
 msgid "Modify"
 msgstr "Ändra"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "No recurrence"
 msgstr "Ingen upprepning"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Preview"
 msgstr "Förhandsgranska"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Pu_blic"
 msgstr "Pu_blikt"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "Recurrence"
 msgstr "Upprepning"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:21
 msgid "Recurrence Rule"
 msgstr "Upprepningsregel"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Reminder"
 msgstr "Påminnare"
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Simple recurrence"
 msgstr "Enkel upprepning"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Su_mmary:"
 msgstr "Sa_mmanfattning:"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:25
 msgid "Time"
 msgstr "Tid"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:26
 msgid "_Audio"
 msgstr "_Ljud"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:27
 msgid "_Confidential"
 msgstr "_Konfidentiellt"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:28
 msgid "_Contacts"
 msgstr "_Kontakter"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "_Display"
 msgstr "_Visa"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_End time:"
 msgstr "Slutti_d:"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Mail"
 msgstr "_E-post"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Program"
 msgstr "_Program"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_Run program:"
 msgstr "_Kör program:"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Start time:"
 msgstr "_Starttid:"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Starting date:"
 msgstr "_Startdatum:"
 
-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "day(s)"
 msgstr "dag"
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "event-editor-dialog"
 msgstr "event-editor-dialog"
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "for"
 msgstr "i"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "forever"
 msgstr "för alltid"
 
-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "label21"
 msgstr "label21"
 
-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "månad"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "until"
 msgstr "till"
 
-#: po/tmp/event-editor-dialog.glade.h:48
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "week(s)"
 msgstr "vecka"
 
-#: po/tmp/event-editor-dialog.glade.h:49
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "year(s)"
 msgstr "år"
 
@@ -2424,63 +2405,59 @@ msgstr "Kunde inte läsa in mappen i \"%s\""
 msgid "Could not create a folder in `%s'"
 msgstr "Kunde inte skapa en mapp i \"%s\""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/goto-dialog.glade.h:6
+#: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
 
-#: po/tmp/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:2
 msgid "August"
 msgstr "augusti"
 
-#: po/tmp/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:3
 msgid "December"
 msgstr "december"
 
-#: po/tmp/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:4
 msgid "February"
 msgstr "februari"
 
-#: po/tmp/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:5
 msgid "Go To Date"
 msgstr "Gå till datum"
 
-#: po/tmp/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "Go To Today"
 msgstr "Gå till idag"
 
-#: po/tmp/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "januari"
 
-#: po/tmp/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "juli"
 
-#: po/tmp/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "juni"
 
-#: po/tmp/goto-dialog.glade.h:15
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "mars"
 
-#: po/tmp/goto-dialog.glade.h:16
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "maj"
 
-#: po/tmp/goto-dialog.glade.h:17
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "november"
 
-#: po/tmp/goto-dialog.glade.h:18
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "oktober"
 
-#: po/tmp/goto-dialog.glade.h:19
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "september"
 
@@ -3420,7 +3397,7 @@ msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: po/tmp/mail-config.glade.h:61
+#: mail/mail-config.glade.h:56
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3494,8 +3471,7 @@ msgstr ""
 "autentisering. Detta bör fungera för anslutning till de flesta SMTP-servrar."
 
 #: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-#: po/tmp/mail-config.glade.h:15
+#: camel/providers/smtp/camel-smtp-transport.c:295 mail/mail-config.glade.h:10
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
@@ -3638,11 +3614,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:2
 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:9
 #: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Ta bort"
@@ -3659,19 +3635,15 @@ msgstr "Lägg till bilaga..."
 msgid "Attach a file to the message"
 msgstr "Bifoga en fil till meddelandet"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * 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:1
 msgid "Attachment properties"
 msgstr "Egenskaper hos bilagan"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Filnamn:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME-typ:"
 
@@ -3954,7 +3926,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:4
 msgid "Edit Filters"
 msgstr "Redigera filter"
 
@@ -4058,27 +4030,27 @@ msgstr "Viktigt"
 msgid "Read"
 msgstr "Läs"
 
-#: po/tmp/filter.glade.h:10
+#: filter/filter.glade.h:5
 msgid "Edit VFolders"
 msgstr "Redigera virtuella mappar"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "Filterregler"
 
-#: po/tmp/filter.glade.h:12
+#: filter/filter.glade.h:7
 msgid "Incoming"
 msgstr "Inkommande"
 
-#: po/tmp/filter.glade.h:13
+#: filter/filter.glade.h:8
 msgid "Outgoing"
 msgstr "Utgående"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:10
 msgid "Virtual Folders"
 msgstr "Virtuella mappar"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:11
 msgid "vFolder Sources"
 msgstr "Källor för virtuella mappar"
 
@@ -4328,7 +4300,7 @@ msgstr "Filtrera på mottagare"
 msgid "Filter on Mailing List"
 msgstr "Filtrera på sändlista"
 
-#: mail/folder-browser.c:658 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658 ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Öppna"
 
@@ -4337,8 +4309,8 @@ msgid "Save As..."
 msgstr "Spara som..."
 
 #: mail/folder-browser.c:661 mail/mail-view.c:148
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:26
 msgid "Print"
 msgstr "Skriv ut"
 
@@ -4346,17 +4318,15 @@ msgstr "Skriv ut"
 msgid "Reply to Sender"
 msgstr "Svara till avsändaren"
 
-#: mail/folder-browser.c:664 mail/mail-view.c:141
-#: po/tmp/evolution-mail.xml.h:37
+#: mail/folder-browser.c:664 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: mail/folder-browser.c:665 mail/mail-view.c:144
-#: po/tmp/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: mail/folder-browser.c:666 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666 ui/evolution-mail.xml.h:13
 msgid "Forward inline"
 msgstr "Vidarebefordra inuti"
 
@@ -4395,35 +4365,37 @@ msgstr "Skapa regel från meddelande"
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrera på sändlista (%s)"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/local-config.glade.h:6
+#: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Aktuellt lagringsformat:"
 
-#: po/tmp/local-config.glade.h:7
+#: mail/local-config.glade.h:2
 msgid "Mailbox Format"
 msgstr "Brevlådeformat"
 
-#: po/tmp/local-config.glade.h:8
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Nytt lagringsformat:"
 
-#: po/tmp/local-config.glade.h:9
-msgid "Note: When converting between mailbox formats, a failure\n"
+#: mail/local-config.glade.h:4
+msgid ""
+"Note: When converting between mailbox formats, a failure\n"
+"(such as lack of disk space) may not be automatically\n"
+"recoverable.  Please use this feature with care."
 msgstr ""
+"Notera: När du konverterar mellan brevlådeformat, kan ett fel\n"
+"(såsom utrymmesbrist på disken) inte automatiskt rättas till.\n"
+"Använd denna finess med försiktighet."
 
-#: po/tmp/local-config.glade.h:12
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "maildir"
 
-#: po/tmp/local-config.glade.h:13
+#: mail/local-config.glade.h:8
 msgid "mbox"
 msgstr "mbox"
 
-#: po/tmp/local-config.glade.h:14
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
@@ -4566,224 +4538,238 @@ msgstr "Skriv ut meddelande"
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/mail-config.glade.h:6
+#: mail/mail-config.glade.h:1
 msgid "Account"
 msgstr "Konto"
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:2
 msgid "Account Information"
 msgstr "Kontoinformation"
 
-#: po/tmp/mail-config.glade.h:8
+#: mail/mail-config.glade.h:3
 msgid "Account Management"
 msgstr "Kontohantering"
 
-#: po/tmp/mail-config.glade.h:9
+#: mail/mail-config.glade.h:4
 msgid "Account Properties"
 msgstr "Kontoegenskaper"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:6
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: po/tmp/mail-config.glade.h:12
+#: mail/mail-config.glade.h:7
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:8
 msgid "Authentication Type:"
 msgstr "Autentiseringstyp:"
 
-#: po/tmp/mail-config.glade.h:16
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr "Gratulerar, din e-postkonfiguration är färdig.\n"
+#: mail/mail-config.glade.h:11
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Finish\" to save your settings."
+msgstr ""
+"Grattis, din e-postkonfiguration är nu klar.\n"
+"\n"
+"Du kan nu skicka och ta emot e-post med Evolution.\n"
+"\n"
+"Klicka på \"Slutför\" för att spara dina inställningar."
 
-#: po/tmp/mail-config.glade.h:22
+#: mail/mail-config.glade.h:17
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: po/tmp/mail-config.glade.h:23
+#: mail/mail-config.glade.h:18
 msgid "Default"
 msgstr "Standard"
 
-#: po/tmp/mail-config.glade.h:25
+#: mail/mail-config.glade.h:20
 msgid "Done"
 msgstr "Klar"
 
-#: po/tmp/mail-config.glade.h:26
+#: mail/mail-config.glade.h:21
 msgid "E-Mail Address:"
 msgstr "E-postadress:"
 
-#: po/tmp/mail-config.glade.h:28
+#: mail/mail-config.glade.h:23
 msgid "Email Address:"
 msgstr "E-postadress:"
 
-#: po/tmp/mail-config.glade.h:29
+#: mail/mail-config.glade.h:24
 msgid "Evolution Mail Configuration"
 msgstr "Evolution e-postkonfiguration"
 
-#: po/tmp/mail-config.glade.h:30
+#: mail/mail-config.glade.h:25
 msgid "Full Name:"
 msgstr "Fullständigt namn:"
 
-#: po/tmp/mail-config.glade.h:33
+#: mail/mail-config.glade.h:28
 msgid "Hostname:"
 msgstr "Värd:"
 
-#: po/tmp/mail-config.glade.h:34
+#: mail/mail-config.glade.h:29
 msgid "Identity"
 msgstr "Identitet"
 
-#: po/tmp/mail-config.glade.h:35
+#: mail/mail-config.glade.h:30
 msgid "Incoming Mail Server"
 msgstr "Server för inkommande post"
 
-#: po/tmp/mail-config.glade.h:36
+#: mail/mail-config.glade.h:31
 msgid "Keep mail on server"
 msgstr "Spara meddelanden på servern"
 
-#: po/tmp/mail-config.glade.h:37
+#: mail/mail-config.glade.h:32
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: po/tmp/mail-config.glade.h:38
+#: mail/mail-config.glade.h:33
 msgid "Mail"
 msgstr "E-post"
 
-#: po/tmp/mail-config.glade.h:39
+#: mail/mail-config.glade.h:34
 msgid "Mail Account"
 msgstr "Epostkonton"
 
-#: po/tmp/mail-config.glade.h:40
+#: mail/mail-config.glade.h:35
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: po/tmp/mail-config.glade.h:41
+#: mail/mail-config.glade.h:36
 msgid "Mail Configuration Druid"
 msgstr "E-postkonfigurationsguide"
 
-#: po/tmp/mail-config.glade.h:42
+#: mail/mail-config.glade.h:37
 msgid "Make this my default account"
 msgstr "Gör detta till mitt standardkonto"
 
-#: po/tmp/mail-config.glade.h:43
+#: mail/mail-config.glade.h:38
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: po/tmp/mail-config.glade.h:45
+#: mail/mail-config.glade.h:40
 msgid "News"
 msgstr "Diskussionsgrupper"
 
-#: po/tmp/mail-config.glade.h:47
+#: mail/mail-config.glade.h:42
 msgid "Optional"
 msgstr "Valfri"
 
-#: po/tmp/mail-config.glade.h:48
+#: mail/mail-config.glade.h:43
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: po/tmp/mail-config.glade.h:49
+#: mail/mail-config.glade.h:44
 msgid "Outgoing Mail Server"
 msgstr "Server för utgående post"
 
-#: po/tmp/mail-config.glade.h:50
+#: mail/mail-config.glade.h:45
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: po/tmp/mail-config.glade.h:52
+#: mail/mail-config.glade.h:47
 msgid "Plain Text"
 msgstr "Vanlig text"
 
-#: po/tmp/mail-config.glade.h:53
+#: mail/mail-config.glade.h:48
 msgid "Receiving Email"
 msgstr "Tar emot e-post"
 
-#: po/tmp/mail-config.glade.h:54
+#: mail/mail-config.glade.h:49
 msgid "Remember my password"
 msgstr "Kom ihåg mitt lösenord"
 
-#: mail/mail-format.c:626 po/tmp/mail-config.glade.h:55
+#: mail/mail-config.glade.h:50 mail/mail-format.c:626
 msgid "Reply-To:"
 msgstr "Svara-Till:"
 
-#: po/tmp/mail-config.glade.h:56
+#: mail/mail-config.glade.h:51
 msgid "Required"
 msgstr "Krävs"
 
-#: po/tmp/mail-config.glade.h:57
+#: mail/mail-config.glade.h:52
 msgid "SMTP"
 msgstr "SMTP"
 
-#: po/tmp/mail-config.glade.h:58
+#: mail/mail-config.glade.h:53
 msgid "Save password"
 msgstr "Spara lösenord"
 
-#: po/tmp/mail-config.glade.h:59
+#: mail/mail-config.glade.h:54
 msgid "Select signature file"
 msgstr "Välj signaturfil"
 
-#: po/tmp/mail-config.glade.h:60
+#: mail/mail-config.glade.h:55
 msgid "Sending Email"
 msgstr "Skickar e-post"
 
-#: po/tmp/mail-config.glade.h:62
+#: mail/mail-config.glade.h:57
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: po/tmp/mail-config.glade.h:63
+#: mail/mail-config.glade.h:58
 msgid "Server Type: "
 msgstr "Servertyp: "
 
-#: po/tmp/mail-config.glade.h:64
+#: mail/mail-config.glade.h:59
 msgid "Server requires authentication"
 msgstr "Servern kräver autentisering"
 
-#: po/tmp/mail-config.glade.h:65
+#: mail/mail-config.glade.h:60
 msgid "Servers"
 msgstr "Servrar"
 
-#: po/tmp/mail-config.glade.h:66
+#: mail/mail-config.glade.h:61
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: po/tmp/mail-config.glade.h:67
+#: mail/mail-config.glade.h:62
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: po/tmp/mail-config.glade.h:68
+#: mail/mail-config.glade.h:63
 msgid "Sources"
 msgstr "Källor"
 
-#: po/tmp/mail-config.glade.h:69
+#: mail/mail-config.glade.h:64
 msgid "This server requires a secure connection (SSL)"
 msgstr "Servern kräver en säker anslutning (SSL)"
 
-#: po/tmp/mail-config.glade.h:70
+#: mail/mail-config.glade.h:65
 msgid "Type"
 msgstr "Typ"
 
-#: po/tmp/mail-config.glade.h:71
+#: mail/mail-config.glade.h:66
 msgid ""
 "Type the name by which you would like to refer to these servers. For "
 "example: \"Work\" or \"Home\"."
 msgstr ""
-"Skriv in namnet som du vill använda för att referera till dessa servrar, till exempel: \"Jobb\" eller \"Hemma\"."
+"Skriv in namnet som du vill använda för att referera till dessa servrar, "
+"till exempel: \"Jobb\" eller \"Hemma\"."
 
-#: po/tmp/mail-config.glade.h:73
+#: mail/mail-config.glade.h:68
 msgid "User Information"
 msgstr "Användarinformation"
 
-#: po/tmp/mail-config.glade.h:74
+#: mail/mail-config.glade.h:69
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: po/tmp/mail-config.glade.h:75
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr "Välkommen till Evolutions guide för e-postkonfiguration.\n"
+#: mail/mail-config.glade.h:70
+msgid ""
+"Welcome to the Evolution Mail Configuration Druid.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+"Välkommen till Evolutions guide för e-postkonfiguration.\n"
+"\n"
+"Klicka \"Nästa\" för att starta."
 
 #: mail/mail-config-druid.c:346
 #, c-format
@@ -4968,6 +4954,7 @@ msgstr ""
 "%s"
 
 #: mail/mail-mt.c:85
+#, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
@@ -4976,6 +4963,7 @@ msgstr ""
 "%s"
 
 #: mail/mail-mt.c:87
+#, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
@@ -4988,10 +4976,12 @@ msgid "Working"
 msgstr "Jobbar"
 
 #: mail/mail-ops.c:90
+#, c-format
 msgid "Fetching email from %s"
 msgstr "Hämtar e-post från %s"
 
 #: mail/mail-ops.c:92
+#, c-format
 msgid "Fetch email from %s"
 msgstr "Hämta e-post från %s"
 
@@ -5122,10 +5112,11 @@ msgid "Saving messages"
 msgstr "Sparar meddelanden"
 
 #: mail/mail-ops.c:1910
+#, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
-msgstr 
+msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
@@ -5135,10 +5126,11 @@ msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Sparar meddelande %d av %d (uid \"%s\")"
 
 #: mail/mail-ops.c:1937
+#, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
-msgstr 
+msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
@@ -5256,27 +5248,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:36
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
 msgid "Reply"
 msgstr "Svara"
 
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:41
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
 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:40
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
 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:14
 msgid "Forward this message"
 msgstr "Vidarebefordra detta meddelande"
 
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:35
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
 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:7
 msgid "Delete this message"
 msgstr "Ta bort detta meddelande"
 
@@ -5360,6 +5352,7 @@ msgid "Size"
 msgstr "Storlek"
 
 #: mail/openpgp-utils.c:76
+#, c-format
 msgid "Please enter your %s passphrase%s%s"
 msgstr "Ange din %s-lösenordsfras%s%s"
 
@@ -5674,9 +5667,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:49 po/tmp/evolution.xml.h:36
-#: shell/e-storage-set-view.c:335
+#: shell/e-storage-set-view.c:335 ui/evolution-event-editor.xml.h:120
+#: ui/evolution-message-composer.xml.h:44 ui/evolution.xml.h:31
 msgid "_View"
 msgstr "_Visa"
 
@@ -5794,1141 +5786,1101 @@ 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:2
 msgid "Create a new contact"
 msgstr "Skapa en ny kontakt"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:4
 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:5 ui/evolution-event-editor.xml.h:62
 msgid "Find"
 msgstr "Sök"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:6
 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:7 ui/evolution-calendar.xml.h:14
 msgid "New"
 msgstr "Ny"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:9
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
-#: po/tmp/evolution-addressbook.xml.h:15 po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
 msgid "Stop"
 msgstr "Stopp"
 
-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:11
 msgid "Stop Loading"
 msgstr "Stoppa inläsning"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:12
 msgid "View All"
 msgstr "Visa alla"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:13
 msgid "View all contacts"
 msgstr "Visa alla kontakter"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:14
 msgid "_Addressbook Configuration..."
 msgstr "_Adressbokskonfiguration..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:15
 msgid "_Print Contacts..."
 msgstr "Skriv _ut kontakter..."
 
-#: po/tmp/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:16
 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:17 ui/evolution-event-editor.xml.h:118
 msgid "_Tools"
 msgstr "_Verktyg"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:1
 msgid "5 Days"
 msgstr "5 dagar"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:2
 msgid "Alter preferences"
 msgstr "Ändra inställningar"
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:3
 msgid "Ca_lendar"
 msgstr "Ka_lender"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:4
 msgid "Calendar Preferences..."
 msgstr "Inställningar för kalendern..."
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt möte"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a new calendar"
 msgstr "Skapa en ny kalender"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:7
 msgid "Day"
 msgstr "Dag"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:8
 msgid "Go back in time"
 msgstr "Gå bakåt i tiden"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:9
 msgid "Go forward in time"
 msgstr "Gå framåt i tiden"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to"
 msgstr "Gå till"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Gå till ett specifikt datum"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to present time"
 msgstr "Gå till nuvarande tid"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:13
 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:15 ui/evolution-event-editor.xml.h:69
 msgid "Next"
 msgstr "Nästa"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:16
 msgid "Open a calendar"
 msgstr "Öppna en kalender"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:17
 msgid "Prev"
 msgstr "Föreg"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:19
 msgid "Print this calendar"
 msgstr "Skriv ut denna kalender"
 
-#: po/tmp/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 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:21
 msgid "Show 1 day"
 msgstr "Visa 1 dag"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:22
 msgid "Show 1 month"
 msgstr "Visa 1 månad"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:23
 msgid "Show 1 week"
 msgstr "Visa 1 vecka"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:24
 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:25 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Idag"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:26
 msgid "Week"
 msgstr "Vecka"
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:33
+#: ui/evolution-calendar.xml.h:27 ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Ny"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:28
 msgid "_Open Calendar"
 msgstr "_Öppna kalender"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:29
 msgid "_Print this calendar"
 msgstr "Skriv _ut denna kalender"
 
-#: po/tmp/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:30
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Ta bort detta objekt"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:3
 msgid "Delete..."
 msgstr "Ta bort..."
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:4
 msgid "Help"
 msgstr "Hjälp"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:5
 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:6 ui/evolution-event-editor.xml.h:76
 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:7 ui/evolution-event-editor.xml.h:77
 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:8 ui/evolution-event-editor.xml.h:84
+#: ui/evolution-message-composer.xml.h:16
 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:9 ui/evolution-event-editor.xml.h:85
 msgid "Save and Close"
 msgstr "Spara och stäng"
 
-#: po/tmp/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-editor.xml.h:10
 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:11
 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:12 ui/evolution-event-editor.xml.h:93
 msgid "See online help"
 msgstr "Se online-hjälpen"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:13
 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:43
-#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:26
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:105
+#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:21
 msgid "_File"
 msgstr "_Arkiv"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:15
 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:47
+#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:116
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Save"
 msgstr "_Spara"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:1
 msgid "About this application"
 msgstr "Om detta program"
 
-#: po/tmp/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:2
 msgid "About..."
 msgstr "Om..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:3
 msgid "Actio_ns"
 msgstr "_Åtgärder"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:4
 msgid "C_lear"
 msgstr "_Töm"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:5
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:6
 msgid "Clear"
 msgstr "Töm"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:7
 msgid "Clear the selection"
 msgstr "Töm markeringen"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:9
 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:10 ui/evolution-mail.xml.h:3
 msgid "Copy"
 msgstr "Kopiera"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:11
 msgid "Copy the selection"
 msgstr "Koiera markeringen"
 
-#: po/tmp/evolution-event-editor.xml.h:17
+#: ui/evolution-event-editor.xml.h:12
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: po/tmp/evolution-event-editor.xml.h:18
+#: ui/evolution-event-editor.xml.h:13
 msgid "Cut the selection"
 msgstr "Klipp ut markeringen"
 
-#: po/tmp/evolution-event-editor.xml.h:21
+#: ui/evolution-event-editor.xml.h:16
 msgid "Dump XML"
 msgstr "Kasta XML"
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:17
 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:18
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: Adress_bok..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:19
 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:20
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: _Kontrollera namn"
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:21
 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:22
 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:23
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: Ange utskrifts_stiler"
 
-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:24
 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:25
 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:26
 msgid "FIXME: For_ward"
 msgstr "FIXME: _Vidarebefordra"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:27
 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:28
 msgid "FIXME: Help"
 msgstr "FIXME: Hjälp"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: Oav_slutad uppgift"
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Insert File"
 msgstr "FIXME: Infoga fil"
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: It_em..."
 msgstr "FIXME: Obj_ekt..."
 
-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: Klistra in _special... "
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Förhands_granska"
 
-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:34
 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:35
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: Publicera _formulär..."
 
-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: _Upprepning..."
 
-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:37
 msgid "FIXME: S_end"
 msgstr "FIXME: S_kicka"
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Spara bilagor..."
 
-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Skri_ptfelsökare"
 
-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Uppgifts_begäran"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:41
 msgid "FIXME: _Contact"
 msgstr "FIXME: _Kontakt"
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: _Customize..."
 msgstr "FIXME: _Anpassa..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: _File..."
 msgstr "FIXME: _Fil..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: _Font..."
 msgstr "FIXME: _Typsnitt..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: _Formatting"
 msgstr "FIXME: _Formatering"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Item"
 msgstr "FIXME: Objek_t"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: _Dagbokspost"
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:48
 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:49
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: _Posta meddelande"
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: _Minneslappsstil"
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: _Flytta till mapp..."
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Nytt möte"
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Note"
 msgstr "FIXME: _Anteckning"
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Objekt..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: St_ycke..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: _Stavning..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _Standard"
 msgstr "FIXME: _Standard"
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Task"
 msgstr "FIXME: _Uppgift"
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: _Oläst objekt"
 
-#: po/tmp/evolution-event-editor.xml.h:65
+#: ui/evolution-event-editor.xml.h:60
 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:61 ui/evolution-message-composer.xml.h:6
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: po/tmp/evolution-event-editor.xml.h:68
+#: ui/evolution-event-editor.xml.h:63
 msgid "Find Again"
 msgstr "Sök igen"
 
-#: po/tmp/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:64
 msgid "Find _Again"
 msgstr "Sök ige_n..."
 
-#: po/tmp/evolution-event-editor.xml.h:70
+#: ui/evolution-event-editor.xml.h:65
 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:66
 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:67
 msgid "Modify the file's properties"
 msgstr "Ändra filens egenskaper"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:68
 msgid "N_ext"
 msgstr "N_ästa"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:70
 msgid "Paste"
 msgstr "Klistra in"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:71
 msgid "Paste the clipboard"
 msgstr "Klistra in från urklipp"
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:72
 msgid "Pre_vious"
 msgstr "Före_gående"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:73
 msgid "Previous"
 msgstr "Föregående"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:74
 msgid "Print S_etup..."
 msgstr "Skrivar_inställning..."
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:75
 msgid "Print Setup"
 msgstr "Skrivarinställningar"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:78
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:79
 msgid "Redo"
 msgstr "Gör om"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:80
 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:81
 msgid "Replace"
 msgstr "Ersätt"
 
-#: po/tmp/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:82
 msgid "Replace a string"
 msgstr "Ersätt en sträng"
 
-#: po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-event-editor.xml.h:83 ui/evolution-message-composer.xml.h:14
 msgid "Save"
 msgstr "Spara"
 
-#: po/tmp/evolution-event-editor.xml.h:91
+#: ui/evolution-event-editor.xml.h:86
 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:25
+#: ui/evolution-event-editor.xml.h:87 ui/evolution-message-composer.xml.h:20
 msgid "Save the current file"
 msgstr "Spara aktuell fil"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:88
 msgid "Schedule Meeting"
 msgstr "Boka möte"
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:89
 msgid "Schedule _Meeting"
 msgstr "Boka _möte"
 
-#: po/tmp/evolution-event-editor.xml.h:95
+#: ui/evolution-event-editor.xml.h:90
 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:91
 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:92
 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:94
 msgid "Select All"
 msgstr "Markera allt"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:95
 msgid "Select everything"
 msgstr "Markera alltihop"
 
-#: po/tmp/evolution-event-editor.xml.h:101
+#: ui/evolution-event-editor.xml.h:96
 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:97
 msgid "Undo"
 msgstr "Ångra"
 
-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:98
 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:39
+#: ui/evolution-event-editor.xml.h:99 ui/evolution-message-composer.xml.h:34
 msgid "_About..."
 msgstr "_Om..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-event-editor.xml.h:100 ui/evolution-message-composer.xml.h:35
 msgid "_Close"
 msgstr "S_täng"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:101
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-event-editor.xml.h:102 ui/evolution-message-composer.xml.h:36
 msgid "_Debug"
 msgstr "Fels_ök"
 
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:42
-#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:25
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:37
+#: ui/evolution-subscribe.xml.h:10 ui/evolution.xml.h:20
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:106
 msgid "_Find..."
 msgstr "_Sök..."
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:107
 msgid "_Forms"
 msgstr "_Formulär"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:44 po/tmp/evolution.xml.h:29
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
+#: ui/evolution.xml.h:24
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:109
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:110
 msgid "_Object"
 msgstr "_Objekt"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:111
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:113
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Redo"
 msgstr "_Gör om"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Replace..."
 msgstr "_Ersätt..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Toolbars"
 msgstr "_Verktygsrader"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Undo"
 msgstr "_Ångra"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:1
 msgid "Compose"
 msgstr "Skriv"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:2
 msgid "Compose a new message"
 msgstr "Skriv ett nytt meddelande"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:4
 msgid "Copy message to a new folder"
 msgstr "Kopiera meddelandet till en ny mapp"
 
-#: po/tmp/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:5
 msgid "Create Rule"
 msgstr "Skapa regel"
 
-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
+#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
 msgid "F_older"
 msgstr "Ma_pp"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:9
 msgid "Fi_lter on Sender"
 msgstr "Fi_ltrera på avsändare"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:10
 msgid "Filter on Rec_ipients"
 msgstr "Filtrera på _mottagare"
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:11
 msgid "Forget _Passwords"
 msgstr "Glöm _lösenord"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:15
 msgid "Get Mail"
 msgstr "Hämta e-post"
 
-#: po/tmp/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:16
 msgid "Hide S_elected Messages"
 msgstr "Göm _markerade meddelanden"
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:17
 msgid "Hide _Deleted Messages"
 msgstr "Göm _borttagna meddelanden"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:18
 msgid "Hide _Read messages"
 msgstr "Göm _lästa meddelanden"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:19
 msgid "Mail _Filters..."
 msgstr "E-post_filter..."
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:20
 msgid "Manage Subscriptions..."
 msgstr "Hantera prenumerationer..."
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:21
 msgid "Mar_k As Read"
 msgstr "Mar_kera som läst"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:22
 msgid "Mark As U_nread"
 msgstr "Markera som _oläst"
 
-#: po/tmp/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:23
 msgid "Move"
 msgstr "Flytta"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:24
 msgid "Move message to a new folder"
 msgstr "Flytta meddelandet till en ny mapp"
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:25
 msgid "Previews the message to be printed"
 msgstr "Förhandsgranskar meddelandet som ska skrivas ut"
 
-#: po/tmp/evolution-mail.xml.h:32
+#: ui/evolution-mail.xml.h:27
 msgid "Print Preview of message..."
 msgstr "Förhandsgranska meddelande..."
 
-#: po/tmp/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:28
 msgid "Print message to the printer"
 msgstr "Skriv ut meddelande på skrivaren"
 
-#: po/tmp/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:29
 msgid "Print message..."
 msgstr "Skriv ut meddelande..."
 
-#: po/tmp/evolution-mail.xml.h:38
+#: ui/evolution-mail.xml.h:33
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: po/tmp/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:34
 msgid "Reply to _Sender"
 msgstr "Svara till av_sändaren"
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:37
 msgid "S_ource"
 msgstr "_Källa"
 
-#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Markera _alla"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:39
 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:40
 msgid "Show _All Messages"
 msgstr "Visa _alla meddelanden"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:42
 msgid "Threaded Message list"
 msgstr "Trådad meddelandelista"
 
-#: po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:43
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på avsä_ndare"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:44
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på mottaga_re"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:45
 msgid "View Raw Message Source"
 msgstr "Visa rå meddelandekälla"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:46
 msgid "_Apply Filters"
 msgstr "Tillämp_a filter"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:47
 msgid "_Configure Folder..."
 msgstr "_Konfigura mapp..."
 
-#: po/tmp/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:48
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:50
 msgid "_Edit Message"
 msgstr "R_edigera meddelande"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:51
 msgid "_Expunge"
 msgstr "V_erkställ tömning"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:52
 msgid "_Filter on Subject"
 msgstr "_Filtrera på ämne"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:53
 msgid "_Forward"
 msgstr "Vidarebe_fordra"
 
-#: po/tmp/evolution-mail.xml.h:59 po/tmp/evolution-subscribe.xml.h:17
+#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Om_vänd markering"
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:55
 msgid "_Mail Configuration..."
 msgstr "_E-postkonfiguration..."
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:56
 msgid "_Message"
 msgstr "_Meddelande"
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:57
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp..."
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:58
 msgid "_Open in New Window"
 msgstr "_Öppna i nytt fönster"
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:59
 msgid "_Print Message"
 msgstr "Skriv _ut meddelande"
 
-#: po/tmp/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:60
 msgid "_Save Message As..."
 msgstr "Spara meddelande so_m..."
 
-#: po/tmp/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr "_Trådat"
 
-#: po/tmp/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:62
 msgid "_Undelete"
 msgstr "_Ångra borttagning"
 
-#: po/tmp/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr "_Virtuell mapp på ämne"
 
-#: po/tmp/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:64
 msgid "_Virtual Folder Editor..."
 msgstr "Editor för _virtuella mappar..."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Bifoga"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:4
 msgid "Close the current file"
 msgstr "Stäng aktuell fil"
 
-#: po/tmp/evolution-message-composer.xml.h:10
+#: ui/evolution-message-composer.xml.h:5
 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:7
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:8
 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:9
 msgid "Insert text file..."
 msgstr "Infoga textfil..."
 
-#: po/tmp/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Öppna en fil"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP-kryptera"
 
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP-signera"
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:15
 msgid "Save As"
 msgstr "Spara som"
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save _Draft"
 msgstr "Spara _utkast"
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save in _folder... (FIXME)"
 msgstr "Spara i map_p... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save in folder..."
 msgstr "Spara i mapp..."
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save the current file with a different name"
 msgstr "Spara aktuell fil med ett annat namn"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the message in a specified folder"
 msgstr "Spara meddelandet i angiven mapp"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:23
 msgid "Send"
 msgstr "Skicka"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send _Later"
 msgstr "Skicka senar_e"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:25
 msgid "Send _later"
 msgstr "Skicka senar_e"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:26
 msgid "Send the mail in HTML format"
 msgstr "Skicka brevet i HTML-format"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send the message later"
 msgstr "Skicka meddelandet senare"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send the message now"
 msgstr "Skicka meddelandet nu"
 
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send this message now"
 msgstr "Skicka detta meddelande nu"
 
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:30
 msgid "Show / hide attachments"
 msgstr "Visa/göm bilaga"
 
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:31
 msgid "Show _attachments"
 msgstr "Visa _bilagor"
 
-#: po/tmp/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:32
 msgid "Show attachments"
 msgstr "Visa bilagor"
 
-#: po/tmp/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:33
 msgid "Sign this message with your PGP key"
 msgstr "Signera detta meddelande med din PGP-nyckel"
 
-#: po/tmp/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Insert text file... (FIXME)"
 msgstr "_Infoga textfil... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:41
 msgid "_Open..."
 msgstr "_Öppna..."
 
-#: po/tmp/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Security"
 msgstr "_Säkerhet"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:1
 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:4
 msgid "Refresh List"
 msgstr "Uppdatera lista"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:5
 msgid "Refresh List of Folders"
 msgstr "Uppdatera listan med mappar"
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:6
 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:8
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:9
 msgid "Unsubscribe"
 msgstr "Säg upp prenumeration"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution.xml.h:6
+#: ui/evolution.xml.h:1
 msgid "Display a different folder"
 msgstr "Visa en annan mapp"
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:2
 msgid "E_xit"
 msgstr "_Avsluta"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:3
 msgid "Evolution bar _shortcut"
 msgstr "Evolution-genväg för _rader"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:4
 msgid "Exit the program"
 msgstr "Avlsuta programmet"
 
-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:5
 msgid "Getting _Started"
 msgstr "Komma i _gång"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:6
 msgid "Import an external file format"
 msgstr "Importera ett externt filformat"
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:7
 msgid "Show information about Evolution"
 msgstr "Visa information om Evolution"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:8
 msgid "Show the _Folder Bar"
 msgstr "Visa _mappraden"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:9
 msgid "Show the _Shortcut Bar"
 msgstr "Visa _genvägsraden"
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:10
 msgid "Submit _Bug Report"
 msgstr "Skicka _felrapport"
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:11
 msgid "Submit bug report using Bug Buddy."
 msgstr "Skicka felrapport med Bug-Buddy."
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:12
 msgid "Toggle whether to show the folder bar"
 msgstr "Växla om mappraden ska visas"
 
-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:13
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Växla om genvägsraden ska visas"
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:14
 msgid "Using the C_ontact Manager"
 msgstr "Använda k_ontakthanteraren"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:15
 msgid "Using the _Calendar"
 msgstr "Använda _kalendern"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:16
 msgid "Using the _Mailer"
 msgstr "Använda _e-postdelen"
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:17
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:18
 msgid "_Appointment (FIXME)"
 msgstr "_Möte (FIXME)"
 
-#: po/tmp/evolution.xml.h:24
+#: ui/evolution.xml.h:19
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:22
 msgid "_Folder"
 msgstr "_Mapp"
 
-#: po/tmp/evolution.xml.h:28
+#: ui/evolution.xml.h:23
 msgid "_Go to Folder..."
 msgstr "_Gå till mapp..."
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:25
 msgid "_Import file..."
 msgstr "_Infoga fil..."
 
-#: po/tmp/evolution.xml.h:31
+#: ui/evolution.xml.h:26
 msgid "_Index"
 msgstr "_Index"
 
-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:27
 msgid "_Mail message"
 msgstr "_Posta meddelande"
 
-#: po/tmp/evolution.xml.h:34
+#: ui/evolution.xml.h:29
 msgid "_Settings"
 msgstr "_Inställningar"
 
-#: po/tmp/evolution.xml.h:35
+#: ui/evolution.xml.h:30
 msgid "_Task (FIXME)"
 msgstr "_Uppgift (FIXME)"
 
@@ -7051,6 +7003,9 @@ msgstr "%I.%M %p"
 msgid "Group %i"
 msgstr "Grupp %i"
 
+#~ msgid "Congratulations, your mail configuration is complete.\n"
+#~ msgstr "Gratulerar, din e-postkonfiguration är färdig.\n"
+
 #, fuzzy
 #~ msgid "Expunge"
 #~ msgstr "V_erkställ tömning"
@@ -7283,13 +7238,6 @@ msgstr "Grupp %i"
 #~ 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"