Updated Norwegian (bokmål) translation.

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

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

svn path=/trunk/; revision=7317

1 files changed, 1901 insertions, 1556 deletions

diff --git a/po/no.po b/po/no.po
index 0dcb209203..884e6344b1 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2000-12-25 10:46+0100\n"
-"PO-Revision-Date: 2000-12-25 10:49+01:00\n"
+"POT-Creation-Date: 2001-01-09 13:25+0100\n"
+"PO-Revision-Date: 2001-01-09 13:28+01:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -307,7 +307,7 @@ msgstr ""
 #: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
 #: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
@@ -455,28 +455,7 @@ msgstr "Kunne ikke starte wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/categories-strings.h:7
-msgid "categories"
-msgstr "kategorier"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "Oppføring(er) hører til disse kategoriene:"
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "Tilgjengelige kategorier:"
-
-#.
-#. * 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 "Slett kontakt?"
 
@@ -490,7 +469,7 @@ msgid "_Add"
 msgstr "_Legg til"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:53
+#: ui/evolution-event-editor.xml.h:103 ui/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -503,13 +482,10 @@ msgstr "Telefontyper"
 msgid "New phone type"
 msgstr "Ny telefontype"
 
-#.
-#. * 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/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
-#: po/tmp/mail-config.glade.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:1
+#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: mail/mail-config-druid.glade.h:5 mail/mail-config.glade.h:1
 msgid "Add"
 msgstr "Legg til"
 
@@ -550,7 +526,7 @@ msgid "_Mobile"
 msgstr "_Mobil"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1328
+#: addressbook/contact-editor/e-contact-editor.c:1336
 msgid "Primary Email"
 msgstr "Primær e-post"
 
@@ -567,7 +543,8 @@ msgid "C_ontacts..."
 msgstr "K_ontakter..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/task-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
+#: calendar/gui/event-editor-dialog.glade.h:4
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
@@ -584,7 +561,8 @@ msgid "_Address..."
 msgstr "_Adresse..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:11
+#: mail/mail-config-druid.glade.h:26
 msgid "General"
 msgstr "Generell"
 
@@ -629,143 +607,139 @@ msgid "No_tes:"
 msgstr "No_tater:"
 
 #: 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:8
 msgid "Details"
 msgstr "Detaljer"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1267
-#: addressbook/contact-editor/e-contact-editor.c:1371
+#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1379
 msgid "Business"
 msgstr "Arbeid"
 
-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "Business 2"
 msgstr "Arbeid 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "Faks på arbeid"
 
-#: addressbook/contact-editor/e-contact-editor.c:1270
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Callback"
 msgstr "Tilbakering"
 
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/contact-editor/e-contact-editor.c:1372
+#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1380
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Home 2"
 msgstr "Hjemme 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/contact-editor/e-contact-editor.c:1285
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1373
-#: po/tmp/mail-config.glade.h:17
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/contact-editor/e-contact-editor.c:1381
+#: mail/mail-config.glade.h:12
 msgid "Other"
 msgstr "Annet"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "Personsøker"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 msgid "Primary"
 msgstr "Primær"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1290
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1292
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:1337
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 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 "Adresse _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 "Sjekk adresse"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Lan_d:"
 
-#: 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 "_Adresse:"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_By:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Postboks:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Stat/Provins:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_ZIP/Postnummer:"
 
@@ -832,24 +806,25 @@ msgstr "_Etternavn:"
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 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:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Som _tabell"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+#, c-format
+msgid "Enter password for %s"
+msgstr "Skriv inn passord for %s"
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åpne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:407
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -870,198 +845,304 @@ msgstr ""
 "installere OpenLDAP, deretter må du kompilere og\n"
 "installere Evolution på nytt.\n"
 
-#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 msgid "Show All"
 msgstr "Vis alle"
 
-#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr "Avansert..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 msgid "Email contains"
 msgstr "E-post inneholder"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "Eksterne kataloger"
+#: addressbook/gui/component/addressbook-storage.c:95
+msgid "Other Contacts"
+msgstr "Andre kontakter"
 
-#.
-#. * 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:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "Beskrivelse:"
+#: addressbook/gui/component/addressbook-config.c:139
+msgid "LDAP Server"
+msgstr "LDAP-tjener"
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
-msgstr "LDAP-tjener:"
+#: addressbook/gui/component/addressbook-config.c:141
+msgid "File"
+msgstr "Fil"
 
-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
-msgstr "Navn:"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Unknown addressbook type"
+msgstr "Ukjent type adressebok"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "None (anonymous mode)"
+msgstr "Ingen (anonym modus)"
+
+#: addressbook/gui/component/addressbook-config.c:155
+#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/pop3/camel-pop3-store.c:148
+msgid "Password"
+msgstr "Passord"
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr "SASL"
+
+#: addressbook/gui/component/addressbook-config.c:160
+msgid "Unknown auth type"
+msgstr "Ukjent autentiseringstype"
+
+#: addressbook/gui/component/addressbook-config.c:169
+msgid "Base"
+msgstr "Basis"
+
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr "En"
+
+#: addressbook/gui/component/addressbook-config.c:173
+msgid "Subtree"
+msgstr "Undertre"
+
+#: addressbook/gui/component/addressbook-config.c:176
+msgid "Unknown scope type"
+msgstr "Ukjent type område"
+
+#: addressbook/gui/component/addressbook-config.c:309
+msgid "Bind DN:"
+msgstr "Bind DN:"
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "Portnummer:"
+#: addressbook/gui/component/addressbook-config.c:311
+#: mail/mail-config-gui.c:968
+msgid "Remember this password"
+msgstr "Husk dette passordet"
 
-#: po/tmp/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/addressbook-config.c:360
+#: mail/mail-config-druid.glade.h:27
+msgid "Host:"
+msgstr "Vert:"
+
+#: addressbook/gui/component/addressbook-config.c:361
+msgid "Port:"
+msgstr "Port:"
+
+#: addressbook/gui/component/addressbook-config.c:364
 msgid "Root DN:"
 msgstr "Rot DN:"
 
-#.
-#. * 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/addressbook-config.c:384
+msgid "Search Scope:"
+msgstr "Søkeområde:"
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:9 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "Autentisering:"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:46 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "Sti:"
+
+#: addressbook/gui/component/addressbook-config.c:460
+msgid "Create path if it doesn't exist."
+msgstr "Opprett sti hvis den ikke eksisterer."
+
+#: addressbook/gui/component/addressbook-config.c:593
+msgid "Edit Addressbook"
+msgstr "Redigér adressebok"
+
+#: addressbook/gui/component/addressbook-config.c:595
+msgid "Add Addressbook"
+msgstr "Legg til adressebok"
+
+#: addressbook/gui/component/addressbook-config.c:611
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr "Velg type adressebok du har, og skriv inn relevant informasjon om den."
+
+#: addressbook/gui/component/addressbook-config.c:616
+#: mail/mail-config-druid.glade.h:39
+msgid "Name:"
+msgstr "Navn:"
+
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Beskrivelse:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "Addressbook Sources"
+msgstr "Adressebok-kilder"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#: calendar/gui/e-calendar-table.c:342
+#: calendar/gui/event-editor-dialog.glade.h:8 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
+#: mail/mail-config-druid.glade.h:19 mail/mail-config.glade.h:3
+#: 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 "Slett"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#: filter/filter.glade.h:3 mail/folder-browser.c:671
+#: mail/mail-config-druid.glade.h:22 mail/mail-config.glade.h:4
+msgid "Edit"
+msgstr "Redigér"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+msgid "Name"
+msgstr "Navn"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Finn..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Message Recipients"
 msgstr "Meldingsmottakere:"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Velg navn"
 
-#: po/tmp/select-names.glade.h:9
-msgid "Select name from List:"
-msgstr "Velg navn fra liste:"
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select name from:"
+msgstr "Velg navn fra:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "Søk"
 
-#.
-#. * Translatable strings file generated by 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"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
 
@@ -1083,175 +1164,172 @@ msgstr ""
 "\n"
 "Dobbelklikk her for å opprette 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 "Blanke skjema på slutten:"
 
-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Kropp"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "Bunn:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Dimensjoner:"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "Font..."
 msgstr "Skrifttype..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "Bunntekst:"
 
-#: 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 "Topptekst"
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "Topp-/bunntekst"
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "Topptekster"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "Topptekst for hver bokstav"
 
-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "Høyde:"
 
-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "Rett etter hverandre"
 
-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "Inkluder:"
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "Landskap"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Venstre:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "Bokstavfaner på siden"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Marger"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
 msgstr "Antall kolonner:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Alternativer"
 
-#: 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 "Side"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "Sideoppsett"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Papir"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "Papirkilde:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "Portrett"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "Forhåndsvis:"
 
-#: 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åtoner"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
 msgstr "Motsatt på like sider"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "Høyre:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "Seksjoner:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Skyggelegging"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "Start på en ny side"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "Stilnavn:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "Topp:"
 
-#: po/tmp/e-contact-print.glade.h:45
+#: addressbook/printing/e-contact-print.glade.h:40
+#: mail/mail-config-druid.glade.h:68
 msgid "Type:"
 msgstr "Type:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Bredde:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "label26"
 msgstr "etikett26"
 
@@ -1286,118 +1364,143 @@ msgstr "Konfigurasjonsverktøy for evolutions oppgavelistekomponent.\n"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
-msgstr "Omriss:"
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Eksempel på Bonobo-kontroll som viser en kalender."
+
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:2
+msgid "Factory for the sample Calendar control"
+msgstr "Factory for eksempelkontroll for kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:1
+msgid "Calendar Repository"
+msgstr "Kalenderlager"
 
-#: calendar/gui/calendar-commands.c:61
-msgid "Headings:"
-msgstr "Topptekster:"
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:2
+msgid "Calendar Server"
+msgstr "Kalendertjener"
 
-#: calendar/gui/calendar-commands.c:62
-msgid "Empty days:"
-msgstr "Tomme dager:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "Evolution calendar executive summary component."
+msgstr "Evolution komponent for kalendersammendrag."
 
-#: calendar/gui/calendar-commands.c:63
-msgid "Appointments:"
-msgstr "Avtaler:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution kalender iTip/iMip-visning"
 
-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
-msgstr "Merket dag:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution component for handling the calendar."
+msgstr "Evolution komponent for håndtering av kalenderen."
 
-#: calendar/gui/calendar-commands.c:65
-msgid "Day numbers:"
-msgstr "Dagnummer:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Factory for the Calendar Summary component."
+msgstr "Factory for kalenderens sammendragskomponent."
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "Nummer for idag:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Evolution calendar component."
+msgstr "Factory for Evolution kalender-komponent."
 
-#: calendar/gui/calendar-commands.c:67
-msgid "To-Do item that is not yet due:"
-msgstr "Oppgavelisteoppføring som ikke har gått ut ennå:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the calendar iTip view control"
+msgstr "Factory for kalenderens iTip visningskontroll"
+
+#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
+#: calendar/gui/alarm-notify.c:940
+msgid "Reminder of your appointment at "
+msgstr "Påminnelse om din avtale "
 
-#: calendar/gui/calendar-commands.c:68
-msgid "To-Do item that is due today:"
-msgstr "Oppgavelisteoppføring som går ut idag:"
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "Utsett"
 
-#: calendar/gui/calendar-commands.c:69
-msgid "To-Do item that is overdue:"
-msgstr "Oppgavelisteoppføring som har gått ut:"
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
+#: mail/mail-search-dialogue.c:104
+msgid "Ok"
+msgstr "Ok"
 
-#: calendar/gui/calendar-commands.c:354
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Fil ikke funnet"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 msgid "Open calendar"
 msgstr "Åpne kalender"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 msgid "Save calendar"
 msgstr "Lagre kalender"
 
+#: calendar/gui/calendar-commands.c:432
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Kunne ikke opprette kalendervisning. Vennligst sjekk din ORBit og OAF "
+"konfigurasjon."
+
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:283
+#: calendar/gui/calendar-model.c:284
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:287 calendar/gui/calendar-model.c:737
+#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:718
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:291 calendar/gui/calendar-model.c:740
+#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:721
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:345 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:326
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/calendar-model.c:348 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:329
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:351 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:332
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/calendar-model.c:354 calendar/gui/calendar-model.c:522
+#: calendar/gui/calendar-model.c:335 calendar/gui/calendar-model.c:503
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: calendar/gui/calendar-model.c:442
+#: calendar/gui/calendar-model.c:423
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:442
+#: calendar/gui/calendar-model.c:423
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:444
+#: calendar/gui/calendar-model.c:425
 msgid "E"
 msgstr "Ø"
 
-#: calendar/gui/calendar-model.c:444
+#: calendar/gui/calendar-model.c:425
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:516
+#: calendar/gui/calendar-model.c:497
 msgid "Transparent"
 msgstr "Gjennomsiktig"
 
-#: calendar/gui/calendar-model.c:519
+#: calendar/gui/calendar-model.c:500
 msgid "Opaque"
 msgstr "Ugjennomsiktig"
 
