Updated Norwegian translation.

2000-11-10  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian translation.

svn path=/trunk/; revision=6531

3 files changed, 1246 insertions, 756 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index d2bfa02325..488d6588c2 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-10  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian translation.
+	
 2000-11-08  Valek Filippov  <frob@df.ru>
 
 	* ru.po: updated russian translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ce0e009136..5133ed7428 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,23 +8,23 @@ addressbook/conduit/address-conduit-control-applet.c
 addressbook/conduit/address-conduit.c
 addressbook/contact-editor/categories-strings.h
 addressbook/contact-editor/e-contact-editor.c
-addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h
+addressbook/contact-editor/e-contact-editor-confirm-delete.glade
 addressbook/contact-editor/e-contact-editor-strings.h
-addressbook/contact-editor/fulladdr.glade.h
+addressbook/contact-editor/fulladdr.glade
 addressbook/contact-editor/fullname-strings.h
 addressbook/gui/component/addressbook-factory.c
 addressbook/gui/component/addressbook.c
 addressbook/gui/component/e-ldap-storage.c
-addressbook/gui/component/ldap-server-dialog.glade.h
-addressbook/gui/component/select-names/select-names.glade.h
-addressbook/gui/widgets/alphabet.glade.h
+addressbook/gui/component/ldap-server-dialog.glade
+addressbook/gui/component/select-names/select-names.glade
+addressbook/gui/widgets/alphabet.glade
 addressbook/gui/widgets/e-addressbook-view.c
 addressbook/gui/widgets/e-minicard-control.c
 addressbook/gui/widgets/e-minicard-view.c
 addressbook/gui/widgets/e-minicard.c
 #addressbook/gui/widgets/test-minicard-view.c	: not in Makefile.am
 addressbook/gui/search/e-addressbook-search-dialog.c
-addressbook/printing/e-contact-print.glade.h
+addressbook/printing/e-contact-print.glade
 calendar/cal-util/timeutil.c
 calendar/conduits/calendar/calendar-conduit-control-applet.c
 calendar/conduits/calendar/calendar-conduit.c
@@ -34,10 +34,10 @@ calendar/gui/calendar-commands.c
 calendar/gui/calendar-model.c
 calendar/gui/control-factory.c
 calendar/gui/dialogs/alarm-notify-dialog.c
-calendar/gui/dialogs/alarm-notify.glade.h
-calendar/gui/dialogs/cal-prefs-dialog.glade.h
+calendar/gui/dialogs/alarm-notify.glade
+calendar/gui/dialogs/cal-prefs-dialog.glade
 calendar/gui/dialogs/task-editor.c
-calendar/gui/dialogs/task-editor-dialog.glade.h
+calendar/gui/dialogs/task-editor-dialog.glade
 calendar/gui/e-calendar-table.c
 calendar/gui/e-day-view-time-item.c
 calendar/gui/e-day-view-top-item.c
@@ -45,7 +45,7 @@ calendar/gui/e-day-view.c
 calendar/gui/e-week-view.c
 calendar/gui/e-week-view-main-item.c
 calendar/gui/event-editor.c
-calendar/gui/event-editor-dialog.glade.h
+calendar/gui/event-editor-dialog.glade
 calendar/gui/getdate.y
 calendar/gui/gncal-todo.c
 calendar/gui/gnome-cal.c
@@ -87,7 +87,7 @@ camel/providers/smtp/camel-smtp-provider.c
 camel/providers/vee/camel-vee-provider.c
 composer/e-msg-composer-attachment-bar.c
 composer/e-msg-composer-attachment.c
-composer/e-msg-composer-attachment.glade.h
+composer/e-msg-composer-attachment.glade
 composer/e-msg-composer-hdrs.c
 composer/e-msg-composer.c
 composer/evolution-composer.c
@@ -99,7 +99,7 @@ filter/filter-input.c
 filter/filter-option.c
 filter/filter-part.c
 filter/filter-rule.c
-filter/filter.glade.h
+filter/filter.glade
 filter/libfilter-i18n.h
 filter/score-editor.c
 filter/score-rule.c
@@ -112,8 +112,8 @@ mail/folder-browser.c
 mail/mail-autofilter.c
 mail/mail-callbacks.c
 mail/mail-config-gui.c
-mail/mail-config-druid.glade.h
-mail/mail-config.glade.h
+mail/mail-config-druid.glade
+mail/mail-config.glade
 #mail/mail-config.c
 mail/mail-crypto.c
 mail/mail-display.c
@@ -151,6 +151,7 @@ ui/evolution-calendar.xml
 ui/evolution-contact-editor.xml
 ui/evolution-event-editor.xml
 ui/evolution-mail.xml
+ui/evolution-message-composer.xml
 ui/evolution-subscribe.xml
 ui/evolution.xml
 widgets/meeting-time-sel/e-meeting-time-sel.c
diff --git a/po/no.po b/po/no.po
index 1b8b4a50ea..4af781768c 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.4\n"
-"POT-Creation-Date: 2000-11-03 23:54+0100\n"
-"PO-Revision-Date: 2000-11-03 23:54+01:00\n"
+"POT-Creation-Date: 2000-11-10 14:44+0100\n"
+"PO-Revision-Date: 2000-11-09 00:58+01:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -303,10 +303,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:910
+#: addressbook/conduit/address-conduit.c:1012
 #: addressbook/gui/component/addressbook-factory.c:38
 #: calendar/conduits/calendar/calendar-conduit.c:1091
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
@@ -429,28 +429,28 @@ msgstr ""
 "En feil oppsto under forsøk på å hente\n"
 "pilot-listen fra gnome-pilot daemonen"
 
-#: addressbook/conduit/address-conduit.c:193
+#: addressbook/conduit/address-conduit.c:207
 msgid "Cursor could not be loaded\n"
 msgstr "Markøren kunne ikke lokaliseres\n"
 
-#: addressbook/conduit/address-conduit.c:206
+#: addressbook/conduit/address-conduit.c:220
 msgid "EBook not loaded\n"
 msgstr "EBook ikke lastet\n"
 
-#: addressbook/conduit/address-conduit.c:490
+#: addressbook/conduit/address-conduit.c:579
 #: calendar/conduits/calendar/calendar-conduit.c:651
 #: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat tjener"
 
-#: addressbook/conduit/address-conduit.c:491
+#: addressbook/conduit/address-conduit.c:580
 #: calendar/conduits/calendar/calendar-conduit.c:652
 #: calendar/conduits/todo/todo-conduit.c:525
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
-#: addressbook/conduit/address-conduit.c:517
-#: addressbook/conduit/address-conduit.c:520
+#: addressbook/conduit/address-conduit.c:613
+#: addressbook/conduit/address-conduit.c:616
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
@@ -471,96 +471,96 @@ msgstr "Oppføring(er) hører til disse kategoriene:"
 msgid "Available Categories:"
 msgstr "Tilgjengelige kategorier:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
+#: addressbook/contact-editor/e-contact-editor.c:1234
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1219
-#: addressbook/contact-editor/e-contact-editor.c:1323
+#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1339
 msgid "Business"
 msgstr "Arbeid"
 
-#: addressbook/contact-editor/e-contact-editor.c:1220
+#: addressbook/contact-editor/e-contact-editor.c:1236
 msgid "Business 2"
 msgstr "Arbeid 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1221
+#: addressbook/contact-editor/e-contact-editor.c:1237
 msgid "Business Fax"
 msgstr "Faks på arbeid"
 
-#: addressbook/contact-editor/e-contact-editor.c:1222
+#: addressbook/contact-editor/e-contact-editor.c:1238
 msgid "Callback"
 msgstr "Tilbakering"
 
-#: addressbook/contact-editor/e-contact-editor.c:1223
+#: addressbook/contact-editor/e-contact-editor.c:1239
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1224
+#: addressbook/contact-editor/e-contact-editor.c:1240
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1324
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1340
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/contact-editor/e-contact-editor.c:1226
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Home 2"
 msgstr "Hjemme 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1227
+#: addressbook/contact-editor/e-contact-editor.c:1243
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: addressbook/contact-editor/e-contact-editor.c:1228
+#: addressbook/contact-editor/e-contact-editor.c:1244
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1325
-#: mail/mail-config.glade.h:28
+#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:1341
+#: mail/mail-config.glade.h:28 mail/mail-config.glade.h:40
 msgid "Other"
 msgstr "Annet"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/contact-editor/e-contact-editor.c:1248
 msgid "Pager"
 msgstr "Personsøker"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1249
 msgid "Primary"
 msgstr "Primær"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/contact-editor/e-contact-editor.c:1250
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1251
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1252
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1296
 msgid "Primary Email"
 msgstr "Primær e-post"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1297
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1298
 msgid "Email 3"
 msgstr "E-post 3"
 
@@ -578,6 +578,7 @@ msgstr ""
 "vil slette denne kontakten?"
 
 #: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:10
 msgid "Delete Contact?"
 msgstr "Slett kontakt?"
 
@@ -591,7 +592,7 @@ msgid "_Add"
 msgstr "_Legg til"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.h:111 ui/evolution-mail.h:48
+#: ui/evolution-event-editor.xml.h:109 ui/evolution-mail.xml.h:47
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -605,10 +606,12 @@ msgid "New phone type"
 msgstr "Ny telefontype"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:71 filter/filter.glade.h:12
+#: calendar/gui/event-editor-dialog.glade.h:53
+#: calendar/gui/event-editor-dialog.glade.h:62 filter/filter.glade.h:12
 #: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
+#: filter/filter.glade.h:26 mail/mail-config-druid.glade.h:22
 #: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:22 mail/mail-config.glade.h:29
 msgid "Add"
 msgstr "Legg til"
 
@@ -662,6 +665,7 @@ msgstr "K_ontakter..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:34
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
@@ -679,6 +683,7 @@ msgstr "_Adresse..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
 #: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:69
 msgid "General"
 msgstr "Generell"
 
@@ -724,6 +729,7 @@ msgstr "No_tater:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:36
 msgid "Details"
 msgstr "Detaljer"
 
@@ -733,26 +739,32 @@ msgstr "Detaljer"
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:19
 msgid "Check Address"
 msgstr "Sjekk adresse"
 
 #: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:21
 msgid "_Address:"
 msgstr "_Adresse:"
 
 #: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:22
 msgid "_City:"
 msgstr "_By:"
 
 #: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:23
 msgid "_PO Box:"
 msgstr "_Postboks:"
 
 #: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:18
 msgid "Address _2:"
 msgstr "Adresse _2:"
 
 #: addressbook/contact-editor/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:24
 msgid "_State/Province:"
 msgstr "_Stat/Provins:"
 
@@ -769,10 +781,12 @@ msgid "Finland"
 msgstr "Finland"
 
 #: addressbook/contact-editor/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:25
 msgid "_ZIP Code:"
 msgstr "_ZIP/Postnummer:"
 
 #: addressbook/contact-editor/fulladdr.glade.h:17
+#: addressbook/contact-editor/fulladdr.glade.h:20
 msgid "Countr_y:"
 msgstr "Lan_d:"
 
@@ -835,26 +849,25 @@ msgstr "_Etternavn:"
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
-#: addressbook/gui/component/addressbook.c:265
+#: addressbook/gui/component/addressbook.c:266
 msgid "As _Minicards"
 msgstr "Som _minikort"
 
 #.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:271 ui/evolution-addressbook.h:9
+#: addressbook/gui/component/addressbook.c:272
+#: ui/evolution-addressbook.xml.h:7
 msgid "As _Table"
 msgstr "Som _tabell"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:392
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åpne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:397
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -875,7 +888,27 @@ msgstr ""
 "installere OpenLDAP, deretter må du kompilere og\n"
 "installere Evolution på nytt.\n"
 
-#: addressbook/gui/component/addressbook.c:574
+#: addressbook/gui/component/addressbook.c:507 mail/folder-browser.c:152
+msgid "Show All"
+msgstr "Vis alle"
+
+#: addressbook/gui/component/addressbook.c:509 mail/folder-browser.c:154
+msgid "Advanced..."
+msgstr "Avansert..."
+
+#: addressbook/gui/component/addressbook.c:539
+msgid "Any field contains"
+msgstr "Et felt inneholder"
+
+#: addressbook/gui/component/addressbook.c:540
+msgid "Name contains"
+msgstr "Navn inneholder"
+
+#: addressbook/gui/component/addressbook.c:541
+msgid "Email contains"
+msgstr "E-post inneholder"
+
+#: addressbook/gui/component/addressbook.c:627
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
@@ -889,23 +922,30 @@ msgstr "Eksterne kataloger"
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/component/ldap-server-dialog.glade.h:7
+#: addressbook/gui/component/ldap-server-dialog.glade.h:12
 #: composer/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:12
 msgid "Description:"
 msgstr "Beskrivelse:"
 
 #: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#: addressbook/gui/component/ldap-server-dialog.glade.h:13
 msgid "LDAP Server:"
 msgstr "LDAP-tjener:"
 
 #: addressbook/gui/component/ldap-server-dialog.glade.h:9
+#: addressbook/gui/component/ldap-server-dialog.glade.h:15
 msgid "Port Number:"
 msgstr "Portnummer:"
 
 #: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/ldap-server-dialog.glade.h:16
 msgid "Root DN:"
 msgstr "Rot DN:"
 
 #: addressbook/gui/component/ldap-server-dialog.glade.h:11
+#: addressbook/gui/component/ldap-server-dialog.glade.h:14
+#: mail/mail-config-druid.glade.h:49
 msgid "Name:"
 msgstr "Navn:"
 
@@ -915,18 +955,22 @@ msgstr "Navn:"
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:13
 msgid "Select Names"
 msgstr "Velg navn"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:11
 msgid "Find..."
 msgstr "Finn..."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:9
+#: addressbook/gui/component/select-names/select-names.glade.h:14
 msgid "Select name from List:"
 msgstr "Velg navn fra liste:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:10
+#: addressbook/gui/component/select-names/select-names.glade.h:12
 msgid "Message Recipients"
 msgstr "Meldingsmottakere:"
 
@@ -936,10 +980,12 @@ msgstr "Meldingsmottakere:"
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/widgets/alphabet.glade.h:7
+#: addressbook/gui/widgets/alphabet.glade.h:36
 msgid "window2"
 msgstr "vindu2"
 
 #: addressbook/gui/widgets/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:35
 msgid "123"
 msgstr "123"
 
