Removed addressbook/gui/widgets/test-minicard-view.c,

001-01-17 Dave Camp <dave@ximian.com> * POTFILES.in: Removed addressbook/gui/widgets/test-minicard-view.c, camel/providers/local/camel-mbox-provider.c, notes/component-factory.c, notes/main.c, and calendar/gui/gnome-month-item.c, and calendar/gui/alarm-notify.c. svn path=/trunk/; revision=7611
author: Dave Camp <dave@ximian.com> 2001-01-18 13:11:02 +0800
committer: Dave Camp <campd@src.gnome.org> 2001-01-18 13:11:02 +0800
commit: c90d8e6799b27b7964db9f3d4874557db8d313ac (patch)
tree: 3381f029d4507fa8ba260aa55c7388cef5992271 /po/no.po
parent: 809a9d80148789de20f4d00ec49dce7ead5a3399 (diff)
download: gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar
gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.gz
gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.bz2
gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.lz
gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.xz
gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.zst
gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.zip
1 files changed, 2858 insertions, 3044 deletions
diff --git a/po/no.po b/po/no.po
index 884e6344b1..4a961664e0 100644
--- a/po/no.po
+++ b/po/no.po
@@ -2,11 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Kjartan Maraas <kmaraas@gnome.org>, 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-01-09 13:25+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\n"
 "PO-Revision-Date: 2001-01-09 13:28+01:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -14,11 +14,186 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Kan ikke initiere Evolutions e-postkomponent."
+
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Kunne ikke initialisere Bonobo"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr "UNIX e-post filer i mbox-format"
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+"For lesing av e-post levert av det lokale systemet, og for lagring av e-post "
+"på lokal disk."
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Ingen slik melding"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Henter e-post fra %s"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Lukk"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Flytt til mappe"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Gå til forrige oppføring"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Gå til neste oppføring"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Konfigurér mappe"
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Kan ikke åpne fil %s:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Feil under lesing av postfil: %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "Ingen feil"
+
+#: mail/mail-config.c:799
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Test tilkobling til \"%s\""
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "Kunne ikke koble til POP-tjener på %s."
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr "Ny"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Opprett en ny mappe"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Kan ikke initiere Evolutions e-postkomponent."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Kunne ikke initialisere Bonobo"
+
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +201,7 @@ msgstr ""
 "\n"
 "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +209,7 @@ msgstr ""
 "\n"
 "Prefiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +217,7 @@ msgstr ""
 "\n"
 "Oppgitt:     "
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +225,7 @@ msgstr ""
 "\n"
 "Tillegg: "
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +233,7 @@ msgstr ""
 "\n"
 "Familie:    "
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +241,7 @@ msgstr ""
 "\n"
 "Suffiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +249,7 @@ msgstr ""
 "\n"
 "Fødselsdato: "
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +257,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +265,7 @@ msgstr ""
 "\n"
 "Postboks:  "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +273,7 @@ msgstr ""
 "\n"
 "Linje:         "
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +281,7 @@ msgstr ""
 "\n"
 "Gate:     "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +289,7 @@ msgstr ""
 "\n"
 "By:          "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +297,7 @@ msgstr ""
 "\n"
 "Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +305,7 @@ msgstr ""
 "\n"
 "Postnummer: "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +313,7 @@ msgstr ""
 "\n"
 "Land:    "
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +321,7 @@ msgstr ""
 "\n"
 "Leveringsetikett: "
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +329,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +337,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +345,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +353,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
@@ -186,7 +361,7 @@ msgstr ""
 "\n"
 "E-post program: "
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
@@ -194,7 +369,7 @@ msgstr ""
 "\n"
 "Tidssone: "
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
@@ -202,7 +377,7 @@ msgstr ""
 "\n"
 "Geografisk lokasjon: "
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
@@ -210,7 +385,7 @@ msgstr ""
 "\n"
 "Stilling: "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
@@ -218,7 +393,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
@@ -226,7 +401,7 @@ msgstr ""
 "\n"
 "Navn:  "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
@@ -234,7 +409,7 @@ msgstr ""
 "\n"
 "Enhet:  "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
@@ -242,7 +417,7 @@ msgstr ""
 "\n"
 "Enhet2: "
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
@@ -250,7 +425,7 @@ msgstr ""
 "\n"
 "Enhet3: "
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
@@ -258,7 +433,7 @@ msgstr ""
 "\n"
 "Enhet4: "
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
@@ -266,7 +441,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -284,7 +459,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
@@ -292,7 +467,7 @@ msgstr ""
 "\n"
 "Unik streng: "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 msgid ""
 "\n"
 "Public Key: "
@@ -300,17 +475,6 @@ msgstr ""
 "\n"
 "Offentlig nøkkel: "
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "Kunne ikke initialisere Bonobo"
-
 #. This array must be in the same order as enumerations
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
@@ -430,35 +594,31 @@ msgstr ""
 "En feil oppsto under forsøk på å hente\n"
 "pilot-listen fra gnome-pilot daemonen"
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "Markøren kunne ikke lokaliseres\n"
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr "EBook ikke lastet\n"
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat tjener"
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Slett kontakt?"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -469,7 +629,7 @@ msgid "_Add"
 msgstr "_Legg til"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:103 ui/evolution-mail.xml.h:48
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -483,9 +643,6 @@ msgid "New phone type"
 msgstr "Ny telefontype"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config-druid.glade.h:5 mail/mail-config.glade.h:1
 msgid "Add"
 msgstr "Legg til"
 
@@ -543,8 +700,6 @@ msgid "C_ontacts..."
 msgstr "K_ontakter..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:4
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
@@ -561,8 +716,6 @@ msgid "_Address..."
 msgstr "_Adresse..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:11
-#: mail/mail-config-druid.glade.h:26
 msgid "General"
 msgstr "Generell"
 
@@ -607,24 +760,27 @@ msgid "No_tes:"
 msgstr "No_tater:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Details"
 msgstr "Detaljer"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "Arbeid"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "Arbeid 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "Faks på arbeid"
 
@@ -633,6 +789,7 @@ msgid "Callback"
 msgstr "Tilbakering"
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "Bil"
 
@@ -642,28 +799,33 @@ msgstr "Firma"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Hjemme"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "Hjemme 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:12
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "Annet"
 
@@ -672,10 +834,12 @@ msgid "Other Fax"
 msgstr "Annen faks"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "Personsøker"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "Primær"
 
@@ -692,57 +856,15 @@ msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adresse _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "Sjekk adresse"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "Lan_d:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "Finland"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "_Adresse:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "_By:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "_Postboks:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "_Stat/Provins:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "_ZIP/Postnummer:"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -811,7 +933,6 @@ msgid "As _Minicards"
 msgstr "Som _minikort"
 
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Som _tabell"
 
@@ -845,27 +966,27 @@ msgstr ""
 "installere OpenLDAP, deretter må du kompilere og\n"
 "installere Evolution på nytt.\n"
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr "Vis alle"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr "Avansert..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr "E-post inneholder"
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
@@ -890,9 +1011,9 @@ msgid "None (anonymous mode)"
 msgstr "Ingen (anonym modus)"
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr "Passord"
 
@@ -925,12 +1046,10 @@ msgid "Bind DN:"
 msgstr "Bind DN:"
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr "Husk dette passordet"
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:27
 msgid "Host:"
 msgstr "Vert:"
 
@@ -947,12 +1066,10 @@ msgid "Search Scope:"
 msgstr "Søkeområde:"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:9 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Autentisering:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:46 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Sti:"
 
@@ -975,182 +1092,89 @@ msgid ""
 msgstr "Velg type adressebok du har, og skriv inn relevant informasjon om den."
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:39
 msgid "Name:"
 msgstr "Navn:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Adressebok-kilder"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:8 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:19 mail/mail-config.glade.h:3
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-mail.xml.h:6
-msgid "Delete"
-msgstr "Slett"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:22 mail/mail-config.glade.h:4
-msgid "Edit"
-msgstr "Redigér"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Navn"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Finn..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Meldingsmottakere:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Velg navn"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Velg navn fra:"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "Søk"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
+msgstr "Lagre som VCard"
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
+msgstr "Navn"
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+#, fuzzy
+msgid "Email"
+msgstr "E-post 2"
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Organisasjon"
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
+msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+#, fuzzy
+msgid "Department"
+msgstr "Av_deling:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+#, fuzzy
+msgid "Office"
+msgstr "Kont_or:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "_Tittel:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+#, fuzzy
+msgid "Profession"
+msgstr "_Yrke:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+#, fuzzy
+msgid "Manager"
+msgstr "Personsøker"
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+#, fuzzy
+msgid "Nickname"
+msgstr "Kalle_navn:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+#, fuzzy
+msgid "Spouse"
+msgstr "Ekte_felle:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#, fuzzy
+msgid "Note"
+msgstr "Ingen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Lagre som VCard"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
+msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1164,175 +1188,6 @@ msgstr ""
 "\n"
 "Dobbelklikk her for å opprette en ny kontakt."
 
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Blanke skjema på slutten:"
-
-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Kropp"
-
-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Bunn:"
-
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Dimensjoner:"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Skrifttype..."
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Skrifttyper"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Bunntekst:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Format"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "Topptekst"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Topp-/bunntekst"
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Topptekster"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Topptekst for hver bokstav"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Høyde:"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Rett etter hverandre"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Inkluder:"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Landskap"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Venstre:"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Bokstavfaner på siden"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Marger"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "Antall kolonner:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Alternativer"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Orientering"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Side"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Sideoppsett"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papir"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Papirkilde:"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Portrett"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Forhåndsvis:"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Skriv ut med gråtoner"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Motsatt på like sider"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Høyre:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Seksjoner:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Skyggelegging"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "Størrelse:"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Start på en ny side"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Stilnavn:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Topp:"
-
-#: addressbook/printing/e-contact-print.glade.h:40
-#: mail/mail-config-druid.glade.h:68
-msgid "Type:"
-msgstr "Type:"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Bredde:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "etikett26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolution kalender-komponent"
@@ -1341,13 +1196,13 @@ msgstr "Evolution kalender-komponent"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Konfigurasjonsverktøy for evolutions kalender-komponent.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "Feil under kommunikasjon med kalendertjeneren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 
@@ -1359,57 +1214,17 @@ msgstr "Evolution oppgaveliste-komponent"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Konfigurasjonsverktøy for evolutions oppgavelistekomponent.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Eksempel på Bonobo-kontroll som viser en kalender."
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:2
-msgid "Factory for the sample Calendar control"
-msgstr "Factory for eksempelkontroll for kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:1
-msgid "Calendar Repository"
-msgstr "Kalenderlager"
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:2
-msgid "Calendar Server"
-msgstr "Kalendertjener"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution komponent for kalendersammendrag."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution kalender iTip/iMip-visning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution komponent for håndtering av kalenderen."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Factory for the Calendar Summary component."
-msgstr "Factory for kalenderens sammendragskomponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Evolution calendar component."
-msgstr "Factory for Evolution kalender-komponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the calendar iTip view control"
-msgstr "Factory for kalenderens iTip visningskontroll"
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr "Påminnelse om din avtale "
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr "Utsett"
 
@@ -1419,19 +1234,19 @@ msgstr "Utsett"
 msgid "Ok"
 msgstr "Ok"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "Fil ikke funnet"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "Åpne kalender"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "Lagre kalender"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -1439,7 +1254,7 @@ msgstr ""
 "konfigurasjon."
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1447,60 +1262,57 @@ msgstr "%a %d.%m.%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:718
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:721
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:326
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/calendar-model.c:329
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:332
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/calendar-model.c:335 calendar/gui/calendar-model.c:503
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "Ø"
 
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr "Gjennomsiktig"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr "Ugjennomsiktig"
 
-#: calendar/gui/calendar-model.c:726
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1512,7 +1324,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:827 calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1520,27 +1332,27 @@ msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:845
+#: calendar/gui/calendar-model.c:893
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:848
+#: calendar/gui/calendar-model.c:896
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:852
+#: calendar/gui/calendar-model.c:900
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:855
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:975
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1550,620 +1362,287 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1015
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteten må være mellom 0 og 9, inklusive"
 
-#: calendar/gui/calendar-summary.c:83
+#: calendar/gui/calendar-summary.c:97
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-summary.c:119 calendar/gui/calendar-summary.c:125
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
 msgid "%I:%M%p"
 msgstr "%I:%M%p"
 
-#: calendar/gui/calendar-summary.c:276
+#: calendar/gui/calendar-summary.c:302
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Feil under lasting av kalender</b>"
 
-#: calendar/gui/calendar-summary.c:281
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr "<b>Feil under lasting av kalender:<br>Kalender i bruk."
-
-#: calendar/gui/calendar-summary.c:287
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Feil under lasting av kalender:<br>Metoden er ikke støttet"
 