-#: calendar/gui/calendar-model.c:745
+#: calendar/gui/calendar-model.c:726
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1409,7 +1512,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:846 calendar/gui/calendar-model.c:894
+#: calendar/gui/calendar-model.c:827 calendar/gui/calendar-model.c:875
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1417,27 +1520,27 @@ msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:864
+#: calendar/gui/calendar-model.c:845
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:867
+#: calendar/gui/calendar-model.c:848
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:871
+#: calendar/gui/calendar-model.c:852
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:874
+#: calendar/gui/calendar-model.c:855
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:994
+#: calendar/gui/calendar-model.c:975
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1447,14 +1550,38 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1034
+#: calendar/gui/calendar-model.c:1015
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
 
-#: calendar/gui/calendar-model.c:1074
+#: calendar/gui/calendar-model.c:1055
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteten må være mellom 0 og 9, inklusive"
 
+#: calendar/gui/calendar-summary.c:83
+msgid "%A, %e %B %Y"
+msgstr "%A, %e %B %Y"
+
+#: calendar/gui/calendar-summary.c:119 calendar/gui/calendar-summary.c:125
+msgid "%I:%M%p"
+msgstr "%I:%M%p"
+
+#: calendar/gui/calendar-summary.c:276
+msgid "<b>Error loading calendar</b>"
+msgstr "<b>Feil under lasting av kalender</b>"
+
+#: calendar/gui/calendar-summary.c:281
+msgid "<b>Error loading calendar:<br>Calendar in use."
+msgstr "<b>Feil under lasting av kalender:<br>Kalender i bruk."
+
+#: calendar/gui/calendar-summary.c:287
+msgid "<b>Error loading calendar:<br>Method not supported"
+msgstr "<b>Feil under lasting av kalender:<br>Metoden er ikke støttet"
+
+#: calendar/gui/calendar-summary.c:367
+msgid "Loading Calendar"
+msgstr "Laster kalender"
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
@@ -1471,390 +1598,403 @@ msgstr "Melding om din avtale på %A %b %d %Y %H:%M"
 msgid "No summary available."
 msgstr "Ingen sammendrag tilgjengelig."
 
-#.
-#. * 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 "Lukk"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:2
 msgid "Edit appointment"
 msgstr "Rediger avtale:"
 
-#: calendar/gui/gnome-cal.c:1333 po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Utsett"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:4
 msgid "Snooze time (minutes)"
 msgstr "Utsett-tid (minutter)"
 
-#.
-#. * 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 "5 minutter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "10 minutes"
 msgstr "10 minutter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "12 hour (am/pm)"
 msgstr "12 timer (am/pm)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minutter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "24 hour"
 msgstr "24 timer"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "30 minutes"
 msgstr "30 minutter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "60 minutes"
 msgstr "60 minutter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Alarms timeout after"
 msgstr "Tidsavbrudd for alarm etter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Audio Alarms"
 msgstr "Lyd-alarmer"
 
-#: 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 alarmvinduet kommer til syne."
 
-#: 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 "Brukervalg for kalender"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Colors"
 msgstr "Farger"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Compress weekends"
 msgstr "Komprimér helger"
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Date navigator options"
 msgstr "Alternativer for datonavigator"
 
-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Defaults"
 msgstr "Forvalg"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Display options"
 msgstr "Vis alternativer"
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Due Date"
 msgstr "Ferdig-dato"
 
-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Enable snoozing for"
 msgstr "Slå på utsetting for "
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Dagen slutter:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "First day of week:"
 msgstr "Første dag i uken:"
 
-#: 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:437 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 "Markér"
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Items Due Today"
 msgstr "Oppføringer som går ut idag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Items Due Today:"
 msgstr "Oppføringer som går ut i dag:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Items Not Yet Due"
 msgstr "Oppføringer som ikke har gått ut"
 
-#: po/tmp/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Items Not Yet Due:"
 msgstr "Oppføringer som ikke har gått ut:"
 
-#: 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 "Man"
 
-#: calendar/gui/event-editor.c:433 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 "Mandag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Overdue Items"
 msgstr "Utgåtte oppføringer"
 
-#: po/tmp/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Overdue Items:"
 msgstr "Utgåtte oppføringer:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34 filter/libfilter-i18n.h:31
 msgid "Priority"
 msgstr "Prioritet"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Remind me of all appointments"
 msgstr "Påminnelse om alle avtaler"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Reminders"
 msgstr "Påminnelser"
 
-#: 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:438 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 "Vis"
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Show appointment end times"
 msgstr "Vis tid for avtalers slutt"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Show week numbers"
 msgstr "Vis ukenummer"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Start of day:"
 msgstr "Dagen starter:"
 
 #. 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:439 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 "Oppgaveblokk"
 
-#: 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:436 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 før den går ut"
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "Time divisions:"
 msgstr "Oppdeling av tid:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "Time format:"
 msgstr "Tidformat:"
 
-#: 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 "Tir"
 
-#: calendar/gui/event-editor.c:434 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 "Tirsdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Visual Alarms"
 msgstr "Visuelle alarmer"
 
-#: 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:435 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 "Arbeidsuke"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "minutes before they occur."
 msgstr "minutter i forveien."
 
-#: po/tmp/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "seconds."
 msgstr "sekunder"
 
-#: calendar/gui/dialogs/delete-comp.c:57
-msgid "Are you sure you want to delete the appointment"
-msgstr "Er du sikker på at du vil slette denne avtalen"
-
-#: calendar/gui/dialogs/delete-comp.c:61
-msgid "Are you sure you want to delete the task"
-msgstr "Er du sikker på at du vil slette denne oppgaven"
+#: calendar/gui/dialogs/delete-comp.c:62
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr "Er du sikker på at du vil slette avtalen `%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:65
-msgid "Are you sure you want to delete the journal entry"
-msgstr "Er du sikker på at du vil slette journaloppføringen"
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr "Er du sikker på at du vil slette denne avtalen uten tittel?"
 
-#.
-#. * 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/delete-comp.c:71
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr "Er du sikker på at du vil slette oppgaven `%s'?"
+
+#: calendar/gui/dialogs/delete-comp.c:74
+msgid "Are you sure you want to delete this untitled task?"
+msgstr "Er du sikker på at du vil slette denne oppgaven uten tittel?"
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr "Er du sikker på at du vil slette journaloppføringen `%s'?"
+
+#: calendar/gui/dialogs/delete-comp.c:83
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr "Er du sikker på at du vil slette denne journaloppføringen uten tittel?"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
 msgid "% Comp_lete:"
 msgstr "% ferdi_g:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
 msgid "C_lassification:"
 msgstr "K_lassifisering"
 
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
 msgid "Cancelled"
 msgstr "Avbrutt"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
 msgid "Completed"
 msgstr "Fullført"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "Date Completed:"
 msgstr "Fullført dato:"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "High"
 msgstr "Høy"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "In Progress"
 msgstr "Under arbeid"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 msgid "Low"
 msgstr "Lav"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: mail/mail-config-druid.glade.h:41 shell/e-shell-view.c:1073
 #: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
 #: widgets/misc/e-dateedit.c:1445
 msgid "None"
 msgstr "Ingen"
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Normal"
 msgstr "Normal"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
 msgid "S_ummary"
 msgstr "Sa_mmendrag"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Sta_rt Date:"
 msgstr "Sta_rt dato:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid "Task"
 msgstr "Oppgave"
 
-#: po/tmp/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
 msgid "URL:"
 msgstr "URL:"
 
-#: po/tmp/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
 msgid "_Contacts..."
 msgstr "_Kontakter..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "_Due Date:"
 msgstr "Fer_dig-dato:"
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "_Status:"
 msgstr "_Status:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
-#: calendar/gui/dialogs/task-editor.c:681
+#: calendar/gui/dialogs/task-editor.c:690
 msgid "Edit Task"
 msgstr "Redigér oppgave"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:336
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:342
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:345
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:348
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3254
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3269
 msgid "Do you want to save changes?"
 msgstr "Vil du lagre endringene?"
 
@@ -1874,14 +2014,6 @@ msgstr "Merk som fullført"
 msgid "Mark the task complete"
 msgstr "Merk oppgaven som fullført"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:608 mail/mail-view.c:160
-#: po/tmp/event-editor-dialog.glade.h:12 po/tmp/evolution-addressbook.xml.h:8
-#: po/tmp/evolution-event-editor.xml.h:19 po/tmp/evolution-mail.xml.h:11
-#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:8
-msgid "Delete"
-msgstr "Slett"
-
 #: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Slett oppgaven"
@@ -1893,65 +2025,149 @@ msgstr "%02i minutters oppdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1209
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1223
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1236
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
-#: calendar/gui/print.c:605
+#: calendar/gui/print.c:610
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
-#: calendar/gui/print.c:604
+#: calendar/gui/print.c:609
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-day-view.c:2953
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
 #: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "Ny avtale..."
 
-#: calendar/gui/e-day-view.c:2950 calendar/gui/e-day-view.c:2957
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
 #: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "Redigér denne avtalen..."
 
-#: calendar/gui/e-day-view.c:2951 calendar/gui/e-week-view.c:3174
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:15
 msgid "Delete this appointment"
 msgstr "Slett denne avtalen"
 
-#: calendar/gui/e-day-view.c:2958 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr "Gjør denne avtalen flyttbar"
 
-#: calendar/gui/e-day-view.c:2959 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr "Slett denne oppføringen"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr "Slett alle oppføringer"
 
+#: calendar/gui/e-itip-control.c:140
+msgid "I couldn't update your calendar file!\n"
+msgstr "Kunne ikke oppdatere din kalenderfil!\n"
+
+#: calendar/gui/e-itip-control.c:147 calendar/gui/e-itip-control.c:489
+msgid "Component successfully updated."
+msgstr "Oppdatering av komponent fullført."
+
+#: calendar/gui/e-itip-control.c:154
+msgid "There was an error loading the calendar file."
+msgstr "Det oppsto en feil under lasting av kalenderfilen."
+
+#: calendar/gui/e-itip-control.c:178
+msgid "I couldn't open your calendar file!\n"
+msgstr "Kunne ikke åpne din kalenderfil!\n"
+
+#: calendar/gui/e-itip-control.c:437 calendar/gui/e-itip-control.c:508
+msgid "I couldn't load your calendar file!\n"
+msgstr "Kunne ikke laste din kalenderfil!\n"
+
+#: calendar/gui/e-itip-control.c:449
+msgid "I couldn't read your calendar file!\n"
+msgstr "Kunne ikke lese din kalenderfil!\n"
+
+#: calendar/gui/e-itip-control.c:462
+msgid "This is a reply from someone who was uninvited!"
+msgstr "Dette er et svar fra noen som ikke er invitert!"
+
+#: calendar/gui/e-itip-control.c:478
+msgid "I couldn't update your calendar store."
+msgstr "Kunne ikke oppdatere ditt kalenderlager."
+
+#: calendar/gui/e-itip-control.c:519
+msgid "I couldn't delete the calendar component!\n"
+msgstr "Kunne ikke slette kalenderkomponenten!\n"
+
+#: calendar/gui/e-itip-control.c:529
+msgid "Component successfully deleted."
+msgstr "Sletting av komponent fullført."
+
+#: calendar/gui/e-itip-control.c:673
+msgid "I don't recognize this type of calendar component."
+msgstr "Kan ikke kjenne igjen denne typen kalenderkomponent."
+
+#: calendar/gui/e-itip-control.c:759
+msgid "Add to Calendar"
+msgstr "Legg til i kalenderen"
+
+#: calendar/gui/e-itip-control.c:793
+msgid "Accept"
+msgstr "Akseptér"
+
+#: calendar/gui/e-itip-control.c:794
+msgid "Decline"
+msgstr "Avslå"
+
+#: calendar/gui/e-itip-control.c:795
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Tentativ"
+
+#: calendar/gui/e-itip-control.c:839
+msgid "Update Calendar"
+msgstr "Oppdatér kalender"
+
+#: calendar/gui/e-itip-control.c:862
+msgid "Cancel Meeting"
+msgstr "Alys møte"
+
+#: calendar/gui/e-tasks.c:281
+#, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Kunne ikke laste oppgavene i `%s'"
+
+#: calendar/gui/e-tasks.c:292
+#, c-format
+msgid "Could not create a tasks file in `%s'"
+msgstr "Kunne ikke opprette oppgavefil i `%s'"
+
+#: calendar/gui/e-tasks.c:304 calendar/gui/gnome-cal.c:698
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
+
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
@@ -1959,422 +2175,466 @@ msgstr "Slett alle oppføringer"
 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 "Varer he_le dagen"
 