@@ -1048,8 +1094,8 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:414
-#: addressbook/gui/widgets/e-minicard.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:415
+#: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
 
@@ -1072,7 +1118,7 @@ msgstr ""
 "Dobbelklikk her for å opprette en ny kontakt."
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:643 mail/mail-search-dialogue.c:101
+#: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "Søk"
 
@@ -1082,54 +1128,67 @@ msgstr "Søk"
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/printing/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:82
 msgid "Page Setup:"
 msgstr "Sideoppsett"
 
 #: addressbook/printing/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:94
 msgid "Style name:"
 msgstr "Stilnavn:"
 
 #: addressbook/printing/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:86
 msgid "Preview:"
 msgstr "Forhåndsvis:"
 
 #: addressbook/printing/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:79
 msgid "Options"
 msgstr "Alternativer"
 
 #: addressbook/printing/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:73
 msgid "Include:"
 msgstr "Inkluder:"
 
 #: addressbook/printing/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:90
 msgid "Sections:"
 msgstr "Seksjoner:"
 
 #: addressbook/printing/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:72
 msgid "Immediately follow each other"
 msgstr "Rett etter hverandre"
 
 #: addressbook/printing/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:76
 msgid "Letter tabs on side"
 msgstr "Bokstavfaner på siden"
 
 #: addressbook/printing/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:70
 msgid "Headings for each letter"
 msgstr "Topptekst for hver bokstav"
 
 #: addressbook/printing/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:93
 msgid "Start on a new page"
 msgstr "Start på en ny side"
 
 #: addressbook/printing/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:78
 msgid "Number of columns:"
 msgstr "Antall kolonner:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:59
 msgid "Blank forms at end:"
 msgstr "Blanke skjema på slutten:"
 
 #: addressbook/printing/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:64
 msgid "Fonts"
 msgstr "Skrifttyper"
 
@@ -1137,123 +1196,153 @@ msgstr "Skrifttyper"
 #: addressbook/printing/e-contact-print.glade.h:21
 #: addressbook/printing/e-contact-print.glade.h:51
 #: addressbook/printing/e-contact-print.glade.h:54
+#: addressbook/printing/e-contact-print.glade.h:63
 msgid "Font..."
 msgstr "Skrifttype..."
 
 #: addressbook/printing/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:69
 msgid "Headings"
 msgstr "Topptekster"
 
 #: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:57
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:60
 msgid "Body"
 msgstr "Kropp"
 
 #: addressbook/printing/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:58
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
 #: addressbook/printing/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:91
 msgid "Shading"
 msgstr "Skyggelegging"
 
 #: addressbook/printing/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:87
 msgid "Print using gray shading"
 msgstr "Skriv ut med gråtoner"
 
 #: addressbook/printing/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:66
 msgid "Format"
 msgstr "Format"
 
 #: addressbook/printing/e-contact-print.glade.h:29
 #: addressbook/printing/e-contact-print.glade.h:50
+#: addressbook/printing/e-contact-print.glade.h:83
 msgid "Paper"
 msgstr "Papir"
 
 #: addressbook/printing/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:96
+#: mail/mail-config-druid.glade.h:78
 msgid "Type:"
 msgstr "Type:"
 
 #: addressbook/printing/e-contact-print.glade.h:31
 #: addressbook/printing/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:98
 msgid "label26"
 msgstr "etikett26"
 
 #: addressbook/printing/e-contact-print.glade.h:32
 #: addressbook/printing/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:62
 msgid "Dimensions:"
 msgstr "Dimensjoner:"
 
 #: addressbook/printing/e-contact-print.glade.h:33
 #: addressbook/printing/e-contact-print.glade.h:45
+#: addressbook/printing/e-contact-print.glade.h:97
 msgid "Width:"
 msgstr "Bredde:"
 
 #: addressbook/printing/e-contact-print.glade.h:34
 #: addressbook/printing/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:71
 msgid "Height:"
 msgstr "Høyde:"
 
 #: addressbook/printing/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:84
 msgid "Paper source:"
 msgstr "Papirkilde:"
 
 #: addressbook/printing/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:77
 msgid "Margins"
 msgstr "Marger"
 
 #: addressbook/printing/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:95
 msgid "Top:"
 msgstr "Topp:"
 
 #: addressbook/printing/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:61
 msgid "Bottom:"
 msgstr "Bunn:"
 
 #: addressbook/printing/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:75
 msgid "Left:"
 msgstr "Venstre:"
 
 #: addressbook/printing/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:89
 msgid "Right:"
 msgstr "Høyre:"
 
 #: addressbook/printing/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:81
 msgid "Page"
 msgstr "Side"
 
 #: addressbook/printing/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:92
 msgid "Size:"
 msgstr "Størrelse:"
 
 #: addressbook/printing/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:80
 msgid "Orientation"
 msgstr "Orientering"
 
 #: addressbook/printing/e-contact-print.glade.h:48
+#: addressbook/printing/e-contact-print.glade.h:85
 msgid "Portrait"
 msgstr "Portrett"
 
 #: addressbook/printing/e-contact-print.glade.h:49
+#: addressbook/printing/e-contact-print.glade.h:74
 msgid "Landscape"
 msgstr "Landskap"
 
 #: addressbook/printing/e-contact-print.glade.h:52
+#: addressbook/printing/e-contact-print.glade.h:67
 msgid "Header"
 msgstr "Topptekst"
 
 #: addressbook/printing/e-contact-print.glade.h:53
+#: addressbook/printing/e-contact-print.glade.h:65
 msgid "Footer:"
 msgstr "Bunntekst:"
 
 #: addressbook/printing/e-contact-print.glade.h:55
+#: addressbook/printing/e-contact-print.glade.h:88
 msgid "Reverse on even pages"
 msgstr "Motsatt på like sider"
 
 #: addressbook/printing/e-contact-print.glade.h:56
+#: addressbook/printing/e-contact-print.glade.h:68
 msgid "Header/Footer"
 msgstr "Topp-/bunntekst"
 
@@ -1490,20 +1579,25 @@ msgstr "Ingen sammendrag tilgjengelig."
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7 ui/evolution-contact-editor.h:9
-#: ui/evolution-event-editor.h:16 ui/evolution-subscribe.h:10
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:11
+#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:10 ui/evolution-subscribe.xml.h:8
 msgid "Close"
 msgstr "Lukk"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1458
+#: calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/dialogs/alarm-notify.glade.h:13 calendar/gui/gnome-cal.c:1458
 msgid "Snooze"
 msgstr "Utsett"
 
 #: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:12
 msgid "Edit appointment"
 msgstr "Rediger avtale:"
 
 #: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: calendar/gui/dialogs/alarm-notify.glade.h:14
 msgid "Snooze time (minutes)"
 msgstr "Utsett-tid (minutter)"
 
@@ -1513,121 +1607,140 @@ msgstr "Utsett-tid (minutter)"
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
 msgid "Calendar Preferences"
 msgstr "Brukervalg for kalender"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:111
 msgid "Work week"
 msgstr "Arbeidsuke"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:90
 #: calendar/gui/gnome-month-item.c:737
 msgid "Mon"
 msgstr "Man"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:108
 #: calendar/gui/gnome-month-item.c:738
 msgid "Tue"
 msgstr "Tir"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:110
 #: calendar/gui/gnome-month-item.c:739
 msgid "Wed"
 msgstr "Ons"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:104
 #: calendar/gui/gnome-month-item.c:740
 msgid "Thu"
 msgstr "Tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:84
 #: calendar/gui/gnome-month-item.c:741
 msgid "Fri"
 msgstr "Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:97
 #: calendar/gui/gnome-month-item.c:742
 msgid "Sat"
 msgstr "Lør"
 
 #. Initialize by default to three-letter day names
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:102
 #: calendar/gui/gnome-month-item.c:736
 msgid "Sun"
 msgstr "Søn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
 msgid "First day of week:"
 msgstr "Første dag i uken:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:45 calendar/gui/prop.c:354
+#: calendar/gui/event-editor.c:368 calendar/gui/prop.c:354
 msgid "Monday"
 msgstr "Mandag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor.c:369
 msgid "Tuesday"
 msgstr "Tirsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor.c:370
 msgid "Wednesday"
 msgstr "Onsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:48
+#: calendar/gui/event-editor.c:371
 msgid "Thursday"
 msgstr "Torsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:49
+#: calendar/gui/event-editor.c:372
 msgid "Friday"
 msgstr "Fredag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:50
+#: calendar/gui/event-editor.c:373
 msgid "Saturday"
 msgstr "Lørdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:51 calendar/gui/prop.c:353
+#: calendar/gui/event-editor.c:374 calendar/gui/prop.c:353
 msgid "Sunday"
 msgstr "Søndag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:101
 msgid "Start of day:"
 msgstr "Dagen starter:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:82
 msgid "End of day:"
 msgstr "Dagen slutter:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
 msgid "Display options"
 msgstr "Vis alternativer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:106
 msgid "Time divisions:"
 msgstr "Oppdeling av tid:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:107
 msgid "Time format:"
 msgstr "Tidformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:99
 msgid "Show appointment end times"
 msgstr "Vis tid for avtalers slutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "Compress weekends"
 msgstr "Komprimér helger"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "12 hour (am/pm)"
 msgstr "12 timer (am/pm)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "24 hour"
 msgstr "24 timer"
 
@@ -1652,115 +1765,142 @@ msgid "05 minutes"
 msgstr "5 minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "Date navigator options"
 msgstr "Alternativer for datonavigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:100
 msgid "Show week numbers"
 msgstr "Vis ukenummer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "Calendar"
 msgstr "Kalender"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:98
 msgid "Show"
 msgstr "Vis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 calendar/gui/prop.c:610
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:80 calendar/gui/prop.c:610
 msgid "Due Date"
 msgstr "Ferdig-dato"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 calendar/gui/prop.c:612
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:105 calendar/gui/prop.c:612
 msgid "Time Until Due"
 msgstr "Tid før den går ut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:611
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:94 calendar/gui/prop.c:611
 #: filter/libfilter-i18n.h:18
 msgid "Priority"
 msgstr "Prioritet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
 msgid "Highlight"
 msgstr "Markér"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:91
 msgid "Overdue Items"
 msgstr "Utgåtte oppføringer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:86
 msgid "Items Due Today"
 msgstr "Oppføringer som går ut idag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:88
 msgid "Items Not Yet Due"
 msgstr "Oppføringer som ikke har gått ut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 calendar/gui/prop.c:528
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:75 calendar/gui/prop.c:528
 msgid "Colors"
 msgstr "Farger"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:93
 msgid "Pick a color"
 msgstr "Velg en farge"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:89
 msgid "Items Not Yet Due:"
 msgstr "Oppføringer som ikke har gått ut:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:87
 msgid "Items Due Today:"
 msgstr "Oppføringer som går ut i dag:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:92
 msgid "Overdue Items:"
 msgstr "Utgåtte oppføringer:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:103
 msgid "TaskPad"
 msgstr "Oppgaveblokk"
 
 #. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 calendar/gui/prop.c:842
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:78 calendar/gui/prop.c:842
 msgid "Defaults"
 msgstr "Forvalg"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:95
 msgid "Remind me of all appointments"
 msgstr "Påminnelse om alle avtaler"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:112
 msgid "minutes before they occur."
 msgstr "minutter i forveien."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:109
 msgid "Visual Alarms"
 msgstr "Visuelle alarmer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "Beep when alarm windows appear."
 msgstr "Pip når alarmvinduet kommer til syne."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "Audio Alarms"
 msgstr "Lyd-alarmer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "Alarms timeout after"
 msgstr "Tidsavbrudd for alarm etter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:113
 msgid "seconds."
 msgstr "sekunder"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
 msgid "Enable snoozing for"
 msgstr "Slå på utsetting for "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:96
 msgid "Reminders"
 msgstr "Påminnelser"
 
@@ -1768,21 +1908,21 @@ msgstr "Påminnelser"
 msgid "Edit Task"
 msgstr "Redigér oppgave"
 
-#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:303
+#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:307
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:309
+#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:313
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:312
+#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:316
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:315
+#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:319
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
@@ -1793,26 +1933,32 @@ msgstr "Journaloppføring - %s"
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:45
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:37
 msgid "S_ummary"
 msgstr "Sa_mmendrag"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:38
 msgid "Sta_rt Date:"
 msgstr "Sta_rt dato:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:42
 msgid "_Due Date:"
 msgstr "Fer_dig-dato:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:32
 msgid "% Comp_lete:"
 msgstr "% ferdi_g:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:44
 msgid "_Status:"
 msgstr "_Status:"
 
@@ -1833,6 +1979,7 @@ msgid "Cancelled"
 msgstr "Avbrutt"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:43
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
@@ -1849,6 +1996,7 @@ msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:33
 msgid "C_lassification:"
 msgstr "K_lassifisering"
 
@@ -1859,18 +2007,22 @@ msgid "None"
 msgstr "Ingen"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:41
 msgid "_Contacts..."
 msgstr "_Kontakter..."
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:39
 msgid "Task"
 msgstr "Oppgave"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:35
 msgid "Date Completed:"
 msgstr "Fullført dato:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:40
 msgid "URL:"
 msgstr "URL:"
 
@@ -1891,12 +2043,14 @@ msgid "Mark the task complete"
 msgstr "Merk oppgaven som fullført"
 
 #: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:73 filter/filter.glade.h:14
-#: filter/filter.glade.h:19 filter/libfilter-i18n.h:8
+#: calendar/gui/event-editor-dialog.glade.h:55
+#: calendar/gui/event-editor-dialog.glade.h:66 filter/filter.glade.h:14
+#: filter/filter.glade.h:19 filter/filter.glade.h:27 filter/libfilter-i18n.h:8
+#: mail/folder-browser.c:476 mail/mail-config-druid.glade.h:35
 #: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-view.c:165
-#: ui/evolution-addressbook.h:11 ui/evolution-contact-editor.h:10
-#: ui/evolution-event-editor.h:22 ui/evolution-mail.h:13
+#: mail/mail-config.glade.h:24 mail/mail-config.glade.h:31
+#: mail/mail-view.c:165 ui/evolution-addressbook.xml.h:9
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-mail.xml.h:12
 msgid "Delete"
 msgstr "Slett"
 
@@ -1911,50 +2065,50 @@ 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:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1173
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1187
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1200
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
+#: calendar/gui/e-day-view.c:2631 calendar/gui/e-day-view.c:2638
+#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2930
+#: calendar/gui/e-week-view.c:2937 calendar/gui/e-week-view.c:2946
 msgid "New appointment..."
 msgstr "Ny avtale..."
 