-#: calendar/gui/calendar-summary.c:367
+#: calendar/gui/calendar-summary.c:484
+#, fuzzy
+msgid "Display"
+msgstr "_Vis"
+
+#: calendar/gui/calendar-summary.c:489
+#, fuzzy
+msgid "Show appointments"
+msgstr "Vis tid for avtalers slutt"
+
+#: calendar/gui/calendar-summary.c:497
+#, fuzzy
+msgid "Show tasks"
+msgstr "Vis vedlegg"
+
+#: calendar/gui/calendar-summary.c:583
 msgid "Loading Calendar"
 msgstr "Laster kalender"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm på %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "Melding om din avtale på %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr "Ingen sammendrag tilgjengelig."
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:8
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-msgid "Close"
-msgstr "Lukk"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Rediger avtale:"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Utsett-tid (minutter)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "5 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 timer (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 timer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Tidsavbrudd for alarm etter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Lyd-alarmer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "Pip når alarmvinduet kommer til syne."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Calendar"
-msgstr "Kalender"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Brukervalg for kalender"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Farger"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "Komprimér helger"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Alternativer for datonavigator"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Forvalg"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Vis alternativer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Due Date"
-msgstr "Ferdig-dato"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Slå på utsetting for "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "Dagen slutter:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "Første dag i uken:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Fre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:438
-msgid "Friday"
-msgstr "Fredag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Markér"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Oppføringer som går ut idag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Oppføringer som går ut i dag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Oppføringer som ikke har gått ut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Oppføringer som ikke har gått ut:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Man"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:434
-msgid "Monday"
-msgstr "Mandag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Utgåtte oppføringer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Utgåtte oppføringer:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "Velg en farge"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr "Prioritet"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "Påminnelse om alle avtaler"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Reminders"
-msgstr "Påminnelser"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Lør"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:439
-msgid "Saturday"
-msgstr "Lørdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Vis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Vis tid for avtalers slutt"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "Vis ukenummer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "Dagen starter:"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Søn"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:440
-msgid "Sunday"
-msgstr "Søndag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Oppgaveblokk"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Tor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:437
-msgid "Thursday"
-msgstr "Torsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Tid før den går ut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "Oppdeling av tid:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "Tidformat:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Tir"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:435
-msgid "Tuesday"
-msgstr "Tirsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Visuelle alarmer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Ons"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:436
-msgid "Wednesday"
-msgstr "Onsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Arbeidsuke"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "minutter i forveien."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "seconds."
-msgstr "sekunder"
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Er du sikker på at du vil slette avtalen `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Er du sikker på at du vil slette denne avtalen uten tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Er du sikker på at du vil slette oppgaven `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Er du sikker på at du vil slette denne oppgaven uten tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Er du sikker på at du vil slette journaloppføringen `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker på at du vil slette denne journaloppføringen uten tittel?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
-msgid "% Comp_lete:"
-msgstr "% ferdi_g:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-msgid "C_lassification:"
-msgstr "K_lassifisering"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Avbrutt"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-msgid "Completed"
-msgstr "Fullført"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "Date Completed:"
-msgstr "Fullført dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "High"
-msgstr "Høy"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "In Progress"
-msgstr "Under arbeid"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "Low"
-msgstr "Lav"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: mail/mail-config-druid.glade.h:41 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Ingen"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Ikke startet"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-msgid "S_ummary"
-msgstr "Sa_mmendrag"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Sta_rt dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Task"
-msgstr "Oppgave"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "_Contacts..."
-msgstr "_Kontakter..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "_Due Date:"
-msgstr "Fer_dig-dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "_Priority:"
-msgstr "_Prioritet:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "_Status:"
-msgstr "_Status:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
-
 #: calendar/gui/dialogs/task-editor.c:690
 msgid "Edit Task"
 msgstr "Redigér oppgave"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:336
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:342
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:345
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:348
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3269
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
 msgid "Do you want to save changes?"
 msgstr "Vil du lagre endringene?"
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:154
+#, fuzzy
+msgid "Categories"
+msgstr "kategorier"
+
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
+msgstr "Klassifisering"
+
+#: calendar/gui/e-calendar-table.c:156
+#, fuzzy
+msgid "Completion Date"
+msgstr "Fullført"
+
+#: calendar/gui/e-calendar-table.c:157
+#, fuzzy
+msgid "End Date"
+msgstr "Slutt etter"
+
+#: calendar/gui/e-calendar-table.c:158
+#, fuzzy
+msgid "Start Date"
+msgstr "Sta_rt dato:"
+
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "Ferdig-dato"
+
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:161
+#, fuzzy
+msgid "Precent complete"
+msgstr "Merk oppgaven som fullført"
+
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "Prioritet"
+
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "Sa_mmendrag"
+
+#: calendar/gui/e-calendar-table.c:164
+#, fuzzy
+msgid "Transparency"
+msgstr "Gjennomsiktig"
+
+#: calendar/gui/e-calendar-table.c:165
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
+
+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
+msgstr "Alarmer"
+
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "Åpne..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "Åpne oppgaven"
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "Merk som fullført"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "Merk oppgaven som fullført"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Slett"
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "Slett oppgaven"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, c-format
 msgid "%02i minute divisions"
 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Ny avtale..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "Redigér denne avtalen..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:15
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "Slett denne avtalen"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "Gjør denne avtalen flyttbar"
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "Slett denne oppføringen"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 msgstr "Slett alle oppføringer"
 
-#: calendar/gui/e-itip-control.c:140
-msgid "I couldn't update your calendar file!\n"
-msgstr "Kunne ikke oppdatere din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:147 calendar/gui/e-itip-control.c:489
-msgid "Component successfully updated."
-msgstr "Oppdatering av komponent fullført."
-
-#: calendar/gui/e-itip-control.c:154
-msgid "There was an error loading the calendar file."
-msgstr "Det oppsto en feil under lasting av kalenderfilen."
-
-#: calendar/gui/e-itip-control.c:178
-msgid "I couldn't open your calendar file!\n"
-msgstr "Kunne ikke åpne din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:437 calendar/gui/e-itip-control.c:508
-msgid "I couldn't load your calendar file!\n"
-msgstr "Kunne ikke laste din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:449
-msgid "I couldn't read your calendar file!\n"
-msgstr "Kunne ikke lese din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:462
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Dette er et svar fra noen som ikke er invitert!"
-
-#: calendar/gui/e-itip-control.c:478
-msgid "I couldn't update your calendar store."
-msgstr "Kunne ikke oppdatere ditt kalenderlager."
-
-#: calendar/gui/e-itip-control.c:519
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Kunne ikke slette kalenderkomponenten!\n"
-
-#: calendar/gui/e-itip-control.c:529
-msgid "Component successfully deleted."
-msgstr "Sletting av komponent fullført."
-
-#: calendar/gui/e-itip-control.c:673
-msgid "I don't recognize this type of calendar component."
-msgstr "Kan ikke kjenne igjen denne typen kalenderkomponent."
-
-#: calendar/gui/e-itip-control.c:759
-msgid "Add to Calendar"
-msgstr "Legg til i kalenderen"
-
-#: calendar/gui/e-itip-control.c:793
-msgid "Accept"
-msgstr "Akseptér"
-
-#: calendar/gui/e-itip-control.c:794
-msgid "Decline"
-msgstr "Avslå"
-
-#: calendar/gui/e-itip-control.c:795
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentativ"
-
-#: calendar/gui/e-itip-control.c:839
-msgid "Update Calendar"
-msgstr "Oppdatér kalender"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:862
-msgid "Cancel Meeting"
-msgstr "Alys møte"
+#: calendar/gui/e-tasks.c:146
+#, fuzzy
+msgid "Category:"
+msgstr ""
+"\n"
+"Kategorier: "
 
-#: calendar/gui/e-tasks.c:281
+#: calendar/gui/e-tasks.c:285
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke laste oppgavene i `%s'"
 
-#: calendar/gui/e-tasks.c:292
-#, c-format
-msgid "Could not create a tasks file in `%s'"
-msgstr "Kunne ikke opprette oppgavefil i `%s'"
-
-#: calendar/gui/e-tasks.c:304 calendar/gui/gnome-cal.c:698
+#: calendar/gui/e-tasks.c:297
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
@@ -2171,269 +1650,112 @@ msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:338
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Varer he_le dagen"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment Basics"
-msgstr "Grunnleggende om avtaler"
-
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Classification"
-msgstr "Klassifisering"
-
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Custom recurrence"
-msgstr "Egendefinert gjeninntreffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Days"
-msgstr "Dager"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Every"
-msgstr "Hver"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Exceptions"
-msgstr "Unntak"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Hours"
-msgstr "Timer"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Mail _to:"
-msgstr "Send _til:"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Minutes"
-msgstr "Minutter"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Modify"
-msgstr "Endre"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "No recurrence"
-msgstr "Ingen gjeninntreffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Preview"
-msgstr "Forhåndsvis"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Pri_vate"
-msgstr "Pri_vat"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Pu_blic"
-msgstr "Of_fentlig"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Recurrence"
-msgstr "Gjeninntreffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Recurrence Rule"
-msgstr "Regel for gjenintreffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-msgid "Reminder"
-msgstr "Påminnelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Simple recurrence"
-msgstr "Enkel gjeninntreffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Su_mmary:"
-msgstr "Sa_mmendrag:"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Time"
-msgstr "Tid"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "_Audio"
-msgstr "_Lyd"
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "_Confidential"
-msgstr "_Konfidensiell"
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Contacts"
-msgstr "_Kontakter"
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Display"
-msgstr "_Vis"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "S_lutt-tid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Mail"
-msgstr "_E-post"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Program"
-msgstr "_Program"
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_Run program:"
-msgstr "Kjø_r program:"
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Start time:"
-msgstr "_Start-tid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Starting date:"
-msgstr "_Start dato:"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "day(s)"
-msgstr "dag(er)"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "for"
-msgstr "for"
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "Rediger avtale"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "forever"
-msgstr "for alltid"
+#: calendar/gui/event-editor.c:409
+msgid "on"
+msgstr "på"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "etikett21"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
+msgstr "dag"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "måned(er)"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "Mandag"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "until"
-msgstr "til"
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "Tirsdag"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "week(s)"
-msgstr "uke(r)"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "Onsdag"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "year(s)"
-msgstr "år"
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "Torsdag"
 
-#: calendar/gui/event-editor.c:330
-msgid "Edit Appointment"
-msgstr "Rediger avtale"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "Fredag"
 
-#: calendar/gui/event-editor.c:408
-msgid "on"
-msgstr "på"
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "Lørdag"
 
-#: calendar/gui/event-editor.c:433 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dag"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "Søndag"
 
-#: calendar/gui/event-editor.c:560
+#: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/event-editor.c:567
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr "de"
 
-#: calendar/gui/event-editor.c:721
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: calendar/gui/event-editor.c:838
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: calendar/gui/event-editor.c:3092 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Kunne ikke laste kalenderen i `%s'"
-
-#: calendar/gui/gnome-cal.c:687
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Kunne ikke opprette kalender i `%s'"
-
-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "April"
-
-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "August"
-
-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Desember"
-
-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Februar"
-
-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Gå til dato"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Gå til idag"
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
+msgstr ""
+"Kan ikke åpne mappe `%s':\n"
+"%s"
 
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "Januar"
+#: calendar/gui/gnome-cal.c:707
+#, fuzzy, c-format
+msgid "The method required to open `%s' is not supported"
+msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
 
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "Juli"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Søn"
 
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "Juni"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Man"
 
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "Mars"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Tir"
 
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "Mai"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Ons"
 
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "November"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Tor"
 
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "Oktober"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Fre"
 
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "September"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Lør"
 
 #: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
@@ -2627,11 +1949,11 @@ msgstr "Dette året (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1012
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
-#: calendar/gui/tasks-control.c:103
+#: calendar/gui/tasks-control.c:105
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til oppgavemappen skal vises"
 
@@ -2725,61 +2047,69 @@ msgstr "Kunne ikke laste %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunne ikke laste %s: Ingen initieringskode i modulen."
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr "%s-tjener %s"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-tjeneste for %s på %s"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "Avbrutt"
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(ukjent vert)"
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr "Tjener koblet fra."
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "Åpne kalender"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' må inneholde et brukernavn"
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' må inneholde et vertsnavn"
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' må inneholde en sti"
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr "Ingen vert %s."
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Midlertidig ute av stand til å slå opp vertsnavn %s."
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen tilbyder tilgjengelig for protokoll `%s'"
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2788,17 +2118,17 @@ msgstr ""
 "Kan ikke opprette katalog %s:\n"
 "%s"
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL-streng `%s' inneholder ikke protokoll"
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL-streng `%s' inneholder en ugyldig protokoll"
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Portnummer i URL `%s' er ikke-numerisk"
@@ -2816,40 +2146,41 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar på autentisering fra tjener."
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feilet: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr "Svar fra tjener ble avsluttet for tidlig."
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Svar fra IMAP-tjener inneholdt ikke %s-informasjon"
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar 'OK' fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -2861,29 +2192,29 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post på IMAP-tjenere."
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Dette valget vil la deg koble til en IMAP-tjener ved å bruke et "
 "klartekst-passord."
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Dette lar deg koble til IMAP-tjeneren ved å bruke Kerberos 4 som "
 "autentisering."
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVennligst skriv inn IMAP-passord for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2894,30 +2225,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke opprette katalog %s: %s"
 
 #: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
-msgstr "UNIX e-postkataloger i MH-format (CamelLocal versjon)"
+#, fuzzy
+msgid "MH-format mail directories"
+msgstr "UNIX e-postkataloger i MH-format"
 
 #: camel/providers/local/camel-local-provider.c:37
 msgid "For storing local mail in MH-like mail directories"
 msgstr "For lagring av lokal e-post i MH-lignende meldingskataloger "
 
 #: camel/providers/local/camel-local-provider.c:47
-msgid "UNIX mbox-format mail files (CamelLocal version)"
-msgstr "UNIX e-post filer i mbox-format (CamelLocal versjon)"
+msgid "Standard Unix mailbox file"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
 msgid "For storing local mail in standard mbox format"
 msgstr "For lagring av lokal e-post i standard mbox format"
 
 #: camel/providers/local/camel-local-provider.c:58
-msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
-msgstr "UNIX qmail maildir format postfiler (CamelLocal versjon)"
+#, fuzzy
+msgid "Qmail maildir-format mail files"
+msgstr "UNIX e-post filer i mbox-format"
 
 #: camel/providers/local/camel-local-provider.c:59
 msgid "For storing local mail in qmail maildir directories"
@@ -3255,8 +2588,8 @@ msgstr ""
 "Dette alternativet vil autentisere mot NNTP-tjeneren ved bruk av klartekst "
 "passord."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Kunne ikke åpne eller opprette .newsrc-fil for %s: %s"
@@ -3288,7 +2621,7 @@ msgstr ""
 "e-post fra enkelte e-posttilbydere via web i tillegg til proprietære "
 "e-postsystemer."
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3297,7 +2630,7 @@ msgstr ""
 "klartekst. Dette er det eneste alternativet som er støttet av mange "
 "POP-tjenere."
 
-#: camel/providers/pop3/camel-pop3-store.c:160
+#: camel/providers/pop3/camel-pop3-store.c:158
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -3307,29 +2640,29 @@ msgstr ""
 "passord via APOP-protokollen. Dette vil kanskje ikke virke for alle brukere "
 "selv på tjenere som hevder å støtte det."
 
-#: camel/providers/pop3/camel-pop3-store.c:172
+#: camel/providers/pop3/camel-pop3-store.c:170
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Dette lar deg koble til POP-tjeneren ved å bruke Kerberos 4 som "
 "autentisering."
 
-#: camel/providers/pop3/camel-pop3-store.c:217
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kunne ikke autentisere mot KPOP-tjener: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:337
+#: camel/providers/pop3/camel-pop3-store.c:335
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Kunne ikke koble til POP-tjener på %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:375
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVennligst skriv inn POP3-passord for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:410
+#: camel/providers/pop3/camel-pop3-store.c:394
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3338,12 +2671,12 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil under oversending av brukernavn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:413
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr "(Ukjent)"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3351,7 +2684,7 @@ msgstr ""
 "Kunne ikke koble til POP-tjeneren.\n"
 "Ingen støtte for forespurt autentiseringsmekanisme."
 
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3360,13 +2693,12 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil ved oversending av passord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen slik mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:57
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3416,25 +2748,21 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering av e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:53
-msgid "SMTP"
-msgstr "SMTP"
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "For levering av e-post via en ekstern e-posttjener med SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Feil ved Welcome-svar: %s: mulig ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 msgid "No authentication required"
 msgstr "Ingen autentisering nødvendig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
@@ -3442,108 +2770,107 @@ msgstr ""
 "Dette alternativet lar deg koble til SMTP-tjeneren uten bruk av "
 "autentisering. Dette bør fungere for de fleste SMTP-tjenerene."
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:10
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 "Dette lar deg koble til SMTP-tjeneren ved å bruke CRAM-MD5-autentisering."
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan ikke sende melding: senderadresse ikke definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende melding: ingen mottakere definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Tidsavbrudd for HELO-forespørsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Feil ved HELO-svar: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for \"MAIL FROM\"-forespørsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Feil ved \"MAIL FROM\"-forespørsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for \"RCPT TO\"-forespørsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+#, fuzzy
+msgid "RCPT TO response error: mail not sent"
 msgstr "Feil ved \"RCPT TO\"-svar: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for DATA-forespørsel: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Feil ved DATA-svar: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Tidsavbrudd for DATA-send: meldingsterminering: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Feil ved DATA-svar: meldingsterminering: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsavbrudd for RSET-forespørsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Feil ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Tidsavbrudd for QUIT-forespørsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Feil ved QUIT-svar: %s: ikke-fatal"
@@ -3586,12 +2913,11 @@ msgid "attachment"
 msgstr "vedlegg"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Fjern"
 
@@ -3607,52 +2933,40 @@ msgstr "Legg til vedlegg..."
 msgid "Attach a file to the message"
 msgstr "Legg en fil ved meldingen"
 
-#: composer/e-msg-composer-attachment.glade.h:1
-msgid "Attachment properties"
-msgstr "Egenskaper for vedlegg"
-
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "File name:"
-msgstr "Filnavn:"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME-type:"
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:305
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "Fra:"
 
-#: composer/e-msg-composer-hdrs.c:249
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:313
 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:310 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:311
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:315 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:316
+#: composer/e-msg-composer-hdrs.c:323
 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:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:322
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3660,11 +2974,11 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten å komme til "
 "syne i mottakerlisten for meldingen."
 
-#: composer/e-msg-composer-hdrs.c:328 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "Skriv inn emnet for meldingen"
 
@@ -3677,38 +2991,38 @@ msgstr ""
 "Kunne ikke åpne signaturfilen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "Lagre endringer i meldingen..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "Lagre endringer til meldingen..."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Feil under lagring av brevet i 'Skisser': %s"
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3718,27 +3032,27 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "Er ikke en vanlig fil."
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr "Filen eksisterer men er ikke lesbar."
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 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:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3746,26 +3060,22 @@ msgstr ""
 "File en meget stor (mer enn 100K).\n"
 "Er du sikker på at du vil sette den inn?"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "En feil oppsto under lesing fra filen."
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan ikke initiere Evolutions composer."
 
-#: filter/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "Sø_k"
-
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "år"
@@ -3898,7 +3208,7 @@ msgstr "innkommende"
 msgid "outgoing"
 msgstr "utgående"
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "Redigér filtre"
 
@@ -3999,186 +3309,167 @@ msgstr "Viktig"
 msgid "Read"
 msgstr "Les"
 
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Redigér VFoldere"
-
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Filterregler"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Innkommende"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Utgående"
-
-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "Virtuelle mapper"
-
-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "vFolder kilder"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "etter"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Gi farge"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Gi poeng"
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr "før"
-
-#: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr "inneholder"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Kopiér til mappe"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Dato mottatt"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Dato sendt"
 
+#: filter/libfilter-i18n.h:8
+msgid "Expression"
+msgstr "Uttrykk"
+
+#: filter/libfilter-i18n.h:9
+msgid "Forward to Address"
+msgstr "Videresend til adresse"
+
+#: filter/libfilter-i18n.h:10
+msgid "Message Body"
+msgstr "Meldingskropp"
+
 #: filter/libfilter-i18n.h:11
-msgid "does not contain"
-msgstr "inneholder ikke"
+msgid "Message Header"
+msgstr "Meldingshode"
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
-msgstr "slutter ikke med"
+msgid "Message was received"
+msgstr "Meldingen ble mottatt"
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
-msgstr "eksisterer ikke"
+msgid "Message was sent"
+msgstr "Meldingen ble sendt"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
-msgstr "ligner ikke"
+msgid "Move to Folder"
+msgstr "Flytt til mappe"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
-msgstr "starter ikke med"
+msgid "Recipients"
+msgstr "Mottakere"
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
-msgstr "slutter med"
+msgid "Regex Match"
+msgstr "Treff på vanlig uttrykk"
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
-msgstr "eksisterer"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
+msgstr "Poenggi"
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
-msgstr "Uttrykk"
+msgid "Sender"
+msgstr "Avsender"
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
-msgstr "Videresend til adresse"
+msgid "Set Status"
+msgstr "Sett status"
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
-msgstr "er"
+msgid "Source"
+msgstr "Kilde"
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
-msgstr "er større enn"
+msgid "Specific header"
+msgstr "Spesifikk header"
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr "er mindre enn"
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+msgid "Status"
+msgstr "Status"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
-msgstr "er ikke"
+msgid "Stop Processing"
+msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
-msgstr "Meldingskropp"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "Emne"
 
 #: filter/libfilter-i18n.h:25
-msgid "Message Header"
-msgstr "Meldingshode"
+msgid "after"
+msgstr "etter"
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
-msgstr "Meldingen ble mottatt"
+msgid "before"
+msgstr "før"
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
-msgstr "Meldingen ble sendt"
+msgid "contains"
+msgstr "inneholder"
 
 #: filter/libfilter-i18n.h:28
-msgid "Move to Folder"
-msgstr "Flytt til mappe"
+msgid "does not contain"
+msgstr "inneholder ikke"
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
-msgstr "på eller etter"
+msgid "does not end with"
+msgstr "slutter ikke med"
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
-msgstr "på eller før"
+msgid "does not exist"
+msgstr "eksisterer ikke"
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
+msgstr "ligner ikke"
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
-msgstr "Mottakere"
+msgid "does not start with"
+msgstr "starter ikke med"
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
-msgstr "Treff på vanlig uttrykk"
+msgid "ends with"
+msgstr "slutter med"
 
 #: filter/libfilter-i18n.h:34
-msgid "Sender"
-msgstr "Avsender"
+msgid "exists"
+msgstr "eksisterer"
 
 #: filter/libfilter-i18n.h:35
-msgid "Set Status"
-msgstr "Sett status"
+msgid "is greater than"
+msgstr "er større enn"
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
-msgstr "lyder som"
+msgid "is less than"
+msgstr "er mindre enn"
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
-msgstr "Kilde"
+msgid "is not"
+msgstr "er ikke"
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
-msgstr "Spesifikk header"
+msgid "is"
+msgstr "er"
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
-msgstr "starter med"
+msgid "on or after"
+msgstr "på eller etter"
 
 #: filter/libfilter-i18n.h:40
-msgid "Status"
-msgstr "Status"
+msgid "on or before"
+msgstr "på eller før"
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
-msgstr "Stopp behandling"
+msgid "sounds like"
+msgstr "lyder som"
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "Emne"
+msgid "starts with"
+msgstr "starter med"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4196,10 +3487,6 @@ msgstr "Legg til regel"
 msgid "Edit Score Rule"
 msgstr "Rediger poengregel"
 
-#: filter/score-rule.c:192 filter/score-rule.c:194
-msgid "Score"
-msgstr "Poenggi"
-
 #: filter/vfolder-editor.c:155
 msgid "Add VFolder Rule"
 msgstr "Legg til regel for VFolder"
@@ -4208,204 +3495,165 @@ msgstr "Legg til regel for VFolder"
 msgid "Edit VFolder Rule"
 msgstr "Redigér VFolder regel"
 
-#: mail/component-factory.c:280
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:319
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:83
-#: ui/evolution-message-composer.xml.h:14
-msgid "Save"
-msgstr "Lagre"
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "Velg mappe"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "Kropp eller emne inneholder"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "Kropp inneholder ikke"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr "VFolder for emne"
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr "VFolder for sender"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr "VFolder for mottakere"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr "Filtrér etter emne"
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr "Filtrér etter sender"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr "Filtrér etter mottaker"
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr "Filtrér etter e-postliste"
 
-#: mail/folder-browser.c:655
-msgid "Show all hidden"
-msgstr "Vis alle skjulte"
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr "Skjul valgte"
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-msgid "Hide read"
-msgstr "Skjul leste"
-
-#: mail/folder-browser.c:661
-msgid "Hide deleted"
-msgstr "Skjul slettede"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-msgid "Hide Subject"
-msgstr "Skjul emne"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-msgid "Hide from Sender"
-msgstr "Skjul fra sender"
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:10
+#: mail/folder-browser.c:658
 msgid "Open"
 msgstr "Åpne"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "Redigér"
+
+#: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:27
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "Svar til sender"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:33
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:13
+#: mail/folder-browser.c:666
 msgid "Forward inline"
 msgstr "Videresend \"inline\""
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr "Markér som lest"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr "Merk som ulest"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 msgid "Move to Folder..."
 msgstr "Flytt til mappe..."
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 msgid "Copy to Folder..."
 msgstr "Kopiér til mappe..."
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 msgid "Undelete"
 msgstr "Angre slett"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr "Påfør filtre"
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:5
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr "Lage regel fra melding"
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:16
-msgid "Hide Messages"
-msgstr "Skjul meldinger"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrér etter e-postliste (%s)"
 
-#: mail/folder-browser.c:787
-#, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Skjul emne \"%s\""
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr "Skjul fra sender <%s>"
-
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Aktivt lagringsformat:"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Ingen"
 
-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr "Format for postboks"
+#: mail/mail-accounts.c:115
+#, fuzzy
+msgid " (default)"
+msgstr "Forvalgt"
 
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Nytt lagringsformat:"
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+#, fuzzy
+msgid "Evolution Account Manager"
+msgstr "Håndtering av konti"
 
-#: mail/local-config.glade.h:4
+#: mail/mail-account-editor.c:274
 msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
-"Merk: Ved konvertering mellom postboksformater, kan en feil (slik som mangel "
-"på diskplass) ikke nødvendigvis rettes opp igjen. Vennligst bruk denne "
-"funksjonen med forsiktighet."
-
-#: mail/local-config.glade.h:5
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:6
-msgid "mbox"
-msgstr "mbox"
 
-#: mail/local-config.glade.h:7
-msgid "mh"
-msgstr "mh"
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
+#, fuzzy
+msgid "Evolution Account Editor"
+msgstr "Evolution oppgaveliste-komponent"
 
 #: mail/mail-autofilter.c:71
 #, c-format
@@ -4427,7 +3675,7 @@ msgstr "E-post fra %s"
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-callbacks.c:78
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4439,7 +3687,7 @@ msgstr ""
 "motta eller skrive meldinger.\n"
 "Vil du konfigurere den nå?"
 
-#: mail/mail-callbacks.c:121
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4447,7 +3695,7 @@ msgstr ""
 "Du må konfigurere en identitet\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:133
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4455,19 +3703,15 @@ msgstr ""
 "Du må konfigurere en e-post-transport\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:169 mail/mail-callbacks.c:181
-msgid "You have no mail sources configured"
-msgstr "Du har ikke konfigurert e-postkilder"
-
-#: mail/mail-callbacks.c:218
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke satt en transportmetode for e-post"
 
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr "Du har ikke konfigurert en utboks"
 
-#: mail/mail-callbacks.c:249
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4475,23 +3719,30 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:317
+#: mail/mail-callbacks.c:345
+#, fuzzy
+msgid "You must configure an account before you can send this email."
+msgstr ""
+"Du må konfigurere en identitet\n"
+"før du kan skrive e-post."
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr "Du må spesifisere mottakere for å kunne sende denne meldingen."
 
-#: mail/mail-callbacks.c:537
+#: mail/mail-callbacks.c:594
 msgid "Forwarded message:\n"
 msgstr "Videresendt melding:\n"
 
-#: mail/mail-callbacks.c:618
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:620
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr "Kopiér melding(er) til"
 
-#: mail/mail-callbacks.c:755
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4499,11 +3750,11 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:788 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:792 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4511,15 +3762,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-callbacks.c:837
+#: mail/mail-callbacks.c:893
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:839
+#: mail/mail-callbacks.c:895
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:923
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4528,427 +3779,32 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:972
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:1019
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
-#: mail/mail-config-druid.glade.h:1
-msgid "Account"
-msgstr "Konto"
-
-#: mail/mail-config-druid.glade.h:2
-msgid "Account Information"
-msgstr "Kontoinformasjon"
-
-#: mail/mail-config-druid.glade.h:3
-msgid "Account Management"
-msgstr "Håndtering av konti"
-
-#: mail/mail-config-druid.glade.h:4
-msgid "Account Properties"
-msgstr "Egenskaper for konto"
-
-#: mail/mail-config-druid.glade.h:6
-msgid "Advanced"
-msgstr "Avansert"
-
-#: mail/mail-config-druid.glade.h:7
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Authentication Type:"
-msgstr "Autentiseringstype:"
-
-#: mail/mail-config-druid.glade.h:11
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr "Gratulerer, konfigurasjon av e-post er fullført.\n"
-
-#: mail/mail-config-druid.glade.h:17
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config-druid.glade.h:18
-msgid "Default"
-msgstr "Forvalgt"
-
-#: mail/mail-config-druid.glade.h:20
-msgid "Done"
-msgstr "Ferdig"
-
-#: mail/mail-config-druid.glade.h:21
-msgid "E-Mail Address:"
-msgstr "E-post adresse:"
-
-#: mail/mail-config-druid.glade.h:23
-msgid "Email Address:"
-msgstr "E-post adresse:"
-
-#: mail/mail-config-druid.glade.h:24
-msgid "Evolution Mail Configuration"
-msgstr "Evolution e-post-konfigurasjon"
-
-#: mail/mail-config-druid.glade.h:25
-msgid "Full Name:"
-msgstr "Fullt navn:"
-
-#: mail/mail-config-druid.glade.h:28
-msgid "Hostname:"
-msgstr "Vertsnavn:"
-
-#: mail/mail-config-druid.glade.h:29
-msgid "Identity"
-msgstr "Identitet"
-
-#: mail/mail-config-druid.glade.h:30
-msgid "Incoming Mail Server"
-msgstr "E-posttjener for innkommende post"
-
-#: mail/mail-config-druid.glade.h:31
-msgid "Keep mail on server"
-msgstr "Behold e-post på tjener"
-
-#: mail/mail-config-druid.glade.h:32
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config-druid.glade.h:33
-msgid "Mail"
-msgstr "E-post"
-
-#: mail/mail-config-druid.glade.h:34
-msgid "Mail Account"
-msgstr "E-post konto"
-
-#: mail/mail-config-druid.glade.h:35
-msgid "Mail Configuration"
-msgstr "E-post-konfigurasjon"
-
-#: mail/mail-config-druid.glade.h:36
-msgid "Mail Configuration Druid"
-msgstr "E-post-konfigurasjonsdruide"
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Make this my default account"
-msgstr "Bruk denne som standard konto"
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Miscellaneous"
-msgstr "Forskjellig"
-
-#: mail/mail-config-druid.glade.h:40
-msgid "News"
-msgstr "News"
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Optional"
-msgstr "Valgfri"
-
-#: mail/mail-config-druid.glade.h:43 mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organisasjon:"
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Outgoing Mail Server"
-msgstr "E-posttjener for utgående post"
-
-#: mail/mail-config-druid.glade.h:45
-msgid "Password:"
-msgstr "Passord:"
-
-#: mail/mail-config-druid.glade.h:47
-msgid "Plain Text"
-msgstr "Vanlig tekst"
-
-#: mail/mail-config-druid.glade.h:48
-msgid "Receiving Email"
-msgstr "Mottar e-post"
-
-#: mail/mail-config-druid.glade.h:49
-msgid "Remember my password"
-msgstr "Husk mitt passord"
-
-#: mail/mail-config-druid.glade.h:50 mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr "Svar-til:"
-
-#: mail/mail-config-druid.glade.h:51
-msgid "Reply-to:"
-msgstr "Svar-til:"
-
-#: mail/mail-config-druid.glade.h:52
-msgid "Required"
-msgstr "Nødvendige"
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Save password"
-msgstr "Lagre passord"
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Select signature file"
-msgstr "Velg signaturfil"
-
-#: mail/mail-config-druid.glade.h:56
-msgid "Sending Email"
-msgstr "Sender e-post"
-
-#: mail/mail-config-druid.glade.h:58
-msgid "Server Configuration"
-msgstr "Tjenerkonfigurasjon"
-
-#: mail/mail-config-druid.glade.h:59
-msgid "Server Type: "
-msgstr "Tjenertype: "
-
-#: mail/mail-config-druid.glade.h:60
-msgid "Server requires authentication"
-msgstr "Tjener krever autentisering"
-
-#: mail/mail-config-druid.glade.h:61
-msgid "Servers"
-msgstr "Tjenere"
-
-#: mail/mail-config-druid.glade.h:62 mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Signaturfil:"
-
-#: mail/mail-config-druid.glade.h:63
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: mail/mail-config-druid.glade.h:64 mail/mail-config.glade.h:15
-msgid "Sources"
-msgstr "Kilder"
-
-#: mail/mail-config-druid.glade.h:65
-msgid "This server requires a secure connection (SSL)"
-msgstr "Denne tjeneren krever en sikker forbindelse (SSL)"
-
-#: mail/mail-config-druid.glade.h:66
-msgid "Type"
-msgstr "Type"
-
-#: mail/mail-config-druid.glade.h:67
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Skriv inn et referansenavn for disse tjenerene. For eksempel: \"Arbeid\" "
-"eller \"Hjemme\"."
-
-#: mail/mail-config-druid.glade.h:69
-msgid "User Information"
-msgstr "Brukerinformasjon"
-
-#: mail/mail-config-druid.glade.h:70 mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Brukernavn:"
-
-#: mail/mail-config-druid.glade.h:71
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr "Velkommen til konfigurasjonsdruiden for Evolution e-post.\n"
-
-#: mail/mail-config-gui.c:433
-msgid ""
-"Enter your name and email address to be used in outgoing mail. You may also, "
-"optionally, enter the name of your organization, and the name of a file to "
-"read your signature from."
-msgstr ""
-"Skriv inn ditt navn og din e-post adresse for bruk i utgående post. Du kan "
-"også skrive inn navnet på din organisasjon, og navnet på en signaturfil."
-
-#: mail/mail-config-gui.c:446
-msgid "Full name:"
-msgstr "Fullt navn:"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "E-post adresse:"
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:14
-msgid "Signature File"
-msgstr "Signaturfil"
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Tjener:"
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-msgstr "Søk etter støttede typer..."
-
-#: mail/mail-config-gui.c:991
-msgid "Don't delete messages from server"
-msgstr "Ikke slett meldinger fra tjeneren"
-
-#: mail/mail-config-gui.c:1003
-msgid "Test Settings"
-msgstr "Prøv ut innstillinger"
-
-#: mail/mail-config-gui.c:1130
-msgid "Mail source type:"
-msgstr "Type e-post-kilde:"
-
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-druid.c:363
+#, c-format
 msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
-"Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon om "
-"denne.\n"
-"\n"
-"Hvis tjeneren trenger autentisering, kan du klikke på \"Søk etter støttede "
-"typer...\" knappen etter at du har skrevet inn resten av informasjonen."
 
-#: mail/mail-config-gui.c:1154
-msgid "News source type:"
-msgstr "Type news-kilde:"
-
-#: mail/mail-config-gui.c:1159
+#: mail/mail-config-druid.c:629
+#, c-format
 msgid ""
-"Select the kind of news server you have, and enter the relevant information "
-"about it.\n"
-"\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
-"Velg hvilken type news-tjener du har, og skriv inn relevant informasjon om "
-"denne.\n"
-"\n"
-"Hvis tjeneren trenger autentisering, kan du klikke på \"Søk etter støttede "
-"typer...\"-knappen etter at du har skrevet inn resten av informasjonen."
-
-#: mail/mail-config-gui.c:1178
-msgid "Mail transport type:"
-msgstr "Type e-post-transport"
 
-#: mail/mail-config-gui.c:1183
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
-"Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon om "
-"denne.\n"
-"Hvis tjeneren trenger autentisering, kan du klikke på \"Søk etter støttede "
-"typer...\" knappen etter at du har skrevet inn resten av informasjonen."
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr "Legg til identitet"
-
-#: mail/mail-config-gui.c:1235
-msgid "Edit Identity"
-msgstr "Rediger identitet"
-
-#: mail/mail-config-gui.c:1333
-msgid "Add Source"
-msgstr "Legg til kilde"
-
-#: mail/mail-config-gui.c:1335
-msgid "Edit Source"
-msgstr "Rediger kilde"
-
-#: mail/mail-config-gui.c:1430
-msgid "Add News Server"
-msgstr "Legg til news-tjener"
-
-#: mail/mail-config-gui.c:1432
-msgid "Edit News Server"
-msgstr "Redigér news-tjener"
-
-#: mail/mail-config-gui.c:2253
-#, c-format
-msgid "Testing \"%s\""
-msgstr "Tester \"%s\""
-
-#: mail/mail-config-gui.c:2255
-#, c-format
-msgid "Test connection to \"%s\""
-msgstr "Test tilkobling til \"%s\""
-
-#: mail/mail-config-gui.c:2296
-msgid "The connection was successful!"
-msgstr "Tilkoblingen var vellykket!"
-
-#: mail/mail-config-gui.c:2346
-#, c-format
-msgid "Querying authorization capabilities of \"%s\""
-msgstr "Spør etter autorisasjonsegenskaper for \"%s\""
-
-#: mail/mail-config-gui.c:2348
-#, c-format
-msgid "Query authorization at \"%s\""
-msgstr "Spør etter autorisasjon hos \"%s\""
-
-#: mail/mail-config.glade.h:2
-msgid "Address"
-msgstr "Adresse"
-
-#: mail/mail-config.glade.h:5
-msgid "Identities"
-msgstr "Identiteter"
-
-#: mail/mail-config.glade.h:6
-msgid "Mail Sources"
-msgstr "E-post-kilder"
-
-#: mail/mail-config.glade.h:7
-msgid "Mail Transport"
-msgstr "E-post-transport"
-
-#: mail/mail-config.glade.h:8
-msgid "Mark message as seen [ms]: "
-msgstr "Merk melding som sett [ms]: "
-
-#: mail/mail-config.glade.h:9
-msgid "News Servers"
-msgstr "News-tjenere"
-
-#: mail/mail-config.glade.h:10
-msgid "News Sources"
-msgstr "News-kilder"
-
-#: mail/mail-config.glade.h:11
-msgid "Organization"
-msgstr "Organisasjon"
-
-#: mail/mail-config.glade.h:13
-msgid "Send messages in HTML format"
-msgstr "Send meldinger i HTML-format"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr "Vennligst skriv inn din PGP/GPG passphrase."
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
-msgstr "Ingen passord gitt."
-
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Kunne ikke opprette rør til GPG/PGP: %s"
-
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
-msgstr "Ingen GPG/PGP-program tilgjengelig."
-
-#: mail/mail-crypto.c:953
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Kunne ikke opprette midlertidig fil: %s"
 
 #: mail/mail-display.c:98
 #, c-format
@@ -4986,65 +3842,65 @@ msgstr "Åpne i %s..."
 msgid "View Inline"
 msgstr "Vis \"inline\""
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis \"inline\" (via %s)"
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr "Ingen GPG/PGP-støtte tilgjengelig i denne versjonen av Evolution."
+#: mail/mail-format.c:626
+msgid "Reply-To:"
+msgstr "Svar-til:"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr "Kryptert melding ikke vist"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr "Kryptert melding"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr "Klikk på ikonet for å dekryptere."
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, 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:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjent ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern-kropp."
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Den %s, skrev %s:\n"
@@ -5104,7 +3960,7 @@ msgstr "Registrerer lokal mappe"
 msgid "Register local folder"
 msgstr "Registrér lokal mappe"
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5135,143 +3991,143 @@ msgstr ""
 msgid "Working"
 msgstr "Arbeider"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Henter e-post fra %s"
 
-#: mail/mail-ops.c:91
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Hent e-post fra %s"
 
-#: mail/mail-ops.c:336
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Ingen ny e-post på %s."
 
-#: mail/mail-ops.c:406
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "Filtrering av post etter behov"
 
-#: mail/mail-ops.c:408
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "Fi_ltrér e-post ved behov"
 
-#: mail/mail-ops.c:552
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:554
+#: mail/mail-ops.c:565
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: mail/mail-ops.c:670
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "Sender kø"
 
-#: mail/mail-ops.c:672
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr "Send kø"
 
-#: mail/mail-ops.c:805 mail/mail-ops.c:812
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Legger til \"%s\""
 
-#: mail/mail-ops.c:809 mail/mail-ops.c:815
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr "Legger til en melding uten emne"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Flytter meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopierer meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytt meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:905
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiér meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:936
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:939
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "Kopiérer"
 
-#: mail/mail-ops.c:959
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1034
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1100 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(Ingen beskrivelse)"
 
-#: mail/mail-ops.c:1165
+#: mail/mail-ops.c:1179
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1206 mail/mail-ops.c:1275
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1337
+#: mail/mail-ops.c:1351
 msgid "Synchronising folder"
 msgstr "Synkroniserer mappe"
 
-#: mail/mail-ops.c:1387
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:1435
+#: mail/mail-ops.c:1450
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1517
 msgid "Retrieving messages"
 msgstr "Henter meldinger"
 
-#: mail/mail-ops.c:1508
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter melding nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1656
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Laster %s-mappe for %s"
 
-#: mail/mail-ops.c:1658
+#: mail/mail-ops.c:1677
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "Last %s-mappe for %s"
 
-#: mail/mail-ops.c:1824
+#: mail/mail-ops.c:1843
 msgid "Saving messages"
 msgstr "Lagrer meldinger"
 
-#: mail/mail-ops.c:1903
+#: mail/mail-ops.c:1922
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5280,12 +4136,12 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Lagrer melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1930
+#: mail/mail-ops.c:1949
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5407,111 +4263,190 @@ msgstr "Ny VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:32
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "Svar til avsender av denne meldingen"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "Svar til alle mottakere av denne meldingen"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "Videresend denne meldingen"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:31
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "Skriv ut den valgte meldingen"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:599
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:890
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et al."
 
-#: mail/message-list.c:899 mail/message-list.c:915
+#: mail/message-list.c:905 mail/message-list.c:921
 msgid "<unknown>"
 msgstr "<ukjent>"
 
-#: mail/message-list.c:968
+#: mail/message-list.c:973
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:975
+#: mail/message-list.c:980
 msgid "Today %l:%M %p"
 msgstr "Idag %l:%M %p"
 
-#: mail/message-list.c:984
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: mail/message-list.c:996
+#: mail/message-list.c:1001
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1004
+#: mail/message-list.c:1009
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1006
+#: mail/message-list.c:1011
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr "Merket"
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "vedlegg"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "Fra:"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "Ferdig-dato"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "Dato mottatt"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "To"
+msgstr "Til:"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "Size"
+msgstr "Størrelse:"
+
+#: mail/openpgp-utils.c:78
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Vennligst skriv inn din PGP/GPG passphrase."
+
+#: mail/openpgp-utils.c:81
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Vennligst skriv inn din PGP/GPG passphrase."
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr "Ingen GPG/PGP-program tilgjengelig."
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr "Ingen passord gitt."
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Kunne ikke opprette rør til GPG/PGP: %s"
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Kunne ikke opprette midlertidig fil: %s"
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "Mapper"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "Poenggi"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr "Vis mapper som som starter med:"
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "Henter lager for \"%s\""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr "Hent lager for \"%s\""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnerer på mappe \"%s\""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Sletter abonnement på mappe \"%s\""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Abonnér på mappe \"%s\""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Slett abonnement på mappe \"%s\""
@@ -5621,23 +4556,24 @@ msgstr ""
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ble ikke funnet i din $PATH."
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5647,7 +4583,7 @@ msgstr ""
 "for e-post, kalender og kontaktdatabaser for\n"
 "GNOME skrivebordsmiljøet."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:334
 msgid "Go to folder..."
 msgstr "Gå til mappe..."
 
@@ -5655,13 +4591,18 @@ msgstr "Gå til mappe..."
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "Mapper"
 
-#: shell/e-shell-view.c:1077
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 #: shell/e-shell.c:372
@@ -5669,7 +4610,7 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5678,15 +4619,15 @@ msgstr ""
 "Ops! Visningen for `%s' døde uventet. :-(\n"
 "Dette betyr sannsynligvis at komponenten %s har krasjet."
 
-#: shell/e-shortcuts-view.c:122
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr "Opprett ny snarveigruppe"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -5695,51 +4636,61 @@ msgstr ""
 "Vil du virkelig fjerne gruppen\n"
 "`%s' fra snarveilinjen?"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr "Ikke fjern"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "_Små ikoner"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "Vis snarveier som små ikoner"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "Store i_koner"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Vis snarveier som store ikoner"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "_Ny gruppe..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "Opprett en ny snarveigruppe"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr "Fje_rn denne gruppen..."
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr "Fjern denne snarveigruppen"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "Vis _snarveilinjen"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "Vis _snarveilinjen"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Aktiver"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Aktiver denne snarveien"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarveien fra snarveilinjen"
 
@@ -5747,12 +4698,11 @@ msgstr "Fjern denne snarveien fra snarveilinjen"
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:120
-#: ui/evolution-message-composer.xml.h:43 ui/evolution.xml.h:29
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "_Vis"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "Vis den valgte mappen"
 
@@ -5863,1198 +4813,2114 @@ msgstr "Slå av."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create a new contact"
-msgstr "Opprett en ny kontakt"
+#: ui/evolution-contact-editor.xml:7
+msgid "FIXME: _Appointment"
+msgstr "_Avtale"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Slett en kontakt"
+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
+msgstr "Møteforesp_ørsel"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-event-editor.xml.h:62
-msgid "Find"
-msgstr "Finn"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr "Send _melding"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Finn en kontakt"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:14
-msgid "New"
-msgstr "Ny"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr "_Oppgave"
 
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "Skriv ut kontakter"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr "Oppgavefo_respørsel"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "Stop"
-msgstr "Stopp"
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr "_Journaloppføring"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "Stopp innlesing"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr "_Notis"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Vis alle"
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr "Velg skjema..."
+
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr "_Notis-stil"
+
+#: ui/evolution-contact-editor.xml:24
+#, fuzzy
+msgid "FIXME: Define Print _Styles..."
+msgstr "Definér utskrift_stiler"
+
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr "_Send"
+
+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
+msgstr "Lagre vedle_gg..."
+
+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
+msgstr "_Flytt til mappe..."
+
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
+msgstr "Kopiér til mappe..."
+
+#: ui/evolution-contact-editor.xml:41
+msgid "Page Set_up"
+msgstr "Sideoppsett"
+
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
+msgstr "Forhåndsvisning av utskrift"
+
+#: ui/evolution-contact-editor.xml:63
+#, fuzzy
+msgid "FIXME: Paste _Special..."
+msgstr "Lim inn _spesial..."
+
+#: ui/evolution-contact-editor.xml:68
+msgid "FIXME: Mark as U_nread"
+msgstr "Merk som ulest"
+
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "_Objekt"
+
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr "_Oppføring"
+
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr "_Ulest oppføring"
+
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "Fø_rste oppføring i mappe"
+
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr "_Siste oppføring i mappe"
+
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr "_Standard"
+
+#: ui/evolution-contact-editor.xml:93
+msgid "FIXME: __Formatting"
+msgstr "_Formatering"
+
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr "_Tilpass..."
+
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "Forri_ge"
+
+#: ui/evolution-contact-editor.xml:102
+msgid "Ne_xt"
+msgstr "Nes_te"
+
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "Verk_tøylinjer"
+
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "_Fil..."
+
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr "Opp_føring"
+
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr "_Objekt..."
+
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "FIXME: Skri_fttyper..."
+
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr "_Avsnitt..."
+
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr "_Utform dette skjemaet"
+
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr "U_tform et skjema..."
+
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr "Publisér skjema..."
+
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr "Pu_blisér skjema som..."
+
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr "Feilsøking i skript"
+
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "_Stavekontroll..."
+
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "Sk_jemaer"
+
+#: ui/evolution-contact-editor.xml:142
+#, fuzzy
+msgid "FIXME: _New Contact"
+msgstr "_Kontakt"
+
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:145
+#, fuzzy
+msgid "FIXME: New _Letter to Contact"
+msgstr "_Kontakt"
+
+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
+msgstr "Send _melding til kontakt..."
+
+#: ui/evolution-contact-editor.xml:147
+#, fuzzy
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "_Kontakt"
+
+#: ui/evolution-contact-editor.xml:148
+#, fuzzy
+msgid "FIXME: _Plan a Meeting..."
+msgstr "_Stavekontroll..."
+
+#: ui/evolution-contact-editor.xml:149
+#, fuzzy
+msgid "FIXME: New _Task for Contact"
+msgstr "_Kontakt"
+
+#: ui/evolution-contact-editor.xml:150
+#, fuzzy
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "_Journaloppføring"
+
+#: ui/evolution-contact-editor.xml:152
+#, fuzzy
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "Kopiér til mappe..."
+
+#: ui/evolution-contact-editor.xml:153
+#, fuzzy
+msgid "FIXME: _Display Map of Address"
+msgstr "Send _melding"
+
+#: ui/evolution-contact-editor.xml:154
+#, fuzzy
+msgid "FIXME: _Open Web Page"
+msgstr "Send _melding"
 
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Vis alle kontakter"
+#: ui/evolution-contact-editor.xml:156
+#, fuzzy
+msgid "FIXME: Forward as _vCard"
+msgstr "Videresend som v_Calendar"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "Konfigurasjon av adressebok..."
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr "_Videresend"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "S_kriv ut kontakter..."
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "Sett _inn"
 
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "_Søk etter kontakter"
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "F_ormat"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:118
+#: ui/evolution-contact-editor.xml:171
 msgid "_Tools"
 msgstr "_Verktøy"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dager"
+#: ui/evolution-contact-editor.xml:172
+msgid "Actio_ns"
+msgstr "Ha_ndlinger"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Alter preferences"
-msgstr "Endre brukervalg"
+#: ui/evolution-contact-editor.xml:246
+msgid "FIXME: Previous"
+msgstr "Forrige"
 
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ka_lender"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "Gå til forrige oppføring"
 
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar Preferences..."
-msgstr "Brukervalg for kalender..."
+#: ui/evolution-contact-editor.xml:249
+msgid "FIXME: Next"
+msgstr "Neste"
 
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
-msgstr "Opprett en ny avtale"
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "Gå til neste oppføring"
 
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Opprett en ny kalender"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Dag"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Tentativ"
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Go back in time"
-msgstr "Gå tilbake i tid"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Opptatt"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Go forward in time"
-msgstr "Gå fremover i tid"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Ute"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go to"
-msgstr "Gå til"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Ingen informasjon"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to a specific date"
-msgstr "Gå til en spesifikk dato"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "_Inviter andre..."
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to present time"
-msgstr "Gå til i dag"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Alternativer"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Month"
-msgstr "Måned"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Vis k_un arbeidstid"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-event-editor.xml.h:69
-msgid "Next"
-msgstr "Neste"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "Vis _zoomet ut"
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Open a calendar"
-msgstr "Åpne en kalender"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "_Oppdater fri/ledig"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Prev"
-msgstr "Forrige"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "_<<"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
+msgstr "_Autovelg"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">_>"
 
-#: ui/evolution-calendar.xml.h:19
-msgid "Print this calendar"
-msgstr "Skriv ut denne kalenderen"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr "_Alle mennesker og ressurser"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Save calendar as something else"
-msgstr "Lagre kalender som noe annet"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Alle _mennesker og en ressurs"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Show 1 day"
-msgstr "Vis 1 dag"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "_Nødvendige mennesker"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Show 1 month"
-msgstr "Vis 1 måned"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "Nødvendige mennesker _og en ressurs"
 
-#: ui/evolution-calendar.xml.h:23
-msgid "Show 1 week"
-msgstr "Vis 1 uke"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Tid for møtets _start:"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show the working week"
-msgstr "Vis arbeidsuken"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Tid for møtets slutt:"
 
-#: ui/evolution-calendar.xml.h:25 widgets/misc/e-dateedit.c:413
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Alle deltakere"
+
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "MTWTFSS"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "nå"
+
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Idag"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Week"
-msgstr "Uke"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution.xml.h:26
-msgid "_New"
-msgstr "_Ny"
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "_Open Calendar"
-msgstr "_Åpne kalender"
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr "Sø_k"
 
-#: ui/evolution-calendar.xml.h:29
-msgid "_Print this calendar"
-msgstr "S_kriv ut denne kalenderen"
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Gruppe %i"
 
-#: ui/evolution-calendar.xml.h:30
-msgid "_Save As..."
-msgstr "Lagre _som..."
+#~ msgid "Delete Contact?"
+#~ msgstr "Slett kontakt?"
 
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Slett denne oppføringen"
+#~ msgid "Address _2:"
+#~ msgstr "Adresse _2:"
 
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "Slett..."
+#~ msgid "Canada"
+#~ msgstr "Kanada"
 
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Hjelp"
+#~ msgid "Check Address"
+#~ msgstr "Sjekk adresse"
 
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "Skriv ut konvolutt..."
+#~ msgid "Countr_y:"
+#~ msgstr "Lan_d:"
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:76
-msgid "Print this item"
-msgstr "Skriv ut denne oppføringen"
+#~ msgid "Finland"
+#~ msgstr "Finland"
 
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:77
-msgid "Print..."
-msgstr "Skriv ut..."
+#~ msgid "USA"
+#~ msgstr "USA"
 
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:84
-#: ui/evolution-message-composer.xml.h:16
-msgid "Save _As..."
-msgstr "L_agre som..."
+#~ msgid "_Address:"
+#~ msgstr "_Adresse:"
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:85
-msgid "Save and Close"
-msgstr "Lagre og lukk"
+#~ msgid "_City:"
+#~ msgstr "_By:"
 
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "Lagre kontakten og lukk dialogboksen"
+#~ msgid "_PO Box:"
+#~ msgstr "_Postboks:"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Se_nd kontakt til andre..."
+#~ msgid "_State/Province:"
+#~ msgstr "_Stat/Provins:"
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:93
-msgid "See online help"
-msgstr "Se hjelp"
+#~ msgid "_ZIP Code:"
+#~ msgstr "_ZIP/Postnummer:"
 
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Send _melding til kontakt..."
+#~ msgid "Addressbook Sources"
+#~ msgstr "Adressebok-kilder"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:105
-#: ui/evolution-message-composer.xml.h:37 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:20
-msgid "_File"
-msgstr "_Fil"
+#~ msgid "URI"
+#~ msgstr "URI"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "S_kriv ut..."
+#~ msgid "Find..."
+#~ msgstr "Finn..."
 
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:116
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Save"
-msgstr "_Lagre"
+#~ msgid "Message Recipients"
+#~ msgstr "Meldingsmottakere:"
 
-#: ui/evolution-event-editor.xml.h:1
-msgid "About this application"
-msgstr "Om denne applikasjonen"
+#~ msgid "Select Names"
+#~ msgstr "Velg navn"
 
-#: ui/evolution-event-editor.xml.h:2
-msgid "About..."
-msgstr "Om..."
+#~ msgid "Select name from:"
+#~ msgstr "Velg navn fra:"
 
-#: ui/evolution-event-editor.xml.h:3
-msgid "Actio_ns"
-msgstr "Ha_ndlinger"
+#~ msgid "123"
+#~ msgstr "123"
 
-#: ui/evolution-event-editor.xml.h:4
-msgid "C_lear"
-msgstr "T_øm"
+#~ msgid "a"
+#~ msgstr "a"
 
-#: ui/evolution-event-editor.xml.h:5
-msgid "C_ut"
-msgstr "Klipp _ut"
+#~ msgid "b"
+#~ msgstr "b"
 
-#: ui/evolution-event-editor.xml.h:6
-msgid "Clear"
-msgstr "Tøm"
+#~ msgid "c"
+#~ msgstr "c"
 
-#: ui/evolution-event-editor.xml.h:7
-msgid "Clear the selection"
-msgstr "Tøm utvalget"
+#~ msgid "d"
+#~ msgstr "d"
 
-#: ui/evolution-event-editor.xml.h:9
-msgid "Close this appointment"
-msgstr "Lukk denne avtalen"
+#~ msgid "e"
+#~ msgstr "e"
 
-#: ui/evolution-event-editor.xml.h:10 ui/evolution-mail.xml.h:3
-msgid "Copy"
-msgstr "Kopiér"
+#~ msgid "f"
+#~ msgstr "f"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Copy the selection"
-msgstr "Kopiér utvalget"
+#~ msgid "g"
+#~ msgstr "g"
 
-#: ui/evolution-event-editor.xml.h:12
-msgid "Cut"
-msgstr "Klipp ut"
+#~ msgid "h"
+#~ msgstr "h"
 
-#: ui/evolution-event-editor.xml.h:13
-msgid "Cut the selection"
-msgstr "Klipp ut utvalget"
+#~ msgid "i"
+#~ msgstr "i"
 
-#: ui/evolution-event-editor.xml.h:16
-msgid "Dump XML"
-msgstr "Dump XML"
+#~ msgid "j"
+#~ msgstr "j"
 
-#: ui/evolution-event-editor.xml.h:17
-msgid "Dump the UI Xml description"
-msgstr "Dump beskrivelse av grensesnittet som XML"
+#~ msgid "k"
+#~ msgstr "k"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "FIXME: Address _Book..."
-msgstr "Addresse_bok..."
+#~ msgid "l"
+#~ msgstr "l"
 
-#: ui/evolution-event-editor.xml.h:19
-msgid "FIXME: Ch_oose Form..."
-msgstr "Velg skjema..."
+#~ msgid "m"
+#~ msgstr "m"
 
-#: ui/evolution-event-editor.xml.h:20
-msgid "FIXME: Chec_k Names"
-msgstr "Sjek_k navn"
+#~ msgid "n"
+#~ msgstr "n"
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "FIXME: Cop_y to Folder..."
-msgstr "Kopiér til mappe..."
+#~ msgid "o"
+#~ msgstr "o"
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "FIXME: D_esign a Form..."
-msgstr "U_tform et skjema..."
+#~ msgid "p"
+#~ msgstr "p"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "FIXME: Define Print _Styles"
-msgstr "Definér utskrift_stiler"
+#~ msgid "q"
+#~ msgstr "q"
 
-#: ui/evolution-event-editor.xml.h:24
-msgid "FIXME: Desi_gn This Form"
-msgstr "_Utform dette skjemaet"
+#~ msgid "r"
+#~ msgstr "r"
 
-#: ui/evolution-event-editor.xml.h:25
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "Fø_rste oppføring i mappe"
+#~ msgid "s"
+#~ msgstr "s"
 
-#: ui/evolution-event-editor.xml.h:26
-msgid "FIXME: For_ward"
-msgstr "_Videresend"
+#~ msgid "t"
+#~ msgstr "t"
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: Forward as v_Calendar"
-msgstr "Videresend som v_Calendar"
+#~ msgid "u"
+#~ msgstr "u"
 
-#: ui/evolution-event-editor.xml.h:28
-msgid "FIXME: Help"
-msgstr "Hjelp"
+#~ msgid "v"
+#~ msgstr "v"
 
-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: In_complete Task"
-msgstr "U_komplett oppgave"
+#~ msgid "w"
+#~ msgstr "w"
 
-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Insert File"
-msgstr "Sett inn fil"
+#~ msgid "x"
+#~ msgstr "x"
 
-#: ui/evolution-event-editor.xml.h:31
-msgid "FIXME: It_em..."
-msgstr "Opp_føring"
+#~ msgid "y"
+#~ msgstr "y"
 
-#: ui/evolution-event-editor.xml.h:32
-msgid "FIXME: Paste _Special... "
-msgstr "Lim inn _spesial..."
+#~ msgid "z"
+#~ msgstr "z"
 
-#: ui/evolution-event-editor.xml.h:33
-msgid "FIXME: Print Pre_view"
-msgstr "Forhåndsvisning av utskrift"
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
 
-#: ui/evolution-event-editor.xml.h:34
-msgid "FIXME: Pu_blish Form As..."
-msgstr "Pu_blisér skjema som..."
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
 
-#: ui/evolution-event-editor.xml.h:35
-msgid "FIXME: Publish _Form..."
-msgstr "Publisér skjema..."
+#~ msgid "Blank forms at end:"
+#~ msgstr "Blanke skjema på slutten:"
 
-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: Rec_urrence..."
-msgstr "Gjentakelse..."
+#~ msgid "Body"
+#~ msgstr "Kropp"
 
-#: ui/evolution-event-editor.xml.h:37
-msgid "FIXME: S_end"
-msgstr "_Send"
+#~ msgid "Bottom:"
+#~ msgstr "Bunn:"
 
-#: ui/evolution-event-editor.xml.h:38
-msgid "FIXME: Save Attac_hments..."
-msgstr "Lagre vedle_gg..."
+#~ msgid "Dimensions:"
+#~ msgstr "Dimensjoner:"
 
-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Script _Debugger"
-msgstr "Feilsøking i skript"
+#~ msgid "Font..."
+#~ msgstr "Skrifttype..."
 
-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Task _Request"
-msgstr "Oppgavefo_respørsel"
+#~ msgid "Fonts"
+#~ msgstr "Skrifttyper"
 
-#: ui/evolution-event-editor.xml.h:41
-msgid "FIXME: _Contact"
-msgstr "_Kontakt"
+#~ msgid "Footer:"
+#~ msgstr "Bunntekst:"
 
-#: ui/evolution-event-editor.xml.h:42
-msgid "FIXME: _Customize..."
-msgstr "_Tilpass..."
+#~ msgid "Format"
+#~ msgstr "Format"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "FIXME: _File..."
-msgstr "_Fil..."
+#~ msgid "Header"
+#~ msgstr "Topptekst"
 
-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: _Font..."
-msgstr "FIXME: Skri_fttyper..."
+#~ msgid "Header/Footer"
+#~ msgstr "Topp-/bunntekst"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: _Formatting"
-msgstr "_Formatering"
+#~ msgid "Headings"
+#~ msgstr "Topptekster"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: _Item"
-msgstr "_Oppføring"
+#~ msgid "Headings for each letter"
+#~ msgstr "Topptekst for hver bokstav"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "FIXME: _Journal Entry"
-msgstr "_Journaloppføring"
+#~ msgid "Height:"
+#~ msgstr "Høyde:"
 
-#: ui/evolution-event-editor.xml.h:48
-msgid "FIXME: _Last Item in Folder"
-msgstr "_Siste oppføring i mappe"
+#~ msgid "Immediately follow each other"
+#~ msgstr "Rett etter hverandre"
 
-#: ui/evolution-event-editor.xml.h:49
-msgid "FIXME: _Mail Message"
-msgstr "Send _melding"
+#~ msgid "Include:"
+#~ msgstr "Inkluder:"
 
-#: ui/evolution-event-editor.xml.h:50
-msgid "FIXME: _Memo Style"
-msgstr "_Notis-stil"
+#~ msgid "Landscape"
+#~ msgstr "Landskap"
 
-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Move to Folder..."
-msgstr "_Flytt til mappe..."
+#~ msgid "Left:"
+#~ msgstr "Venstre:"
 
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _New Appointment"
-msgstr "_Ny avtale"
+#~ msgid "Letter tabs on side"
+#~ msgstr "Bokstavfaner på siden"
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Note"
-msgstr "_Notis"
+#~ msgid "Margins"
+#~ msgstr "Marger"
 
-#: ui/evolution-event-editor.xml.h:54
-msgid "FIXME: _Object..."
-msgstr "_Objekt..."
+#~ msgid "Number of columns:"
+#~ msgstr "Antall kolonner:"
 
-#: ui/evolution-event-editor.xml.h:55
-msgid "FIXME: _Paragraph..."
-msgstr "_Avsnitt..."
+#~ msgid "Options"
+#~ msgstr "Alternativer"
 
-#: ui/evolution-event-editor.xml.h:56
-msgid "FIXME: _Spelling..."
-msgstr "_Stavekontroll..."
+#~ msgid "Orientation"
+#~ msgstr "Orientering"
 
-#: ui/evolution-event-editor.xml.h:57
-msgid "FIXME: _Standard"
-msgstr "_Standard"
+#~ msgid "Page"
+#~ msgstr "Side"
 
-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Task"
-msgstr "_Oppgave"
+#~ msgid "Page Setup:"
+#~ msgstr "Sideoppsett"
 
-#: ui/evolution-event-editor.xml.h:59
-msgid "FIXME: _Unread Item"
-msgstr "_Ulest oppføring"
+#~ msgid "Paper"
+#~ msgstr "Papir"
 
-#: ui/evolution-event-editor.xml.h:60
-msgid "FIXME: what goes here?"
-msgstr "Hva går her?"
+#~ msgid "Paper source:"
+#~ msgstr "Papirkilde:"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
-msgstr "F_ormat"
+#~ msgid "Portrait"
+#~ msgstr "Portrett"
 
-#: ui/evolution-event-editor.xml.h:63
-msgid "Find Again"
-msgstr "Finn igjen"
+#~ msgid "Preview:"
+#~ msgstr "Forhåndsvis:"
 
-#: ui/evolution-event-editor.xml.h:64
-msgid "Find _Again"
-msgstr "Finn ig_jen"
+#~ msgid "Print using gray shading"
+#~ msgstr "Skriv ut med gråtoner"
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "Go to the next item"
-msgstr "Gå til neste oppføring"
+#~ msgid "Reverse on even pages"
+#~ msgstr "Motsatt på like sider"
 
-#: ui/evolution-event-editor.xml.h:66
-msgid "Go to the previous item"
-msgstr "Gå til forrige oppføring"
+#~ msgid "Right:"
+#~ msgstr "Høyre:"
 
-#: ui/evolution-event-editor.xml.h:67
-msgid "Modify the file's properties"
-msgstr "Endre filens egenskaper"
+#~ msgid "Sections:"
+#~ msgstr "Seksjoner:"
 
-#: ui/evolution-event-editor.xml.h:68
-msgid "N_ext"
-msgstr "N_este"
+#~ msgid "Shading"
+#~ msgstr "Skyggelegging"
 
-#: ui/evolution-event-editor.xml.h:70
-msgid "Paste"
-msgstr "Lim inn"
+#~ msgid "Start on a new page"
+#~ msgstr "Start på en ny side"
 
-#: ui/evolution-event-editor.xml.h:71
-msgid "Paste the clipboard"
-msgstr "Lim inn fra utklippstavlen"
+#~ msgid "Style name:"
+#~ msgstr "Stilnavn:"
 
-#: ui/evolution-event-editor.xml.h:72
-msgid "Pre_vious"
-msgstr "Forri_ge"
+#~ msgid "Top:"
+#~ msgstr "Topp:"
 
-#: ui/evolution-event-editor.xml.h:73
-msgid "Previous"
-msgstr "Forrige"
+#~ msgid "Type:"
+#~ msgstr "Type:"
 
-#: ui/evolution-event-editor.xml.h:74
-msgid "Print S_etup..."
-msgstr "Skriveropps_ett..."
+#~ msgid "Width:"
+#~ msgstr "Bredde:"
 
-#: ui/evolution-event-editor.xml.h:75
-msgid "Print Setup"
-msgstr "Skriveroppsett"
+#~ msgid "label26"
+#~ msgstr "etikett26"
 
-#: ui/evolution-event-editor.xml.h:78
-msgid "Properties"
-msgstr "Egenskaper"
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Eksempel på Bonobo-kontroll som viser en kalender."
 
-#: ui/evolution-event-editor.xml.h:79
-msgid "Redo"
-msgstr "Gjenopprett"
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "Factory for eksempelkontroll for kalender"
 
-#: ui/evolution-event-editor.xml.h:80
-msgid "Redo the undone action"
-msgstr "Gjenopprett angret handling"
+#~ msgid "Calendar Repository"
+#~ msgstr "Kalenderlager"
 
-#: ui/evolution-event-editor.xml.h:81
-msgid "Replace"
-msgstr "Erstatt"
+#~ msgid "Calendar Server"
+#~ msgstr "Kalendertjener"
 
-#: ui/evolution-event-editor.xml.h:82
-msgid "Replace a string"
-msgstr "Erstattt en streng"
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolution komponent for kalendersammendrag."
 
-#: ui/evolution-event-editor.xml.h:86
-msgid "Save the appointment and close the dialog box"
-msgstr "Lagre avtalen og lukk dialogboksen"
+#~ msgid "Evolution calendar iTip/iMip viewer"
+#~ msgstr "Evolution kalender iTip/iMip-visning"
 
-#: ui/evolution-event-editor.xml.h:87 ui/evolution-message-composer.xml.h:19
-msgid "Save the current file"
-msgstr "Lagre aktiv fil"
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Evolution komponent for håndtering av kalenderen."
 
-#: ui/evolution-event-editor.xml.h:88
-msgid "Schedule Meeting"
-msgstr "Sett opp møte"
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Factory for kalenderens sammendragskomponent."
 
-#: ui/evolution-event-editor.xml.h:89
-msgid "Schedule _Meeting"
-msgstr "Sett opp _møte"
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Factory for Evolution kalender-komponent."
 
-#: ui/evolution-event-editor.xml.h:90
-msgid "Schedule some sort of a meeting"
-msgstr "Sett opp ett eller annet møte"
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "Factory for kalenderens iTip visningskontroll"
 
-#: ui/evolution-event-editor.xml.h:91
-msgid "Search again for the same string"
-msgstr "Søk etter samme streng på nytt"
+#~ msgid "<b>Error loading calendar:<br>Calendar in use."
+#~ msgstr "<b>Feil under lasting av kalender:<br>Kalender i bruk."
 
-#: ui/evolution-event-editor.xml.h:92
-msgid "Search for a string"
-msgstr "Søk etter en streng"
+#~ msgid "Edit appointment"
+#~ msgstr "Rediger avtale:"
 
-#: ui/evolution-event-editor.xml.h:94
-msgid "Select All"
-msgstr "Velg alle"
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "Utsett-tid (minutter)"
 
-#: ui/evolution-event-editor.xml.h:95
-msgid "Select everything"
-msgstr "Velg alt"
+#~ msgid "05 minutes"
+#~ msgstr "5 minutter"
 
-#: ui/evolution-event-editor.xml.h:96
-msgid "Setup the page settings for your current printer"
-msgstr "Redigér sideinnstillinger for aktiv skriver"
+#~ msgid "10 minutes"
+#~ msgstr "10 minutter"
 
-#: ui/evolution-event-editor.xml.h:97
-msgid "Undo"
-msgstr "Angre"
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 timer (am/pm)"
 
-#: ui/evolution-event-editor.xml.h:98
-msgid "Undo the last action"
-msgstr "Angre siste handling"
+#~ msgid "15 minutes"
+#~ msgstr "15 minutter"
 
-#: ui/evolution-event-editor.xml.h:99 ui/evolution-message-composer.xml.h:33
-msgid "_About..."
-msgstr "_Om..."
+#~ msgid "24 hour"
+#~ msgstr "24 timer"
 
-#: ui/evolution-event-editor.xml.h:100 ui/evolution-message-composer.xml.h:34
-msgid "_Close"
-msgstr "L_ukk"
+#~ msgid "30 minutes"
+#~ msgstr "30 minutter"
 
-#: ui/evolution-event-editor.xml.h:101
-msgid "_Copy"
-msgstr "_Kopiér"
+#~ msgid "60 minutes"
+#~ msgstr "60 minutter"
 
-#: ui/evolution-event-editor.xml.h:102 ui/evolution-message-composer.xml.h:35
-msgid "_Debug"
-msgstr "_Feilsøk"
+#~ msgid "Alarms timeout after"
+#~ msgstr "Tidsavbrudd for alarm etter"
 
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-subscribe.xml.h:10 ui/evolution.xml.h:19
-msgid "_Edit"
-msgstr "R_edigér"
+#~ msgid "Audio Alarms"
+#~ msgstr "Lyd-alarmer"
 
-#: ui/evolution-event-editor.xml.h:106
-msgid "_Find..."
-msgstr "_Finn..."
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Pip når alarmvinduet kommer til syne."
 
-#: ui/evolution-event-editor.xml.h:107
-msgid "_Forms"
-msgstr "Sk_jemaer"
+#~ msgid "Calendar"
+#~ msgstr "Kalender"
 
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:38
-#: ui/evolution.xml.h:23
-msgid "_Help"
-msgstr "_Hjelp"
+#~ msgid "Calendar Preferences"
+#~ msgstr "Brukervalg for kalender"
 
-#: ui/evolution-event-editor.xml.h:109
-msgid "_Insert"
-msgstr "Sett _inn"
+#~ msgid "Colors"
+#~ msgstr "Farger"
 
-#: ui/evolution-event-editor.xml.h:110
-msgid "_Object"
-msgstr "_Objekt"
+#~ msgid "Compress weekends"
+#~ msgstr "Komprimér helger"
 
-#: ui/evolution-event-editor.xml.h:111
-msgid "_Paste"
-msgstr "_Lim inn"
+#~ msgid "Date navigator options"
+#~ msgstr "Alternativer for datonavigator"
 
-#: ui/evolution-event-editor.xml.h:112
-msgid "_Print"
-msgstr "S_kriv ut"
+#~ msgid "Defaults"
+#~ msgstr "Forvalg"
 
-#: ui/evolution-event-editor.xml.h:113
-msgid "_Properties..."
-msgstr "Egenska_per..."
+#~ msgid "Display options"
+#~ msgstr "Vis alternativer"
 
-#: ui/evolution-event-editor.xml.h:114
-msgid "_Redo"
-msgstr "Gjenopp_rett"
+#~ msgid "Enable snoozing for"
+#~ msgstr "Slå på utsetting for "
 
-#: ui/evolution-event-editor.xml.h:115
-msgid "_Replace..."
-msgstr "E_rstatt..."
+#~ msgid "End of day:"
+#~ msgstr "Dagen slutter:"
 
-#: ui/evolution-event-editor.xml.h:117
-msgid "_Toolbars"
-msgstr "Verk_tøylinjer"
+#~ msgid "First day of week:"
+#~ msgstr "Første dag i uken:"
 
-#: ui/evolution-event-editor.xml.h:119
-msgid "_Undo"
-msgstr "_Angre"
+#~ msgid "Highlight"
+#~ msgstr "Markér"
 
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "Komponér"
+#~ msgid "Items Due Today"
+#~ msgstr "Oppføringer som går ut idag"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "Komponér en ny melding"
+#~ msgid "Items Due Today:"
+#~ msgstr "Oppføringer som går ut i dag:"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "Kopiér meldingen til en ny mappe"
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Oppføringer som ikke har gått ut"
 
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "M_appe"
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Oppføringer som ikke har gått ut:"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Fi_ltrér etter sender"
+#~ msgid "Overdue Items"
+#~ msgstr "Utgåtte oppføringer"
 
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "F_iltrér etter mottaker"
+#~ msgid "Overdue Items:"
+#~ msgstr "Utgåtte oppføringer:"
 
-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Glem _passord"
+#~ msgid "Pick a color"
+#~ msgstr "Velg en farge"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Hent e-post"
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Påminnelse om alle avtaler"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted messages"
-msgstr "Skjul slette_de meldinger"
+#~ msgid "Reminders"
+#~ msgstr "Påminnelser"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Skjul le_ste meldinger"
+#~ msgid "Show"
+#~ msgstr "Vis"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Hide _Selected messages"
-msgstr "_Skjul valgte meldinger"
+#~ msgid "Show week numbers"
+#~ msgstr "Vis ukenummer"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Mail _Filters..."
-msgstr "E-post _filtre..."
+#~ msgid "Start of day:"
+#~ msgstr "Dagen starter:"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Manage Subscriptions..."
-msgstr "Håndtér abonnement..."
+#~ msgid "TaskPad"
+#~ msgstr "Oppgaveblokk"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Mar_k As Read"
-msgstr "Mar_kér som lest"
+#~ msgid "Time Until Due"
+#~ msgstr "Tid før den går ut"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Mark As U_nread"
-msgstr "Merk som _ulest"
+#~ msgid "Time divisions:"
+#~ msgstr "Oppdeling av tid:"
 
-#: ui/evolution-mail.xml.h:24
-msgid "Move"
-msgstr "Flytt"
+#~ msgid "Time format:"
+#~ msgstr "Tidformat:"
 
-#: ui/evolution-mail.xml.h:25
-msgid "Move message to a new folder"
-msgstr "Flytt meldingen til en ny mappe"
+#~ msgid "Visual Alarms"
+#~ msgstr "Visuelle alarmer"
 
-#: ui/evolution-mail.xml.h:26
-msgid "Previews the message to be printed"
-msgstr "Viser forhåndsvisning av meldingen som skal skrives ut"
+#~ msgid "Work week"
+#~ msgstr "Arbeidsuke"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Print Preview of message..."
-msgstr "Vis forhåndsvisning av melding..."
+#~ msgid "minutes before they occur."
+#~ msgstr "minutter i forveien."
 
-#: ui/evolution-mail.xml.h:29
-msgid "Print message to the printer"
-msgstr "Skriv ut denne meldingen på skriveren"
+#~ msgid "seconds."
+#~ msgstr "sekunder"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Print message..."
-msgstr "Skriv ut melding..."
+#~ msgid "% Comp_lete:"
+#~ msgstr "% ferdi_g:"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _All"
-msgstr "Svar til _alle"
+#~ msgid "C_lassification:"
+#~ msgstr "K_lassifisering"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Reply to _Sender"
-msgstr "Svar til _sender"
+#~ msgid "Date Completed:"
+#~ msgstr "Fullført dato:"
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Velg _alle"
+#~ msgid "High"
+#~ msgstr "Høy"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Send kølagt e-post og hent ny e-post"
+#~ msgid "In Progress"
+#~ msgstr "Under arbeid"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All messages"
-msgstr "Vis _alle meldinger"
+#~ msgid "Low"
+#~ msgstr "Lav"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Threaded Message list"
-msgstr "Meldingsliste med tråder"
+#~ msgid "Normal"
+#~ msgstr "Normal"
 
-#: ui/evolution-mail.xml.h:42
-msgid "VFolder on Se_nder"
-msgstr "VFolder for se_nder"
+#~ msgid "Not Started"
+#~ msgstr "Ikke startet"
 
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on _Recipients"
-msgstr "VFolder for mottake_re"
+#~ msgid "Task"
+#~ msgstr "Oppgave"
 
-#: ui/evolution-mail.xml.h:44
-msgid "View Raw Message Source"
-msgstr "Vis rå meldingskode"
+#~ msgid "_Contacts..."
+#~ msgstr "_Kontakter..."
 
-#: ui/evolution-mail.xml.h:45
-msgid "_Apply Filters"
-msgstr "_Påfør filtre"
+#~ msgid "_Due Date:"
+#~ msgstr "Fer_dig-dato:"
 
-#: ui/evolution-mail.xml.h:46
-msgid "_Configure Folder"
-msgstr "_Konfigurér mappe"
+#~ msgid "_Priority:"
+#~ msgstr "_Prioritet:"
 
-#: ui/evolution-mail.xml.h:47
-msgid "_Copy to Folder..."
-msgstr "_Kopiér til mappe..."
+#~ msgid "_Status:"
+#~ msgstr "_Status:"
 
-#: ui/evolution-mail.xml.h:49
-msgid "_Edit Message"
-msgstr "R_edigér melding"
+#~ msgid "task-editor-dialog"
+#~ msgstr "task-editor-dialog"
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Expunge"
-msgstr "_Tøm"
+#~ msgid "I couldn't update your calendar file!\n"
+#~ msgstr "Kunne ikke oppdatere din kalenderfil!\n"
 
-#: ui/evolution-mail.xml.h:51
-msgid "_Filter on Subject"
-msgstr "_Filtrér etter emne"
+#~ msgid "Component successfully updated."
+#~ msgstr "Oppdatering av komponent fullført."
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Forward"
-msgstr "_Videresend"
+#~ msgid "There was an error loading the calendar file."
+#~ msgstr "Det oppsto en feil under lasting av kalenderfilen."
 
-#: ui/evolution-mail.xml.h:53 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Re_versér utvalg"
+#~ msgid "I couldn't open your calendar file!\n"
+#~ msgstr "Kunne ikke åpne din kalenderfil!\n"
 
-#: ui/evolution-mail.xml.h:54
-msgid "_Mail Configuration..."
-msgstr "_E-post konfigurasjon..."
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "Kunne ikke laste din kalenderfil!\n"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Message"
-msgstr "_Melding"
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "Kunne ikke lese din kalenderfil!\n"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Move to Folder..."
-msgstr "F_lytt til mappe..."
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "Dette er et svar fra noen som ikke er invitert!"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Open in New Window"
-msgstr "_Åpne i nytt vindu"
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Kunne ikke oppdatere ditt kalenderlager."
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Print Message"
-msgstr "S_kriv ut melding"
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "Kunne ikke slette kalenderkomponenten!\n"
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Save Message As..."
-msgstr "Lagre melding _som..."
+#~ msgid "Component successfully deleted."
+#~ msgstr "Sletting av komponent fullført."
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Source"
-msgstr "_Kildekode"
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Kan ikke kjenne igjen denne typen kalenderkomponent."
 
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "Med _tråder"
+#~ msgid "Add to Calendar"
+#~ msgstr "Legg til i kalenderen"
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "A_ngre slett"
+#~ msgid "Accept"
+#~ msgstr "Akseptér"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_VFolder for emne"
+#~ msgid "Decline"
+#~ msgstr "Avslå"
 
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Redigering av _virtuelle mapper..."
+#~ msgid "Update Calendar"
+#~ msgstr "Oppdatér kalender"
 
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Legg ved"
+#~ msgid "Cancel Meeting"
+#~ msgstr "Alys møte"
 
-#: ui/evolution-message-composer.xml.h:4
-msgid "Close the current file"
-msgstr "Lukk aktiv fil"
+#~ msgid "Could not create a tasks file in `%s'"
+#~ msgstr "Kunne ikke opprette oppgavefil i `%s'"
 
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "Kryptér denne meldingen med PGP"
+#~ msgid "A_ll day event"
+#~ msgstr "Varer he_le dagen"
 
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
+#~ msgid "Appointment Basics"
+#~ msgstr "Grunnleggende om avtaler"
 
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "Sett inn en tekstfil i meldingen"
+#~ msgid "Custom recurrence"
+#~ msgstr "Egendefinert gjeninntreffelse"
 
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "Sett inn tekstfil..."
+#~ msgid "Days"
+#~ msgstr "Dager"
 
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Åpne en fil"
+#~ msgid "Every"
+#~ msgstr "Hver"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "Kryptér med PGP"
+#~ msgid "Exceptions"
+#~ msgstr "Unntak"
 
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "Signér med PGP"
+#~ msgid "Hours"
+#~ msgstr "Timer"
 
-#: ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Lagre som"
+#~ msgid "Mail _to:"
+#~ msgstr "Send _til:"
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save in _folder... (FIXME)"
-msgstr "Lagre i _mappe..."
+#~ msgid "Minutes"
+#~ msgstr "Minutter"
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in folder..."
-msgstr "Lagre i mappe..."
+#~ msgid "Modify"
+#~ msgstr "Endre"
 
-#: ui/evolution-message-composer.xml.h:20
-msgid "Save the current file with a different name"
-msgstr "Lagre aktiv fil med et nytt navn"
+#~ msgid "No recurrence"
+#~ msgstr "Ingen gjeninntreffelse"
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the message in a specified folder"
-msgstr "Lagre meldingen i en spesifisert mappe"
+#~ msgid "Preview"
+#~ msgstr "Forhåndsvis"
 
-#: ui/evolution-message-composer.xml.h:22
-msgid "Send"
-msgstr "Send"
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vat"
 
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send _Later"
-msgstr "Send se_nere"
+#~ msgid "Pu_blic"
+#~ msgstr "Of_fentlig"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _later"
-msgstr "Send se_nere"
+#~ msgid "Recurrence"
+#~ msgstr "Gjeninntreffelse"
 
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send the mail in HTML format"
-msgstr "Send meldingen i HTML-format"
+#~ msgid "Recurrence Rule"
+#~ msgstr "Regel for gjenintreffelse"
 
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the message later"
-msgstr "Send meldingen senere"
+#~ msgid "Reminder"
+#~ msgstr "Påminnelse"
 
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message now"
-msgstr "Send meldingen nå"
+#~ msgid "Simple recurrence"
+#~ msgstr "Enkel gjeninntreffelse"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send this message now"
-msgstr "Send denne meldingen nå"
+#~ msgid "Su_mmary:"
+#~ msgstr "Sa_mmendrag:"
 
-#: ui/evolution-message-composer.xml.h:29
-msgid "Show / hide attachments"
-msgstr "Vis/skjul vedlegg"
+#~ msgid "Time"
+#~ msgstr "Tid"
 
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show _attachments"
-msgstr "Vis _vedlegg"
+#~ msgid "_Audio"
+#~ msgstr "_Lyd"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show attachments"
-msgstr "Vis vedlegg"
+#~ msgid "_Confidential"
+#~ msgstr "_Konfidensiell"
 
-#: ui/evolution-message-composer.xml.h:32
-msgid "Sign this message with your PGP key"
-msgstr "Signér denne meldingen med din PGP-nøkkel"
+#~ msgid "_Contacts"
+#~ msgstr "_Kontakter"
 
-#: ui/evolution-message-composer.xml.h:39
-msgid "_Insert text file... (FIXME)"
-msgstr "Sett _inn tekstfil..."
+#~ msgid "_End time:"
+#~ msgstr "S_lutt-tid:"
 
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Open..."
-msgstr "_Åpne..."
+#~ msgid "_Mail"
+#~ msgstr "_E-post"
 
-#: ui/evolution-message-composer.xml.h:42
-msgid "_Security"
-msgstr "_Sikkerhet"
+#~ msgid "_Program"
+#~ msgstr "_Program"
 
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Legg til mappe på listen over abonnerte mapper"
+#~ msgid "_Run program:"
+#~ msgstr "Kjø_r program:"
 
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "Les listen på nytt"
+#~ msgid "_Start time:"
+#~ msgstr "_Start-tid:"
 
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "Les mappelisten på nytt"
+#~ msgid "_Starting date:"
+#~ msgstr "_Start dato:"
 
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Fjern mappe fra din liste over abbonerte mapper"
+#~ msgid "day(s)"
+#~ msgstr "dag(er)"
 
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "Abonnér"
+#~ msgid "event-editor-dialog"
+#~ msgstr "event-editor-dialog"
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "Fjern abonnement"
+#~ msgid "for"
+#~ msgstr "for"
 
-#: ui/evolution.xml.h:1
-msgid "Display a different folder"
-msgstr "Vis en annen mappe"
+#~ msgid "forever"
+#~ msgstr "for alltid"
 
-#: ui/evolution.xml.h:2
-msgid "E_xit"
-msgstr "A_vslutt"
+#~ msgid "label21"
+#~ msgstr "etikett21"
 
-#: ui/evolution.xml.h:3
-msgid "Evolution bar _shortcut"
-msgstr "Evolution-linje _snarvei"
+#~ msgid "month(s)"
+#~ msgstr "måned(er)"
 
-#: ui/evolution.xml.h:4
-msgid "Exit the program"
-msgstr "Avslutt programmet"
+#~ msgid "until"
+#~ msgstr "til"
 
-#: ui/evolution.xml.h:5
-msgid "Getting _Started"
-msgstr "Kom _igang"
+#~ msgid "week(s)"
+#~ msgstr "uke(r)"
 
-#: ui/evolution.xml.h:6
-msgid "Show information about Evolution"
-msgstr "Vis informasjon om Evolution"
+#~ msgid "year(s)"
+#~ msgstr "år"
 
-#: ui/evolution.xml.h:7
-msgid "Show the _Folder Bar"
-msgstr "Vis _mappelinjen"
+#~ msgid "Could not load the calendar in `%s'"
+#~ msgstr "Kunne ikke laste kalenderen i `%s'"
 
-#: ui/evolution.xml.h:8
-msgid "Show the _Shortcut Bar"
-msgstr "Vis _snarveilinjen"
+#~ msgid "Could not create a calendar in `%s'"
+#~ msgstr "Kunne ikke opprette kalender i `%s'"
 
-#: ui/evolution.xml.h:9
-msgid "Submit _Bug Report"
-msgstr "Sen_d inn feilrapport"
+#~ msgid "April"
+#~ msgstr "April"
 
-#: ui/evolution.xml.h:10
-msgid "Submit bug report using Bug Buddy."
-msgstr "Send inn feilrapport ved bruk av Bug Buddy."
+#~ msgid "August"
+#~ msgstr "August"
 
-#: ui/evolution.xml.h:11
-msgid "Toggle whether to show the folder bar"
-msgstr "Slå av/på visning av mappelinjen"
+#~ msgid "December"
+#~ msgstr "Desember"
 
-#: ui/evolution.xml.h:12
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Slå av/på visning av snarveilinjen"
+#~ msgid "February"
+#~ msgstr "Februar"
 
-#: ui/evolution.xml.h:13
-msgid "Using the C_ontact Manager"
-msgstr "Bruk av k_ontaktdatabasen"
+#~ msgid "Go To Date"
+#~ msgstr "Gå til dato"
 
-#: ui/evolution.xml.h:14
-msgid "Using the _Calendar"
-msgstr "Bruk av _kalenderen"
+#~ msgid "Go To Today"
+#~ msgstr "Gå til idag"
 
-#: ui/evolution.xml.h:15
-msgid "Using the _Mailer"
-msgstr "Bruk av e-_postprogrammet"
+#~ msgid "January"
+#~ msgstr "Januar"
 
-#: ui/evolution.xml.h:16
-msgid "_About Evolution..."
-msgstr "_Om Evolution..."
+#~ msgid "July"
+#~ msgstr "Juli"
 
-#: ui/evolution.xml.h:17
-msgid "_Appointment (FIXME)"
-msgstr "_Avtale"
+#~ msgid "June"
+#~ msgstr "Juni"
 
-#: ui/evolution.xml.h:18
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt"
+#~ msgid "March"
+#~ msgstr "Mars"
 
-#: ui/evolution.xml.h:21
-msgid "_Folder"
-msgstr "_Mappe"
+#~ msgid "May"
+#~ msgstr "Mai"
 
-#: ui/evolution.xml.h:22
-msgid "_Go to Folder..."
-msgstr "_Gå til mappe..."
+#~ msgid "November"
+#~ msgstr "November"
 
-#: ui/evolution.xml.h:24
-msgid "_Index"
-msgstr "_Indeks"
+#~ msgid "October"
+#~ msgstr "Oktober"
 
-#: ui/evolution.xml.h:25
-msgid "_Mail message (FIXME)"
-msgstr "Send _melding"
+#~ msgid "September"
+#~ msgstr "September"
 
-#: ui/evolution.xml.h:27
-msgid "_Settings"
-msgstr "Inn_stillinger"
+#~ msgid "Server disconnected."
+#~ msgstr "Tjener koblet fra."
 
-#: ui/evolution.xml.h:28
-msgid "_Task (FIXME)"
-msgstr "_Oppgave"
+#~ msgid "UNIX MH-format mail directories (CamelLocal version)"
+#~ msgstr "UNIX e-postkataloger i MH-format (CamelLocal versjon)"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+#~ msgid "UNIX mbox-format mail files (CamelLocal version)"
+#~ msgstr "UNIX e-post filer i mbox-format (CamelLocal versjon)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Opptatt"
+#~ msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+#~ msgstr "UNIX qmail maildir format postfiler (CamelLocal versjon)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Ute"
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Ingen informasjon"
+#~ msgid "Attachment properties"
+#~ msgstr "Egenskaper for vedlegg"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Inviter andre..."
+#~ msgid "File name:"
+#~ msgstr "Filnavn:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Alternativer"
+#~ msgid "MIME type:"
+#~ msgstr "MIME-type:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Vis k_un arbeidstid"
+#~ msgid "Edit VFolders"
+#~ msgstr "Redigér VFoldere"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Vis _zoomet ut"
+#~ msgid "Filter Rules"
+#~ msgstr "Filterregler"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Oppdater fri/ledig"
+#~ msgid "Incoming"
+#~ msgstr "Innkommende"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#~ msgid "Outgoing"
+#~ msgstr "Utgående"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Autovelg"
+#~ msgid "Virtual Folders"
+#~ msgstr "Virtuelle mapper"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#~ msgid "vFolder Sources"
+#~ msgstr "vFolder kilder"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Alle mennesker og ressurser"
+#~ msgid "Save"
+#~ msgstr "Lagre"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Alle _mennesker og en ressurs"
+#~ msgid "Show all hidden"
+#~ msgstr "Vis alle skjulte"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_Nødvendige mennesker"
+#~ msgid "Hide selected"
+#~ msgstr "Skjul valgte"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Nødvendige mennesker _og en ressurs"
+#~ msgid "Hide read"
+#~ msgstr "Skjul leste"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Tid for møtets _start:"
+#~ msgid "Hide deleted"
+#~ msgstr "Skjul slettede"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Tid for møtets slutt:"
+#~ msgid "Hide Subject"
+#~ msgstr "Skjul emne"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Alle deltakere"
+#~ msgid "Hide from Sender"
+#~ msgstr "Skjul fra sender"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "MTWTFSS"
+#~ msgid "Hide Messages"
+#~ msgstr "Skjul meldinger"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Skjul emne \"%s\""
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
+#~ msgid "Hide from Sender <%s>"
+#~ msgstr "Skjul fra sender <%s>"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "nå"
+#~ msgid "Current store format:"
+#~ msgstr "Aktivt lagringsformat:"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "Mailbox Format"
+#~ msgstr "Format for postboks"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#~ msgid "New store format:"
+#~ msgstr "Nytt lagringsformat:"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Gruppe %i"
+#~ msgid ""
+#~ "Note: When converting between mailbox formats, a failure (such as lack of "
+#~ "disk space) may not be automatically recoverable.  Please use this feature "
+#~ "with care."
+#~ msgstr ""
+#~ "Merk: Ved konvertering mellom postboksformater, kan en feil (slik som mangel "
+#~ "på diskplass) ikke nødvendigvis rettes opp igjen. Vennligst bruk denne "
+#~ "funksjonen med forsiktighet."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "You have no mail sources configured"
+#~ msgstr "Du har ikke konfigurert e-postkilder"
+
+#~ msgid "Account"
+#~ msgstr "Konto"
+
+#~ msgid "Account Information"
+#~ msgstr "Kontoinformasjon"
+
+#~ msgid "Account Properties"
+#~ msgstr "Egenskaper for konto"
+
+#~ msgid "Advanced"
+#~ msgstr "Avansert"
+
+#~ msgid "Authentication"
+#~ msgstr "Autentisering"
+
+#~ msgid "Authentication Type:"
+#~ msgstr "Autentiseringstype:"
+
+#~ msgid "Congratulations, your mail configuration is complete.\n"
+#~ msgstr "Gratulerer, konfigurasjon av e-post er fullført.\n"
+
+#~ msgid "DIGEST-MD5"
+#~ msgstr "DIGEST-MD5"
+
+#~ msgid "Done"
+#~ msgstr "Ferdig"
+
+#~ msgid "E-Mail Address:"
+#~ msgstr "E-post adresse:"
+
+#~ msgid "Email Address:"
+#~ msgstr "E-post adresse:"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Evolution e-post-konfigurasjon"
+
+#~ msgid "Full Name:"
+#~ msgstr "Fullt navn:"
+
+#~ msgid "Hostname:"
+#~ msgstr "Vertsnavn:"
+
+#~ msgid "Identity"
+#~ msgstr "Identitet"
+
+#~ msgid "Incoming Mail Server"
+#~ msgstr "E-posttjener for innkommende post"
+
+#~ msgid "Keep mail on server"
+#~ msgstr "Behold e-post på tjener"
+
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos"
+
+#~ msgid "Mail"
+#~ msgstr "E-post"
+
+#~ msgid "Mail Account"
+#~ msgstr "E-post konto"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "E-post-konfigurasjon"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "E-post-konfigurasjonsdruide"
+
+#~ msgid "Make this my default account"
+#~ msgstr "Bruk denne som standard konto"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Forskjellig"
+
+#~ msgid "News"
+#~ msgstr "News"
+
+#~ msgid "Optional"
+#~ msgstr "Valgfri"
+
+#~ msgid "Organization:"
+#~ msgstr "Organisasjon:"
+
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "E-posttjener for utgående post"
+
+#~ msgid "Password:"
+#~ msgstr "Passord:"
+
+#~ msgid "Plain Text"
+#~ msgstr "Vanlig tekst"
+
+#~ msgid "Receiving Email"
+#~ msgstr "Mottar e-post"
+
+#~ msgid "Remember my password"
+#~ msgstr "Husk mitt passord"
+
+#~ msgid "Reply-to:"
+#~ msgstr "Svar-til:"
+
+#~ msgid "Required"
+#~ msgstr "Nødvendige"
+
+#~ msgid "Save password"
+#~ msgstr "Lagre passord"
+
+#~ msgid "Select signature file"
+#~ msgstr "Velg signaturfil"
+
+#~ msgid "Sending Email"
+#~ msgstr "Sender e-post"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Tjenerkonfigurasjon"
+
+#~ msgid "Server Type: "
+#~ msgstr "Tjenertype: "
+
+#~ msgid "Server requires authentication"
+#~ msgstr "Tjener krever autentisering"
+
+#~ msgid "Servers"
+#~ msgstr "Tjenere"
+
+#~ msgid "Signature file:"
+#~ msgstr "Signaturfil:"
+
+#~ msgid "Signature:"
+#~ msgstr "Signatur:"
+
+#~ msgid "Sources"
+#~ msgstr "Kilder"
+
+#~ msgid "This server requires a secure connection (SSL)"
+#~ msgstr "Denne tjeneren krever en sikker forbindelse (SSL)"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr ""
+#~ "Skriv inn et referansenavn for disse tjenerene. For eksempel: \"Arbeid\" "
+#~ "eller \"Hjemme\"."
+
+#~ msgid "User Information"
+#~ msgstr "Brukerinformasjon"
+
+#~ msgid "Username:"
+#~ msgstr "Brukernavn:"
+
+#~ msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+#~ msgstr "Velkommen til konfigurasjonsdruiden for Evolution e-post.\n"
+
+#~ msgid ""
+#~ "Enter your name and email address to be used in outgoing mail. You may also, "
+#~ "optionally, enter the name of your organization, and the name of a file to "
+#~ "read your signature from."
+#~ msgstr ""
+#~ "Skriv inn ditt navn og din e-post adresse for bruk i utgående post. Du kan "
+#~ "også skrive inn navnet på din organisasjon, og navnet på en signaturfil."
+
+#~ msgid "Full name:"
+#~ msgstr "Fullt navn:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-post adresse:"
+
+#~ msgid "Signature File"
+#~ msgstr "Signaturfil"
+
+#~ msgid "Server:"
+#~ msgstr "Tjener:"
+
+#~ msgid "Detect supported types..."
+#~ msgstr "Søk etter støttede typer..."
+
+#~ msgid "Don't delete messages from server"
+#~ msgstr "Ikke slett meldinger fra tjeneren"
+
+#~ msgid "Test Settings"
+#~ msgstr "Prøv ut innstillinger"
+
+#~ msgid "Mail source type:"
+#~ msgstr "Type e-post-kilde:"
+
+#~ msgid ""
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
+#~ "\n"
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
+#~ msgstr ""
+#~ "Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon om "
+#~ "denne.\n"
+#~ "\n"
+#~ "Hvis tjeneren trenger autentisering, kan du klikke på \"Søk etter støttede "
+#~ "typer...\" knappen etter at du har skrevet inn resten av informasjonen."
+
+#~ msgid "News source type:"
+#~ msgstr "Type news-kilde:"
+
+#~ msgid ""
+#~ "Select the kind of news server you have, and enter the relevant information "
+#~ "about it.\n"
+#~ "\n"
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
+#~ msgstr ""
+#~ "Velg hvilken type news-tjener du har, og skriv inn relevant informasjon om "
+#~ "denne.\n"
+#~ "\n"
+#~ "Hvis tjeneren trenger autentisering, kan du klikke på \"Søk etter støttede "
+#~ "typer...\"-knappen etter at du har skrevet inn resten av informasjonen."
+
+#~ msgid "Mail transport type:"
+#~ msgstr "Type e-post-transport"
+
+#~ msgid ""
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
+#~ msgstr ""
+#~ "Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon om "
+#~ "denne.\n"
+#~ "Hvis tjeneren trenger autentisering, kan du klikke på \"Søk etter støttede "
+#~ "typer...\" knappen etter at du har skrevet inn resten av informasjonen."
+
+#~ msgid "Add Identity"
+#~ msgstr "Legg til identitet"
+
+#~ msgid "Edit Identity"
+#~ msgstr "Rediger identitet"
+
+#~ msgid "Add Source"
+#~ msgstr "Legg til kilde"
+
+#~ msgid "Edit Source"
+#~ msgstr "Rediger kilde"
+
+#~ msgid "Add News Server"
+#~ msgstr "Legg til news-tjener"
+
+#~ msgid "Edit News Server"
+#~ msgstr "Redigér news-tjener"
+
+#~ msgid "Testing \"%s\""
+#~ msgstr "Tester \"%s\""
+
+#~ msgid "The connection was successful!"
+#~ msgstr "Tilkoblingen var vellykket!"
+
+#~ msgid "Querying authorization capabilities of \"%s\""
+#~ msgstr "Spør etter autorisasjonsegenskaper for \"%s\""
+
+#~ msgid "Query authorization at \"%s\""
+#~ msgstr "Spør etter autorisasjon hos \"%s\""
+
+#~ msgid "Address"
+#~ msgstr "Adresse"
+
+#~ msgid "Identities"
+#~ msgstr "Identiteter"
+
+#~ msgid "Mail Sources"
+#~ msgstr "E-post-kilder"
+
+#~ msgid "Mail Transport"
+#~ msgstr "E-post-transport"
+
+#~ msgid "Mark message as seen [ms]: "
+#~ msgstr "Merk melding som sett [ms]: "
+
+#~ msgid "News Servers"
+#~ msgstr "News-tjenere"
+
+#~ msgid "News Sources"
+#~ msgstr "News-kilder"
+
+#~ msgid "Send messages in HTML format"
+#~ msgstr "Send meldinger i HTML-format"
+
+#~ msgid "No GPG/PGP support available in this copy of Evolution."
+#~ msgstr "Ingen GPG/PGP-støtte tilgjengelig i denne versjonen av Evolution."
+
+#~ msgid "Create a new contact"
+#~ msgstr "Opprett en ny kontakt"
+
+#~ msgid "Delete a contact"
+#~ msgstr "Slett en kontakt"
+
+#~ msgid "Find"
+#~ msgstr "Finn"
+
+#~ msgid "Find a contact"
+#~ msgstr "Finn en kontakt"
+
+#~ msgid "Print contacts"
+#~ msgstr "Skriv ut kontakter"
+
+#~ msgid "Stop"
+#~ msgstr "Stopp"
+
+#~ msgid "Stop Loading"
+#~ msgstr "Stopp innlesing"
+
+#~ msgid "View All"
+#~ msgstr "Vis alle"
+
+#~ msgid "View all contacts"
+#~ msgstr "Vis alle kontakter"
+
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Konfigurasjon av adressebok..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "S_kriv ut kontakter..."
+
+#~ msgid "_Search for contacts"
+#~ msgstr "_Søk etter kontakter"
+
+#~ msgid "5 Days"
+#~ msgstr "5 dager"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Endre brukervalg"
+
+#~ msgid "Ca_lendar"
+#~ msgstr "Ka_lender"
+
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Brukervalg for kalender..."
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Opprett en ny avtale"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Opprett en ny kalender"
+
+#~ msgid "Day"
+#~ msgstr "Dag"
+
+#~ msgid "Go back in time"
+#~ msgstr "Gå tilbake i tid"
+
+#~ msgid "Go forward in time"
+#~ msgstr "Gå fremover i tid"
+
+#~ msgid "Go to"
+#~ msgstr "Gå til"
+
+#~ msgid "Go to a specific date"
+#~ msgstr "Gå til en spesifikk dato"
+
+#~ msgid "Go to present time"
+#~ msgstr "Gå til i dag"
+
+#~ msgid "Month"
+#~ msgstr "Måned"
+
+#~ msgid "Next"
+#~ msgstr "Neste"
+
+#~ msgid "Open a calendar"
+#~ msgstr "Åpne en kalender"
+
+#~ msgid "Prev"
+#~ msgstr "Forrige"
+
+#~ msgid "Print this calendar"
+#~ msgstr "Skriv ut denne kalenderen"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Lagre kalender som noe annet"
+
+#~ msgid "Show 1 day"
+#~ msgstr "Vis 1 dag"
+
+#~ msgid "Show 1 month"
+#~ msgstr "Vis 1 måned"
+
+#~ msgid "Show 1 week"
+#~ msgstr "Vis 1 uke"
+
+#~ msgid "Show the working week"
+#~ msgstr "Vis arbeidsuken"
+
+#~ msgid "Week"
+#~ msgstr "Uke"
+
+#~ msgid "_New"
+#~ msgstr "_Ny"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Åpne kalender"
+
+#~ msgid "_Print this calendar"
+#~ msgstr "S_kriv ut denne kalenderen"
+
+#~ msgid "_Save As..."
+#~ msgstr "Lagre _som..."
+
+#~ msgid "Delete this item"
+#~ msgstr "Slett denne oppføringen"
+
+#~ msgid "Delete..."
+#~ msgstr "Slett..."
+
+#~ msgid "Help"
+#~ msgstr "Hjelp"
+
+#~ msgid "Print En_velope..."
+#~ msgstr "Skriv ut konvolutt..."
+
+#~ msgid "Print this item"
+#~ msgstr "Skriv ut denne oppføringen"
+
+#~ msgid "Print..."
+#~ msgstr "Skriv ut..."
+
+#~ msgid "Save _As..."
+#~ msgstr "L_agre som..."
+
+#~ msgid "Save and Close"
+#~ msgstr "Lagre og lukk"
+
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Lagre kontakten og lukk dialogboksen"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "Se_nd kontakt til andre..."
+
+#~ msgid "See online help"
+#~ msgstr "Se hjelp"
+
+#~ msgid "_File"
+#~ msgstr "_Fil"
+
+#~ msgid "_Print..."
+#~ msgstr "S_kriv ut..."
+
+#~ msgid "_Save"
+#~ msgstr "_Lagre"
+
+#~ msgid "About this application"
+#~ msgstr "Om denne applikasjonen"
+
+#~ msgid "About..."
+#~ msgstr "Om..."
+
+#~ msgid "C_lear"
+#~ msgstr "T_øm"
+
+#~ msgid "C_ut"
+#~ msgstr "Klipp _ut"
+
+#~ msgid "Clear"
+#~ msgstr "Tøm"
+
+#~ msgid "Clear the selection"
+#~ msgstr "Tøm utvalget"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Lukk denne avtalen"
+
+#~ msgid "Copy"
+#~ msgstr "Kopiér"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Kopiér utvalget"
+
+#~ msgid "Cut"
+#~ msgstr "Klipp ut"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Klipp ut utvalget"
+
+#~ msgid "Dump XML"
+#~ msgstr "Dump XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Dump beskrivelse av grensesnittet som XML"
+
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "Addresse_bok..."
+
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "Sjek_k navn"
+
+#~ msgid "FIXME: Help"
+#~ msgstr "Hjelp"
+
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "U_komplett oppgave"
+
+#~ msgid "FIXME: Insert File"
+#~ msgstr "Sett inn fil"
+
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "Gjentakelse..."
+
+#~ msgid "FIXME: _Formatting"
+#~ msgstr "_Formatering"
+
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "_Ny avtale"
+
+#~ msgid "FIXME: what goes here?"
+#~ msgstr "Hva går her?"
+
+#~ msgid "Find Again"
+#~ msgstr "Finn igjen"
+
+#~ msgid "Find _Again"
+#~ msgstr "Finn ig_jen"
+
+#~ msgid "Modify the file's properties"
+#~ msgstr "Endre filens egenskaper"
+
+#~ msgid "N_ext"
+#~ msgstr "N_este"
+
+#~ msgid "Paste"
+#~ msgstr "Lim inn"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "Lim inn fra utklippstavlen"
+
+#~ msgid "Previous"
+#~ msgstr "Forrige"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Skriveropps_ett..."
+
+#~ msgid "Print Setup"
+#~ msgstr "Skriveroppsett"
+
+#~ msgid "Properties"
+#~ msgstr "Egenskaper"
+
+#~ msgid "Redo"
+#~ msgstr "Gjenopprett"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Gjenopprett angret handling"
+
+#~ msgid "Replace"
+#~ msgstr "Erstatt"
+
+#~ msgid "Replace a string"
+#~ msgstr "Erstattt en streng"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Lagre avtalen og lukk dialogboksen"
+
+#~ msgid "Save the current file"
+#~ msgstr "Lagre aktiv fil"
+
+#~ msgid "Schedule Meeting"
+#~ msgstr "Sett opp møte"
+
+#~ msgid "Schedule _Meeting"
+#~ msgstr "Sett opp _møte"
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Sett opp ett eller annet møte"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Søk etter samme streng på nytt"
+
+#~ msgid "Search for a string"
+#~ msgstr "Søk etter en streng"
+
+#~ msgid "Select All"
+#~ msgstr "Velg alle"
+
+#~ msgid "Select everything"
+#~ msgstr "Velg alt"
+
+#~ msgid "Setup the page settings for your current printer"
+#~ msgstr "Redigér sideinnstillinger for aktiv skriver"
+
+#~ msgid "Undo"
+#~ msgstr "Angre"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Angre siste handling"
+
+#~ msgid "_About..."
+#~ msgstr "_Om..."
+
+#~ msgid "_Close"
+#~ msgstr "L_ukk"
+
+#~ msgid "_Copy"
+#~ msgstr "_Kopiér"
+
+#~ msgid "_Debug"
+#~ msgstr "_Feilsøk"
+
+#~ msgid "_Edit"
+#~ msgstr "R_edigér"
+
+#~ msgid "_Find..."
+#~ msgstr "_Finn..."
+
+#~ msgid "_Help"
+#~ msgstr "_Hjelp"
+
+#~ msgid "_Paste"
+#~ msgstr "_Lim inn"
+
+#~ msgid "_Print"
+#~ msgstr "S_kriv ut"
+
+#~ msgid "_Properties..."
+#~ msgstr "Egenska_per..."
+
+#~ msgid "_Redo"
+#~ msgstr "Gjenopp_rett"
+
+#~ msgid "_Replace..."
+#~ msgstr "E_rstatt..."
+
+#~ msgid "_Undo"
+#~ msgstr "_Angre"
+
+#~ msgid "Compose"
+#~ msgstr "Komponér"
+
+#~ msgid "Compose a new message"
+#~ msgstr "Komponér en ny melding"
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Kopiér meldingen til en ny mappe"
+
+#~ msgid "F_older"
+#~ msgstr "M_appe"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Fi_ltrér etter sender"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "F_iltrér etter mottaker"
+
+#~ msgid "Forget _Passwords"
+#~ msgstr "Glem _passord"
+
+#~ msgid "Get Mail"
+#~ msgstr "Hent e-post"
+
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "Skjul slette_de meldinger"
+
+#~ msgid "Hide _Read messages"
+#~ msgstr "Skjul le_ste meldinger"
+
+#~ msgid "Hide _Selected messages"
+#~ msgstr "_Skjul valgte meldinger"
+
+#~ msgid "Mail _Filters..."
+#~ msgstr "E-post _filtre..."
+
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "Håndtér abonnement..."
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Mar_kér som lest"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Merk som _ulest"
+
+#~ msgid "Move"
+#~ msgstr "Flytt"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Flytt meldingen til en ny mappe"
+
+#~ msgid "Previews the message to be printed"
+#~ msgstr "Viser forhåndsvisning av meldingen som skal skrives ut"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Vis forhåndsvisning av melding..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Skriv ut denne meldingen på skriveren"
+
+#~ msgid "Print message..."
+#~ msgstr "Skriv ut melding..."
+
+#~ msgid "Reply to _All"
+#~ msgstr "Svar til _alle"
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Svar til _sender"
+
+#~ msgid "Select _All"
+#~ msgstr "Velg _alle"
+
+#~ msgid "Send queued mail and retrieve new mail"
+#~ msgstr "Send kølagt e-post og hent ny e-post"
+
+#~ msgid "Show _All messages"
+#~ msgstr "Vis _alle meldinger"
+
+#~ msgid "Threaded Message list"
+#~ msgstr "Meldingsliste med tråder"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "VFolder for se_nder"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "VFolder for mottake_re"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Vis rå meldingskode"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Påfør filtre"
+
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_Kopiér til mappe..."
+
+#~ msgid "_Edit Message"
+#~ msgstr "R_edigér melding"
+
+#~ msgid "_Expunge"
+#~ msgstr "_Tøm"
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filtrér etter emne"
+
+#~ msgid "_Forward"
+#~ msgstr "_Videresend"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "Re_versér utvalg"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_E-post konfigurasjon..."
+
+#~ msgid "_Message"
+#~ msgstr "_Melding"
+
+#~ msgid "_Move to Folder..."
+#~ msgstr "F_lytt til mappe..."
+
+#~ msgid "_Open in New Window"
+#~ msgstr "_Åpne i nytt vindu"
+
+#~ msgid "_Print Message"
+#~ msgstr "S_kriv ut melding"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "Lagre melding _som..."
+
+#~ msgid "_Source"
+#~ msgstr "_Kildekode"
+
+#~ msgid "_Threaded"
+#~ msgstr "Med _tråder"
+
+#~ msgid "_Undelete"
+#~ msgstr "A_ngre slett"
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_VFolder for emne"
+
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "Redigering av _virtuelle mapper..."
+
+#~ msgid "Attach"
+#~ msgstr "Legg ved"
+
+#~ msgid "Close the current file"
+#~ msgstr "Lukk aktiv fil"
+
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "Kryptér denne meldingen med PGP"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Sett inn en tekstfil i meldingen"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Sett inn tekstfil..."
+
+#~ msgid "Open a file"
+#~ msgstr "Åpne en fil"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "Kryptér med PGP"
+
+#~ msgid "PGP Sign"
+#~ msgstr "Signér med PGP"
+
+#~ msgid "Save As"
+#~ msgstr "Lagre som"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Lagre i _mappe..."
+
+#~ msgid "Save in folder..."
+#~ msgstr "Lagre i mappe..."
+
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Lagre aktiv fil med et nytt navn"
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Lagre meldingen i en spesifisert mappe"
+
+#~ msgid "Send"
+#~ msgstr "Send"
+
+#~ msgid "Send _Later"
+#~ msgstr "Send se_nere"
+
+#~ msgid "Send _later"
+#~ msgstr "Send se_nere"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Send meldingen i HTML-format"
+
+#~ msgid "Send the message later"
+#~ msgstr "Send meldingen senere"
+
+#~ msgid "Send the message now"
+#~ msgstr "Send meldingen nå"
+
+#~ msgid "Send this message now"
+#~ msgstr "Send denne meldingen nå"
+
+#~ msgid "Show / hide attachments"
+#~ msgstr "Vis/skjul vedlegg"
+
+#~ msgid "Show _attachments"
+#~ msgstr "Vis _vedlegg"
+
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "Signér denne meldingen med din PGP-nøkkel"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "Sett _inn tekstfil..."
+
+#~ msgid "_Open..."
+#~ msgstr "_Åpne..."
+
+#~ msgid "_Security"
+#~ msgstr "_Sikkerhet"
+
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "Legg til mappe på listen over abonnerte mapper"
+
+#~ msgid "Refresh List"
+#~ msgstr "Les listen på nytt"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Les mappelisten på nytt"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Fjern mappe fra din liste over abbonerte mapper"
+
+#~ msgid "Subscribe"
+#~ msgstr "Abonnér"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Fjern abonnement"
+
+#~ msgid "Display a different folder"
+#~ msgstr "Vis en annen mappe"
+
+#~ msgid "E_xit"
+#~ msgstr "A_vslutt"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution-linje _snarvei"
+
+#~ msgid "Exit the program"
+#~ msgstr "Avslutt programmet"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Kom _igang"
+
+#~ msgid "Show information about Evolution"
+#~ msgstr "Vis informasjon om Evolution"
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Vis _mappelinjen"
+
+#~ msgid "Submit _Bug Report"
+#~ msgstr "Sen_d inn feilrapport"
+
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "Send inn feilrapport ved bruk av Bug Buddy."
+
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "Slå av/på visning av mappelinjen"
+
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "Slå av/på visning av snarveilinjen"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Bruk av k_ontaktdatabasen"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Bruk av _kalenderen"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Bruk av e-_postprogrammet"
+
+#~ msgid "_About Evolution..."
+#~ msgstr "_Om Evolution..."
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Avtale"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Kontakt"
+
+#~ msgid "_Folder"
+#~ msgstr "_Mappe"
+
+#~ msgid "_Go to Folder..."
+#~ msgstr "_Gå til mappe..."
+
+#~ msgid "_Index"
+#~ msgstr "_Indeks"
+
+#~ msgid "_Mail message (FIXME)"
+#~ msgstr "Send _melding"
+
+#~ msgid "_Settings"
+#~ msgstr "Inn_stillinger"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Oppgave"
 
 #~ msgid "Automatically check mail every "
 #~ msgstr "Sjekk etter e-post hver "
@@ -7068,9 +6934,6 @@ msgstr "Gruppe %i"
 #~ msgid "minute(s)"
 #~ msgstr "minutt(er)"
 
-#~ msgid "categories"
-#~ msgstr "kategorier"
-
 #~ msgid "Item(s) belong to these categories:"
 #~ msgstr "Oppføring(er) hører til disse kategoriene:"
 
@@ -7162,30 +7025,6 @@ msgstr "Gruppe %i"
 #~ msgid "Note: When converting between mailbox formats, a failure\n"
 #~ msgstr "Merk: Ved konvertering mellom postboksformater, kan en feil\n"
 
-#~ msgid "FIXME: _Appointment"
-#~ msgstr "_Avtale"
-
-#~ msgid "FIXME: Meeting Re_quest"
-#~ msgstr "Møteforesp_ørsel"
-
-#~ msgid "Page Set_up"
-#~ msgstr "Sideoppsett"
-
-#~ msgid "FIXME: Mark as U_nread"
-#~ msgstr "Merk som ulest"
-
-#~ msgid "FIXME: __Formatting"
-#~ msgstr "_Formatering"
-
-#~ msgid "Ne_xt"
-#~ msgstr "Nes_te"
-
-#~ msgid "FIXME: Previous"
-#~ msgstr "Forrige"
-
-#~ msgid "FIXME: Next"
-#~ msgstr "Neste"
-
 #~ msgid "External Directories"
 #~ msgstr "Eksterne kataloger"
 
@@ -7408,16 +7247,6 @@ msgstr "Gruppe %i"
 #~ msgid "Cannot get message: %s"
 #~ msgstr "Kan ikke hente melding: %s"
 
-#~ msgid "UNIX mbox-format mail files"
-#~ msgstr "UNIX e-post filer i mbox-format"
-
-#~ msgid ""
-#~ "For reading mail delivered by the local system, and for storing mail on "
-#~ "local disk."
-#~ msgstr ""
-#~ "For lesing av e-post levert av det lokale systemet, og for lagring av e-post "
-#~ "på lokal disk."
-
 #~ msgid "Could not rename folder %s to %s: destination exists"
 #~ msgstr "Kunne ikke endre navn på mappe %s til %s: målet eksisterer"
 
@@ -7442,9 +7271,6 @@ msgstr "Gruppe %i"
 #~ msgid "Cannot append message to mh folder: %s"
 #~ msgstr "Kan ikke legge til melding i mh-mappe: %s"
 
-#~ msgid "UNIX MH-format mail directories"
-#~ msgstr "UNIX e-postkataloger i MH-format"
-
 #~ msgid "Could not rename folder `%s': %s"
 #~ msgstr "Kunne ikke endre navn på mappe `%s': %s"
 
@@ -7475,9 +7301,6 @@ msgstr "Gruppe %i"
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Kan ikke initiere Evolutions e-postlagrings-hash."
 
-#~ msgid "Flagged"
-#~ msgstr "Merket"
-
 #~ msgid "Set Flag"
 #~ msgstr "Sett flagg"
 
@@ -7493,9 +7316,6 @@ msgstr "Gruppe %i"
 #~ msgid "_Open"
 #~ msgstr "_Åpne"
 
-#~ msgid "Create a new folder"
-#~ msgstr "Opprett en ny mappe"
-
 #~ msgid "_Create New Folder..."
 #~ msgstr "Opprett ny mappe..."
 
@@ -7605,9 +7425,6 @@ msgstr "Gruppe %i"
 #~ msgid "Preferences"
 #~ msgstr "Brukervalg"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmer"
-
 #~ msgid "Alarm Properties"
 #~ msgstr "Egenskaper for alarmer"
 
@@ -7852,9 +7669,6 @@ msgstr "Gruppe %i"
 #~ msgid "End on "
 #~ msgstr "Slutt på "
 
-#~ msgid "End after"
-#~ msgstr "Slutt etter"
-
 #~ msgid "Change"
 #~ msgstr "Endre"
author	Dave Camp <dave@ximian.com>	2001-01-18 13:11:02 +0800
committer	Dave Camp <campd@src.gnome.org>	2001-01-18 13:11:02 +0800
commit	c90d8e6799b27b7964db9f3d4874557db8d313ac (patch)
tree	3381f029d4507fa8ba260aa55c7388cef5992271 /po/no.po
parent	809a9d80148789de20f4d00ec49dce7ead5a3399 (diff)
download	gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.gz gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.bz2 gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.lz gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.xz gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.zst gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.zip