-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:3
 msgid "Appointment Basics"
 msgstr "Grunnleggende om avtaler"
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:5
 msgid "Classification"
 msgstr "Klassifisering"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Custom recurrence"
 msgstr "Egendefinert gjeninntreffelse"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:7
 msgid "Days"
 msgstr "Dager"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:9
 msgid "Every"
 msgstr "Hver"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Exceptions"
 msgstr "Unntak"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:12
 msgid "Hours"
 msgstr "Timer"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "Mail _to:"
 msgstr "Send _til:"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minutter"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:15
 msgid "Modify"
 msgstr "Endre"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "No recurrence"
 msgstr "Ingen gjeninntreffelse"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Preview"
 msgstr "Forhåndsvis"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Pu_blic"
 msgstr "Of_fentlig"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:21
 msgid "Recurrence Rule"
 msgstr "Regel for gjenintreffelse"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Reminder"
 msgstr "Påminnelse"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Simple recurrence"
 msgstr "Enkel gjeninntreffelse"
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:25
 msgid "Time"
 msgstr "Tid"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:26
 msgid "_Audio"
 msgstr "_Lyd"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:27
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:28
+msgid "_Contacts"
+msgstr "_Kontakter"
+
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "_Display"
 msgstr "_Vis"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Mail"
 msgstr "_E-post"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Program"
 msgstr "_Program"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_Run program:"
 msgstr "Kjø_r program:"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Starting date:"
 msgstr "_Start dato:"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "day(s)"
 msgstr "dag(er)"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "event-editor-dialog"
 msgstr "event-editor-dialog"
 
-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "for"
 msgstr "for"
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "forever"
 msgstr "for alltid"
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "label21"
 msgstr "etikett21"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "måned(er)"
 
-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "until"
 msgstr "til"
 
-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "week(s)"
 msgstr "uke(r)"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:330
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:408
 msgid "on"
 msgstr "på"
 
-#: calendar/gui/event-editor.c:432 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:433 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:560
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:567
 msgid "th"
 msgstr "de"
 