-#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
+#: calendar/gui/e-day-view.c:2635 calendar/gui/e-day-view.c:2642
+#: calendar/gui/e-week-view.c:2934 calendar/gui/e-week-view.c:2941
 msgid "Edit this appointment..."
 msgstr "Redigér denne avtalen..."
 
-#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
-#: ui/evolution-event-editor.h:23
+#: calendar/gui/e-day-view.c:2636 calendar/gui/e-week-view.c:2935
+#: ui/evolution-event-editor.xml.h:21
 msgid "Delete this appointment"
 msgstr "Slett denne avtalen"
 
-#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2643 calendar/gui/e-week-view.c:2942
 msgid "Make this appointment movable"
 msgstr "Gjør denne avtalen flyttbar"
 
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2644 calendar/gui/e-week-view.c:2943
 msgid "Delete this occurrence"
 msgstr "Slett denne oppføringen"
 
-#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2645 calendar/gui/e-week-view.c:2944
 msgid "Delete all occurrences"
 msgstr "Slett alle oppføringer"
 
@@ -1965,19 +2119,32 @@ msgstr "Slett alle oppføringer"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:297
+#: calendar/gui/event-editor.c:301
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/event-editor.c:342
+#: calendar/gui/event-editor.c:346
 msgid "on"
 msgstr "på"
 
-#: calendar/gui/event-editor.c:470
+#: calendar/gui/event-editor.c:367 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "dag"
+
+#: calendar/gui/event-editor.c:481
+msgid "on the"
+msgstr "den"
+
+#: calendar/gui/event-editor.c:488
+msgid "th"
+msgstr "de"
+
+#: calendar/gui/event-editor.c:617
 msgid "ocurrences"
 msgstr "gjentakelser"
 
-#: calendar/gui/event-editor.c:2399 calendar/gui/print.c:1085
+#: calendar/gui/event-editor.c:2552 calendar/gui/print.c:1085
 #: calendar/gui/print.c:1087 calendar/gui/print.c:1088
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
@@ -2000,43 +2167,53 @@ msgstr "%a %b %d %Y"
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/event-editor-dialog.glade.h:7
+#: calendar/gui/event-editor-dialog.glade.h:93
 msgid "event-editor-dialog"
 msgstr "event-editor-dialog"
 
 #: calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:56
+#: calendar/gui/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:79
 msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
 #: calendar/gui/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:83
 msgid "Time"
 msgstr "Tid"
 
 #: calendar/gui/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:91
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
 #: calendar/gui/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:87
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
 #: calendar/gui/event-editor-dialog.glade.h:12
+#: calendar/gui/event-editor-dialog.glade.h:61
 msgid "A_ll day event"
 msgstr "Varer he_le dagen"
 
 #: calendar/gui/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:64
 msgid "Classification"
 msgstr "Klassifisering"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:74
 msgid "Pu_blic"
 msgstr "Of_fentlig"
 
 #: calendar/gui/event-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:73
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
 #: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:85
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
@@ -2062,138 +2239,119 @@ msgid "Days"
 msgstr "Dager"
 
 #: calendar/gui/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:86
 msgid "_Display"
 msgstr "_Vis"
 
 #: calendar/gui/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:89
 msgid "_Program"
 msgstr "_Program"
 
 #: calendar/gui/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:88
 msgid "_Mail"
 msgstr "_E-post"
 
 #: calendar/gui/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:70
 msgid "Mail _to:"
 msgstr "Send _til:"
 
 #: calendar/gui/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:90
 msgid "_Run program:"
 msgstr "Kjø_r program:"
 
 #: calendar/gui/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:84
 msgid "_Audio"
 msgstr "_Lyd"
 
 #: calendar/gui/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:77
 msgid "Reminder"
 msgstr "Påminnelse"
 
 #: calendar/gui/event-editor-dialog.glade.h:37
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "Recur on the"
-msgstr "Gjeninntreff den"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "th day of the month"
-msgstr "de dagen i måneden"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 calendar/gui/print.c:288
-msgid "1st"
-msgstr "1"
-
-#: calendar/gui/event-editor-dialog.glade.h:41 calendar/gui/print.c:288
-msgid "2nd"
-msgstr "2"
-
-#: calendar/gui/event-editor-dialog.glade.h:42 calendar/gui/print.c:288
-msgid "3rd"
-msgstr "3"
-
-#: calendar/gui/event-editor-dialog.glade.h:43 calendar/gui/print.c:288
-msgid "4th"
-msgstr "4"
-
-#: calendar/gui/event-editor-dialog.glade.h:44 calendar/gui/print.c:288
-msgid "5th"
-msgstr "5"
-
-#: calendar/gui/event-editor-dialog.glade.h:52
-#: calendar/gui/event-editor-dialog.glade.h:62
-msgid "Every"
-msgstr "Hver"
-
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/event-editor-dialog.glade.h:65
-msgid "month(s)"
-msgstr "måned(er)"
-
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/event-editor-dialog.glade.h:78
-msgid "Recurrence"
-msgstr "Gjeninntreffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:55
+#: calendar/gui/event-editor-dialog.glade.h:63
 msgid "Appointment Basics"
 msgstr "Grunnleggende om avtaler"
 
-#: calendar/gui/event-editor-dialog.glade.h:57
+#: calendar/gui/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:92
 msgid "_Starting date:"
 msgstr "_Start dato:"
 
-#: calendar/gui/event-editor-dialog.glade.h:58
+#: calendar/gui/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:76
 msgid "Recurrence Rule"
 msgstr "Regel for gjenintreffelse"
 
-#: calendar/gui/event-editor-dialog.glade.h:59
+#: calendar/gui/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:72
 msgid "No recurrence"
 msgstr "Ingen gjeninntreffelse"
 
-#: calendar/gui/event-editor-dialog.glade.h:60
+#: calendar/gui/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:78
 msgid "Simple recurrence"
 msgstr "Enkel gjeninntreffelse"
 
-#: calendar/gui/event-editor-dialog.glade.h:61
+#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:65
 msgid "Custom recurrence"
 msgstr "Egendefinert gjeninntreffelse"
 
-#: calendar/gui/event-editor-dialog.glade.h:63
+#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:67
+msgid "Every"
+msgstr "Hver"
+
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "day(s)"
 msgstr "dag(er)"
 
-#: calendar/gui/event-editor-dialog.glade.h:64
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "uke(r)"
 
-#: calendar/gui/event-editor-dialog.glade.h:66
+#: calendar/gui/event-editor-dialog.glade.h:47
+msgid "month(s)"
+msgstr "måned(er)"
+
+#: calendar/gui/event-editor-dialog.glade.h:48
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/event-editor-dialog.glade.h:67
+#: calendar/gui/event-editor-dialog.glade.h:49
 msgid "for"
 msgstr "for"
 
-#: calendar/gui/event-editor-dialog.glade.h:68
+#: calendar/gui/event-editor-dialog.glade.h:50
 msgid "until"
 msgstr "til"
 
-#: calendar/gui/event-editor-dialog.glade.h:69
+#: calendar/gui/event-editor-dialog.glade.h:51
 msgid "forever"
 msgstr "for alltid"
 
-#: calendar/gui/event-editor-dialog.glade.h:70
+#: calendar/gui/event-editor-dialog.glade.h:52
+#: calendar/gui/event-editor-dialog.glade.h:68
 msgid "Exceptions"
 msgstr "Unntak"
 
-#: calendar/gui/event-editor-dialog.glade.h:72
+#: calendar/gui/event-editor-dialog.glade.h:54
+#: calendar/gui/event-editor-dialog.glade.h:71
 msgid "Modify"
 msgstr "Endre"
 
-#: calendar/gui/event-editor-dialog.glade.h:74
+#: calendar/gui/event-editor-dialog.glade.h:56
+#: calendar/gui/event-editor-dialog.glade.h:94
 msgid "label21"
 msgstr "etikett21"
 
-#: calendar/gui/event-editor-dialog.glade.h:75
+#: calendar/gui/event-editor-dialog.glade.h:57
 msgid ""
 "This appointment has custom recurrence rules that cannot be edited by "
 "Evolution.\n"
@@ -2207,6 +2365,19 @@ msgstr ""
 "Avtalen vil uansett inntreffe til riktig tid og vil vises korrekt i "
 "kalendervisningene."
 
+#: calendar/gui/event-editor-dialog.glade.h:60
+#: calendar/gui/event-editor-dialog.glade.h:75
+msgid "Recurrence"
+msgstr "Gjeninntreffelse"
+
+#: calendar/gui/event-editor-dialog.glade.h:80
+msgid ""
+"This appointment has custom recurrence rules that cannot be edited by "
+"Evolution."
+msgstr ""
+"Denne avtalen har egendefinerte regler for gjeninntreffelse som ikke kan "
+"redigeres av Evolution."
+
 #: calendar/gui/getdate.y:391
 msgid "january"
 msgstr "januar"
@@ -2319,10 +2490,6 @@ msgstr "14-dager"
 msgid "week"
 msgstr "uke"
 
-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dag"
-
 #: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr "time"
@@ -2467,7 +2634,7 @@ msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
 
 #. Idea: we need Snooze option :-)
 #: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
-#: mail/mail-search-dialogue.c:101
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "Ok"
 
@@ -2494,6 +2661,26 @@ msgstr ""
 msgid "Go to today"
 msgstr "Gå til idag"
 
+#: calendar/gui/print.c:288
+msgid "1st"
+msgstr "1"
+
+#: calendar/gui/print.c:288
+msgid "2nd"
+msgstr "2"
+
+#: calendar/gui/print.c:288
+msgid "3rd"
+msgstr "3"
+
+#: calendar/gui/print.c:288
+msgid "4th"
+msgstr "4"
+
+#: calendar/gui/print.c:288
+msgid "5th"
+msgstr "5"
+
 #: calendar/gui/print.c:289
 msgid "6th"
 msgstr "6"
@@ -2662,7 +2849,7 @@ msgstr "Dette året (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:834
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:864
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
@@ -2776,11 +2963,11 @@ msgstr "Slå på utsetting for "
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:326 widgets/misc/e-calendar-item.c:416
+#: calendar/gui/weekday-picker.c:345 widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
-#: calendar/gui/weekday-picker.c:328 calendar/gui/weekday-picker.c:418
+#: calendar/gui/weekday-picker.c:347 calendar/gui/weekday-picker.c:437
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
@@ -2926,7 +3113,7 @@ msgstr "URL-streng `%s' inneholder ikke protokoll"
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL-streng `%s' inneholder en ugyldig protokoll"
 
-#: camel/camel-url.c:165
+#: camel/camel-url.c:154
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Portnummer i URL `%s' er ikke-numerisk"
@@ -3021,13 +3208,13 @@ msgstr "Kan ikke opprette katalog %s: %s"
 msgid "Could not create summary"
 msgstr "Kunne ikke opprette sammendrag"
 
-#: camel/providers/mbox/camel-mbox-folder.c:389
-#: camel/providers/mbox/camel-mbox-folder.c:392
+#: camel/providers/mbox/camel-mbox-folder.c:378
+#: camel/providers/mbox/camel-mbox-folder.c:381
 #, c-format
 msgid "Cannot append message to mbox file: %s"
 msgstr "Kan ikke legge til melding i mbox-filen: %s"
 
-#: camel/providers/mbox/camel-mbox-folder.c:496
+#: camel/providers/mbox/camel-mbox-folder.c:485
 #, c-format
 msgid "Cannot get message: %s"
 msgstr "Kan ikke hente melding: %s"
@@ -3467,54 +3654,55 @@ msgstr "E-post-tilbyder for virtuelle mapper"
 msgid "For reading mail as a query of another set of folders"
 msgstr "For lesing av e-post som en spørring på et annet sett med mapper"
 
-#: composer/e-msg-composer-attachment-bar.c:86
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:88
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:300 mail/mail-display.c:116
+#: composer/e-msg-composer-attachment-bar.c:301 mail/mail-display.c:117
 msgid "attachment"
 msgstr "vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:396
+#: composer/e-msg-composer-attachment-bar.c:397
+#: ui/evolution-message-composer.xml.h:8
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer-attachment-bar.c:443 filter/filter.glade.h:22
-#: filter/filter.glade.h:25 shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:444 filter/filter.glade.h:22
+#: filter/filter.glade.h:25 filter/filter.glade.h:32
+#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Fjern"
 
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:445
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte oppføringer fra vedleggslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Add attachment..."
 msgstr "Legg til vedlegg..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:477
 msgid "Attach a file to the message"
 msgstr "Legg en fil ved meldingen"
 
@@ -3524,51 +3712,54 @@ msgstr "Legg en fil ved meldingen"
 #. * DO NOT compile it as part of your application.
 #.
 #: composer/e-msg-composer-attachment.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:11
 msgid "Attachment properties"
 msgstr "Egenskaper for vedlegg"
 
 #: composer/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:14
 msgid "MIME type:"
 msgstr "MIME-type:"
 
 #: composer/e-msg-composer-attachment.glade.h:10
+#: composer/e-msg-composer-attachment.glade.h:13
 msgid "File name:"
 msgstr "Filnavn:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
-#: mail/mail-format.c:589
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
+#: mail/mail-format.c:599
 msgid "From:"
 msgstr "Fra:"
 
-#: composer/e-msg-composer-hdrs.c:243
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:291
 msgid "Enter the identity you wish to send this message from"
 msgstr "Skriv inn identiteten du ønsker å bruke ved sending av denne meldingen"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:602
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:603
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:305 mail/mail-format.c:609
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:605
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:301
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: composer/e-msg-composer-hdrs.c:311
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:307
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3576,15 +3767,15 @@ 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:318 mail/mail-format.c:614
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:607
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "Skriv inn emnet for meldingen"
 
-#: composer/e-msg-composer.c:302
+#: composer/e-msg-composer.c:417
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3593,38 +3784,38 @@ msgstr ""
 "Kunne ikke åpne signaturfilen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:458
+#: composer/e-msg-composer.c:584
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:469
+#: composer/e-msg-composer.c:595
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:489
+#: composer/e-msg-composer.c:615
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:511
+#: composer/e-msg-composer.c:637
 msgid "Saving changes to message..."
 msgstr "Lagre endringer i meldingen..."
 