-#: calendar/gui/event-editor.c:720
+#: calendar/gui/event-editor.c:721
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: calendar/gui/event-editor.c:837
+#: calendar/gui/event-editor.c:838
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: calendar/gui/event-editor.c:3077 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+#: calendar/gui/event-editor.c:3092 calendar/gui/print.c:1090
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/gnome-cal.c:752 calendar/gui/gnome-cal.c:1341
-#: calendar/gui/gnome-cal.c:1397
-msgid "Reminder of your appointment at "
-msgstr "Påminnelse om din avtale "
-
-#: calendar/gui/gnome-cal.c:1022
+#: calendar/gui/gnome-cal.c:676
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr "Kunne ikke laste kalenderen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1033
+#: calendar/gui/gnome-cal.c:687
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Kunne ikke opprette kalender i `%s'"
 
-#: calendar/gui/gnome-cal.c:1044
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
+#: calendar/gui/goto-dialog.glade.h:1
+msgid "April"
+msgstr "April"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1346 calendar/gui/gnome-cal.c:1401
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/goto-dialog.glade.h:2
+msgid "August"
+msgstr "August"
+
+#: calendar/gui/goto-dialog.glade.h:3
+msgid "December"
+msgstr "Desember"
+
+#: calendar/gui/goto-dialog.glade.h:4
+msgid "February"
+msgstr "Februar"
 
-#: calendar/gui/main.c:49
+#: calendar/gui/goto-dialog.glade.h:5
+msgid "Go To Date"
+msgstr "Gå til dato"
+
+#: calendar/gui/goto-dialog.glade.h:6
+msgid "Go To Today"
+msgstr "Gå til idag"
+
+#: calendar/gui/goto-dialog.glade.h:7
+msgid "January"
+msgstr "Januar"
+
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "July"
+msgstr "Juli"
+
+#: calendar/gui/goto-dialog.glade.h:9
+msgid "June"
+msgstr "Juni"
+
+#: calendar/gui/goto-dialog.glade.h:10
+msgid "March"
+msgstr "Mars"
+
+#: calendar/gui/goto-dialog.glade.h:11
+msgid "May"
+msgstr "Mai"
+
+#: calendar/gui/goto-dialog.glade.h:12
+msgid "November"
+msgstr "November"
+
+#: calendar/gui/goto-dialog.glade.h:13
+msgid "October"
+msgstr "Oktober"
+
+#: calendar/gui/goto-dialog.glade.h:14
+msgid "September"
+msgstr "September"
+
+#: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikke initiere GNOME"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:299
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Su"
 msgstr "Søn"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr "Man"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr "Tir"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr "Lør"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "Oppgaver"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr "I dag (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1081
+#: calendar/gui/print.c:1086
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1092
+#: calendar/gui/print.c:1097
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Denne uken (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr "Denne måneden (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr "Dette året (%Y)"
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:914
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1012
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
+#: calendar/gui/tasks-control.c:103
+msgid "The URI of the tasks folder to display"
+msgstr "URIen til oppgavemappen skal vises"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
@@ -2584,12 +2844,12 @@ msgstr "Svar fra IMAP-tjener inneholdt ikke %s-informasjon"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar 'OK' fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:196
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:542
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -2601,12 +2861,6 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post på IMAP-tjenere."
 
-#: camel/providers/imap/camel-imap-store.c:246
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr "Passord"
-
 #: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -3065,17 +3319,17 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kunne ikke autentisere mot KPOP-tjener: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Kunne ikke koble til POP-tjener på %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVennligst skriv inn POP3-passord for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3084,12 +3338,12 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil under oversending av brukernavn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr "(Ukjent)"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3097,7 +3351,7 @@ msgstr ""
 "Kunne ikke koble til POP-tjeneren.\n"
 "Ingen støtte for forespurt autentiseringsmekanisme."
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3106,12 +3360,13 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil ved oversending av passord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen slik mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:57
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3162,6 +3417,7 @@ msgid "Mail delivery via the sendmail program"
 msgstr "Levering av e-post via sendmail programmet"
 
 #: camel/providers/smtp/camel-smtp-provider.c:34
+#: mail/mail-config-druid.glade.h:53
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -3188,6 +3444,7 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:292
 #: camel/providers/smtp/camel-smtp-transport.c:297
+#: mail/mail-config-druid.glade.h:10
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
@@ -3324,82 +3581,78 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:150
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr "vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: po/tmp/evolution-message-composer.xml.h:7
+#: composer/e-msg-composer-attachment-bar.c:413
+#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/filter.glade.h:14
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
 #: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Fjern"
 
-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte oppføringer fra vedleggslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Legg til vedlegg..."
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "Legg en fil ved meldingen"
 
-#.
-#. * 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 for vedlegg"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Filnavn:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME-type:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:305
 #: mail/mail-format.c:626
 msgid "From:"
 msgstr "Fra:"
 
-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:249
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
-#: composer/e-msg-composer-hdrs.c:292
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Enter the identity you wish to send this message from"
 msgstr "Skriv inn identiteten du ønsker å bruke ved sending av denne meldingen"
 
-#: composer/e-msg-composer-hdrs.c:296 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:310 mail/mail-format.c:630
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:297
+#: composer/e-msg-composer-hdrs.c:311
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:301 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:315 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:302
+#: composer/e-msg-composer-hdrs.c:316
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:308
+#: composer/e-msg-composer-hdrs.c:322
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3407,11 +3660,11 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten å komme til "
 "syne i mottakerlisten for meldingen."
 
-#: composer/e-msg-composer-hdrs.c:314 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:328 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:315
+#: composer/e-msg-composer-hdrs.c:329
 msgid "Enter the subject of the mail"
 msgstr "Skriv inn emnet for meldingen"
 
@@ -3451,11 +3704,11 @@ msgstr "Lagre endringer til meldingen..."
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Feil under lagring av brevet i 'Skisser': %s"
 
-#: composer/e-msg-composer.c:740 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:746
+#: composer/e-msg-composer.c:747
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3465,27 +3718,27 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:768
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:894
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: composer/e-msg-composer.c:904
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr "Er ikke en vanlig fil."
 
-#: composer/e-msg-composer.c:914
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr "Filen eksisterer men er ikke lesbar."
 
-#: composer/e-msg-composer.c:924
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Filen ser ut til å være tilgjengelig men open(2) feilet."
 
-#: composer/e-msg-composer.c:946
+#: composer/e-msg-composer.c:950
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3493,15 +3746,15 @@ msgstr ""
 "File en meget stor (mer enn 100K).\n"
 "Er du sikker på at du vil sette den inn?"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr "En feil oppsto under lesing fra filen."
 
-#: composer/e-msg-composer.c:1346
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:1423
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
@@ -3645,7 +3898,7 @@ msgstr "innkommende"
 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 "Redigér filtre"
 
@@ -3682,7 +3935,7 @@ msgstr "Skriv inn URI for mappen"
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
-#: filter/filter-input.c:184
+#: filter/filter-input.c:185
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3691,44 +3944,44 @@ msgstr ""
 "Feil i regulært uttrykk '%s':\n"
 "%s"
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr "Feil under utførelse av søk etter vanlig uttrykk i meldingshode: %s"
 
-#: filter/filter-part.c:456
+#: filter/filter-part.c:467
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:522
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr "Regelnavn: "
 
-#: filter/filter-rule.c:526
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: filter/filter-rule.c:542
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr "Utfør handlinger"
 
-#: filter/filter-rule.c:563
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er møtt"
 
-#: filter/filter-rule.c:568
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr "hvis et kriterie er møtt"
 
-#: filter/filter-rule.c:579
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr "Legg til kriterie"
 
-#: filter/filter-rule.c:585
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr "Fjern kriterie"
 
@@ -3736,14 +3989,8 @@ msgstr "Fjern kriterie"
 msgid "Replied to"
 msgstr "Svart til"
 
-#: filter/filter-system-flag.c:64
-msgid "Deleted"
-msgstr "Slettet"
-
-#: filter/filter-system-flag.c:65
-msgid "Draft"
-msgstr "Skisse"
-
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
 #: filter/filter-system-flag.c:66
 msgid "Important"
 msgstr "Viktig"
@@ -3752,191 +3999,186 @@ msgstr "Viktig"
 msgid "Read"
 msgstr "Les"
 
-#: mail/folder-browser.c:594 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Redigér"
-
-#: po/tmp/filter.glade.h:10
+#: filter/filter.glade.h:5
 msgid "Edit VFolders"
 msgstr "Redigér VFoldere"
 
-#: 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 "Innkommende"
 
-#: 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 "Virtuelle mapper"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:11
 msgid "vFolder Sources"
 msgstr "vFolder kilder"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "etter"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Gi farge"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Gi poeng"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
+msgid "before"
+msgstr "før"
+
+#: filter/libfilter-i18n.h:6
+msgid "contains"
+msgstr "inneholder"
+
+#: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
 msgstr "Kopiér til mappe"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Dato mottatt"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Uttrykk"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Videresend til adresse"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Meldingskropp"
-
 #: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "Meldingshode"
+msgid "does not contain"
+msgstr "inneholder ikke"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Meldingen ble mottatt"
+msgid "does not end with"
+msgstr "slutter ikke med"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Meldingen ble sendt"
+msgid "does not exist"
+msgstr "eksisterer ikke"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Flytt til mappe"
+msgid "does not sound like"
+msgstr "ligner ikke"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr "starter ikke med"
 
 #: filter/libfilter-i18n.h:16
-msgid "Recipients"
-msgstr "Mottakere"
+msgid "ends with"
+msgstr "slutter med"
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
-msgstr "Treff på vanlig uttrykk"
+msgid "exists"
+msgstr "eksisterer"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Avsender"
+msgid "Expression"
+msgstr "Uttrykk"
 
 #: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "Sett status"
+msgid "Forward to Address"
+msgstr "Videresend til adresse"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Kilde"
+msgid "is"
+msgstr "er"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Spesifikk header"
+msgid "is greater than"
+msgstr "er større enn"
 
 #: filter/libfilter-i18n.h:22
-msgid "Status"
-msgstr "Status"
+msgid "is less than"
+msgstr "er mindre enn"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Stopp behandling"
+msgid "is not"
+msgstr "er ikke"
 
 #: filter/libfilter-i18n.h:24
-msgid "Subject"
-msgstr "Emne"
+msgid "Message Body"
+msgstr "Meldingskropp"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "etter"
+msgid "Message Header"
+msgstr "Meldingshode"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "før"
+msgid "Message was received"
+msgstr "Meldingen ble mottatt"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "inneholder"
+msgid "Message was sent"
+msgstr "Meldingen ble sendt"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "inneholder ikke"
+msgid "Move to Folder"
+msgstr "Flytt til mappe"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "slutter ikke med"
+msgid "on or after"
+msgstr "på eller etter"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "eksisterer ikke"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "ligner ikke"
+msgid "on or before"
+msgstr "på eller før"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "starter ikke med"
+msgid "Recipients"
+msgstr "Mottakere"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "slutter med"
+msgid "Regex Match"
+msgstr "Treff på vanlig uttrykk"
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "eksisterer"
+msgid "Sender"
+msgstr "Avsender"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "er større enn"
+msgid "Set Status"
+msgstr "Sett status"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "er mindre enn"
+msgid "sounds like"
+msgstr "lyder som"
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "er ikke"
+msgid "Source"
+msgstr "Kilde"
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "er"
+msgid "Specific header"
+msgstr "Spesifikk header"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "på eller etter"
+msgid "starts with"
+msgstr "starter med"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "på eller før"
+msgid "Status"
+msgstr "Status"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "lyder som"
+msgid "Stop Processing"
+msgstr "Stopp behandling"
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "starter med"
+msgid "Subject"
+msgstr "Emne"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -3966,173 +4208,205 @@ msgstr "Legg til regel for VFolder"
 msgid "Edit VFolder Rule"
 msgstr "Redigér VFolder regel"
 
-#: mail/component-factory.c:229
+#: mail/component-factory.c:280
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:268
+#: mail/component-factory.c:319
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:19
+#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:83
+#: ui/evolution-message-composer.xml.h:14
 msgid "Save"
 msgstr "Lagre"
 
-#: mail/folder-browser.c:153
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr "Kropp eller emne inneholder"
 
-#: mail/folder-browser.c:154
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
-#: mail/folder-browser.c:155
+#: mail/folder-browser.c:238
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
-#: mail/folder-browser.c:156
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr "Kropp inneholder ikke"
 
-#: mail/folder-browser.c:157
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
-#: mail/folder-browser.c:566
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr "VFolder for emne"
 
-#: mail/folder-browser.c:567
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr "VFolder for sender"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr "VFolder for mottakere"
 
-#: mail/folder-browser.c:570
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr "Filtrér etter emne"
 
-#: mail/folder-browser.c:571
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr "Filtrér etter sender"
 
-#: mail/folder-browser.c:572
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr "Filtrér etter mottaker"
 
-#: mail/folder-browser.c:573 mail/folder-browser.c:692
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr "Filtrér etter e-postliste"
 
-#: mail/folder-browser.c:578
+#: mail/folder-browser.c:655
 msgid "Show all hidden"
 msgstr "Vis alle skjulte"
 
-#: mail/folder-browser.c:580
+#: mail/folder-browser.c:657
 msgid "Hide selected"
 msgstr "Skjul valgte"
 
 #. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:583
+#: mail/folder-browser.c:660
 msgid "Hide read"
 msgstr "Skjul leste"
 
-#: mail/folder-browser.c:584
+#: mail/folder-browser.c:661
 msgid "Hide deleted"
 msgstr "Skjul slettede"
 
-#: mail/folder-browser.c:586 mail/folder-browser.c:703
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
 msgid "Hide Subject"
 msgstr "Skjul emne"
 
-#: mail/folder-browser.c:588 mail/folder-browser.c:709
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
 msgid "Hide from Sender"
 msgstr "Skjul fra sender"
 
-#: mail/folder-browser.c:593 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Åpne"
 
-#: mail/folder-browser.c:595
+#: mail/folder-browser.c:672
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/folder-browser.c:596 mail/mail-view.c:158
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:32
+#: mail/folder-browser.c:673 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:27
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:598
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr "Svar til sender"
 
-#: mail/folder-browser.c:599 mail/mail-view.c:151
-#: po/tmp/evolution-mail.xml.h:38
+#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:33
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/folder-browser.c:600 mail/mail-view.c:154
-#: po/tmp/evolution-mail.xml.h:17
+#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/folder-browser.c:601 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:13
 msgid "Forward inline"
 msgstr "Videresend \"inline\""
 
-#: mail/folder-browser.c:603
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr "Markér som lest"
 
-#: mail/folder-browser.c:604
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr "Merk som ulest"
 
-#: mail/folder-browser.c:606
+#: mail/folder-browser.c:683
 msgid "Move to Folder..."
 msgstr "Flytt til mappe..."
 
-#: mail/folder-browser.c:607
+#: mail/folder-browser.c:684
 msgid "Copy to Folder..."
 msgstr "Kopiér til mappe..."
 
-#: mail/folder-browser.c:609
+#: mail/folder-browser.c:686
 msgid "Undelete"
 msgstr "Angre slett"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:613
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr "Påfør filtre"
 
-#: mail/folder-browser.c:615 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:5
 msgid "Create Rule From Message"
 msgstr "Lage regel fra melding"
 
-#: mail/folder-browser.c:616 po/tmp/evolution-mail.xml.h:21
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:16
 msgid "Hide Messages"
 msgstr "Skjul meldinger"
 
-#: mail/folder-browser.c:694
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrér etter e-postliste (%s)"
 
-#: mail/folder-browser.c:700
+#: mail/folder-browser.c:787
 #, c-format
 msgid "Hide Subject \"%s\""
 msgstr "Skjul emne \"%s\""
 
-#: mail/folder-browser.c:706
+#: mail/folder-browser.c:793
 #, c-format
 msgid "Hide from Sender <%s>"
 msgstr "Skjul fra sender <%s>"
 
+#: mail/local-config.glade.h:1
+msgid "Current store format:"
+msgstr "Aktivt lagringsformat:"
+
+#: mail/local-config.glade.h:2
+msgid "Mailbox Format"
+msgstr "Format for postboks"
+
+#: mail/local-config.glade.h:3
+msgid "New store format:"
+msgstr "Nytt lagringsformat:"
+
+#: mail/local-config.glade.h:4
+msgid ""
+"Note: When converting between mailbox formats, a failure (such as lack of "
+"disk space) may not be automatically recoverable.  Please use this feature "
+"with care."
+msgstr ""
+"Merk: Ved konvertering mellom postboksformater, kan en feil (slik som mangel "
+"på diskplass) ikke nødvendigvis rettes opp igjen. Vennligst bruk denne "
+"funksjonen med forsiktighet."
+
+#: mail/local-config.glade.h:5
+msgid "maildir"
+msgstr "maildir"
+
+#: mail/local-config.glade.h:6
+msgid "mbox"
+msgstr "mbox"
+
+#: mail/local-config.glade.h:7
+msgid "mh"
+msgstr "mh"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4153,7 +4427,7 @@ msgstr "E-post fra %s"
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:78
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4165,7 +4439,7 @@ msgstr ""
 "motta eller skrive meldinger.\n"
 "Vil du konfigurere den nå?"
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:121
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4173,7 +4447,7 @@ msgstr ""
 "Du må konfigurere en identitet\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:133
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4181,19 +4455,19 @@ msgstr ""
 "Du må konfigurere en e-post-transport\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
+#: mail/mail-callbacks.c:169 mail/mail-callbacks.c:181
 msgid "You have no mail sources configured"
 msgstr "Du har ikke konfigurert e-postkilder"
 
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:218
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke satt en transportmetode for e-post"
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:227
 msgid "You have no Outbox configured"
 msgstr "Du har ikke konfigurert en utboks"
 
-#: mail/mail-callbacks.c:246
+#: mail/mail-callbacks.c:249
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4201,19 +4475,23 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:317
 msgid "You must specify recipients in order to send this message."
 msgstr "Du må spesifisere mottakere for å kunne sende denne meldingen."
 
-#: mail/mail-callbacks.c:552
+#: mail/mail-callbacks.c:537
+msgid "Forwarded message:\n"
+msgstr "Videresendt melding:\n"
+
+#: mail/mail-callbacks.c:618
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:620
 msgid "Copy message(s) to"
 msgstr "Kopiér melding(er) til"
 
-#: mail/mail-callbacks.c:669
+#: mail/mail-callbacks.c:755
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4221,11 +4499,11 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:74
+#: mail/mail-callbacks.c:788 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:707 mail/mail-display.c:78
+#: mail/mail-callbacks.c:792 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4233,15 +4511,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-callbacks.c:752
+#: mail/mail-callbacks.c:837
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:754
+#: mail/mail-callbacks.c:839
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:829
+#: mail/mail-callbacks.c:923
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4250,45 +4528,229 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:874
+#: mail/mail-callbacks.c:972
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:921
+#: mail/mail-callbacks.c:1019
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/mail-config-druid.glade.h:6
+#: mail/mail-config-druid.glade.h:1
+msgid "Account"
+msgstr "Konto"
+
+#: mail/mail-config-druid.glade.h:2
+msgid "Account Information"
+msgstr "Kontoinformasjon"
+
+#: mail/mail-config-druid.glade.h:3
+msgid "Account Management"
+msgstr "Håndtering av konti"
+
+#: mail/mail-config-druid.glade.h:4
+msgid "Account Properties"
+msgstr "Egenskaper for konto"
+
+#: mail/mail-config-druid.glade.h:6
+msgid "Advanced"
+msgstr "Avansert"
+
+#: mail/mail-config-druid.glade.h:7
+msgid "Authentication"
+msgstr "Autentisering"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Authentication Type:"
+msgstr "Autentiseringstype:"
+
+#: mail/mail-config-druid.glade.h:11
+msgid "Congratulations, your mail configuration is complete.\n"
+msgstr "Gratulerer, konfigurasjon av e-post er fullført.\n"
+
+#: mail/mail-config-druid.glade.h:17
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+#: mail/mail-config-druid.glade.h:18
+msgid "Default"
+msgstr "Forvalgt"
+
+#: mail/mail-config-druid.glade.h:20
+msgid "Done"
+msgstr "Ferdig"
+
+#: mail/mail-config-druid.glade.h:21
+msgid "E-Mail Address:"
+msgstr "E-post adresse:"
+
+#: mail/mail-config-druid.glade.h:23
+msgid "Email Address:"
+msgstr "E-post adresse:"
+
+#: mail/mail-config-druid.glade.h:24
+msgid "Evolution Mail Configuration"
+msgstr "Evolution e-post-konfigurasjon"
+
+#: mail/mail-config-druid.glade.h:25
+msgid "Full Name:"
+msgstr "Fullt navn:"
+
+#: mail/mail-config-druid.glade.h:28
+msgid "Hostname:"
+msgstr "Vertsnavn:"
+
+#: mail/mail-config-druid.glade.h:29
 msgid "Identity"
 msgstr "Identitet"
 
-#: po/tmp/mail-config-druid.glade.h:7
+#: mail/mail-config-druid.glade.h:30
+msgid "Incoming Mail Server"
+msgstr "E-posttjener for innkommende post"
+
+#: mail/mail-config-druid.glade.h:31
+msgid "Keep mail on server"
+msgstr "Behold e-post på tjener"
+
+#: mail/mail-config-druid.glade.h:32
+msgid "Kerberos"
+msgstr "Kerberos"
+
+#: mail/mail-config-druid.glade.h:33
+msgid "Mail"
+msgstr "E-post"
+
+#: mail/mail-config-druid.glade.h:34
+msgid "Mail Account"
+msgstr "E-post konto"
+
+#: mail/mail-config-druid.glade.h:35
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "E-post-kilde"
+#: mail/mail-config-druid.glade.h:36
+msgid "Mail Configuration Druid"
+msgstr "E-post-konfigurasjonsdruide"
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "E-post-transport"
+#: mail/mail-config-druid.glade.h:37
+msgid "Make this my default account"
+msgstr "Bruk denne som standard konto"
+
+#: mail/mail-config-druid.glade.h:38
+msgid "Miscellaneous"
+msgstr "Forskjellig"
+
+#: mail/mail-config-druid.glade.h:40
+msgid "News"
+msgstr "News"
+
+#: mail/mail-config-druid.glade.h:42
+msgid "Optional"
+msgstr "Valgfri"
+
+#: mail/mail-config-druid.glade.h:43 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "Organisasjon:"
+
+#: mail/mail-config-druid.glade.h:44
+msgid "Outgoing Mail Server"
+msgstr "E-posttjener for utgående post"
+
+#: mail/mail-config-druid.glade.h:45
+msgid "Password:"
+msgstr "Passord:"
+
+#: mail/mail-config-druid.glade.h:47
+msgid "Plain Text"
+msgstr "Vanlig tekst"
+
+#: mail/mail-config-druid.glade.h:48
+msgid "Receiving Email"
+msgstr "Mottar e-post"
+
+#: mail/mail-config-druid.glade.h:49
+msgid "Remember my password"
+msgstr "Husk mitt passord"
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
-msgstr "Velkommen til konfigurasjonsdruiden for Evolution e-post!\n"
+#: mail/mail-config-druid.glade.h:50 mail/mail-format.c:628
+msgid "Reply-To:"
+msgstr "Svar-til:"
+
+#: mail/mail-config-druid.glade.h:51
+msgid "Reply-to:"
+msgstr "Svar-til:"
+
+#: mail/mail-config-druid.glade.h:52
+msgid "Required"
+msgstr "Nødvendige"
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Save password"
+msgstr "Lagre passord"
+
+#: mail/mail-config-druid.glade.h:55
+msgid "Select signature file"
+msgstr "Velg signaturfil"
+
+#: mail/mail-config-druid.glade.h:56
+msgid "Sending Email"
+msgstr "Sender e-post"
+
+#: mail/mail-config-druid.glade.h:58
+msgid "Server Configuration"
+msgstr "Tjenerkonfigurasjon"
+
+#: mail/mail-config-druid.glade.h:59
+msgid "Server Type: "
+msgstr "Tjenertype: "
+
+#: mail/mail-config-druid.glade.h:60
+msgid "Server requires authentication"
+msgstr "Tjener krever autentisering"
+
+#: mail/mail-config-druid.glade.h:61
+msgid "Servers"
+msgstr "Tjenere"
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:62 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "Signaturfil:"
+
+#: mail/mail-config-druid.glade.h:63
+msgid "Signature:"
+msgstr "Signatur:"
+
+#: mail/mail-config-druid.glade.h:64 mail/mail-config.glade.h:15
+msgid "Sources"
+msgstr "Kilder"
+
+#: mail/mail-config-druid.glade.h:65
+msgid "This server requires a secure connection (SSL)"
+msgstr "Denne tjeneren krever en sikker forbindelse (SSL)"
+
+#: mail/mail-config-druid.glade.h:66
+msgid "Type"
+msgstr "Type"
+
+#: mail/mail-config-druid.glade.h:67
 msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
+"Type the name by which you would like to refer to these servers. For "
+"example: \"Work\" or \"Home\"."
 msgstr ""
-"Din e-post-konfigurasjon er nå komplett.\n"
-"Klikk \"Fullfør\" for å lagre dine nye innstillinger"
+"Skriv inn et referansenavn for disse tjenerene. For eksempel: \"Arbeid\" "
+"eller \"Hjemme\"."
+
+#: mail/mail-config-druid.glade.h:69
+msgid "User Information"
+msgstr "Brukerinformasjon"
+
+#: mail/mail-config-druid.glade.h:70 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "Brukernavn:"
+
+#: mail/mail-config-druid.glade.h:71
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+msgstr "Velkommen til konfigurasjonsdruiden for Evolution e-post.\n"
 
 #: mail/mail-config-gui.c:433
 msgid ""
@@ -4307,15 +4769,7 @@ msgstr "Fullt navn:"
 msgid "Email address:"
 msgstr "E-post adresse:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organisasjon:"
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Signaturfil:"
-
-#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
+#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:14
 msgid "Signature File"
 msgstr "Signaturfil"
 
@@ -4323,26 +4777,10 @@ msgstr "Signaturfil"
 msgid "Server:"
 msgstr "Tjener:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Brukernavn:"
-
-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "Sti:"
-
-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "Autentisering:"
-
 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Søk etter støttede typer..."
 
-#: mail/mail-config-gui.c:968
-msgid "Remember this password"
-msgstr "Husk dette passordet"
-
 #: mail/mail-config-gui.c:991
 msgid "Don't delete messages from server"
 msgstr "Ikke slett meldinger fra tjeneren"
@@ -4451,42 +4889,42 @@ msgstr "Spør etter autorisasjonsegenskaper for \"%s\""
 msgid "Query authorization at \"%s\""
 msgstr "Spør etter autorisasjon hos \"%s\""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:2
 msgid "Address"
 msgstr "Adresse"
 
-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:5
 msgid "Identities"
 msgstr "Identiteter"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:6
 msgid "Mail Sources"
 msgstr "E-post-kilder"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:7
+msgid "Mail Transport"
+msgstr "E-post-transport"
+
+#: mail/mail-config.glade.h:8
 msgid "Mark message as seen [ms]: "
 msgstr "Merk melding som sett [ms]: "
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:9
 msgid "News Servers"
 msgstr "News-tjenere"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:10
 msgid "News Sources"
 msgstr "News-kilder"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:11
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:13
 msgid "Send messages in HTML format"
 msgstr "Send meldinger i HTML-format"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Kilder"
-
 #: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
 #: mail/mail-crypto.c:781
 msgid "Please enter your PGP/GPG passphrase."
@@ -4498,21 +4936,21 @@ msgid "No password provided."
 msgstr "Ingen passord gitt."
 
 #: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:923
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikke opprette rør til GPG/PGP: %s"
 
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:917
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr "Ingen GPG/PGP-program tilgjengelig."
 
-#: mail/mail-crypto.c:945
+#: mail/mail-crypto.c:953
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Kunne ikke opprette midlertidig fil: %s"
 
-#: mail/mail-display.c:93
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4521,55 +4959,51 @@ msgstr ""
 "Kan ikke åpne fil %s:\n"
 "%s"
 
-#: mail/mail-display.c:126
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-display.c:224
+#: mail/mail-display.c:229
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:264
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/mail-display.c:306
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr "Lagre til disk..."
 
-#: mail/mail-display.c:308
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/mail-display.c:310
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr "Vis \"inline\""
 
-#: mail/mail-display.c:334
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis \"inline\" (via %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-format.c:505
+#: mail/mail-format.c:503
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr "Svar-til:"
-
 #: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "Ingen GPG/PGP-støtte tilgjengelig i denne versjonen av Evolution."
@@ -4615,33 +5049,37 @@ msgstr "Feilutformet del for ekstern-kropp."
 msgid "On %s, %s wrote:\n"
 msgstr "Den %s, skrev %s:\n"
 
-#: mail/mail-local.c:203
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Endrer mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:207
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Endre mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:262
+#: mail/mail-local.c:251
+msgid "Reconfiguring folder"
+msgstr "Omkonfigurerer mappe"
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr "Lukker aktiv mappe"
 
-#: mail/mail-local.c:294
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr "Endrer navn på gammel mappe og gjenåpner"
 
-#: mail/mail-local.c:315
+#: mail/mail-local.c:313
 msgid "Creating new folder"
 msgstr "Oppretter en ny mappe"
 
-#: mail/mail-local.c:330
+#: mail/mail-local.c:327
 msgid "Copying messages"
 msgstr "Kopierer meldinger"
 
-#: mail/mail-local.c:342
+#: mail/mail-local.c:348
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4650,7 +5088,7 @@ msgstr ""
 "Kan ikke lagre metainformasjon for mappe; du vil sannsynligvis\n"
 "ikke kunne åpne denne mappen igjen: %s"
 
-#: mail/mail-local.c:373
+#: mail/mail-local.c:379
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4658,299 +5096,209 @@ msgstr ""
 "Hvis du ikke kan åpne denne postboksen igjen må\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:782
+#: mail/mail-local.c:787
 msgid "Registering local folder"
 msgstr "Registrerer lokal mappe"
 
-#: mail/mail-local.c:784
+#: mail/mail-local.c:789
 msgid "Register local folder"
 msgstr "Registrér lokal mappe"
 
-#: mail/mail-ops.c:82
+#: mail/mail-local.c:894
+#, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr ""
+"Kan ikke registrer mappe '%s':\n"
+"%s"
+
+#: mail/mail-mt.c:85
+#, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Feil under '%s':\n"
+"%s"
+
+#: mail/mail-mt.c:87
+#, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Feil under utføring av operasjon:\n"
+"%s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+msgid "Working"
+msgstr "Arbeider"
+
+#: mail/mail-ops.c:89
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Henter e-post fra %s"
 
-#: mail/mail-ops.c:84
+#: mail/mail-ops.c:91
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Hent e-post fra %s"
 
-#: mail/mail-ops.c:329
+#: mail/mail-ops.c:336
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Ingen ny e-post på %s."
 
-#: mail/mail-ops.c:399
+#: mail/mail-ops.c:406
 msgid "Filtering email on demand"
 msgstr "Filtrering av post etter behov"
 
-#: mail/mail-ops.c:401
+#: mail/mail-ops.c:408
 msgid "Filter email on demand"
 msgstr "Fi_ltrér e-post ved behov"
 
-#: mail/mail-ops.c:538
+#: mail/mail-ops.c:552
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr "Sender en melding uten emne"
-
-#: mail/mail-ops.c:546
-#, c-format
-msgid "Send \"%s\""
-msgstr "Send \"%s\""
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr "Send en melding uten emne"
+#: mail/mail-ops.c:554
+msgid "Sending message"
+msgstr "Sender melding"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:670
 msgid "Sending queue"
 msgstr "Sender kø"
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:672
 msgid "Send queue"
 msgstr "Send kø"
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:805 mail/mail-ops.c:812
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Legger til \"%s\""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:809 mail/mail-ops.c:815
 msgid "Appending a message without a subject"
 msgstr "Legger til en melding uten emne"
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr "Fjerner \"%s\""
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr "Fjern \"%s\""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:898
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Flytter meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:900
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopierer meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:903
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytt meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:905
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiér meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:936
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:939
 msgid "Copying"
 msgstr "Kopiérer"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:959
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "Merker meldinger i mappe \"%s"
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "Merk meldinger i mappe \"%s\""
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "Merker melding %d av %d"
-
-#: mail/mail-ops.c:1296
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1298
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr "Skann foldere i \"%s\""
-
-#: mail/mail-ops.c:1367 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1100 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(Ingen beskrivelse)"
 
-#: mail/mail-ops.c:1433
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr "Legger ved meldinger fra mappe \"%s\""
-
-#: mail/mail-ops.c:1436
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr "Legg ved meldinger fra \"%s\""
-
-#: mail/mail-ops.c:1536
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "Videresender meldinger \"%s\""
-
-#: mail/mail-ops.c:1540
-msgid "Forwarding a message without a subject"
-msgstr "Videresender en melding uten emne"
-
-#: mail/mail-ops.c:1543
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "Videresend meldingen \"%s\""
-
-#: mail/mail-ops.c:1547
-msgid "Forward a message without a subject"
-msgstr "Videresend en melding uten emne"
-
-#: mail/mail-ops.c:1594
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Henter melding nummer %d av %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1611
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-"Kunne ikke generere MIME-del fra melding under generering av videresendt "
-"melding."
-
-#: mail/mail-ops.c:1666
+#: mail/mail-ops.c:1165
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1680
-msgid "Forwarded message:\n"
-msgstr "Videresendt melding:\n"
-
-#: mail/mail-ops.c:1749
-#, c-format
-msgid "Loading \"%s\""
-msgstr "Laster \"%s\""
-
-#: mail/mail-ops.c:1751
-#, c-format
-msgid "Load \"%s\""
-msgstr "Last \"%s\""
-
-#: mail/mail-ops.c:1854
-#, c-format
-msgid "Creating \"%s\""
-msgstr "Oppretter \"%s\""
-
-#: mail/mail-ops.c:1856
+#: mail/mail-ops.c:1206 mail/mail-ops.c:1275
 #, c-format
-msgid "Create \"%s\""
-msgstr "Opprett \"%s\""
-
-#: mail/mail-ops.c:1904
-msgid "Exception while reporting result to shell component listener."
-msgstr "Unntak under rapportering av resultat til skallkomponentens lytter."
+msgid "Opening folder %s"
+msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1950
-#, c-format
-msgid "Synchronizing \"%s\""
-msgstr "Synkroniserer \"%s\""
+#: mail/mail-ops.c:1337
+msgid "Synchronising folder"
+msgstr "Synkroniserer mappe"
 
-#: mail/mail-ops.c:1952
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr "Synkronisér \"%s\""
+#: mail/mail-ops.c:1387
+msgid "Expunging folder"
+msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:1435
 #, c-format
-msgid "Displaying message UID \"%s\""
-msgstr "Viser melding-UID \"%s\""
+msgid "Retrieving message %s"
+msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:2020
-msgid "Clearing message display"
-msgstr "Tømmer meldingsvisning"
+#: mail/mail-ops.c:1498
+msgid "Retrieving messages"
+msgstr "Henter meldinger"
 
-#: mail/mail-ops.c:2023
+#: mail/mail-ops.c:1508
 #, c-format
-msgid "Display message UID \"%s\""
-msgstr "Vis meldings-UID \"%s\""
-
-#: mail/mail-ops.c:2026
-msgid "Clear message display"
-msgstr "Tøm meldingsvisning"
-
-#: mail/mail-ops.c:2217
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr "Åpner meldinger fra mappe \"%s\""
-
-#: mail/mail-ops.c:2220
-#, c-format
-msgid "Open messages from \"%s\""
-msgstr "Åpne meldinger fra \"%s\""
-
-#: mail/mail-ops.c:2324
-#, c-format
-msgid "Loading %s Folder"
-msgstr "Laster %s-mappe"
-
-#: mail/mail-ops.c:2326
-#, c-format
-msgid "Load %s Folder"
-msgstr "Last %s-mappe"
-
-#: mail/mail-ops.c:2390
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr "Viser meldinger fra mappe \"%s\""
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "Henter melding nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2393
+#: mail/mail-ops.c:1656
 #, c-format
-msgid "View messages from \"%s\""
-msgstr "Vis meldinger fra \"%s\""
+msgid "Loading %s Folder for %s"
+msgstr "Laster %s-mappe for %s"
 
-#: mail/mail-ops.c:2426
+#: mail/mail-ops.c:1658
 #, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr "Henter melding %d av %d (uid \"%s\")"
+msgid "Load %s Folder for %s"
+msgstr "Last %s-mappe for %s"
 
-#: mail/mail-ops.c:2517
-#, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Lagrer meldinger fra mappe \"%s\""
+#: mail/mail-ops.c:1824
+msgid "Saving messages"
+msgstr "Lagrer meldinger"
 
-#: mail/mail-ops.c:2520
+#: mail/mail-ops.c:1903
 #, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "Lagre meldinger fra mappe \"%s\""
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Kunne ikke opprette utdatafil: %s\n"
+" %s"
 
-#: mail/mail-ops.c:2563
+#: mail/mail-ops.c:1916
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Lagrer melding %d av %d (uid \"%s\")"
 
+#: mail/mail-ops.c:1930
+#, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr ""
+"Feil under lagring av av meldinger til: %s:\n"
+" %s"
+
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "Uferdig melding skrevet på rør!"
 
@@ -4994,53 +5342,53 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kunne ikke opprette midlertidig mbox `%s': %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:240
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr "Undersøker %s"
 