-#: composer/e-msg-composer.c:513
+#: composer/e-msg-composer.c:639
 msgid "Save changes to message..."
 msgstr "Lagre endringer til meldingen..."
 
-#: composer/e-msg-composer.c:554
+#: composer/e-msg-composer.c:680
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Feil under lagring av brevet i 'Skisser': %s"
 
-#: composer/e-msg-composer.c:598 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:724 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:604
+#: composer/e-msg-composer.c:730
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3634,27 +3825,27 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:626
+#: composer/e-msg-composer.c:752
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:752
+#: composer/e-msg-composer.c:878
 msgid "That file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: composer/e-msg-composer.c:762
+#: composer/e-msg-composer.c:888
 msgid "That is not a regular file."
 msgstr "Er ikke en vanlig fil."
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:898
 msgid "That file exists but is not readable."
 msgstr "Filen eksisterer men er ikke lesbar."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:908
 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:804
+#: composer/e-msg-composer.c:930
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3662,15 +3853,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:825
+#: composer/e-msg-composer.c:951
 msgid "An error occurred while reading the file."
 msgstr "En feil oppsto under lesing fra filen."
 
-#: composer/e-msg-composer.c:1197
+#: composer/e-msg-composer.c:1328
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1402
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
@@ -3764,8 +3955,8 @@ msgstr "Sammenligne med"
 msgid "<click here to select a date>"
 msgstr "<klikk her for å velge en dato>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:289
-#: mail/mail-autofilter.c:338
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:284
+#: mail/mail-autofilter.c:333
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
@@ -3778,7 +3969,7 @@ msgstr "Redigér filterregel"
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
 #.
-#: filter/filter-editor.c:456 filter/filter.glade.h:7
+#: filter/filter-editor.c:456 filter/filter.glade.h:7 filter/filter.glade.h:29
 msgid "Edit Filters"
 msgstr "Redigér filtre"
 
@@ -3868,25 +4059,26 @@ msgstr ""
 "Innkommende\n"
 "Utgående\n"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:11 filter/filter.glade.h:31
 msgid "Filter Rules"
 msgstr "Filterregler"
 
-#: filter/filter.glade.h:13 filter/filter.glade.h:18
+#: filter/filter.glade.h:13 filter/filter.glade.h:18 filter/filter.glade.h:28
+#: mail/folder-browser.c:463 mail/mail-config-druid.glade.h:38
 #: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:23 mail/mail-config.glade.h:32
 msgid "Edit"
 msgstr "Redigér"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:15 filter/filter.glade.h:30
 msgid "Edit VFolders"
 msgstr "Redigér VFoldere"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:16 filter/filter.glade.h:33
 msgid "Virtual Folders"
 msgstr "Virtuelle mapper"
 
-#: filter/filter.glade.h:20 filter/filter.glade.h:23
+#: filter/filter.glade.h:20 filter/filter.glade.h:23 filter/filter.glade.h:34
 msgid "vFolder Sources"
 msgstr "vFolder kilder"
 
@@ -4107,123 +4299,116 @@ msgstr "Kan ikke initiere Evolutions e-postlagrings-hash."
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: mail/folder-browser.c:143
+#: mail/folder-browser.c:156 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save"
+msgstr "Lagre"
+
+#: mail/folder-browser.c:169
 msgid "Body or subject contains"
 msgstr "Kropp eller emne inneholder"
 
-#: mail/folder-browser.c:144
+#: mail/folder-browser.c:170
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
-#: mail/folder-browser.c:145
+#: mail/folder-browser.c:171
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
-#: mail/folder-browser.c:146
+#: mail/folder-browser.c:172
 msgid "Body does not contain"
 msgstr "Kropp inneholder ikke"
 
-#: mail/folder-browser.c:147
+#: mail/folder-browser.c:173
 msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
-#: mail/folder-browser.c:148
-msgid "Custom search"
-msgstr "Egendefinert søk"
+#: mail/folder-browser.c:451
+msgid "VFolder on Subject"
+msgstr "VFolder for emne"
 
-#: mail/folder-browser.c:320
-msgid "Custom"
-msgstr "Egendefinert"
+#: mail/folder-browser.c:452
+msgid "VFolder on Sender"
+msgstr "VFolder for sender"
 
-#: mail/folder-browser.c:478
-msgid "Open in New Window"
-msgstr "Åpne i nytt vindu"
+#: mail/folder-browser.c:453
+msgid "VFolder on Recipients"
+msgstr "VFolder for mottakere"
 
-#: mail/folder-browser.c:479
-msgid "Edit Message"
-msgstr "Redigér melding"
+#: mail/folder-browser.c:455
+msgid "Filter on Subject"
+msgstr "Filtrér etter emne"
 
-#: mail/folder-browser.c:480 mail/mail-callbacks.c:794
-msgid "Print Message"
-msgstr "Skriv ut melding"
+#: mail/folder-browser.c:456
+msgid "Filter on Sender"
+msgstr "Filtrér etter sender"
 
-#: mail/folder-browser.c:482
+#: mail/folder-browser.c:457
+msgid "Filter on Recipients"
+msgstr "Filtrér etter mottaker"
+
+#: mail/folder-browser.c:458 mail/folder-browser.c:541
+msgid "Filter on Mailing List"
+msgstr "Filtrér etter e-postliste"
+
+#: mail/folder-browser.c:462 ui/evolution-message-composer.xml.h:16
+msgid "Open"
+msgstr "Åpne"
+
+#: mail/folder-browser.c:464 mail/mail-view.c:163
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
+#: ui/evolution-mail.xml.h:28
+msgid "Print"
+msgstr "Skriv ut"
+
+#: mail/folder-browser.c:466
 msgid "Reply to Sender"
 msgstr "Svar til sender"
 
-#: mail/folder-browser.c:483 mail/mail-view.c:156 ui/evolution-mail.h:35
+#: mail/folder-browser.c:467 mail/mail-view.c:156 ui/evolution-mail.xml.h:34
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/folder-browser.c:484
-msgid "Forward Message"
-msgstr "Videresend melding"
+#: mail/folder-browser.c:468 mail/mail-view.c:159 ui/evolution-mail.xml.h:18
+msgid "Forward"
+msgstr "Videresend"
 
-#: mail/folder-browser.c:486
+#: mail/folder-browser.c:471
 msgid "Mark as Read"
 msgstr "Markér som lest"
 
-#: mail/folder-browser.c:487
+#: mail/folder-browser.c:472
 msgid "Mark as Unread"
 msgstr "Merk som ulest"
 
-#: mail/folder-browser.c:488
-msgid "Delete Message"
-msgstr "Slett melding"
+#: mail/folder-browser.c:474
+msgid "Move to Folder..."
+msgstr "Flytt til mappe..."
 
-#: mail/folder-browser.c:489
-msgid "Move Message"
-msgstr "Flytt melding"
+#: mail/folder-browser.c:475
+msgid "Copy to Folder..."
+msgstr "Kopiér til mappe..."
 
-#: mail/folder-browser.c:490
-msgid "Copy Message"
-msgstr "Kopiér melding"
+#: mail/folder-browser.c:477
+msgid "Undelete"
+msgstr "Angre slett"
 
-#: mail/folder-browser.c:491
+#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
+#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
+#: mail/folder-browser.c:481
 msgid "Apply Filters"
 msgstr "Påfør filtre"
 
-#: mail/folder-browser.c:493
-msgid "VFolder on Subject"
-msgstr "VFolder for emne"
-
-#: mail/folder-browser.c:494
-msgid "VFolder on Sender"
-msgstr "VFolder for sender"
-
-#: mail/folder-browser.c:495
-msgid "VFolder on Recipients"
-msgstr "VFolder for mottakere"
-
-#: mail/folder-browser.c:497
-msgid "Filter on Subject"
-msgstr "Filtrér etter emne"
+#: mail/folder-browser.c:483 ui/evolution-mail.xml.h:11
+msgid "Create Rule From Message"
+msgstr "Lage regel fra melding"
 
-#: mail/folder-browser.c:498
-msgid "Filter on Sender"
-msgstr "Filtrér etter sender"
-
-#: mail/folder-browser.c:499
-msgid "Filter on Recipients"
-msgstr "Filtrér etter mottaker"
-
-#: mail/folder-browser.c:500 mail/folder-browser.c:523
-msgid "Filter on Mailing List"
-msgstr "Filtrér etter e-postliste"
-
-#: mail/folder-browser.c:525
+#: mail/folder-browser.c:543
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrér etter e-postliste (%s)"
 
-#: mail/folder-browser.c:641
-msgid "Full Search"
-msgstr "Fullt søk"
-
-#: mail/folder-browser.c:646 ui/evolution-event-editor.h:93
-msgid "Save"
-msgstr "Lagre"
-
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4234,12 +4419,12 @@ msgstr "Send til %s"
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:232
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: mail/mail-autofilter.c:334
+#: mail/mail-autofilter.c:329
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
@@ -4312,7 +4497,7 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:749
+#: mail/mail-callbacks.c:779
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4321,7 +4506,11 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:841
+#: mail/mail-callbacks.c:824
+msgid "Print Message"
+msgstr "Skriv ut melding"
+
+#: mail/mail-callbacks.c:871
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
@@ -4342,31 +4531,32 @@ msgstr "Fullt navn:"
 msgid "Email address:"
 msgstr "E-post adresse:"
 
-#: mail/mail-config-gui.c:484
+#: mail/mail-config-druid.glade.h:53 mail/mail-config-gui.c:484
 msgid "Organization:"
 msgstr "Organisasjon:"
 
-#: mail/mail-config-gui.c:495
+#: mail/mail-config-druid.glade.h:75 mail/mail-config-gui.c:495
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
 #: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:42
 msgid "Signature File"
 msgstr "Signaturfil"
 
-#: mail/mail-config-gui.c:906
+#: mail/mail-config-druid.glade.h:74 mail/mail-config-gui.c:906
 msgid "Server:"
 msgstr "Tjener:"
 
-#: mail/mail-config-gui.c:912
+#: mail/mail-config-druid.glade.h:79 mail/mail-config-gui.c:912
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: mail/mail-config-gui.c:918
+#: mail/mail-config-druid.glade.h:55 mail/mail-config-gui.c:918
 msgid "Path:"
 msgstr "Sti:"
 
-#: mail/mail-config-gui.c:927
+#: mail/mail-config-druid.glade.h:26 mail/mail-config-gui.c:927
 msgid "Authentication:"
 msgstr "Autentisering:"
 
@@ -4374,11 +4564,11 @@ msgstr "Autentisering:"
 msgid "Detect supported types..."
 msgstr "Søk etter støttede typer..."
 
-#: mail/mail-config-gui.c:967
+#: mail/mail-config-druid.glade.h:36 mail/mail-config-gui.c:967
 msgid "Don't delete messages from server"
 msgstr "Ikke slett meldinger fra tjeneren"
 
-#: mail/mail-config-gui.c:979
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:979
 msgid "Test Settings"
 msgstr "Prøv ut innstillinger"
 
@@ -4476,7 +4666,7 @@ msgstr "Spør etter autorisasjon hos \"%s\""
 #. * DO NOT compile it as part of your application.
 #.
 #: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
+#: mail/mail-config-druid.glade.h:16 mail/mail-config-druid.glade.h:46
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
@@ -4492,7 +4682,7 @@ msgstr ""
 "innstillinger kan du begynne å sende og motta e-post\n"
 "med én gang. Klikk neste for å fortsette."
 
-#: mail/mail-config-druid.glade.h:13
+#: mail/mail-config-druid.glade.h:13 mail/mail-config-druid.glade.h:44
 msgid "Identity"
 msgstr "Identitet"
 
@@ -4501,6 +4691,7 @@ msgid "Mail Source"
 msgstr "E-post-kilde"
 
 #: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:35
 msgid "Mail Transport"
 msgstr "E-post-transport"
 
@@ -4512,44 +4703,222 @@ msgstr ""
 "Din e-post-konfigurasjon er nå komplett.\n"
 "Klikk \"Fullfør\" for å lagre dine nye innstillinger"
 