-#: mail/mail-tools.c:270
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 "Kunne ikke lese bufferfil for UID \"%s\". Du kan motta dupliserte meldinger."
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Henter melding %d av %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:314
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Skriver melding %d av %d"
 
-#: mail/mail-tools.c:346
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Lagrer endringer til %s"
 
-#: mail/mail-tools.c:383
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (videresendt melding)"
 
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (uten emne)"
 
-#: mail/mail-tools.c:432
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: mail/mail-tools.c:434
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "Videresendt melding (uten emne)"
 
-#: mail/mail-tools.c:537
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5059,89 +5407,81 @@ msgstr "Ny VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:32
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:42
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply to the sender of this message"
 msgstr "Svar til avsender av denne meldingen"
 
-#: mail/mail-view.c:151 po/tmp/evolution-mail.xml.h:41
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:36
 msgid "Reply to all recipients of this message"
 msgstr "Svar til alle mottakere av denne meldingen"
 
-#: mail/mail-view.c:154 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
 msgid "Forward this message"
 msgstr "Videresend denne meldingen"
 
-#: mail/mail-view.c:158 po/tmp/evolution-mail.xml.h:36
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:31
 msgid "Print the selected message"
 msgstr "Skriv ut den valgte meldingen"
 
-#: mail/mail-view.c:160 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:593
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:596
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:599
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:881
+#: mail/message-list.c:884
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:893 mail/message-list.c:909
+#: mail/message-list.c:896 mail/message-list.c:912
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et al."
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:899 mail/message-list.c:915
 msgid "<unknown>"
 msgstr "<ukjent>"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:968
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:972
+#: mail/message-list.c:975
 msgid "Today %l:%M %p"
 msgstr "Idag %l:%M %p"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:984
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: mail/message-list.c:993
+#: mail/message-list.c:996
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1004
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1006
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2347
-msgid "Rebuilding message view"
-msgstr "Bygger opp meldingsvisningen på nytt"
-
-#: mail/message-list.c:2349
-msgid "Rebuild message view"
-msgstr "Gjenoppbygg meldingsvisningen"
-
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
 msgstr "Vis mapper som som starter med:"
@@ -5156,27 +5496,27 @@ msgstr "Henter lager for \"%s\""
 msgid "Get store for \"%s\""
 msgstr "Hent lager for \"%s\""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnerer på mappe \"%s\""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Sletter abonnement på mappe \"%s\""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Abonnér på mappe \"%s\""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Slett abonnement på mappe \"%s\""
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Evolution installasjon"
 
@@ -5194,23 +5534,23 @@ msgstr ""
 "Vennligst klikk \"OK\" for å installere filene, eller \"Avbryt\" for å "
 "avslutte."
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr "Kunne ikke oppdatere filene."
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr "Evolutions filer ble installert."
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr "Dette ser ut til å være første gang du kjører Evolution."
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Vennligst klikk \"OK\" for å installere Evolutions brukerfiler under"
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5221,7 +5561,7 @@ msgstr ""
 "%s\n"
 "Feil: %s"
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5230,7 +5570,7 @@ msgstr ""
 "Kan ikke kopiere filer til\n"
 "`%s'."
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5241,7 +5581,7 @@ msgstr ""
 "Venligst flytt denne for å tillate installasjon\n"
 "av Evolution's brukerfiler."
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5285,23 +5625,19 @@ msgstr "Ny..."
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ble ikke funnet i din $PATH."
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5311,7 +5647,7 @@ msgstr ""
 "for e-post, kalender og kontaktdatabaser for\n"
 "GNOME skrivebordsmiljøet."
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr "Gå til mappe..."
 
@@ -5411,9 +5747,8 @@ msgstr "Fjern denne snarveien fra snarveilinjen"
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:48 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:120
+#: ui/evolution-message-composer.xml.h:43 ui/evolution.xml.h:29
 msgid "_View"
 msgstr "_Vis"
 
@@ -5528,1142 +5863,1091 @@ msgstr "Slå av."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr "Ny katalog-tj_ener"
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr "H_andlinger"
-
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:2
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:4
 msgid "Delete a contact"
 msgstr "Slett 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 "Finn"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:6
 msgid "Find a contact"
 msgstr "Finn 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
+#: ui/evolution-addressbook.xml.h:10
 msgid "Stop"
 msgstr "Stopp"
 
-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:11
 msgid "Stop Loading"
 msgstr "Stopp innlesing"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:12
 msgid "View All"
 msgstr "Vis alle"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:13
 msgid "View all contacts"
 msgstr "Vis alle kontakter"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:14
+msgid "_Addressbook Configuration..."
+msgstr "Konfigurasjon av adressebok..."
+
+#: ui/evolution-addressbook.xml.h:15
 msgid "_Print Contacts..."
 msgstr "S_kriv ut kontakter..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:16
 msgid "_Search for contacts"
 msgstr "_Søk etter kontakter"
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:118
 msgid "_Tools"
 msgstr "_Verktøy"
 
-#.
-#. * 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 dager"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:2
 msgid "Alter preferences"
 msgstr "Endre brukervalg"
 
-#: 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 "Brukervalg for kalender..."
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a new calendar"
 msgstr "Opprett 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å tilbake i tid"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:9
 msgid "Go forward in time"
 msgstr "Gå fremover i tid"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to"
 msgstr "Gå til"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Gå til en spesifikk dato"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to present time"
 msgstr "Gå til i dag"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Måned"
 
-#: 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 "Neste"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:16
 msgid "Open a calendar"
 msgstr "Åpne en kalender"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:17
 msgid "Prev"
 msgstr "Forrige"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:19
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: po/tmp/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Save calendar as something else"
 msgstr "Lagre kalender som noe annet"
 
-#: po/tmp/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Show 1 day"
 msgstr "Vis 1 dag"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:22
 msgid "Show 1 month"
 msgstr "Vis 1 måned"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:23
 msgid "Show 1 week"
 msgstr "Vis 1 uke"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:24
 msgid "Show the working week"
 msgstr "Vis arbeidsuken"
 
-#: 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 "Uke"
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+#: ui/evolution-calendar.xml.h:27 ui/evolution.xml.h:26
 msgid "_New"
 msgstr "_Ny"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:28
 msgid "_Open Calendar"
 msgstr "_Åpne kalender"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:29
 msgid "_Print this calendar"
 msgstr "S_kriv ut denne kalenderen"
 
-#: po/tmp/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:30
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Slett denne oppføringen"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:3
 msgid "Delete..."
 msgstr "Slett..."
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:4
 msgid "Help"
 msgstr "Hjelp"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Skriv ut konvolutt..."
 
-#: 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 denne oppføringen"
 
-#: 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 "L_agre som..."
 
-#: 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 "Lagre og lukk"
 
-#: 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 "Lagre kontakten og lukk dialogboksen"
 
-#: po/tmp/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-editor.xml.h:11
 msgid "Se_nd contact to other..."
 msgstr "Se_nd kontakt til andre..."
 
-#: 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 hjelp"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:13
 msgid "Send _message to contact..."
 msgstr "Send _melding til kontakt..."
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:42
-#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:105
+#: ui/evolution-message-composer.xml.h:37 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:20
 msgid "_File"
 msgstr "_Fil"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:15
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:46
+#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:116
+#: ui/evolution-message-composer.xml.h:41
 msgid "_Save"
 msgstr "_Lagre"
 
-#.
-#. * 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 denne applikasjonen"
 
-#: 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 "Ha_ndlinger"
 
-#: 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 utvalget"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:9
 msgid "Close this appointment"
 msgstr "Lukk denne avtalen"
 
-#: 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 "Kopiér"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:11
 msgid "Copy the selection"
 msgstr "Kopiér utvalget"
 
-#: 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 utvalget"
 
-#: po/tmp/evolution-event-editor.xml.h:21
+#: ui/evolution-event-editor.xml.h:16
 msgid "Dump XML"
 msgstr "Dump XML"
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:17
 msgid "Dump the UI Xml description"
 msgstr "Dump beskrivelse av grensesnittet som XML"
 
-#: po/tmp/evolution-event-editor.xml.h:23
+#: ui/evolution-event-editor.xml.h:18
 msgid "FIXME: Address _Book..."
 msgstr "Addresse_bok..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:19
 msgid "FIXME: Ch_oose Form..."
 msgstr "Velg skjema..."
 
-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:20
 msgid "FIXME: Chec_k Names"
 msgstr "Sjek_k navn"
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:21
 msgid "FIXME: Cop_y to Folder..."
 msgstr "Kopiér til mappe..."
 
-#: po/tmp/evolution-event-editor.xml.h:27
+#: ui/evolution-event-editor.xml.h:22
 msgid "FIXME: D_esign a Form..."
 msgstr "U_tform et skjema..."
 
-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:23
 msgid "FIXME: Define Print _Styles"
-msgstr "Definér utskriftstiler"
+msgstr "Definér utskrift_stiler"
 
-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Desi_gn This Form"
 msgstr "_Utform dette skjemaet"
 
-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "Fø_rste oppføring i mappe"
 
-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: For_ward"
 msgstr "_Videresend"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: Forward as v_Calendar"
 msgstr "Videresend som v_Calendar"
 
-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:28
 msgid "FIXME: Help"
 msgstr "Hjelp"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: In_complete Task"
 msgstr "U_komplett oppgave"
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Insert File"
 msgstr "Sett inn fil"
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: It_em..."
 msgstr "Opp_føring"
 
-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Paste _Special... "
 msgstr "Lim inn _spesial..."
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Print Pre_view"
 msgstr "Forhåndsvisning av utskrift"
 
-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:34
 msgid "FIXME: Pu_blish Form As..."
 msgstr "Pu_blisér skjema som..."
 
-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:35
 msgid "FIXME: Publish _Form..."
 msgstr "Publisér skjema..."
 
-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: Rec_urrence..."
 msgstr "Gjentakelse..."
 
-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:37
 msgid "FIXME: S_end"
 msgstr "_Send"
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Save Attac_hments..."
 msgstr "Lagre vedle_gg..."
 
-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Script _Debugger"
 msgstr "Feilsøking i skript"
 
-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Task _Request"
 msgstr "Oppgavefo_respørsel"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:41
 msgid "FIXME: _Contact"
 msgstr "_Kontakt"
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: _Customize..."
 msgstr "_Tilpass..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: _File..."
 msgstr "_Fil..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: _Font..."
 msgstr "FIXME: Skri_fttyper..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: _Formatting"
 msgstr "_Formatering"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Item"
 msgstr "_Oppføring"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Journal Entry"
 msgstr "_Journaloppføring"
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _Last Item in Folder"
 msgstr "_Siste oppføring i mappe"
 
-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Mail Message"
 msgstr "Send _melding"
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Memo Style"
 msgstr "_Notis-stil"
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Move to Folder..."
 msgstr "_Flytt til mappe..."
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _New Appointment"
 msgstr "_Ny avtale"
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Note"
 msgstr "_Notis"
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Object..."
 msgstr "_Objekt..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Paragraph..."
 msgstr "_Avsnitt..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Spelling..."
 msgstr "_Stavekontroll..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _Standard"
 msgstr "_Standard"
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Task"
 msgstr "_Oppgave"
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Unread Item"
 msgstr "_Ulest oppføring"
 
-#: po/tmp/evolution-event-editor.xml.h:65
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: what goes here?"
 msgstr "Hva går her?"
 
-#: 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 "Finn igjen"
 
-#: po/tmp/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:64
 msgid "Find _Again"
 msgstr "Finn ig_jen"
 
-#: po/tmp/evolution-event-editor.xml.h:70
+#: ui/evolution-event-editor.xml.h:65
 msgid "Go to the next item"
 msgstr "Gå til neste oppføring"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:66
 msgid "Go to the previous item"
 msgstr "Gå til forrige oppføring"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:67
 msgid "Modify the file's properties"
 msgstr "Endre filens egenskaper"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:68
 msgid "N_ext"
 msgstr "N_este"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:70
 msgid "Paste"
 msgstr "Lim inn"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:71
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:72
 msgid "Pre_vious"
 msgstr "Forri_ge"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:73
 msgid "Previous"
 msgstr "Forrige"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:74
 msgid "Print S_etup..."
 msgstr "Skriveropps_ett..."
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:75
 msgid "Print Setup"
 msgstr "Skriveroppsett"
 
-#: 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 "Gjenopprett"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:80
 msgid "Redo the undone action"
 msgstr "Gjenopprett angret handling"
 
-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:81
 msgid "Replace"
 msgstr "Erstatt"
 
-#: po/tmp/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:82
 msgid "Replace a string"
 msgstr "Erstattt en streng"
 
-#: 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 "Lagre avtalen og lukk dialogboksen"
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-event-editor.xml.h:87 ui/evolution-message-composer.xml.h:19
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:88
 msgid "Schedule Meeting"
 msgstr "Sett opp møte"
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:89
 msgid "Schedule _Meeting"
 msgstr "Sett opp _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 "Sett opp ett eller annet 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 etter samme streng på nytt"
 
-#: po/tmp/evolution-event-editor.xml.h:97
+#: ui/evolution-event-editor.xml.h:92
 msgid "Search for a string"
 msgstr "Søk etter en streng"
 