+#: mail/mail-config-druid.glade.h:19
+msgid "Account Information"
+msgstr "Kontoinformasjon"
+
+#: mail/mail-config-druid.glade.h:20
+msgid "Account Management"
+msgstr "Håndtering av konti"
+
+#: mail/mail-config-druid.glade.h:21
+msgid "Accounts"
+msgstr "Konti"
+
+#: mail/mail-config-druid.glade.h:23
+msgid "Add Optional Fields..."
+msgstr "Legg til tillegsfelt..."
+
+#: mail/mail-config-druid.glade.h:24
+msgid "Additional Identity Fields"
+msgstr "Ekstra identitetsfelt"
+
+#: mail/mail-config-druid.glade.h:25
+msgid "Authentication"
+msgstr "Autentisering"
+
+#: mail/mail-config-druid.glade.h:27
+msgid "Browse..."
+msgstr "Bla gjennom..."
+
+#: mail/mail-config-druid.glade.h:28
+msgid "Congratulations, your mail configuration is complete."
+msgstr "Gratulerer, konfigurasjon av e-post er fullført."
+
+#: mail/mail-config-druid.glade.h:34
+msgid "Default"
+msgstr "Forvalgt"
+
+#: mail/mail-config-druid.glade.h:37
+msgid "Done"
+msgstr "Ferdig"
+
+#: mail/mail-config-druid.glade.h:39
+msgid "Edit Mail Configuration Settings"
+msgstr "Redigér innstillinger for e-post-konfigurasjon"
+
+#: mail/mail-config-druid.glade.h:40
+msgid "Email Address:"
+msgstr "E-post adresse:"
+
+#: mail/mail-config-druid.glade.h:41
+msgid "Evolution Mail Configuration"
+msgstr "Evolution e-post-konfigurasjon"
+
+#: mail/mail-config-druid.glade.h:42
+msgid "Full Name:"
+msgstr "Fullt navn:"
+
+#: mail/mail-config-druid.glade.h:43
+msgid "IMAP"
+msgstr "IMAP"
+
+#: mail/mail-config-druid.glade.h:45
+msgid "Mail"
+msgstr "E-post"
+
+#: mail/mail-config-druid.glade.h:47
+msgid "Mail Configuration Druid"
+msgstr "E-post-konfigurasjonsdruide"
+
+#: mail/mail-config-druid.glade.h:48
+msgid "Make this my default account"
+msgstr "Bruk denne som standard konto"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "News"
+msgstr "News"
+
+#: mail/mail-config-druid.glade.h:51
+msgid "Optional"
+msgstr "Valgfri"
+
+#: mail/mail-config-druid.glade.h:52
+msgid "Optional Information"
+msgstr "Valgfri informasjon"
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Password:"
+msgstr "Passord:"
+
+#: mail/mail-config-druid.glade.h:56
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what"
+msgstr ""
+"Vennligst skriv inn informasjon om din tjener for innkommende e-post under. "
+"Hvis du ikke vet hva"
+
+#: mail/mail-config-druid.glade.h:58
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know "
+msgstr ""
+"Vennligst skriv inn informasjon om protokoll for utgående e-post under. Hvis "
+"du ikke vet "
+
+#: mail/mail-config-druid.glade.h:60
+msgid ""
+"Please enter your name and email address below. The &quot;optional&quot; "
+"fields below do not "
+msgstr ""
+"Vennligst skriv inn ditt navn og din e-post adresse under. "
+"&quot;optional&quot; feltene under er ikke"
+
+#: mail/mail-config-druid.glade.h:62
+msgid "Preferred type: "
+msgstr "Foretrukket type: "
+
+#: mail/mail-config-druid.glade.h:63
+msgid "Receiving Email"
+msgstr "Mottar e-post"
+
+#: mail/mail-config-druid.glade.h:64
+msgid "Receiving Mail"
+msgstr "Mottar e-post"
+
+#: mail/mail-config-druid.glade.h:65
+msgid "Remember my password"
+msgstr "Husk mitt passord"
+
+#: mail/mail-config-druid.glade.h:66
+msgid "Reply-to:"
+msgstr "Svar-til:"
+
+#: mail/mail-config-druid.glade.h:67
+msgid "Required"
+msgstr "Nødvendige"
+
+#: mail/mail-config-druid.glade.h:68
+msgid "SMTP"
+msgstr "SMTP"
+
+#: mail/mail-config-druid.glade.h:69
+msgid "SMTP server requires authentication"
+msgstr "SMTP-tjener må ha autentisering"
+
+#: mail/mail-config-druid.glade.h:70
+msgid "Sending Email"
+msgstr "Sender e-post"
+
+#: mail/mail-config-druid.glade.h:71
+msgid "Sending Mail"
+msgstr "Sender e-post"
+
+#: mail/mail-config-druid.glade.h:72
+msgid "Server Configuration"
+msgstr "Tjenerkonfigurasjon"
+
+#: mail/mail-config-druid.glade.h:73
+msgid "Server Type: "
+msgstr "Tjenertype: "
+
+#: mail/mail-config-druid.glade.h:76 mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:43
+msgid "Sources"
+msgstr "Kilder"
+
+#: mail/mail-config-druid.glade.h:80
+msgid "Welcome to the Evolution Mail Configuration Druid! "
+msgstr "Velkommen til konfigurasjonsdruiden for Evolution e-post"
+
+#: mail/mail-config-druid.glade.h:86
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming"
+msgstr ""
+"Du er nesten ferdig med konfigurasjonsprosessen for e-post. Identiteten, "
+"innkommende"
+
+#: mail/mail-config-druid.glade.h:90
+msgid "Your mail server supports the following types of authentication. Please"
+msgstr "Din e-post tjener støtter følgende typer autentisering. Vennligst"
+
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
 #.
 #: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:33
 msgid "Identities"
 msgstr "Identiteter"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:8 mail/mail-config.glade.h:30
 msgid "Address"
 msgstr "Adresse"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:9 mail/mail-config.glade.h:39
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: mail/mail-config.glade.h:15
-msgid "Sources"
-msgstr "Kilder"
-
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:19 mail/mail-config.glade.h:34
 msgid "Mail Sources"
 msgstr "E-post-kilder"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:21 mail/mail-config.glade.h:37
 msgid "News Servers"
 msgstr "News-tjenere"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:25 mail/mail-config.glade.h:38
 msgid "News Sources"
 msgstr "News-kilder"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:26 mail/mail-config.glade.h:41
 msgid "Send messages in HTML format"
 msgstr "Send meldinger i HTML-format"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:27 mail/mail-config.glade.h:36
 msgid "Mark message as seen [ms]: "
 msgstr "Merk melding som sett [ms]: "
 
@@ -4585,11 +4954,11 @@ msgstr "Kunne ikke opprette rør til GPG/PGP: %s"
 msgid "No GPG/PGP program available."
 msgstr "Ingen GPG/PGP-program tilgjengelig."
 
-#: mail/mail-display.c:66
+#: mail/mail-display.c:67
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-display.c:70
+#: mail/mail-display.c:71
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4597,7 +4966,7 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-display.c:84
+#: mail/mail-display.c:85
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4606,43 +4975,43 @@ msgstr ""
 "Kan ikke åpne fil %s:\n"
 "%s"
 
-#: mail/mail-display.c:96
+#: mail/mail-display.c:97
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-display.c:192
+#: mail/mail-display.c:193
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:232
+#: mail/mail-display.c:233
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/mail-display.c:274
+#: mail/mail-display.c:275
 msgid "Save to Disk..."
 msgstr "Lagre til disk..."
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:277
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:279
 msgid "View Inline"
 msgstr "Vis \"inline\""
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:303
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:325
+#: mail/mail-display.c:326
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis \"inline\" (via %s)"
 
-#: mail/mail-display.c:329
+#: mail/mail-display.c:330
 msgid "Hide"
 msgstr "Skjul"
 
@@ -4651,77 +5020,77 @@ msgstr "Skjul"
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:595
+#: mail/mail-format.c:601
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
-#: mail/mail-format.c:835
+#: mail/mail-format.c:823
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "Ingen GPG/PGP-støtte tilgjengelig i denne versjonen av Evolution."
 
-#: mail/mail-format.c:847
+#: mail/mail-format.c:835
 msgid "Encrypted message not displayed"
 msgstr "Kryptert melding ikke vist"
 
-#: mail/mail-format.c:853
+#: mail/mail-format.c:841
 msgid "Encrypted message"
 msgstr "Kryptert melding"
 
-#: mail/mail-format.c:854
+#: mail/mail-format.c:842
 msgid "Click icon to decrypt."
 msgstr "Klikk på ikonet for å dekryptere."
 
-#: mail/mail-format.c:1456
+#: mail/mail-format.c:1444
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1468
+#: mail/mail-format.c:1456
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig på nettsted \"%s\""
 
-#: mail/mail-format.c:1472
+#: mail/mail-format.c:1460
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:1506
+#: mail/mail-format.c:1494
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjent ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:1511
+#: mail/mail-format.c:1499
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern-kropp."
 
-#: mail/mail-local.c:279
+#: mail/mail-local.c:194
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Endrer mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:283
+#: mail/mail-local.c:198
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Endre mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:254
 msgid "Closing current folder"
 msgstr "Lukker aktiv mappe"
 
-#: mail/mail-local.c:359
+#: mail/mail-local.c:286
 msgid "Renaming old folder and opening"
 msgstr "Endrer navn på gammel mappe og gjenåpner"
 
-#: mail/mail-local.c:380
+#: mail/mail-local.c:307
 msgid "Creating new folder"
 msgstr "Oppretter en ny mappe"
 
-#: mail/mail-local.c:395
+#: mail/mail-local.c:322
 msgid "Copying messages"
 msgstr "Kopierer meldinger"
 
-#: mail/mail-local.c:407
+#: mail/mail-local.c:334
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4730,7 +5099,7 @@ msgstr ""
 "Kan ikke lagre metainformasjon for mappe; du vil sannsynligvis\n"
 "ikke kunne åpne denne mappen igjen: %s"
 
-#: mail/mail-local.c:443
+#: mail/mail-local.c:370
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4738,11 +5107,13 @@ msgstr ""
 "Hvis du ikke kan åpne denne postboksen igjen må\n"
 "du reparere den manuelt."
 
-#. This is how we could do to display extra information about the
-#. folder.
-#: mail/mail-local-storage.c:97
-msgid " (XXX unread)"
-msgstr " (XXX ulest)"
+#: mail/mail-local.c:659
+msgid "Registering local folder"
+msgstr "Registrerer lokal mappe"
+
+#: mail/mail-local.c:661
+msgid "Register local folder"
+msgstr "Registrér lokal mappe"
 
 #: mail/mail-ops.c:69
 #, c-format