-#: po/tmp/evolution-event-editor.xml.h:99
+#: ui/evolution-event-editor.xml.h:94
 msgid "Select All"
 msgstr "Velg alle"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:95
 msgid "Select everything"
 msgstr "Velg alt"
 
-#: 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 "Redigér sideinnstillinger for aktiv skriver"
 
-#: po/tmp/evolution-event-editor.xml.h:102
+#: ui/evolution-event-editor.xml.h:97
 msgid "Undo"
 msgstr "Angre"
 
-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:98
 msgid "Undo the last action"
 msgstr "Angre siste handling"
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:38
+#: ui/evolution-event-editor.xml.h:99 ui/evolution-message-composer.xml.h:33
 msgid "_About..."
 msgstr "_Om..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:39
+#: ui/evolution-event-editor.xml.h:100 ui/evolution-message-composer.xml.h:34
 msgid "_Close"
 msgstr "L_ukk"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:101
 msgid "_Copy"
 msgstr "_Kopiér"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-event-editor.xml.h:102 ui/evolution-message-composer.xml.h:35
 msgid "_Debug"
 msgstr "_Feilsøk"
 
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:41
-#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:36
+#: ui/evolution-subscribe.xml.h:10 ui/evolution.xml.h:19
 msgid "_Edit"
 msgstr "R_edigér"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:106
 msgid "_Find..."
 msgstr "_Finn..."
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:107
 msgid "_Forms"
 msgstr "Sk_jemaer"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:38
+#: ui/evolution.xml.h:23
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:109
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: 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 "_Lim inn"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:113
 msgid "_Properties..."
 msgstr "Egenska_per..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Redo"
 msgstr "Gjenopp_rett"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Replace..."
 msgstr "E_rstatt..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Toolbars"
 msgstr "Verk_tøylinjer"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Undo"
 msgstr "_Angre"
 
-#.
-#. * 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 "Komponér"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:2
 msgid "Compose a new message"
 msgstr "Komponér en ny melding"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:4
 msgid "Copy message to a new folder"
 msgstr "Kopiér meldingen til en ny mappe"
 
-#: 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 "M_appe"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:9
 msgid "Fi_lter on Sender"
 msgstr "Fi_ltrér etter sender"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:10
 msgid "Filter on Rec_ipients"
 msgstr "F_iltrér etter mottaker"
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:11
 msgid "Forget _Passwords"
 msgstr "Glem _passord"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:15
 msgid "Get Mail"
 msgstr "Hent e-post"
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:17
 msgid "Hide _Deleted messages"
 msgstr "Skjul slette_de meldinger"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:18
 msgid "Hide _Read messages"
 msgstr "Skjul le_ste meldinger"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:19
 msgid "Hide _Selected messages"
 msgstr "_Skjul valgte meldinger"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:20
 msgid "Mail _Filters..."
 msgstr "E-post _filtre..."
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:21
 msgid "Manage Subscriptions..."
 msgstr "Håndtér abonnement..."
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:22
 msgid "Mar_k As Read"
 msgstr "Mar_kér som lest"
 
-#: po/tmp/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:23
 msgid "Mark As U_nread"
 msgstr "Merk som _ulest"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:24
 msgid "Move"
 msgstr "Flytt"
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:25
 msgid "Move message to a new folder"
 msgstr "Flytt meldingen til en ny mappe"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:26
 msgid "Previews the message to be printed"
 msgstr "Viser forhåndsvisning av meldingen som skal skrives ut"
 
-#: po/tmp/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:28
 msgid "Print Preview of message..."
 msgstr "Vis forhåndsvisning av melding..."
 
-#: po/tmp/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:29
 msgid "Print message to the printer"
 msgstr "Skriv ut denne meldingen på skriveren"
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:30
 msgid "Print message..."
 msgstr "Skriv ut melding..."
 
-#: po/tmp/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:34
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:35
 msgid "Reply to _Sender"
 msgstr "Svar til _sender"
 
-#: 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 "Velg _alle"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:39
 msgid "Send queued mail and retrieve new mail"
 msgstr "Send kølagt e-post og hent ny e-post"
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:40
 msgid "Show _All messages"
 msgstr "Vis _alle meldinger"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr "Meldingsliste med tråder"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:44
 msgid "View Raw Message Source"
 msgstr "Vis rå meldingskode"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:45
 msgid "_Apply Filters"
 msgstr "_Påfør filtre"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:46
 msgid "_Configure Folder"
 msgstr "_Konfigurér mappe"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:47
 msgid "_Copy to Folder..."
 msgstr "_Kopiér til mappe..."
 
-#: po/tmp/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:49
 msgid "_Edit Message"
 msgstr "R_edigér melding"
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:50
 msgid "_Expunge"
-msgstr "_Fjern"
+msgstr "_Tøm"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:51
 msgid "_Filter on Subject"
 msgstr "_Filtrér etter emne"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:52
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: po/tmp/evolution-mail.xml.h:58 po/tmp/evolution-subscribe.xml.h:17
+#: ui/evolution-mail.xml.h:53 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Re_versér utvalg"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:54
 msgid "_Mail Configuration..."
 msgstr "_E-post konfigurasjon..."
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:55
 msgid "_Message"
 msgstr "_Melding"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:56
 msgid "_Move to Folder..."
 msgstr "F_lytt til mappe..."
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:57
 msgid "_Open in New Window"
 msgstr "_Åpne i nytt vindu"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:58
 msgid "_Print Message"
 msgstr "S_kriv ut melding"
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:59
 msgid "_Save Message As..."
 msgstr "Lagre melding _som..."
 
-#: po/tmp/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:60
 msgid "_Source"
 msgstr "_Kildekode"
 
-#: po/tmp/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr "Med _tråder"
 
-#: po/tmp/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:62
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
-#: po/tmp/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr "_VFolder for emne"
 
-#: po/tmp/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:64
 msgid "_Virtual Folder Editor..."
 msgstr "Redigering av _virtuelle mapper..."
 
-#.
-#. * 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 "Legg ved"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:4
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: po/tmp/evolution-message-composer.xml.h:10
+#: ui/evolution-message-composer.xml.h:5
 msgid "Encrypt this message with PGP"
 msgstr "Kryptér denne meldingen 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 "Sett inn en tekstfil i meldingen"
 
-#: po/tmp/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:9
 msgid "Insert text file..."
 msgstr "Sett inn tekstfil..."
 
-#: po/tmp/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Åpne en fil"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Kryptér med PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Signér med PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:15
 msgid "Save As"
 msgstr "Lagre som"
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save in _folder... (FIXME)"
 msgstr "Lagre i _mappe..."
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save in folder..."
 msgstr "Lagre i mappe..."
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save the current file with a different name"
 msgstr "Lagre aktiv fil med et nytt navn"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save the message in a specified folder"
 msgstr "Lagre meldingen i en spesifisert mappe"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:22
 msgid "Send"
 msgstr "Send"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:23
 msgid "Send _Later"
 msgstr "Send se_nere"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send _later"
 msgstr "Send se_nere"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:25
 msgid "Send the mail in HTML format"
 msgstr "Send meldingen i HTML-format"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:26
 msgid "Send the message later"
 msgstr "Send meldingen senere"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send the message now"
 msgstr "Send meldingen nå"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send this message now"
 msgstr "Send denne meldingen nå"
 
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show / hide attachments"
 msgstr "Vis/skjul vedlegg"
 
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:30
 msgid "Show _attachments"
 msgstr "Vis _vedlegg"
 
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:31
 msgid "Show attachments"
 msgstr "Vis vedlegg"
 
-#: po/tmp/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:32
 msgid "Sign this message with your PGP key"
 msgstr "Signér denne meldingen med din PGP-nøkkel"
 
-#: po/tmp/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:39
 msgid "_Insert text file... (FIXME)"
 msgstr "Sett _inn tekstfil..."
 
-#: po/tmp/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: po/tmp/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Security"
 msgstr "_Sikkerhet"
 
-#.
-#. * 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 "Legg til mappe på listen over abonnerte mapper"
 
-#: po/tmp/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List"
 msgstr "Les listen på nytt"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:5
 msgid "Refresh List of Folders"
 msgstr "Les mappelisten på nytt"
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:6
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Fjern mappe fra din liste over abbonerte mapper"
 
-#: po/tmp/evolution-subscribe.xml.h:13
+#: ui/evolution-subscribe.xml.h:8
 msgid "Subscribe"
 msgstr "Abonnér"
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:9
 msgid "Unsubscribe"
 msgstr "Fjern abonnement"
 
-#.
-#. * 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 "Vis en annen mappe"
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:2
 msgid "E_xit"
 msgstr "A_vslutt"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:3
 msgid "Evolution bar _shortcut"
 msgstr "Evolution-linje _snarvei"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:4
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:5
 msgid "Getting _Started"
 msgstr "Kom _igang"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:6
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:7
 msgid "Show the _Folder Bar"
 msgstr "Vis _mappelinjen"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:8
 msgid "Show the _Shortcut Bar"
 msgstr "Vis _snarveilinjen"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:9
 msgid "Submit _Bug Report"
 msgstr "Sen_d inn feilrapport"
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:10
 msgid "Submit bug report using Bug Buddy."
 msgstr "Send inn feilrapport ved bruk av Bug Buddy."
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:11
 msgid "Toggle whether to show the folder bar"
 msgstr "Slå av/på visning av mappelinjen"
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:12
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Slå av/på visning av snarveilinjen"
 
-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:13
 msgid "Using the C_ontact Manager"
 msgstr "Bruk av k_ontaktdatabasen"
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:14
 msgid "Using the _Calendar"
 msgstr "Bruk av _kalenderen"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:15
 msgid "Using the _Mailer"
 msgstr "Bruk av e-_postprogrammet"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:16
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:17
 msgid "_Appointment (FIXME)"
 msgstr "_Avtale"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:18
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:21
 msgid "_Folder"
 msgstr "_Mappe"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:22
 msgid "_Go to Folder..."
 msgstr "_Gå til mappe..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:24
 msgid "_Index"
 msgstr "_Indeks"
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:25
 msgid "_Mail message (FIXME)"
 msgstr "Send _melding"
 
-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:27
 msgid "_Settings"
 msgstr "Inn_stillinger"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:28
 msgid "_Task (FIXME)"
 msgstr "_Oppgave"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentativ"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:387
 msgid "Busy"
 msgstr "Opptatt"
@@ -6747,7 +7031,7 @@ msgstr "MTWTFSS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
@@ -6772,6 +7056,223 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Gruppe %i"
 
+#~ msgid "Automatically check mail every "
+#~ msgstr "Sjekk etter e-post hver "
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "Server Timeouts"
+#~ msgstr "Tidsavbrudd for tjener"
+
+#~ msgid "minute(s)"
+#~ msgstr "minutt(er)"
+
+#~ msgid "categories"
+#~ msgstr "kategorier"
+
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "Oppføring(er) hører til disse kategoriene:"
+
+#~ msgid "Available Categories:"
+#~ msgstr "Tilgjengelige kategorier:"
+
+#~ msgid "Deleted"
+#~ msgstr "Slettet"
+
+#~ msgid "Draft"
+#~ msgstr "Skisse"
+
+#~ msgid "Mail Source"
+#~ msgstr "E-post-kilde"
+
+#~ msgid ""
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
+#~ msgstr ""
+#~ "Din e-post-konfigurasjon er nå komplett.\n"
+#~ "Klikk \"Fullfør\" for å lagre dine nye innstillinger"
+
+#~ msgid "Sending a message without a subject"
+#~ msgstr "Sender en melding uten emne"
+
+#~ msgid "Send \"%s\""
+#~ msgstr "Send \"%s\""
+
+#~ msgid "Send a message without a subject"
+#~ msgstr "Send en melding uten emne"
+
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "Merker meldinger i mappe \"%s"
+
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "Merk meldinger i mappe \"%s\""
+
+#~ msgid "Marking message %d of %d"
+#~ msgstr "Merker melding %d av %d"
+
+#~ msgid "Scan folders in \"%s\""
+#~ msgstr "Skann foldere i \"%s\""
+
+#~ msgid "Attaching messages from folder \"%s\""
+#~ msgstr "Legger ved meldinger fra mappe \"%s\""
+
+#~ msgid "Attach messages from \"%s\""
+#~ msgstr "Legg ved meldinger fra \"%s\""
+
+#~ msgid "Forwarding messages \"%s\""
+#~ msgstr "Videresender meldinger \"%s\""
+
+#~ msgid "Forwarding a message without a subject"
+#~ msgstr "Videresender en melding uten emne"
+
+#~ msgid "Forward message \"%s\""
+#~ msgstr "Videresend meldingen \"%s\""
+
+#~ msgid "Forward a message without a subject"
+#~ msgstr "Videresend en melding uten emne"
+
+#~ msgid ""
+#~ "Failed to generate mime part from message while generating forwarded message."
+#~ msgstr ""
+#~ "Kunne ikke generere MIME-del fra melding under generering av videresendt "
+#~ "melding."
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "Oppretter \"%s\""
+
+#~ msgid "Create \"%s\""
+#~ msgstr "Opprett \"%s\""
+
+#~ msgid "Exception while reporting result to shell component listener."
+#~ msgstr "Unntak under rapportering av resultat til skallkomponentens lytter."
+
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "Lagrer meldinger fra mappe \"%s\""
+
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Lagre meldinger fra mappe \"%s\""
+
+#~ msgid "Rebuilding message view"
+#~ msgstr "Bygger opp meldingsvisningen på nytt"
+
+#~ msgid "Rebuild message view"
+#~ msgstr "Gjenoppbygg meldingsvisningen"
+
+#~ msgid "Note: When converting between mailbox formats, a failure\n"
+#~ msgstr "Merk: Ved konvertering mellom postboksformater, kan en feil\n"
+
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "_Avtale"
+
+#~ msgid "FIXME: Meeting Re_quest"
+#~ msgstr "Møteforesp_ørsel"
+
+#~ msgid "Page Set_up"
+#~ msgstr "Sideoppsett"
+
+#~ msgid "FIXME: Mark as U_nread"
+#~ msgstr "Merk som ulest"
+
+#~ msgid "FIXME: __Formatting"
+#~ msgstr "_Formatering"
+
+#~ msgid "Ne_xt"
+#~ msgstr "Nes_te"
+
+#~ msgid "FIXME: Previous"
+#~ msgstr "Forrige"
+
+#~ msgid "FIXME: Next"
+#~ msgstr "Neste"
+
+#~ msgid "External Directories"
+#~ msgstr "Eksterne kataloger"
+
+#~ msgid "Port Number:"
+#~ msgstr "Portnummer:"
+
+#~ msgid "Outline:"
+#~ msgstr "Omriss:"
+
+#~ msgid "Headings:"
+#~ msgstr "Topptekster:"
+
+#~ msgid "Empty days:"
+#~ msgstr "Tomme dager:"
+
+#~ msgid "Appointments:"
+#~ msgstr "Avtaler:"
+
+#~ msgid "Highlighted day:"
+#~ msgstr "Merket dag:"
+
+#~ msgid "Day numbers:"
+#~ msgstr "Dagnummer:"
+
+#~ msgid "Current day's number:"
+#~ msgstr "Nummer for idag:"
+
+#~ msgid "To-Do item that is not yet due:"
+#~ msgstr "Oppgavelisteoppføring som ikke har gått ut ennå:"
+
+#~ msgid "To-Do item that is due today:"
+#~ msgstr "Oppgavelisteoppføring som går ut idag:"
+
+#~ msgid "To-Do item that is overdue:"
+#~ msgstr "Oppgavelisteoppføring som har gått ut:"
+
+#~ msgid "Expunging \"%s\""
+#~ msgstr "Fjerner \"%s\""
+
+#~ msgid "Expunge \"%s\""
+#~ msgstr "Tøm \"%s\""
+
+#~ msgid "Loading \"%s\""
+#~ msgstr "Laster \"%s\""
+
+#~ msgid "Load \"%s\""
+#~ msgstr "Last \"%s\""
+
+#~ msgid "Synchronizing \"%s\""
+#~ msgstr "Synkroniserer \"%s\""
+
+#~ msgid "Synchronize \"%s\""
+#~ msgstr "Synkronisér \"%s\""
+
+#~ msgid "Displaying message UID \"%s\""
+#~ msgstr "Viser melding-UID \"%s\""
+
+#~ msgid "Clearing message display"
+#~ msgstr "Tømmer meldingsvisning"
+
+#~ msgid "Display message UID \"%s\""
+#~ msgstr "Vis meldings-UID \"%s\""
+
+#~ msgid "Clear message display"
+#~ msgstr "Tøm meldingsvisning"
+
+#~ msgid "Opening messages from folder \"%s\""
+#~ msgstr "Åpner meldinger fra mappe \"%s\""
+
+#~ msgid "Open messages from \"%s\""
+#~ msgstr "Åpne meldinger fra \"%s\""
+
+#~ msgid "Viewing messages from folder \"%s\""
+#~ msgstr "Viser meldinger fra mappe \"%s\""
+
+#~ msgid "View messages from \"%s\""
+#~ msgstr "Vis meldinger fra \"%s\""
+
+#~ msgid "Retrieving message %d of %d (uid \"%s\")"
+#~ msgstr "Henter melding %d av %d (uid \"%s\")"
+
+#~ msgid "N_ew Directory Server"
+#~ msgstr "Ny katalog-tj_ener"
+
+#~ msgid "_Actions"
+#~ msgstr "H_andlinger"
+
 #~ msgid "appointment"
 #~ msgstr "avtaler"
 
@@ -6784,9 +7285,6 @@ msgstr "Gruppe %i"
 #~ msgid "Year:"
 #~ msgstr "År:"
 
-#~ msgid "Go to date"
-#~ msgstr "Gå til dato"
-
 #~ msgid ""
 #~ "Please select the date you want to go to.\n"
 #~ "When you click on a day, you will be taken\n"
@@ -6796,54 +7294,18 @@ msgstr "Gruppe %i"
 #~ "Når du klikker på en dag vil du flytte\n"
 #~ "deg til denne datoen."
 
-#~ msgid "Go to today"
-#~ msgstr "Gå til idag"
-
 #~ msgid "_Mail Configuration"
 #~ msgstr "E-post-ko_nfigurasjon"
 
 #~ msgid "_Save Calendar As"
 #~ msgstr "Lagre kalender _som"
 
-#~ msgid "january"
-#~ msgstr "januar"
-
-#~ msgid "february"
-#~ msgstr "februar"
-
-#~ msgid "march"
-#~ msgstr "mars"
-
-#~ msgid "april"
-#~ msgstr "april"
-
 #~ msgid "may"
 #~ msgstr "mai"
 
-#~ msgid "june"
-#~ msgstr "juni"
-
-#~ msgid "july"
-#~ msgstr "juli"
-
-#~ msgid "august"
-#~ msgstr "august"
-
-#~ msgid "september"
-#~ msgstr "september"
-
 #~ msgid "sept"
 #~ msgstr "sept"
 
-#~ msgid "october"
-#~ msgstr "oktober"
-
-#~ msgid "november"
-#~ msgstr "november"
-
-#~ msgid "december"
-#~ msgstr "desember"
-
 #~ msgid "sunday"
 #~ msgstr "søndag"
 
@@ -7010,9 +7472,6 @@ msgstr "Gruppe %i"
 #~ msgid "Cannot fork %s: %s"
 #~ msgstr "Kan ikke kjøre fork på %s: %s"
 
-#~ msgid "Cannot initialize Evolution's mail summary component."
-#~ msgstr "Kan ikke initiere Evolution's e-postsammendrag-komponent."
-
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Kan ikke initiere Evolutions e-postlagrings-hash."
 
@@ -7025,9 +7484,6 @@ msgstr "Gruppe %i"
 #~ msgid "Forward as Attachment"
 #~ msgstr "Videresend som vedlegg"
 
-#~ msgid "_New Contact"
-#~ msgstr "_Ny kontakt"
-
 #~ msgid "New Ca_lendar"
 #~ msgstr "Ny ka_lender"
 
@@ -7084,9 +7540,6 @@ msgstr "Gruppe %i"
 #~ msgid "Due Date:"
 #~ msgstr "Ferdig-dato:"
 
-#~ msgid "Priority:"
-#~ msgstr "Prioritet:"
-
 #~ msgid "Item Comments:"
 #~ msgstr "Kommentarer for oppføring:"
 
@@ -7187,15 +7640,6 @@ msgstr "Gruppe %i"
 #~ "innstillinger kan du begynne å sende og motta e-post\n"
 #~ "med én gang. Klikk neste for å fortsette."
 
-#~ msgid "Account Information"
-#~ msgstr "Kontoinformasjon"
-
-#~ msgid "Account Management"
-#~ msgstr "Håndtering av konti"
-
-#~ msgid "Accounts"
-#~ msgstr "Konti"
-
 #~ msgid "Add Optional Fields..."
 #~ msgstr "Legg til tillegsfelt..."
 
@@ -7205,51 +7649,12 @@ msgstr "Gruppe %i"
 #~ msgid "Browse..."
 #~ msgstr "Bla gjennom..."
 
-#~ msgid "Congratulations, your mail configuration is complete."
-#~ msgstr "Gratulerer, konfigurasjon av e-post er fullført."
-
-#~ msgid "Default"
-#~ msgstr "Forvalgt"
-
-#~ msgid "Done"
-#~ msgstr "Ferdig"
-
 #~ msgid "Edit Mail Configuration Settings"
 #~ msgstr "Redigér innstillinger for e-post-konfigurasjon"
 
-#~ msgid "Email Address:"
-#~ msgstr "E-post adresse:"
-
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Evolution e-post-konfigurasjon"
-
-#~ msgid "Full Name:"
-#~ msgstr "Fullt navn:"
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "Mail"
-#~ msgstr "E-post"
-
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "E-post-konfigurasjonsdruide"
-
-#~ msgid "Make this my default account"
-#~ msgstr "Bruk denne som standard konto"
-
-#~ msgid "News"
-#~ msgstr "News"
-
-#~ msgid "Optional"
-#~ msgstr "Valgfri"
-
 #~ msgid "Optional Information"
 #~ msgstr "Valgfri informasjon"
 
-#~ msgid "Password:"
-#~ msgstr "Passord:"
-
 #~ msgid ""
 #~ "Please enter information about your incoming mail server below. If you don't "
 #~ "know what"
@@ -7274,33 +7679,12 @@ msgstr "Gruppe %i"
 #~ msgid "Preferred type: "
 #~ msgstr "Foretrukket type: "
 
-#~ msgid "Receiving Email"
-#~ msgstr "Mottar e-post"
-
 #~ msgid "Receiving Mail"
 #~ msgstr "Mottar e-post"
 
-#~ msgid "Reply-to:"
-#~ msgstr "Svar-til:"
-
-#~ msgid "Required"
-#~ msgstr "Nødvendige"
-
-#~ msgid "SMTP server requires authentication"
-#~ msgstr "SMTP-tjener må ha autentisering"
-
-#~ msgid "Sending Email"
-#~ msgstr "Sender e-post"
-
 #~ msgid "Sending Mail"
 #~ msgstr "Sender e-post"
 
-#~ msgid "Server Configuration"
-#~ msgstr "Tjenerkonfigurasjon"
-
-#~ msgid "Server Type: "
-#~ msgstr "Tjenertype: "
-
 #~ msgid ""
 #~ "You are almost done with the mail configuration process. The identity, "
 #~ "incoming"
@@ -7312,9 +7696,6 @@ msgstr "Gruppe %i"
 #~ "Your mail server supports the following types of authentication. Please"
 #~ msgstr "Din e-post tjener støtter følgende typer autentisering. Vennligst"
 
-#~ msgid "Mailbox summary"
-#~ msgstr "Sammendrag for postboks"
-
 #~ msgid "Threading message list"
 #~ msgstr "Utvider tråder for meldingsliste"
 
@@ -7324,9 +7705,6 @@ msgstr "Gruppe %i"
 #~ msgid "Drafts"
 #~ msgstr "Skisser"
 
-#~ msgid "Outbox"
-#~ msgstr "Utboks"
-
 #~ msgid "Sent"
 #~ msgstr "Sendt"
 
@@ -7387,21 +7765,12 @@ msgstr "Gruppe %i"
 #~ msgid "Bad storage URL (no server): %s"
 #~ msgstr "Ugyldig URL for lagring (ingen tjener): %s"
 
-#~ msgid "Retrieving messages : %s"
-#~ msgstr "Henter meldinger : %s"
-
 #~ msgid "File As"
 #~ msgstr "Lagre som"
 
-#~ msgid "Name"
-#~ msgstr "Navn"
-
 #~ msgid "Family Name"
 #~ msgstr "Etternavn"
 
-#~ msgid "Email"
-#~ msgstr "E-post"
-
 #~ msgid "Prim"
 #~ msgstr "Pri"
 
@@ -7492,24 +7861,6 @@ msgstr "Gruppe %i"
 #~ msgid "_Unselect All"
 #~ msgstr "_Velg bort alt"
 
-#~ msgid "FIXME: _Appointment"
-#~ msgstr "_Avtale"
-
-#~ msgid "FIXME: Meeting Re_quest"
-#~ msgstr "Møteforesp_ørsel"
-
-#~ msgid "Page Set_up"
-#~ msgstr "Sideoppsett"
-
-#~ msgid "FIXME: Mark as U_nread"
-#~ msgstr "Merk som ulest"
-
-#~ msgid "FIXME: __Formatting"
-#~ msgstr "_Formatering"
-
-#~ msgid "Ne_xt"
-#~ msgstr "Nes_te"
-
 #~ msgid "FIXME: _New Task"
 #~ msgstr "_Ny oppgave"
 
@@ -7549,12 +7900,6 @@ msgstr "Gruppe %i"
 #~ msgid "Delete this task"
 #~ msgstr "Slett denne oppgaven"
 
-#~ msgid "FIXME: Previous"
-#~ msgstr "Forrige"
-
-#~ msgid "FIXME: Next"
-#~ msgstr "Neste"
-
 #~ msgid "FIXME: Ca_lendar..."
 #~ msgstr "Ka_lender..."