@@ -5001,15 +5372,15 @@ msgstr "Vis meldinger fra \"%s\""
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Henter melding %d av %d (uid \"%s\")"
 
-#: mail/mail-search-dialogue.c:101
+#: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: mail/mail-summary.c:97 mail/mail-threads.c:703
+#: mail/mail-summary.c:95 mail/mail-threads.c:703
 msgid "Incomplete message written on pipe!"
 msgstr "Uferdig melding skrevet på rør!"
 
-#: mail/mail-summary.c:370
+#: mail/mail-summary.c:368
 msgid "Mailbox summary"
 msgstr "Sammendrag for postboks"
 
@@ -5047,18 +5418,18 @@ msgstr "Kan ikke opprette dialogboks."
 msgid "User cancelled query."
 msgstr "Spørring avbrutt av bruker."
 
-#: mail/mail-tools.c:210
+#: mail/mail-tools.c:187
 #, c-format
 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:264
+#: mail/mail-tools.c:237
 #, c-format
 msgid "Examining %s"
 msgstr "Undersøker %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:267
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -5066,46 +5437,41 @@ msgstr ""
 "Kunne ikke lese bufferfil for UID \"%s\". Du kan motta dupliserte meldinger."
 
 #. Info
-#: mail/mail-tools.c:315
+#: mail/mail-tools.c:288
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Henter melding %d av %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:328
+#: mail/mail-tools.c:301
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Skriver melding %d av %d"
 
-#: mail/mail-tools.c:357
+#: mail/mail-tools.c:330
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Lagrer endringer til %s"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:367
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (videresendt melding)"
 
-#: mail/mail-tools.c:400
+#: mail/mail-tools.c:377
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (uten emne)"
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:416
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:418
 msgid "Forwarded message (no subject)"
 msgstr "Videresendt melding (uten emne)"
 
-#: mail/mail-tools.c:510
-#, c-format
-msgid "Don't know protocol to open URI `%s'"
-msgstr "Ingen protokoll for åpning av URI `%s'"
-
-#: mail/mail-tools.c:539
+#: mail/mail-tools.c:521
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5124,36 +5490,27 @@ msgstr "Ny VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 ui/evolution-mail.h:34
+#: mail/mail-view.c:153 ui/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:153 ui/evolution-mail.h:39
+#: mail/mail-view.c:153 ui/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr "Svar til avsender av denne meldingen"
 
-#: mail/mail-view.c:156 ui/evolution-mail.h:38
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "Svar til alle mottakere av denne meldingen"
 
-#: mail/mail-view.c:159 ui/evolution-mail.h:19
-msgid "Forward"
-msgstr "Videresend"
-
-#: mail/mail-view.c:159 ui/evolution-mail.h:20
+#: mail/mail-view.c:159 ui/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Videresend denne meldingen"
 
-#: mail/mail-view.c:163 ui/evolution-addressbook.h:16
-#: ui/evolution-calendar.h:26 ui/evolution-mail.h:29
-msgid "Print"
-msgstr "Skriv ut"
-
-#: mail/mail-view.c:163 ui/evolution-mail.h:33
+#: mail/mail-view.c:163 ui/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Skriv ut den valgte meldingen"
 
-#: mail/mail-view.c:165 ui/evolution-mail.h:14
+#: mail/mail-view.c:165 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
@@ -5169,11 +5526,11 @@ msgstr "Bygger opp meldingsvisningen på nytt"
 msgid "Rebuild message view"
 msgstr "Gjenoppbygg meldingsvisningen"
 
-#: mail/message-thread.c:582
+#: mail/message-thread.c:583
 msgid "Threading message list"
 msgstr "Utvider tråder for meldingsliste"
 
-#: mail/message-thread.c:584
+#: mail/message-thread.c:585
 msgid "Thread message list"
 msgstr "Vis tråder i meldingsliste"
 
@@ -5211,11 +5568,11 @@ msgstr "Slett abonnement på mappe \"%s\""
 msgid "Unsubscribe to folder \"%s\""
 msgstr "Sletter abonnement på mappe \"%s\""
 
-#: shell/e-setup.c:106 shell/e-setup.c:175
+#: shell/e-setup.c:110 shell/e-setup.c:179
 msgid "Evolution installation"
 msgstr "Evolution installasjon"
 
-#: shell/e-setup.c:110
+#: shell/e-setup.c:114
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -5223,29 +5580,29 @@ msgstr ""
 "Denne nye versjonen av Evolution må installere tilleggsfiler i\n"
 "din personlige Evolution-katalog"
 
-#: shell/e-setup.c:111
+#: shell/e-setup.c:115
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Vennligst klikk \"OK\" for å installere filene, eller \"Avbryt\" for å "
 "avslutte."
 
-#: shell/e-setup.c:152
+#: shell/e-setup.c:156
 msgid "Could not update files correctly"
 msgstr "Kunne ikke oppdatere filene."
 
-#: shell/e-setup.c:156 shell/e-setup.c:216
+#: shell/e-setup.c:160 shell/e-setup.c:220
 msgid "Evolution files successfully installed."
 msgstr "Evolutions filer ble installert."
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:183
 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:180
+#: shell/e-setup.c:184
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Vennligst klikk \"OK\" for å installere Evolutions brukerfiler under"
 
-#: shell/e-setup.c:197
+#: shell/e-setup.c:201
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5256,7 +5613,7 @@ msgstr ""
 "%s\n"
 "Feil: %s"
 
-#: shell/e-setup.c:212
+#: shell/e-setup.c:216
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5265,7 +5622,7 @@ msgstr ""
 "Kan ikke kopiere filer til\n"
 "`%s'."
 
-#: shell/e-setup.c:237
+#: shell/e-setup.c:241
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5276,7 +5633,7 @@ msgstr ""
 "Venligst flytt denne for å tillate installasjon\n"
 "av Evolution's brukerfiler."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5363,20 +5720,20 @@ msgstr "Mapper"
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1167
+#: shell/e-shell.c:339
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Kan ikke sette opp lokal lagring -- %s"
+
+#: shell/e-shell.c:1157
 #, c-format
 msgid ""
-"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 "Ops! Visningen for `%s' døde uventet. :-(\n"
 "Dette betyr sannsynligvis at komponenten %s har krasjet."
 
-#: shell/e-shell.c:336
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan ikke sette opp lokal lagring -- %s"
-
 #: shell/e-shortcuts-view.c:122
 msgid "Create new shortcut group"
 msgstr "Opprett ny snarveigruppe"
@@ -5494,8 +5851,8 @@ msgstr "Operasjonen er ikke støttet"
 msgid "The specified type is not supported in this storage"
 msgstr "Spesifisert type er ikke støttet for dette lageret"
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.h:128
-#: ui/evolution.h:39
+#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:126
+#: ui/evolution-message-composer.xml.h:46 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Vis"
 
@@ -5563,978 +5920,1091 @@ msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
 #.
-#. *  This file is autogenerated from evolution-addressbook-ldap.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.h:9
+#: ui/evolution-addressbook-ldap.xml.h:7
 msgid "N_ew Directory Server"
 msgstr "Ny katalog-tj_ener"
 
-#: ui/evolution-addressbook-ldap.h:10
+#: ui/evolution-addressbook-ldap.xml.h:8
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ui/evolution-addressbook.h:10
+#: ui/evolution-addressbook.xml.h:8
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
-#: ui/evolution-addressbook.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Delete a contact"
 msgstr "Slett en kontakt"
 
-#: ui/evolution-addressbook.h:13 ui/evolution-event-editor.h:72
+#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:68
 msgid "Find"
 msgstr "Finn"
 
-#: ui/evolution-addressbook.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Find a contact"
 msgstr "Finn en kontakt"
 
-#: ui/evolution-addressbook.h:15 ui/evolution-calendar.h:21
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Ny"
 
-#: ui/evolution-addressbook.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
-#: ui/evolution-addressbook.h:18
+#: ui/evolution-addressbook.xml.h:16
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.h:19
+#: ui/evolution-addressbook.xml.h:17
 msgid "Stop Loading"
 msgstr "Stopp innlesing"
 
-#: ui/evolution-addressbook.h:20
+#: ui/evolution-addressbook.xml.h:18
 msgid "View All"
 msgstr "Vis alle"
 
-#: ui/evolution-addressbook.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "View all contacts"
 msgstr "Vis alle kontakter"
 
-#: ui/evolution-addressbook.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "_New Contact"
 msgstr "_Ny kontakt"
 
-#: ui/evolution-addressbook.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Print Contacts..."
 msgstr "S_kriv ut kontakter..."
 
-#: ui/evolution-addressbook.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Search for contacts"
 msgstr "_Søk etter kontakter"
 
-#: ui/evolution-addressbook.h:25 ui/evolution-event-editor.h:126
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-event-editor.xml.h:124
 msgid "_Tools"
 msgstr "_Verktøy"
 
 #.
-#. *  This file is autogenerated from evolution-calendar.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: ui/evolution-calendar.h:9
+#: ui/evolution-calendar.xml.h:7
 msgid "5 Days"
 msgstr "5 dager"
 
-#: ui/evolution-calendar.h:10
+#: ui/evolution-calendar.xml.h:8
 msgid "Alter preferences"
 msgstr "Endre brukervalg"
 
-#: ui/evolution-calendar.h:11
+#: ui/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Brukervalg for kalender..."
 
-#: ui/evolution-calendar.h:12
+#: ui/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: ui/evolution-calendar.h:13
+#: ui/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
-#: ui/evolution-calendar.h:14
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.h:15
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Gå tilbake i tid"
 
-#: ui/evolution-calendar.h:16
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Gå fremover i tid"
 
-#: ui/evolution-calendar.h:17
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Gå til"
 
-#: ui/evolution-calendar.h:18
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Gå til en spesifikk dato"
 
-#: ui/evolution-calendar.h:19
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Gå til i dag"
 
-#: ui/evolution-calendar.h:20
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Måned"
 
-#: ui/evolution-calendar.h:22
+#: ui/evolution-calendar.xml.h:20
 msgid "New Ca_lendar"
 msgstr "Ny ka_lender"
 
-#: ui/evolution-calendar.h:23 ui/evolution-event-editor.h:79
+#: ui/evolution-calendar.xml.h:21 ui/evolution-event-editor.xml.h:75
 msgid "Next"
 msgstr "Neste"
 
-#: ui/evolution-calendar.h:24
+#: ui/evolution-calendar.xml.h:22
 msgid "Open a calendar"
 msgstr "Åpne en kalender"
 
-#: ui/evolution-calendar.h:25
+#: ui/evolution-calendar.xml.h:23
 msgid "Prev"
 msgstr "Forrige"
 
-#: ui/evolution-calendar.h:27
+#: ui/evolution-calendar.xml.h:25
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ui/evolution-calendar.h:28
+#: ui/evolution-calendar.xml.h:26
 msgid "Save calendar As something else"
 msgstr "Lagre kalender som noe annet"
 
-#: ui/evolution-calendar.h:29
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 day"
 msgstr "Vis 1 dag"
 
-#: ui/evolution-calendar.h:30
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 month"
 msgstr "Vis 1 måned"
 
-#: ui/evolution-calendar.h:31
+#: ui/evolution-calendar.xml.h:29
 msgid "Show 1 week"
 msgstr "Vis 1 uke"
 
-#: ui/evolution-calendar.h:32
+#: ui/evolution-calendar.xml.h:30
 msgid "Show the working week"
 msgstr "Vis arbeidsuken"
 
-#: ui/evolution-calendar.h:33 widgets/misc/e-dateedit.c:365
+#: ui/evolution-calendar.xml.h:31 widgets/misc/e-dateedit.c:365
 msgid "Today"
 msgstr "Idag"
 
-#: ui/evolution-calendar.h:34
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Uke"
 
-#: ui/evolution-calendar.h:35 ui/evolution.h:35
+#: ui/evolution-calendar.xml.h:33 ui/evolution.xml.h:34
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution-calendar.h:36
+#: ui/evolution-calendar.xml.h:34
 msgid "_New appointment..."
 msgstr "_Ny avtale..."
 
-#: ui/evolution-calendar.h:37
+#: ui/evolution-calendar.xml.h:35
 msgid "_Open"
 msgstr "_Åpne"
 
-#: ui/evolution-calendar.h:38
+#: ui/evolution-calendar.xml.h:36
 msgid "_Open Calendar"
 msgstr "_Åpne kalender"
 
-#: ui/evolution-calendar.h:39
+#: ui/evolution-calendar.xml.h:37
 msgid "_Print this calendar"
 msgstr "S_kriv ut denne kalenderen"
 
-#: ui/evolution-calendar.h:40
+#: ui/evolution-calendar.xml.h:38
 msgid "_Save Calendar As"
 msgstr "Lagre kalender _som"
 
-#: ui/evolution-contact-editor.h:11
+#: ui/evolution-contact-editor.xml.h:8
 msgid "Delete this item"
 msgstr "Slett denne oppføringen"
 
-#: ui/evolution-contact-editor.h:12 ui/evolution-event-editor.h:86
+#: ui/evolution-contact-editor.xml.h:9
+msgid "Delete..."
+msgstr "Slett..."
+
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Help"
+msgstr "Hjelp"
+
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Print En_velope..."
+msgstr "Skriv ut konvolutt..."
+
+#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
 msgid "Print this item"
 msgstr "Skriv ut denne oppføringen"
 
-#: ui/evolution-contact-editor.h:13 ui/evolution-event-editor.h:87
+#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:83
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: ui/evolution-contact-editor.h:14
-msgid "Save _As"
-msgstr "L_agre som"
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save _As..."
+msgstr "L_agre som..."
 
-#: ui/evolution-contact-editor.h:15 ui/evolution-event-editor.h:95
+#: ui/evolution-contact-editor.xml.h:15 ui/evolution-event-editor.xml.h:91
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
-#: ui/evolution-contact-editor.h:16
+#: ui/evolution-contact-editor.xml.h:16
 msgid "Save the contact and close the dialog box"
 msgstr "Lagre kontakten og lukk dialogboksen"
 
-#: ui/evolution-contact-editor.h:17 ui/evolution-event-editor.h:113
-#: ui/evolution-subscribe.h:19 ui/evolution.h:29
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:99
+msgid "See online help"
+msgstr "Se hjelp"
+
+#: ui/evolution-contact-editor.xml.h:18 ui/evolution-event-editor.xml.h:111
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "_File"
 msgstr "_Fil"
 
-#: ui/evolution-contact-editor.h:18 ui/evolution-event-editor.h:120
-msgid "_Print"
-msgstr "S_kriv ut"
+#: ui/evolution-contact-editor.xml.h:19
+msgid "_Print..."
+msgstr "S_kriv ut..."
 
-#: ui/evolution-contact-editor.h:19 ui/evolution-event-editor.h:124
+#: ui/evolution-contact-editor.xml.h:20 ui/evolution-event-editor.xml.h:122
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Save"
 msgstr "_Lagre"
 
 #.
-#. *  This file is autogenerated from evolution-event-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: ui/evolution-event-editor.h:9
+#: ui/evolution-event-editor.xml.h:7
 msgid "About this application"
 msgstr "Om denne applikasjonen"
 
-#: ui/evolution-event-editor.h:10
+#: ui/evolution-event-editor.xml.h:8
 msgid "About..."
 msgstr "Om..."
 
-#: ui/evolution-event-editor.h:11
+#: ui/evolution-event-editor.xml.h:9
 msgid "Actio_ns"
 msgstr "Ha_ndlinger"
 
-#: ui/evolution-event-editor.h:12
+#: ui/evolution-event-editor.xml.h:10
 msgid "C_lear"
 msgstr "T_øm"
 
-#: ui/evolution-event-editor.h:13
+#: ui/evolution-event-editor.xml.h:11
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: ui/evolution-event-editor.h:14
+#: ui/evolution-event-editor.xml.h:12
 msgid "Clear"
 msgstr "Tøm"
 
-#: ui/evolution-event-editor.h:15
+#: ui/evolution-event-editor.xml.h:13
 msgid "Clear the selection"
 msgstr "Tøm utvalget"
 
-#: ui/evolution-event-editor.h:17
+#: ui/evolution-event-editor.xml.h:15
 msgid "Close this appointment"
 msgstr "Lukk denne avtalen"
 
-#: ui/evolution-event-editor.h:18 ui/evolution-mail.h:11
+#: ui/evolution-event-editor.xml.h:16 ui/evolution-mail.xml.h:9
 msgid "Copy"
 msgstr "Kopiér"
 
-#: ui/evolution-event-editor.h:19
+#: ui/evolution-event-editor.xml.h:17
 msgid "Copy the selection"
 msgstr "Kopiér utvalget"
 
-#: ui/evolution-event-editor.h:20
+#: ui/evolution-event-editor.xml.h:18
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: ui/evolution-event-editor.h:21
+#: ui/evolution-event-editor.xml.h:19
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: ui/evolution-event-editor.h:24
+#: ui/evolution-event-editor.xml.h:22
 msgid "Dump XML"
 msgstr "Dump XML"
 
-#: ui/evolution-event-editor.h:25
+#: ui/evolution-event-editor.xml.h:23
 msgid "Dump the UI Xml description"
 msgstr "Dump beskrivelse av grensesnittet som XML"
 
-#: ui/evolution-event-editor.h:26
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Address _Book..."
 msgstr "Addresse_bok..."
 
-#: ui/evolution-event-editor.h:27
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Ch_oose Form..."
 msgstr "Velg skjema..."
 
-#: ui/evolution-event-editor.h:28
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: Chec_k Names"
 msgstr "Sjek_k navn"
 
-#: ui/evolution-event-editor.h:29
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: Cop_y to Folder..."
 msgstr "Kopiér til mappe..."
 
-#: ui/evolution-event-editor.h:30
+#: ui/evolution-event-editor.xml.h:28
 msgid "FIXME: D_esign a Form..."
 msgstr "U_tform et skjema..."
 
-#: ui/evolution-event-editor.h:31
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: Define Print _Styles"
 msgstr "Definér utskriftstiler"
 
-#: ui/evolution-event-editor.h:32
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Desi_gn This Form"
 msgstr "_Utform dette skjemaet"
 
-#: ui/evolution-event-editor.h:33
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "Fø_rste oppføring i mappe"
 
-#: ui/evolution-event-editor.h:34
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: For_ward"
 msgstr "_Videresend"
 
-#: ui/evolution-event-editor.h:35
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Forward as v_Calendar"
 msgstr "Videresend som v_Calendar"
 
-#: ui/evolution-event-editor.h:36
+#: ui/evolution-event-editor.xml.h:34
 msgid "FIXME: Help"
 msgstr "Hjelp"
 
-#: ui/evolution-event-editor.h:37
+#: ui/evolution-event-editor.xml.h:35
 msgid "FIXME: In_complete Task"
 msgstr "U_komplett oppgave"
 
-#: ui/evolution-event-editor.h:38
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: Insert File"
 msgstr "Sett inn fil"
 
-#: ui/evolution-event-editor.h:39
+#: ui/evolution-event-editor.xml.h:37
 msgid "FIXME: It_em..."
 msgstr "Opp_føring"
 
-#: ui/evolution-event-editor.h:40
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Paste _Special... "
 msgstr "Lim inn _spesial..."
 
-#: ui/evolution-event-editor.h:41
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Print Pre_view"
 msgstr "Forhåndsvisning av utskrift"
 
-#: ui/evolution-event-editor.h:42
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Pu_blish Form As..."
 msgstr "Pu_blisér skjema som..."
 
-#: ui/evolution-event-editor.h:43
+#: ui/evolution-event-editor.xml.h:41
 msgid "FIXME: Publish _Form..."
 msgstr "Publisér skjema..."
 
-#: ui/evolution-event-editor.h:44
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: Rec_urrence..."
 msgstr "Gjentakelse..."
 
-#: ui/evolution-event-editor.h:45
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: S_end"
 msgstr "_Send"
 
-#: ui/evolution-event-editor.h:46
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: Save Attac_hments..."
 msgstr "Lagre vedle_gg..."
 
-#: ui/evolution-event-editor.h:47
-msgid "FIXME: Schedule Meeting"
-msgstr "Sett opp møte"
-
-#: ui/evolution-event-editor.h:48
-msgid "FIXME: Schedule _Meeting"
-msgstr "Sett opp _møte"
-
-#: ui/evolution-event-editor.h:49
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: Script _Debugger"
 msgstr "Feilsøking i skript"
 
-#: ui/evolution-event-editor.h:50
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: Task _Request"
 msgstr "Oppgavefo_respørsel"
 
-#: ui/evolution-event-editor.h:51
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Contact"
 msgstr "_Kontakt"
 
-#: ui/evolution-event-editor.h:52
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _Customize..."
 msgstr "_Tilpass..."
 
-#: ui/evolution-event-editor.h:53
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _File..."
 msgstr "_Fil..."
 
-#: ui/evolution-event-editor.h:54
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Font..."
 msgstr "FIXME: Skri_fttyper..."
 
-#: ui/evolution-event-editor.h:55
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Formatting"
 msgstr "_Formatering"
 
-#: ui/evolution-event-editor.h:56
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Item"
 msgstr "_Oppføring"
 
-#: ui/evolution-event-editor.h:57
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Journal Entry"
 msgstr "_Journaloppføring"
 
-#: ui/evolution-event-editor.h:58
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Last Item in Folder"
 msgstr "_Siste oppføring i mappe"
 
-#: ui/evolution-event-editor.h:59
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Mail Message"
 msgstr "Send _melding"
 
-#: ui/evolution-event-editor.h:60
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Memo Style"
 msgstr "_Notis-stil"
 
-#: ui/evolution-event-editor.h:61
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _Move to Folder..."
 msgstr "_Flytt til mappe..."
 
-#: ui/evolution-event-editor.h:62
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _New Appointment"
 msgstr "_Ny avtale"
 
-#: ui/evolution-event-editor.h:63
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Note"
 msgstr "_Notis"
 
-#: ui/evolution-event-editor.h:64
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Object..."
 msgstr "_Objekt..."
 
-#: ui/evolution-event-editor.h:65
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Paragraph..."
 msgstr "_Avsnitt..."
 
-#: ui/evolution-event-editor.h:66
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Spelling..."
 msgstr "_Stavekontroll..."
 
-#: ui/evolution-event-editor.h:67
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Standard"
 msgstr "_Standard"
 
-#: ui/evolution-event-editor.h:68
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Task"
 msgstr "_Oppgave"
 
-#: ui/evolution-event-editor.h:69
+#: ui/evolution-event-editor.xml.h:65
 msgid "FIXME: _Unread Item"
 msgstr "_Ulest oppføring"
 
-#: ui/evolution-event-editor.h:70
+#: ui/evolution-event-editor.xml.h:66
 msgid "FIXME: what goes here?"
 msgstr "Hva går her?"
 
-#: ui/evolution-event-editor.h:71
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-message-composer.xml.h:12
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: ui/evolution-event-editor.h:73
+#: ui/evolution-event-editor.xml.h:69
 msgid "Find Again"
 msgstr "Finn igjen"
 
-#: ui/evolution-event-editor.h:74
+#: ui/evolution-event-editor.xml.h:70
 msgid "Find _Again"
 msgstr "Finn ig_jen"
 
-#: ui/evolution-event-editor.h:75
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the next item"
 msgstr "Gå til neste oppføring"
 
-#: ui/evolution-event-editor.h:76
+#: ui/evolution-event-editor.xml.h:72
 msgid "Go to the previous item"
 msgstr "Gå til forrige oppføring"
 
-#: ui/evolution-event-editor.h:77
+#: ui/evolution-event-editor.xml.h:73
 msgid "Modify the file's properties"
 msgstr "Endre filens egenskaper"
 
-#: ui/evolution-event-editor.h:78
+#: ui/evolution-event-editor.xml.h:74
 msgid "N_ext"
 msgstr "N_este"
 
-#: ui/evolution-event-editor.h:80
+#: ui/evolution-event-editor.xml.h:76
 msgid "Paste"
 msgstr "Lim inn"
 
-#: ui/evolution-event-editor.h:81
+#: ui/evolution-event-editor.xml.h:77
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ui/evolution-event-editor.h:82
+#: ui/evolution-event-editor.xml.h:78
 msgid "Pre_vious"
 msgstr "Forri_ge"
 
-#: ui/evolution-event-editor.h:83
+#: ui/evolution-event-editor.xml.h:79
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-event-editor.h:84
+#: ui/evolution-event-editor.xml.h:80
 msgid "Print S_etup..."
 msgstr "Skriveropps_ett..."
 
-#: ui/evolution-event-editor.h:85
+#: ui/evolution-event-editor.xml.h:81
 msgid "Print Setup"
 msgstr "Skriveroppsett"
 
-#: ui/evolution-event-editor.h:88
+#: ui/evolution-event-editor.xml.h:84
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ui/evolution-event-editor.h:89
+#: ui/evolution-event-editor.xml.h:85
 msgid "Redo"
 msgstr "Gjenopprett"
 
-#: ui/evolution-event-editor.h:90
+#: ui/evolution-event-editor.xml.h:86
 msgid "Redo the undone action"
 msgstr "Gjenopprett angret handling"
 
-#: ui/evolution-event-editor.h:91
+#: ui/evolution-event-editor.xml.h:87
 msgid "Replace"
 msgstr "Erstatt"
 
-#: ui/evolution-event-editor.h:92
+#: ui/evolution-event-editor.xml.h:88
 msgid "Replace a string"
 msgstr "Erstattt en streng"
 
-#: ui/evolution-event-editor.h:94
-msgid "Save _As..."
-msgstr "L_agre som..."
-
-#: ui/evolution-event-editor.h:96
+#: ui/evolution-event-editor.xml.h:92
 msgid "Save the appointment and close the dialog box"
 msgstr "Lagre avtalen og lukk dialogboksen"
 
-#: ui/evolution-event-editor.h:97
+#: ui/evolution-event-editor.xml.h:93 ui/evolution-message-composer.xml.h:23
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: ui/evolution-event-editor.h:98
+#: ui/evolution-event-editor.xml.h:94
+msgid "Schedule Meeting"
+msgstr "Sett opp møte"
+
+#: ui/evolution-event-editor.xml.h:95
+msgid "Schedule _Meeting"
+msgstr "Sett opp _møte"
+
+#: ui/evolution-event-editor.xml.h:96
 msgid "Schedule some sort of a meeting"
 msgstr "Sett opp ett eller annet møte"
 
-#: ui/evolution-event-editor.h:99
+#: ui/evolution-event-editor.xml.h:97
 msgid "Search again for the same string"
 msgstr "Søk etter samme streng på nytt"
 
-#: ui/evolution-event-editor.h:100
+#: ui/evolution-event-editor.xml.h:98
 msgid "Search for a string"
 msgstr "Søk etter en streng"
 
-#: ui/evolution-event-editor.h:101
-msgid "See online help"
-msgstr "Se hjelp"
-
-#: ui/evolution-event-editor.h:102
+#: ui/evolution-event-editor.xml.h:100
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ui/evolution-event-editor.h:103
+#: ui/evolution-event-editor.xml.h:101
 msgid "Select everything"
 msgstr "Velg alt"
 
-#: ui/evolution-event-editor.h:104
+#: ui/evolution-event-editor.xml.h:102
 msgid "Setup the page settings for your current printer"
 msgstr "Redigér sideinnstillinger for aktiv skriver"
 
-#: ui/evolution-event-editor.h:105
+#: ui/evolution-event-editor.xml.h:103
 msgid "Undo"
 msgstr "Angre"
 
-#: ui/evolution-event-editor.h:106
+#: ui/evolution-event-editor.xml.h:104
 msgid "Undo the last action"
 msgstr "Angre siste handling"
 
-#: ui/evolution-event-editor.h:107
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:37
 msgid "_About..."
 msgstr "_Om..."
 
-#: ui/evolution-event-editor.h:108
+#: ui/evolution-event-editor.xml.h:106 ui/evolution-message-composer.xml.h:38
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ui/evolution-event-editor.h:109
+#: ui/evolution-event-editor.xml.h:107
 msgid "_Copy"
 msgstr "_Kopiér"
 
-#: ui/evolution-event-editor.h:110
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
 msgid "_Debug"
 msgstr "_Feilsøk"
 
-#: ui/evolution-event-editor.h:112 ui/evolution-subscribe.h:18
-#: ui/evolution.h:28
+#: ui/evolution-event-editor.xml.h:110 ui/evolution-message-composer.xml.h:40
+#: ui/evolution-subscribe.xml.h:16 ui/evolution.xml.h:27
 msgid "_Edit"
 msgstr "R_edigér"
 
-#: ui/evolution-event-editor.h:114
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Find..."
 msgstr "_Finn..."
 
-#: ui/evolution-event-editor.h:115
+#: ui/evolution-event-editor.xml.h:113
 msgid "_Forms"
 msgstr "Sk_jemaer"
 
-#: ui/evolution-event-editor.h:116 ui/evolution.h:32
+#: ui/evolution-event-editor.xml.h:114 ui/evolution-message-composer.xml.h:42
+#: ui/evolution.xml.h:31
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ui/evolution-event-editor.h:117
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ui/evolution-event-editor.h:118
+#: ui/evolution-event-editor.xml.h:116
 msgid "_Object"
 msgstr "_Objekt"
 
-#: ui/evolution-event-editor.h:119
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ui/evolution-event-editor.h:121
+#: ui/evolution-event-editor.xml.h:118
+msgid "_Print"
+msgstr "S_kriv ut"
+
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Properties..."
 msgstr "Egenska_per..."
 
-#: ui/evolution-event-editor.h:122
+#: ui/evolution-event-editor.xml.h:120
 msgid "_Redo"
 msgstr "Gjenopp_rett"
 
-#: ui/evolution-event-editor.h:123
+#: ui/evolution-event-editor.xml.h:121
 msgid "_Replace..."
 msgstr "E_rstatt..."
 
-#: ui/evolution-event-editor.h:125
+#: ui/evolution-event-editor.xml.h:123
 msgid "_Toolbars"
 msgstr "Verk_tøylinjer"
 
-#: ui/evolution-event-editor.h:127
+#: ui/evolution-event-editor.xml.h:125
 msgid "_Undo"
 msgstr "_Angre"
 
 #.
-#. *  This file is autogenerated from evolution-mail.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: ui/evolution-mail.h:9
+#: ui/evolution-mail.xml.h:7
 msgid "Compose"
 msgstr "Komponér"
 
-#: ui/evolution-mail.h:10
+#: ui/evolution-mail.xml.h:8
 msgid "Compose a new message"
 msgstr "Komponér en ny melding"
 
-#: ui/evolution-mail.h:12
+#: ui/evolution-mail.xml.h:10
 msgid "Copy message to a new folder"
 msgstr "Kopiér meldingen til en ny mappe"
 
-#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:11
+#: ui/evolution-mail.xml.h:14 ui/evolution-subscribe.xml.h:9
 msgid "F_older"
 msgstr "Ma_ppe"
 
-#: ui/evolution-mail.h:16
+#: ui/evolution-mail.xml.h:15
 msgid "Fi_lter on Sender"
 msgstr "Fi_ltrér etter sender"
 
-#: ui/evolution-mail.h:17
+#: ui/evolution-mail.xml.h:16
 msgid "Filter on Rec_ipients"
 msgstr "F_iltrér etter mottaker"
 
-#: ui/evolution-mail.h:18
+#: ui/evolution-mail.xml.h:17
 msgid "Forget _Passwords"
 msgstr "Glem _passord"
 
-#: ui/evolution-mail.h:21
+#: ui/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Hent e-post"
 
-#: ui/evolution-mail.h:22
+#: ui/evolution-mail.xml.h:21
 msgid "Mail _Filters..."
 msgstr "E-post _filtre..."
 
-#: ui/evolution-mail.h:23
+#: ui/evolution-mail.xml.h:22
 msgid "Manage Subscriptions..."
 msgstr "Håndtér abonnement..."
 
-#: ui/evolution-mail.h:24
+#: ui/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
 msgstr "Mar_kér som lest"
 
-#: ui/evolution-mail.h:25
+#: ui/evolution-mail.xml.h:24
 msgid "Mark As U_nread"
 msgstr "Merk som _ulest"
 
-#: ui/evolution-mail.h:26
+#: ui/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "Flytt"
 
-#: ui/evolution-mail.h:27
+#: ui/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr "Flytt meldingen til en ny mappe"
 
-#: ui/evolution-mail.h:28
+#: ui/evolution-mail.xml.h:27
 msgid "Previews the message to be printed"
 msgstr "Viser forhåndsvisning av meldingen som skal skrives ut"
 
-#: ui/evolution-mail.h:30
+#: ui/evolution-mail.xml.h:29
 msgid "Print Preview of message..."
 msgstr "Vis forhåndsvisning av melding..."
 
-#: ui/evolution-mail.h:31
+#: ui/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr "Skriv ut denne meldingen på skriveren"
 
-#: ui/evolution-mail.h:32
+#: ui/evolution-mail.xml.h:31
 msgid "Print message..."
 msgstr "Skriv ut melding..."
 
-#: ui/evolution-mail.h:36
+#: ui/evolution-mail.xml.h:35
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ui/evolution-mail.h:37
+#: ui/evolution-mail.xml.h:36
 msgid "Reply to _Sender"
 msgstr "Svar til _sender"
 
-#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:15
+#: ui/evolution-mail.xml.h:39 ui/evolution-subscribe.xml.h:13
 msgid "Select _All"
 msgstr "Velg _alle"
 
-#: ui/evolution-mail.h:41
+#: ui/evolution-mail.xml.h:40
 msgid "Send queued mail and retrieve new mail"
 msgstr "Send kølagt e-post og hent ny e-post"
 
-#: ui/evolution-mail.h:42
+#: ui/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr "Meldingsliste med tråder"
 
-#: ui/evolution-mail.h:43
+#: ui/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: ui/evolution-mail.h:44
+#: ui/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: ui/evolution-mail.h:45
+#: ui/evolution-mail.xml.h:44
 msgid "_Apply Filters"
 msgstr "_Påfør filtre"
 
-#: ui/evolution-mail.h:46
+#: ui/evolution-mail.xml.h:45
 msgid "_Configure Folder"
 msgstr "_Konfigurér mappe"
 
-#: ui/evolution-mail.h:47
-msgid "_Copy to Folder"
-msgstr "_Kopiér til mappe"
+#: ui/evolution-mail.xml.h:46
+msgid "_Copy to Folder..."
+msgstr "_Kopiér til mappe..."
 
-#: ui/evolution-mail.h:49
+#: ui/evolution-mail.xml.h:48
 msgid "_Edit Message"
 msgstr "R_edigér melding"
 
-#: ui/evolution-mail.h:50
+#: ui/evolution-mail.xml.h:49
 msgid "_Expunge"
 msgstr "_Fjern"
 
-#: ui/evolution-mail.h:51
+#: ui/evolution-mail.xml.h:50
 msgid "_Filter on Subject"
 msgstr "_Filtrér etter emne"
 
-#: ui/evolution-mail.h:52
+#: ui/evolution-mail.xml.h:51
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ui/evolution-mail.h:53 ui/evolution-subscribe.h:20
+#: ui/evolution-mail.xml.h:52 ui/evolution-subscribe.xml.h:18
 msgid "_Invert Selection"
 msgstr "Re_versér utvalg"
 
-#: ui/evolution-mail.h:54
+#: ui/evolution-mail.xml.h:53
 msgid "_Mail Configuration..."
 msgstr "_E-post konfigurasjon..."
 
-#: ui/evolution-mail.h:55
+#: ui/evolution-mail.xml.h:54
 msgid "_Message"
 msgstr "_Melding"
 
-#: ui/evolution-mail.h:56
-msgid "_Move to Folder"
-msgstr "_Flytt til mappe"
+#: ui/evolution-mail.xml.h:55
+msgid "_Move to Folder..."
+msgstr "F_lytt til mappe..."
 
-#: ui/evolution-mail.h:57
+#: ui/evolution-mail.xml.h:56
 msgid "_Open in New Window"
 msgstr "_Åpne i nytt vindu"
 
-#: ui/evolution-mail.h:58
+#: ui/evolution-mail.xml.h:57
 msgid "_Print Message"
 msgstr "S_kriv ut melding"
 
-#: ui/evolution-mail.h:59
+#: ui/evolution-mail.xml.h:58
 msgid "_Threaded"
 msgstr "Med _tråder"
 
-#: ui/evolution-mail.h:60
+#: ui/evolution-mail.xml.h:59
+msgid "_Undelete"
+msgstr "A_ngre slett"
+
+#: ui/evolution-mail.xml.h:60
 msgid "_VFolder on Subject"
 msgstr "_VFolder for emne"
 
-#: ui/evolution-mail.h:61
+#: ui/evolution-mail.xml.h:61
 msgid "_Virtual Folder Editor..."
 msgstr "Redigering av _virtuelle mapper..."
 
 #.
-#. *  This file is autogenerated from evolution-subscribe.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
+#: ui/evolution-message-composer.xml.h:7
+msgid "Attach"
+msgstr "Legg ved"
+
+#: ui/evolution-message-composer.xml.h:9
+msgid "Bold"
+msgstr "Uthevet"
+
+#: ui/evolution-message-composer.xml.h:11
+msgid "Close the current file"
+msgstr "Lukk aktiv fil"
+
+#: ui/evolution-message-composer.xml.h:13
+msgid "HTML"
+msgstr "HTML"
+
+#: ui/evolution-message-composer.xml.h:14
+msgid "Insert a file as text into the message"
+msgstr "Sett inn en tekstfil i meldingen"
+
+#: ui/evolution-message-composer.xml.h:15
+msgid "Insert text file..."
+msgstr "Sett inn tekstfil..."
+
+#: ui/evolution-message-composer.xml.h:17
+msgid "Open a file"
+msgstr "Åpne en fil"
+
+#: ui/evolution-message-composer.xml.h:19
+msgid "Save As"
+msgstr "Lagre som"
+
+#: ui/evolution-message-composer.xml.h:21
+msgid "Save in _folder... (FIXME)"
+msgstr "Lagre i _mappe..."
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save in folder..."
+msgstr "Lagre i mappe..."
+
+#: ui/evolution-message-composer.xml.h:24
+msgid "Save the current file with a different name"
+msgstr "Lagre aktiv fil med et nytt navn"
+
+#: ui/evolution-message-composer.xml.h:25
+msgid "Save the message in a specified folder"
+msgstr "Lagre meldingen i en spesifisert mappe"
+
+#: ui/evolution-message-composer.xml.h:26
+msgid "Send"
+msgstr "Send"
+
+#: ui/evolution-message-composer.xml.h:27
+msgid "Send _Later"
+msgstr "Send se_nere"
+
+#: ui/evolution-message-composer.xml.h:28
+msgid "Send _later"
+msgstr "Send se_nere"
+
+#: ui/evolution-message-composer.xml.h:29
+msgid "Send the mail in HTML format"
+msgstr "Send meldingen i HTML-format"
+
+#: ui/evolution-message-composer.xml.h:30
+msgid "Send the message later"
+msgstr "Send meldingen senere"
+
+#: ui/evolution-message-composer.xml.h:31
+msgid "Send the message now"
+msgstr "Send meldingen nå"
+
+#: ui/evolution-message-composer.xml.h:32
+msgid "Send this message now"
+msgstr "Send denne meldingen nå"
+
+#: ui/evolution-message-composer.xml.h:33
+msgid "Sets something as bold"
+msgstr "Setter utvalg til uthevet"
+
+#: ui/evolution-message-composer.xml.h:34
+msgid "Show / hide attachments"
+msgstr "Vis/skjul vedlegg"
+
+#: ui/evolution-message-composer.xml.h:35
+msgid "Show _attachments"
+msgstr "Vis _vedlegg"
+
+#: ui/evolution-message-composer.xml.h:36
+msgid "Show attachments"
+msgstr "Vis vedlegg"
+
+#: ui/evolution-message-composer.xml.h:43
+msgid "_Insert text file... (FIXME)"
+msgstr "Sett _inn tekstfil..."
+
+#: ui/evolution-message-composer.xml.h:44
+msgid "_Open..."
+msgstr "_Åpne..."
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: ui/evolution-subscribe.h:9
+#: ui/evolution-subscribe.xml.h:7
 msgid "Add folder to your list of subscribed folders"
 msgstr "Legg til mappe på listen over abonnerte mapper"
 
-#: ui/evolution-subscribe.h:12
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List"
 msgstr "Les listen på nytt"
 
-#: ui/evolution-subscribe.h:13
+#: ui/evolution-subscribe.xml.h:11
 msgid "Refresh List of Folders"
 msgstr "Les mappelisten på nytt"
 
-#: ui/evolution-subscribe.h:14
+#: ui/evolution-subscribe.xml.h:12
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Fjern mappe fra din liste over abbonerte mapper"
 
-#: ui/evolution-subscribe.h:16
+#: ui/evolution-subscribe.xml.h:14
 msgid "Subscribe"
 msgstr "Abonnér"
 
-#: ui/evolution-subscribe.h:17
+#: ui/evolution-subscribe.xml.h:15
 msgid "Unsubscribe"
 msgstr "Fjern abonnement"
 
 #.
-#. *  This file is autogenerated from evolution.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: ui/evolution.h:9
+#: ui/evolution.xml.h:7
 msgid "Create a new folder"
 msgstr "Opprett en ny mappe"
 
-#: ui/evolution.h:10
+#: ui/evolution.xml.h:8
 msgid "Display a different folder"
 msgstr "Vis en annen mappe"
 
-#: ui/evolution.h:11
+#: ui/evolution.xml.h:9
 msgid "E_xit"
 msgstr "A_vslutt"
 
-#: ui/evolution.h:12
+#: ui/evolution.xml.h:10
 msgid "Evolution bar _shortcut"
 msgstr "Evolution-linje _snarvei"
 
-#: ui/evolution.h:13
+#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ui/evolution.h:14
+#: ui/evolution.xml.h:12
 msgid "Getting _Started"
 msgstr "Kom _igang"
 
-#: ui/evolution.h:15
+#: ui/evolution.xml.h:13
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ui/evolution.h:16
+#: ui/evolution.xml.h:14
 msgid "Show the _Folder Bar"
 msgstr "Vis _mappelinjen"
 
-#: ui/evolution.h:17
+#: ui/evolution.xml.h:15
 msgid "Show the _Shortcut Bar"
 msgstr "Vis _snarveilinjen"
 
-#: ui/evolution.h:18
+#: ui/evolution.xml.h:16
+msgid "Submit _Bug Report"
+msgstr "Sen_d inn feilrapport"
+
+#: ui/evolution.xml.h:17
 msgid "Submit bug report using Bug Buddy"
 msgstr "Send inn feilrapport ved bruk av Bug Buddy"
 
-#: ui/evolution.h:19
+#: ui/evolution.xml.h:18
 msgid "Toggle whether to show the folder bar"
 msgstr "Slå av/på visning av mappelinjen"
 
-#: ui/evolution.h:20
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Slå av/på visning av snarveilinjen"
 
-#: ui/evolution.h:21
+#: ui/evolution.xml.h:20
 msgid "Using the C_ontact Manager"
 msgstr "Bruk av k_ontaktdatabasen"
 
-#: ui/evolution.h:22
+#: ui/evolution.xml.h:21
 msgid "Using the _Calendar"
 msgstr "Bruk av _kalenderen"
 
-#: ui/evolution.h:23
+#: ui/evolution.xml.h:22
 msgid "Using the _Mailer"
 msgstr "Bruk av e-_postprogrammet"
 
-#: ui/evolution.h:24
+#: ui/evolution.xml.h:23
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ui/evolution.h:25
+#: ui/evolution.xml.h:24
 msgid "_Appointment (FIXME)"
 msgstr "_Avtale"
 
-#: ui/evolution.h:26
+#: ui/evolution.xml.h:25
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt"
 
-#: ui/evolution.h:27
+#: ui/evolution.xml.h:26
 msgid "_Create New Folder..."
 msgstr "Opprett ny mappe..."
 
-#: ui/evolution.h:30
+#: ui/evolution.xml.h:29
 msgid "_Folder"
 msgstr "_Mappe"
 
-#: ui/evolution.h:31
+#: ui/evolution.xml.h:30
 msgid "_Go to Folder..."
 msgstr "_Gå til mappe..."
 
-#: ui/evolution.h:33
+#: ui/evolution.xml.h:32
 msgid "_Index"
 msgstr "_Indeks"
 
-#: ui/evolution.h:34
+#: ui/evolution.xml.h:33
 msgid "_Mail message (FIXME)"
 msgstr "Send _melding"
 
-#: ui/evolution.h:36
+#: ui/evolution.xml.h:35
 msgid "_Settings"
 msgstr "Inn_stillinger"
 
-#: ui/evolution.h:37
-msgid "_Submit Bug Report"
-msgstr "_Send inn feilrapport"
-
-#: ui/evolution.h:38
+#: ui/evolution.xml.h:36
 msgid "_Task (FIXME)"
 msgstr "_Oppgave"
 
@@ -6653,6 +7123,69 @@ msgstr "nå"
 msgid "Group %i"
 msgstr "Gruppe %i"
 
+#~ msgid "Drafts"
+#~ msgstr "Skisser"
+
+#~ msgid "Outbox"
+#~ msgstr "Utboks"
+
+#~ msgid "Sent"
+#~ msgstr "Sendt"
+
+#~ msgid "_Submit Bug Report"
+#~ msgstr "_Send inn feilrapport"
+
+#~ msgid "Send _Now"
+#~ msgstr "Send _nå"
+
+#~ msgid "Custom search"
+#~ msgstr "Egendefinert søk"
+
+#~ msgid "Custom"
+#~ msgstr "Egendefinert"
+
+#~ msgid "Full Search"
+#~ msgstr "Fullt søk"
+
+#~ msgid " (XXX unread)"
+#~ msgstr " (XXX ulest)"
+
+#~ msgid "Don't know protocol to open URI `%s'"
+#~ msgstr "Ingen protokoll for åpning av URI `%s'"
+
+#~ msgid "_Copy to Folder"
+#~ msgstr "_Kopiér til mappe"
+
+#~ msgid "_Move to Folder"
+#~ msgstr "_Flytt til mappe"
+
+#~ msgid "Recur on the"
+#~ msgstr "Gjeninntreff den"
+
+#~ msgid "th day of the month"
+#~ msgstr "de dagen i måneden"
+
+#~ msgid "Open in New Window"
+#~ msgstr "Åpne i nytt vindu"
+
+#~ msgid "Edit Message"
+#~ msgstr "Redigér melding"
+
+#~ msgid "Forward Message"
+#~ msgstr "Videresend melding"
+
+#~ msgid "Delete Message"
+#~ msgstr "Slett melding"
+
+#~ msgid "Move Message"
+#~ msgstr "Flytt melding"
+
+#~ msgid "Copy Message"
+#~ msgstr "Kopiér melding"
+
+#~ msgid "Save _As"
+#~ msgstr "L_agre som"
+
 #~ msgid "Quick Search"
 #~ msgstr "Raskt søk"
 
@@ -6851,9 +7384,6 @@ msgstr "Gruppe %i"
 #~ msgid "Search..."
 #~ msgstr "Søk..."
 
-#~ msgid "Add..."
-#~ msgstr "Legg til..."
-
 #~ msgid "To: >>"
 #~ msgstr "Til: >>"
 
@@ -6884,54 +7414,9 @@ msgstr "Gruppe %i"
 #~ msgid "Save message"
 #~ msgstr "Send melding"
 
-#~ msgid "Save message with a different name"
-#~ msgstr "Lagre meldingen med et nytt navn"
-
-#~ msgid "Save in _folder..."
-#~ msgstr "Lagre i _mappe..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Lagre meldingen i en spesifisert mappe"
-
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "Sett _inn tekstfil..."
-
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Sett inn en tekstfil i meldingen"
-
-#~ msgid "Send _Now"
-#~ msgstr "Send _nå"
-
-#~ msgid "Send _Later"
-#~ msgstr "Send se_nere"
-
-#~ msgid "Send the message later"
-#~ msgstr "Send meldingen senere"
-
-#~ msgid "_Close..."
-#~ msgstr "L_ukk..."
-
 #~ msgid "Quit the message composer"
 #~ msgstr "Avslutt meldingsredigering"
 
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Send meldingen i HTML-format"
-
-#~ msgid "Show _attachments"
-#~ msgstr "Vis _vedlegg"
-
-#~ msgid "Show/hide attachments"
-#~ msgstr "Vis/skjul vedlegg"
-
-#~ msgid "Send this message"
-#~ msgstr "Send denne meldingen"
-
-#~ msgid "Attach"
-#~ msgstr "Legg ved"
-
 #~ msgid "More criteria"
 #~ msgstr "Flere kriterier"