Updated Norwegian (bokmål) translation.

2001-01-09 Kjartan Maraas <kmaraas@gnome.org> * no.po: Updated Norwegian (bokmål) translation. svn path=/trunk/; revision=7317
author: Kjartan Maraas <kmaraas@gnome.org> 2001-01-09 20:42:06 +0800
committer: Kjartan Maraas <kmaraas@src.gnome.org> 2001-01-09 20:42:06 +0800
commit: af5d7854bb8392904e09bfd7fa208f1426bc6b81 (patch)
tree: cea1da1c4826dd9dcd520a0d1e8870c405a17873 /po/nn.po
parent: 0cf53e3e5840295efe3462ad0b341d1f45640103 (diff)
download: gsoc2013-evolution-af5d7854bb8392904e09bfd7fa208f1426bc6b81.tar
gsoc2013-evolution-af5d7854bb8392904e09bfd7fa208f1426bc6b81.tar.gz
gsoc2013-evolution-af5d7854bb8392904e09bfd7fa208f1426bc6b81.tar.bz2
gsoc2013-evolution-af5d7854bb8392904e09bfd7fa208f1426bc6b81.tar.lz
gsoc2013-evolution-af5d7854bb8392904e09bfd7fa208f1426bc6b81.tar.xz
gsoc2013-evolution-af5d7854bb8392904e09bfd7fa208f1426bc6b81.tar.zst
gsoc2013-evolution-af5d7854bb8392904e09bfd7fa208f1426bc6b81.zip
1 files changed, 2421 insertions, 1732 deletions
diff --git a/po/nn.po b/po/nn.po
index 5fe77edc5f..df47638b0f 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Gaute Hvoslef Kvalnes.
 # Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>, 2000.
 #
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: KDE PIM/abbrowser\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-09-07 20:17+02:00\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>\n"
 "Language-Team: Norwegian (Nynorsk)\n"
@@ -249,10 +250,10 @@ msgstr "Praksis"
 #: 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:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikkje initiere Bonobo"
 
@@ -378,57 +379,38 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr "Feil under opning av dette dokumentet"
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 #, fuzzy
 msgid "Could not start wombat server"
 msgstr "Kunne ikkje starta underprosess."
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "Kunne ikkje starta %1."
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/categories-strings.h:7
-#, fuzzy
-msgid "categories"
-msgstr "Kategoriar"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr ""
-
-#: addressbook/contact-editor/categories-strings.h:9
-#, fuzzy
-msgid "Available Categories:"
-msgstr "Tilgjengelege kategoriar"
-
-#.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
 #, fuzzy
 msgid "Delete Contact?"
 msgstr "Slett kolonne"
@@ -444,7 +426,7 @@ msgid "_Add"
 msgstr "Legg til"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 #, fuzzy
 msgid "_Delete"
 msgstr "Slett"
@@ -461,12 +443,13 @@ msgid "New phone type"
 msgstr "&Ny type"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
-#: po/tmp/mail-config.glade.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
+#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr "Legg til"
 
@@ -515,7 +498,7 @@ msgid "_Mobile"
 msgstr "Mobil:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1328
+#: addressbook/contact-editor/e-contact-editor.c:1336
 #, fuzzy
 msgid "Primary Email"
 msgstr "Primær&oppsett"
@@ -536,7 +519,7 @@ msgid "C_ontacts..."
 msgstr "&Innhald ..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/task-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 #, fuzzy
 msgid "Ca_tegories..."
 msgstr "Kategoriar ..."
@@ -557,7 +540,8 @@ msgid "_Address..."
 msgstr "Adresse"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:15
+#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "Generelt"
 
@@ -612,160 +596,160 @@ msgid "No_tes:"
 msgstr "Notat:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: po/tmp/task-editor-dialog.glade.h:13
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Detaljar"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 #, fuzzy
 msgid "Assistant"
 msgstr "Namn på assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1267
-#: addressbook/contact-editor/e-contact-editor.c:1371
+#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1379
 msgid "Business"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 #, fuzzy
 msgid "Business 2"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "Firma-fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1270
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Callback"
 msgstr "Ring tilbake"
 
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1279
 #, fuzzy
 msgid "Car"
 msgstr "Teikn"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/contact-editor/e-contact-editor.c:1372
+#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1380
 msgid "Home"
 msgstr "Heim"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 #, fuzzy
 msgid "Home 2"
 msgstr "Heim"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "Heime-faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/contact-editor/e-contact-editor.c:1285
 #, fuzzy
 msgid "Mobile"
 msgstr "Mobil:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1373
-#: po/tmp/mail-config.glade.h:17
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/contact-editor/e-contact-editor.c:1381
+#: mail/mail-config.glade.h:17
 msgid "Other"
 msgstr "Anna"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "Alternativ faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "Personsøkjar"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 #, fuzzy
 msgid "Primary"
 msgstr "Privat"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1290
 #, fuzzy
 msgid "Radio"
 msgstr "Tilfeldig"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1292
 #, fuzzy
 msgid "TTY/TDD"
 msgstr "TTY/TDD-telefon"
 
-#: addressbook/contact-editor/e-contact-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:1337
 #, fuzzy
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 #, fuzzy
 msgid "Email 3"
 msgstr "E-post 3"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/fulladdr.glade.h:6
+#: addressbook/contact-editor/fulladdr.glade.h:6
 #, fuzzy
 msgid "Address _2:"
 msgstr "Adresse"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "Canada"
 msgstr ""
 
-#: po/tmp/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:8
 #, fuzzy
 msgid "Check Address"
 msgstr "Alternativ adresse"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:9
 #, fuzzy
 msgid "Countr_y:"
 msgstr "Land:"
 
-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "Finland"
 msgstr ""
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "USA"
 msgstr ""
 
-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:12
 #, fuzzy
 msgid "_Address:"
 msgstr "Adresse"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 #, fuzzy
 msgid "_City:"
 msgstr "Stad:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:14
 #, fuzzy
 msgid "_PO Box:"
 msgstr "Postboks"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:15
 #, fuzzy
 msgid "_State/Province:"
 msgstr "Stat/provins"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 #, fuzzy
 msgid "_ZIP Code:"
 msgstr "ZIP/Postnummer"
@@ -785,10 +769,12 @@ msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -799,52 +785,57 @@ msgid ""
 "Esq.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 #, fuzzy
 msgid "_First:"
 msgstr "Førenamn"
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 #, fuzzy
 msgid "_Title:"
 msgstr "Tittel:"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 #, fuzzy
 msgid "_Middle:"
 msgstr "Midt på:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 #, fuzzy
 msgid "_Last:"
 msgstr "Etternamn"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 #, fuzzy
 msgid "_Suffix:"
 msgstr "Etterstaving"
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 #, fuzzy
 msgid "As _Minicards"
 msgstr "Bruk jokerteikn"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 #, fuzzy
 msgid "As _Table"
 msgstr "Tabell"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+#, c-format
+msgid "Enter password for %s"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:402
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "Kan ikkje opna adresseboka."
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:407
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -856,85 +847,212 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 msgid "Show All"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 #, fuzzy
 msgid "Advanced..."
 msgstr "Legg til ..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 #, fuzzy
 msgid "Email contains"
 msgstr "Små ikon"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/gui/component/e-ldap-storage.c:88
+#: addressbook/gui/component/addressbook-storage.c:95
 #, fuzzy
-msgid "External Directories"
-msgstr "Separate katalogar"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "Skildring:"
+msgid "Other Contacts"
+msgstr "Slett kolonne"
 
-#: po/tmp/ldap-server-dialog.glade.h:7
+#: addressbook/gui/component/addressbook-config.c:139
 #, fuzzy
-msgid "LDAP Server:"
+msgid "LDAP Server"
 msgstr "Tenar:"
 
-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
-msgstr "Navn:"
+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "Fil"
+
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "Kan ikkje opna adresseboka."
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "None (anonymous mode)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:155
+#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/pop3/camel-pop3-store.c:148
+msgid "Password"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:160
+#, fuzzy
+msgid "Unknown auth type"
+msgstr "Ukjend feil"
+
+#: addressbook/gui/component/addressbook-config.c:169
+#, fuzzy
+msgid "Base"
+msgstr "Lim inn"
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "Portnummer:"
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/addressbook-config.c:173
+#, fuzzy
+msgid "Subtree"
+msgstr "Kjelder"
+
+#: addressbook/gui/component/addressbook-config.c:176
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:309
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:311
+#: mail/mail-config-gui.c:968
+msgid "Remember this password"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:360
+#: mail/mail-config-druid.glade.h:34
+#, fuzzy
+msgid "Host:"
+msgstr "time/timar"
+
+#: addressbook/gui/component/addressbook-config.c:361
+#, fuzzy
+msgid "Port:"
+msgstr "Prioritet:"
+
+#: addressbook/gui/component/addressbook-config.c:364
 #, fuzzy
 msgid "Root DN:"
 msgstr "Rot"
 
+#: addressbook/gui/component/addressbook-config.c:384
+#, fuzzy
+msgid "Search Scope:"
+msgstr "Søk"
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "Autentisering:"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "Sti:"
+
+#: addressbook/gui/component/addressbook-config.c:460
+#, fuzzy
+msgid "Create path if it doesn't exist."
+msgstr "Fila finst ikkje\n"
+
+#: addressbook/gui/component/addressbook-config.c:593
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "KDE adressebok"
+
+#: addressbook/gui/component/addressbook-config.c:595
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "KDE adressebok"
+
+#: addressbook/gui/component/addressbook-config.c:611
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:616
+#: mail/mail-config-druid.glade.h:45
+msgid "Name:"
+msgstr "Navn:"
+
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Description:"
+msgstr "Skildring:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Kjelde:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#: calendar/gui/e-calendar-table.c:342
+#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
+#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
+#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
+#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
+msgid "Delete"
+msgstr "Slett"
+
+#: addressbook/gui/component/addressbook-config.glade.h:9
+#: filter/filter.glade.h:8 mail/folder-browser.c:671
+#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
+msgid "Edit"
+msgstr "Rediger"
+
+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid "Name"
+msgstr "Namn"
+
+#: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
+msgid "URI"
+msgstr "URL"
+
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Find..."
 msgstr "Finn ..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
 msgid "Message Recipients"
 msgstr "Melding motteken"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 #, fuzzy
 msgid "Select Names"
 msgstr "Merk område"
 
-#: po/tmp/select-names.glade.h:9
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 #, fuzzy
-msgid "Select name from List:"
+msgid "Select name from:"
 msgstr "Vel ei gruppe først."
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
@@ -943,135 +1061,135 @@ msgid "Search"
 msgstr "Søk"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/alphabet.glade.h:6
+#: addressbook/gui/widgets/alphabet.glade.h:6
 msgid "123"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:7
+#: addressbook/gui/widgets/alphabet.glade.h:7
 #, fuzzy
 msgid "a"
 msgstr "am"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 #, fuzzy
 msgid "b"
 msgstr "av"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 #, fuzzy
 msgid "c"
 msgstr "cm"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 #, fuzzy
 msgid "d"
 msgstr "Id"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 #, fuzzy
 msgid "g"
 msgstr "gs"
 
-#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 #, fuzzy
 msgid "i"
 msgstr "er"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 #, fuzzy
 msgid "k"
 msgstr "Ok"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 #, fuzzy
 msgid "m"
 msgstr "ms"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 #, fuzzy
 msgid "n"
 msgstr "På"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 #, fuzzy
 msgid "o"
 msgstr "Nei"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 #, fuzzy
 msgid "p"
 msgstr "pm"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 #, fuzzy
 msgid "r"
 msgstr "Dr"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 #, fuzzy
 msgid "t"
 msgstr "Qt"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 #, fuzzy
 msgid "x"
 msgstr "Tx"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 #, fuzzy
 msgid "y"
 msgstr "av"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 #, fuzzy
 msgid "z"
 msgstr "Hz"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 #, fuzzy
 msgid "Save as VCard"
 msgstr "Lagra som"
@@ -1091,206 +1209,195 @@ msgid ""
 msgstr ""
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/e-contact-print.glade.h:6
+#: addressbook/printing/e-contact-print.glade.h:6
 msgid "10 pt. Tahoma"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "Kropp"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Botn:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 #, fuzzy
 msgid "Dimensions:"
 msgstr "Dimensjonar"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Skrifttype ..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Skrifttypar"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:14
 #, fuzzy
 msgid "Footer:"
 msgstr "Botntekst"
 
-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Format"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "Dekl."
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:17
 #, fuzzy
 msgid "Header/Footer"
 msgstr "&Topp-/botntekst ..."
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:18
 #, fuzzy
 msgid "Headings"
 msgstr "Les"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:19
 #, fuzzy
 msgid "Headings for each letter"
 msgstr "Les mapper"
 
-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "Høgd:"
 
-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:22
 #, fuzzy
 msgid "Include:"
 msgstr "Inkluder fil"
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Liggjande"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Venstre:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:26
 #, fuzzy
 msgid "Margins"
 msgstr "&Marg"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 #, fuzzy
 msgid "Number of columns:"
 msgstr "Tal på kolonnar:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Val"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Retning"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Side"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 #, fuzzy
 msgid "Page Setup:"
 msgstr "Speloppsett"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Papir"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 #, fuzzy
 msgid "Paper source:"
 msgstr "Papir&storleik:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Ståande"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Førehandsvising:"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:36
 #, fuzzy
 msgid "Print using gray shading"
 msgstr "Skriv med grånyansar"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:37
 #, fuzzy
 msgid "Reverse on even pages"
 msgstr "Merk partal-sider"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Høgre:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 #, fuzzy
 msgid "Sections:"
 msgstr "Del:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 #, fuzzy
 msgid "Shading"
 msgstr "Lagring"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Storleik:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 #, fuzzy
 msgid "Start on a new page"
 msgstr "Startar nytt spel ..."
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 #, fuzzy
 msgid "Style name:"
 msgstr "Typenamn:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Topp:"
 
-#: po/tmp/e-contact-print.glade.h:45
+#: addressbook/printing/e-contact-print.glade.h:45
+#: mail/mail-config-druid.glade.h:75
 msgid "Type:"
 msgstr "Type:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Breidd:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 #, fuzzy
 msgid "label26"
 msgstr "Etikett"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr "pm"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 #, fuzzy
 msgid "Evolution Calendar Conduit"
@@ -1301,14 +1408,14 @@ msgstr "Tilgjengelege lenkjer:"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Øydelagd oppsettfil."
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 #, fuzzy
 msgid "Error while communicating with calendar server"
 msgstr "Feil ved tilkopling til tenar."
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -1321,139 +1428,171 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:60
-#, fuzzy
-msgid "Outline:"
-msgstr "Oversikt"
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:61
-#, fuzzy
-msgid "Headings:"
-msgstr "Overskrift:"
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
+msgid "Factory for the sample Calendar control"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:62
-#, fuzzy
-msgid "Empty days:"
-msgstr " dag"
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
+msgid "Calendar Repository"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:63
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
 #, fuzzy
-msgid "Appointments:"
-msgstr "Avtale"
+msgid "Calendar Server"
+msgstr "Skriv ut alle"
 
-#: calendar/gui/calendar-commands.c:64
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 #, fuzzy
-msgid "Highlighted day:"
-msgstr "Opplysing:"
+msgid "Evolution calendar executive summary component."
+msgstr "Kan ikkje initialisera lokale variablar"
 
-#: calendar/gui/calendar-commands.c:65
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 #, fuzzy
-msgid "Day numbers:"
-msgstr "Høgste tal"
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Tilgjengelege lenkjer:"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Evolution component for handling the calendar."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:66
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
-msgid "Current day's number:"
-msgstr "Noverande namn:"
+msgid "Factory for the Evolution calendar component."
+msgstr "Øydelagd oppsettfil."
 
-#: calendar/gui/calendar-commands.c:67
-msgid "To-Do item that is not yet due:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:68
-msgid "To-Do item that is due today:"
+#: 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 ""
 
-#: calendar/gui/calendar-commands.c:69
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
 #, fuzzy
-msgid "To-Do item that is overdue:"
-msgstr "Element i hugselista:"
+msgid "Snooze"
+msgstr "Spooler"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
+#: mail/mail-search-dialogue.c:104
+msgid "Ok"
+msgstr "Ok"
 
-#: calendar/gui/calendar-commands.c:354
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Fann ikkje fil"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 #, fuzzy
 msgid "Open calendar"
 msgstr "Feil ved opning"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 #, fuzzy
 msgid "Save calendar"
 msgstr "Ny kalender"
 
+#: calendar/gui/calendar-commands.c:432
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr ""
+
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:282
+#: calendar/gui/calendar-model.c:284
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
+#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:741
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:346
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
 #, fuzzy
 msgid "Public"
 msgstr "Praksis"
 
-#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:349
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:352
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 #, fuzzy
 msgid "Confidential"
 msgstr "Eksponentiell"
 
-#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 #, fuzzy
 msgid "N"
 msgstr "Nr"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 #, fuzzy
 msgid "W"
 msgstr "RW"
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 #, fuzzy
 msgid "Transparent"
 msgstr "Gjennomsiktig "
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 #, fuzzy
 msgid "Opaque"
 msgstr "Opna"
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, fuzzy, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1462,51 +1601,76 @@ msgid ""
 msgstr "Ein bandindeks må vera valt i treet."
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. 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:863
+#: calendar/gui/calendar-model.c:865
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:866
+#: calendar/gui/calendar-model.c:868
 msgid "%H:%M:%S%n"
 msgstr ""
 
 #. 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:870
+#: calendar/gui/calendar-model.c:872
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:873
+#: calendar/gui/calendar-model.c:875
 #, fuzzy
 msgid "%H:%M%n"
 msgstr "%H:%M"
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:1075
 #, fuzzy
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteten må vera i området 1-99"
 
+#: calendar/gui/calendar-summary.c:81
+#, fuzzy
+msgid "%A, %e %B %Y"
+msgstr "%1 bit %2 %3"
+
+#: calendar/gui/calendar-summary.c:224
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr ""
+"Feil ved nedlasting av fil:\n"
+"%1"
+
+#: calendar/gui/calendar-summary.c:229
+msgid "<b>Error loading calendar:<br>Calendar in use."
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:235
+msgid "<b>Error loading calendar:<br>Method not supported"
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:293
+#, fuzzy
+msgid "Loading Calendar"
+msgstr "Skriv ut alle"
+
 #: calendar/gui/control-factory.c:125
 #, fuzzy
 msgid "The URI that the calendar will display"
@@ -1526,398 +1690,437 @@ msgid "No summary available."
 msgstr "Ingen bilete tilgjengeleg."
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
-#: po/tmp/evolution-event-editor.xml.h:13
-#: po/tmp/evolution-message-composer.xml.h:8
-#: po/tmp/evolution-subscribe.xml.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:6
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "Lukk"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 #, fuzzy
 msgid "Edit appointment"
 msgstr "&Endra avtale ..."
 
-#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
-#, fuzzy
-msgid "Snooze"
-msgstr "Spooler"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
 #, fuzzy
 msgid "Snooze time (minutes)"
 msgstr "Låg grense (minutt):"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 #, fuzzy
 msgid "05 minutes"
 msgstr "minutt"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy
 msgid "10 minutes"
 msgstr "minutt"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
 msgid "15 minutes"
 msgstr "minutt"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #, fuzzy
 msgid "24 hour"
 msgstr "time/timar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "30 minutes"
 msgstr "minutt"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #, fuzzy
 msgid "60 minutes"
 msgstr "minutt"
 
-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
 msgid "Audio Alarms"
 msgstr "Alarm"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #, fuzzy
 msgid "Calendar"
 msgstr "Skriv ut alle"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #, fuzzy
 msgid "Calendar Preferences"
 msgstr "Innstillingar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Fargar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "Standard"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #, fuzzy
 msgid "Display options"
 msgstr "Vis"
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Forfallsdato"
 
-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #, fuzzy
 msgid "End of day:"
 msgstr "Slutt trekk"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/gnome-month-item.c:741
 msgid "Fri"
 msgstr "Fre"
 
-#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/event-editor.c:433
 #, fuzzy
 msgid "Friday"
 msgstr "Fredag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #, fuzzy
 msgid "Highlight"
 msgstr "Opplysing:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #, fuzzy
 msgid "Items Due Today"
 msgstr "&Opplys syntaks"
 
-#: po/tmp/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/gnome-month-item.c:737
 msgid "Mon"
 msgstr "Mån"
 
-#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/event-editor.c:429
 msgid "Monday"
 msgstr "Måndag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "Overdue Items"
 msgstr "&Syntaksmerkingsmodusar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
 msgid "Priority"
 msgstr "Prioritet"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "Remind me of all appointments"
 msgstr "&Slett avtale"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #, fuzzy
 msgid "Reminders"
 msgstr "Påminning:"
 
-#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/gnome-month-item.c:742
 msgid "Sat"
 msgstr "Lau"
 
-#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/event-editor.c:434
 #, fuzzy
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "Show appointment end times"
 msgstr "Avtale"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "Show week numbers"
 msgstr "Vis %1"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 #, fuzzy
 msgid "Start of day:"
 msgstr "Start-dato"
 
 #. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/gnome-month-item.c:736
 msgid "Sun"
 msgstr "Sun"
 
-#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/event-editor.c:435
 msgid "Sunday"
 msgstr "Sundag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #, fuzzy
 msgid "TaskPad"
 msgstr "Oppgåve"
 
-#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/gnome-month-item.c:740
 msgid "Thu"
 msgstr "Tor"
 
-#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:432
 #, fuzzy
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 #, fuzzy
 msgid "Time Until Due"
 msgstr "Tid og dato"
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #, fuzzy
 msgid "Time divisions:"
 msgstr "Dimensjonar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 #, fuzzy
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: calendar/gui/gnome-month-item.c:738
 msgid "Tue"
 msgstr "Tys"
 
-#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/event-editor.c:430
 #, fuzzy
 msgid "Tuesday"
 msgstr "Tysdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 #, fuzzy
 msgid "Visual Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: calendar/gui/gnome-month-item.c:739
 msgid "Wed"
 msgstr "Ons"
 
-#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: calendar/gui/event-editor.c:431
 #, fuzzy
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 #, fuzzy
 msgid "Work week"
 msgstr "Veke"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 #, fuzzy
 msgid "seconds."
 msgstr "sekund"
 
+#: calendar/gui/dialogs/delete-comp.c:62
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr "Er du sikker på at du vil sletta denne klassen?"
+
+#: calendar/gui/dialogs/delete-comp.c:65
+#, fuzzy
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr "Er du sikker på at du vil sletta denne klassen?"
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr "Er du sikker på at du vil sletta denne klassen?"
+
+#: calendar/gui/dialogs/delete-comp.c:74
+#, fuzzy
+msgid "Are you sure you want to delete this untitled task?"
+msgstr "Er du sikker på at du vil sletta denne klassen?"
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr "Er du sikker på at du vil sletta denne klassen?"
+
+#: calendar/gui/dialogs/delete-comp.c:83
+#, fuzzy
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr "Er du sikker på at du vil sletta denne klassen?"
+
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/task-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
 #, fuzzy
 msgid "% Comp_lete:"
 msgstr "Ferdig"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 #, fuzzy
 msgid "C_lassification:"
 msgstr "&Forstørring"
 
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 #, fuzzy
 msgid "Cancelled"
 msgstr "Avbroten."
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Ferdig"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 #, fuzzy
 msgid "Date Completed:"
 msgstr "Ferdig"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 #, fuzzy
 msgid "High"
 msgstr "Høgd"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 #, fuzzy
 msgid "In Progress"
 msgstr "Framgong:"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 #, fuzzy
 msgid "Low"
 msgstr "Senk"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
 msgid "None"
 msgstr "Ingen"
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "Normal"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 #, fuzzy
 msgid "Not Started"
 msgstr "Starta"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 #, fuzzy
 msgid "S_ummary"
 msgstr "Samandrag"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 #, fuzzy
 msgid "Sta_rt Date:"
 msgstr "Start-dato:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Oppgåve"
 
-#: po/tmp/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: po/tmp/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #, fuzzy
 msgid "_Contacts..."
 msgstr "&Innhald ..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #, fuzzy
 msgid "_Due Date:"
 msgstr "Forfallsdato:"
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 #, fuzzy
 msgid "_Priority:"
 msgstr "Prioritet:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 #, fuzzy
 msgid "_Status:"
 msgstr "Status:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr ""
 
@@ -1925,27 +2128,27 @@ msgstr ""
 msgid "Edit Task"
 msgstr "Rediger oppgåve"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
 #, fuzzy
 msgid "No summary"
 msgstr "oppsummering"
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "Oppgåver"
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 #, fuzzy
 msgid "Do you want to save changes?"
 msgstr "I ferd med å senda e-post ..."
@@ -1969,14 +2172,6 @@ msgstr "Ferdig"
 msgid "Mark the task complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: po/tmp/event-editor-dialog.glade.h:12 po/tmp/evolution-addressbook.xml.h:8
-#: po/tmp/evolution-event-editor.xml.h:19 po/tmp/evolution-mail.xml.h:11
-#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:8
-msgid "Delete"
-msgstr "Slett"
-
 #: calendar/gui/e-calendar-table.c:343
 #, fuzzy
 msgid "Delete the task"
@@ -1989,56 +2184,68 @@ msgstr ""
 
 #. 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:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr ""
 
 #. 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:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
 #. 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:1235
+#: 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
 #, fuzzy
 msgid "%d %b"
 msgstr "%1 %2"
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/print.c:610
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/print.c: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
 #, fuzzy
 msgid "New appointment..."
 msgstr "&Vis avtale ..."
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: 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
 #, fuzzy
 msgid "Edit this appointment..."
 msgstr "&Endra avtale ..."
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 #, fuzzy
 msgid "Delete this appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 #, fuzzy
 msgid "Make this appointment movable"
 msgstr "Se&nd avtale"
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Erstatt denne førekomsten?"
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 #, fuzzy
 msgid "Delete all occurrences"
 msgstr "Slettar klassen"
@@ -2052,755 +2259,534 @@ msgid "%d %B"
 msgstr "%1 %2"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/event-editor-dialog.glade.h:6
+#: calendar/gui/event-editor-dialog.glade.h:6
 msgid "A_ll day event"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:8
 #, fuzzy
 msgid "Appointment Basics"
 msgstr "Avtale"
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:9
 #, fuzzy
 msgid "Classification"
 msgstr "&Forstørring"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:10
 #, fuzzy
 msgid "Custom recurrence"
 msgstr "Repetering"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:11
 #, fuzzy
 msgid "Days"
 msgstr "Dag"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:13
 #, fuzzy
 msgid "Every"
 msgstr "kvar"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Exceptions"
 msgstr "Unntak"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 #, fuzzy
 msgid "Hours"
 msgstr "time/timar"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 #, fuzzy
 msgid "Mail _to:"
 msgstr "E-post:"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 #, fuzzy
 msgid "Minutes"
 msgstr "minutt"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 #, fuzzy
 msgid "Modify"
 msgstr "Måndag"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:20
 #, fuzzy
 msgid "No recurrence"
 msgstr "Repetering"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:21
 #, fuzzy
 msgid "Preview"
 msgstr "Førehandsvising:"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 #, fuzzy
 msgid "Pri_vate"
 msgstr "Privat"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 #, fuzzy
 msgid "Pu_blic"
 msgstr "Praksis"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Recurrence"
 msgstr "Repetering"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:25
 #, fuzzy
 msgid "Recurrence Rule"
 msgstr "Regel for repetering"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:26
 #, fuzzy
 msgid "Reminder"
 msgstr "Påminning:"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:27
 #, fuzzy
 msgid "Simple recurrence"
 msgstr "Repetering"
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:28
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "Samandrag:"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Tid"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 #, fuzzy
 msgid "_Audio"
 msgstr "Lyd"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 #, fuzzy
 msgid "_Confidential"
 msgstr "Eksponentiell"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 #, fuzzy
 msgid "_Display"
 msgstr "Vis"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 #, fuzzy
 msgid "_End time:"
 msgstr "Slutt-tid:"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 #, fuzzy
 msgid "_Mail"
 msgstr "Send"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 #, fuzzy
 msgid "_Program"
 msgstr "Program"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 #, fuzzy
 msgid "_Run program:"
 msgstr "Terminalprogram:"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 #, fuzzy
 msgid "_Start time:"
 msgstr "Start-tid:"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 #, fuzzy
 msgid "_Starting date:"
 msgstr "Start-dato"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr "dag(ar)"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40
 #, fuzzy
 msgid "event-editor-dialog"
 msgstr "Opnar angrehistoriedialogen"
 
-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:41
 #, fuzzy
 msgid "for"
 msgstr "Munnar"
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:42
 #, fuzzy
 msgid "forever"
 msgstr "Repeterer for alltid"
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:43
 #, fuzzy
 msgid "label21"
 msgstr "Etikett"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "månad(er)"
 
-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:45
 #, fuzzy
 msgid "until"
 msgstr "utan tittel"
 
-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:46
 #, fuzzy
 msgid "week(s)"
 msgstr "veke(r) på:"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:325
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "&Endra avtale ..."
 
-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:403
 #, fuzzy
 msgid "on"
 msgstr "Mån"
 
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dagen"
 
-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:555
 #, fuzzy
 msgid "on the"
 msgstr "Månad"
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 #, fuzzy
 msgid "th"
 msgstr "4."
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 #, fuzzy
 msgid "%a %b %d %Y"
 msgstr "%1 bit %2 %3"
 
-#: calendar/gui/getdate.y:391
-#, fuzzy
-msgid "january"
-msgstr "Januar"
+#: calendar/gui/gnome-cal.c:676
+#, fuzzy, c-format
+msgid "Could not load the calendar in `%s'"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/getdate.y:392
-#, fuzzy
-msgid "february"
-msgstr "Februar"
+#: calendar/gui/gnome-cal.c:687
+#, fuzzy, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/getdate.y:393
-#, fuzzy
-msgid "march"
-msgstr "Mars"
+#: calendar/gui/gnome-cal.c:698
+#, fuzzy, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "Metoden %1 er ikkje støtta."
 
-#: calendar/gui/getdate.y:394
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/goto-dialog.glade.h:6
 #, fuzzy
-msgid "april"
+msgid "April"
 msgstr "April"
 
-#: calendar/gui/getdate.y:395
-#, fuzzy
-msgid "may"
-msgstr "Mai"
-
-#: calendar/gui/getdate.y:396
+#: calendar/gui/goto-dialog.glade.h:7
 #, fuzzy
-msgid "june"
-msgstr "Juni"
-
-#: calendar/gui/getdate.y:397
-#, fuzzy
-msgid "july"
-msgstr "Juli"
-
-#: calendar/gui/getdate.y:398
-#, fuzzy
-msgid "august"
+msgid "August"
 msgstr "August"
 
-#: calendar/gui/getdate.y:399
-#, fuzzy
-msgid "september"
-msgstr "September"
-
-#: calendar/gui/getdate.y:400
-#, fuzzy
-msgid "sept"
-msgstr "Nullstill"
-
-#: calendar/gui/getdate.y:401
-#, fuzzy
-msgid "october"
-msgstr "Oktober"
-
-#: calendar/gui/getdate.y:402
-#, fuzzy
-msgid "november"
-msgstr "November"
-
-#: calendar/gui/getdate.y:403
+#: calendar/gui/goto-dialog.glade.h:8
 #, fuzzy
-msgid "december"
+msgid "December"
 msgstr "Desember"
 
-#: calendar/gui/getdate.y:404
-#, fuzzy
-msgid "sunday"
-msgstr "Sundag"
-
-#: calendar/gui/getdate.y:405
-#, fuzzy
-msgid "monday"
-msgstr "Måndag"
-
-#: calendar/gui/getdate.y:406
-#, fuzzy
-msgid "tuesday"
-msgstr "Tysdag"
-
-#: calendar/gui/getdate.y:407
-#, fuzzy
-msgid "tues"
-msgstr "sann"
-
-#: calendar/gui/getdate.y:408
-#, fuzzy
-msgid "wednesday"
-msgstr "Onsdag"
-
-#: calendar/gui/getdate.y:409
-#, fuzzy
-msgid "wednes"
-msgstr "Sverige"
-
-#: calendar/gui/getdate.y:410
-#, fuzzy
-msgid "thursday"
-msgstr "Torsdag"
-
-#: calendar/gui/getdate.y:411
-#, fuzzy
-msgid "thur"
-msgstr "Anna"
-
-#: calendar/gui/getdate.y:412
-#, fuzzy
-msgid "thurs"
-msgstr "Andre"
-
-#: calendar/gui/getdate.y:413
-#, fuzzy
-msgid "friday"
-msgstr "Fredag"
-
-#: calendar/gui/getdate.y:414
-#, fuzzy
-msgid "saturday"
-msgstr "Laurdag"
-
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-#, fuzzy
-msgid "year"
-msgstr "År"
-
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-#, fuzzy
-msgid "month"
-msgstr "Månad"
-
-#: calendar/gui/getdate.y:422
-#, fuzzy
-msgid "fortnight"
-msgstr "høgre"
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-#, fuzzy
-msgid "week"
-msgstr "Veke"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-#, fuzzy
-msgid "hour"
-msgstr "time/timar"
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-#, fuzzy
-msgid "minute"
-msgstr "minutt"
-
-#: calendar/gui/getdate.y:427
-#, fuzzy
-msgid "min"
-msgstr " min"
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-#, fuzzy
-msgid "second"
-msgstr "sekund"
-
-#: calendar/gui/getdate.y:429
-#, fuzzy
-msgid "sec"
-msgstr " sek"
-
-#: calendar/gui/getdate.y:435
-#, fuzzy
-msgid "tomorrow"
-msgstr "Comoros"
-
-#: calendar/gui/getdate.y:436
-#, fuzzy
-msgid "yesterday"
-msgstr "kvar dag"
-
-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr "i dag"
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
+#: calendar/gui/goto-dialog.glade.h:9
 #, fuzzy
-msgid "now"
-msgstr "nei"
-
-#: calendar/gui/getdate.y:439
-#, fuzzy
-msgid "last"
-msgstr "Etternamn"
-
-#: calendar/gui/getdate.y:440
-#, fuzzy
-msgid "this"
-msgstr "er"
-
-#: calendar/gui/getdate.y:441
-#, fuzzy
-msgid "next"
-msgstr "Neste"
-
-#: calendar/gui/getdate.y:442
-#, fuzzy
-msgid "first"
-msgstr "Førenamn"
-
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-#, fuzzy
-msgid "third"
-msgstr "Anna"
+msgid "February"
+msgstr "Februar"
 
-#: calendar/gui/getdate.y:445
+#: calendar/gui/goto-dialog.glade.h:10
 #, fuzzy
-msgid "fourth"
-msgstr "Munnar"
+msgid "Go To Date"
+msgstr "Gå til side"
 
-#: calendar/gui/getdate.y:446
+#: calendar/gui/goto-dialog.glade.h:11
 #, fuzzy
-msgid "fifth"
-msgstr "Shift"
+msgid "Go To Today"
+msgstr "Gå til &i dag"
 
-#: calendar/gui/getdate.y:447
+#: calendar/gui/goto-dialog.glade.h:12
 #, fuzzy
-msgid "sixth"
-msgstr "Høgre"
+msgid "January"
+msgstr "Januar"
 
-#: calendar/gui/getdate.y:448
+#: calendar/gui/goto-dialog.glade.h:13
 #, fuzzy
-msgid "seventh"
-msgstr "partalssider"
+msgid "July"
+msgstr "Juli"
 
-#: calendar/gui/getdate.y:449
+#: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
-msgid "eighth"
-msgstr "høgd"
+msgid "June"
+msgstr "Juni"
 
-#: calendar/gui/getdate.y:450
+#: calendar/gui/goto-dialog.glade.h:15
 #, fuzzy
-msgid "ninth"
-msgstr "int"
+msgid "March"
+msgstr "Mars"
 
-#: calendar/gui/getdate.y:451
+#: calendar/gui/goto-dialog.glade.h:16
 #, fuzzy
-msgid "tenth"
-msgstr "1 tidel"
+msgid "May"
+msgstr "Måndag"
 
-#: calendar/gui/getdate.y:452
+#: calendar/gui/goto-dialog.glade.h:17
 #, fuzzy
-msgid "eleventh"
-msgstr "partalssider"
-
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr ""
+msgid "November"
+msgstr "November"
 
-#: calendar/gui/getdate.y:454
+#: calendar/gui/goto-dialog.glade.h:18
 #, fuzzy
-msgid "ago"
-msgstr "Tag"
-
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:1152
-#, fuzzy, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: calendar/gui/gnome-cal.c:1163
-#, fuzzy, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: calendar/gui/gnome-cal.c:1174
-#, fuzzy, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Metoden %1 er ikkje støtta."
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "År:"
+msgid "October"
+msgstr "Oktober"
 
-#: calendar/gui/goto.c:270
+#: calendar/gui/goto-dialog.glade.h:19
 #, fuzzy
-msgid "Go to date"
-msgstr "Gå til side"
-
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
+msgid "September"
+msgstr "September"
 
-#: calendar/gui/goto.c:318
+#: calendar/gui/main.c:49
 #, fuzzy
-msgid "Go to today"
-msgstr "Gå til &i dag"
+msgid "Could not initialize GNOME"
+msgstr "Kunne ikkje initiere Bonobo"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:299
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 #, fuzzy
 msgid "Su"
 msgstr "Sum"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 #, fuzzy
 msgid "Mo"
 msgstr "Mån"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 #, fuzzy
 msgid "Tu"
 msgstr "Tys"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 #, fuzzy
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 #, fuzzy
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 #, fuzzy
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 #, fuzzy
 msgid "Sa"
 msgstr "Lau"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "Oppgåver"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1081
+#: calendar/gui/print.c:1086
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1092
+#: calendar/gui/print.c:1097
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 #, fuzzy
 msgid "Current month (%b %Y)"
 msgstr "Denne månaden"
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 #, fuzzy
 msgid "Current year (%Y)"
 msgstr "Gjeldande: %1"
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 #, fuzzy
 msgid "Print Calendar"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 #, fuzzy
 msgid "Print Preview"
 msgstr "&Førehandsvising ..."
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
 
@@ -2898,60 +2884,61 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, fuzzy, c-format
 msgid "%s server %s"
 msgstr "Diskusjonsgruppetenarar"
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr ""
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2975,51 +2962,51 @@ msgstr ""
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, fuzzy, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Slett e-post frå tenaren"
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:196
 #, fuzzy, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/imap/camel-imap-folder.c:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -3031,31 +3018,25 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3063,7 +3044,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
@@ -3158,12 +3139,12 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Mottek meldingar frå %1"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3171,14 +3152,14 @@ msgid ""
 msgstr "Kan ikkje setja blokkstorleik for band."
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 #, fuzzy
 msgid "No such message"
 msgstr "Vidaresendt melding"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr ""
 
@@ -3224,7 +3205,7 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -3232,25 +3213,25 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3300,18 +3281,18 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, fuzzy, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
@@ -3319,40 +3300,40 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, fuzzy, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, fuzzy, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, fuzzy, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjend feil"
@@ -3385,7 +3366,7 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, fuzzy, c-format
 msgid "Message %s not found."
 msgstr "Fann ikkje fil"
@@ -3436,16 +3417,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, fuzzy, c-format
 msgid "No message with uid %s"
 msgstr "Lag meldingar og slå saman"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, fuzzy, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Slett e-post frå tenaren"
@@ -3483,48 +3464,49 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Ukjend"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 #, fuzzy
 msgid "Sendmail"
 msgstr "Send"
@@ -3573,8 +3555,133 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
+#: camel/providers/smtp/camel-smtp-provider.c:34
+#: mail/mail-config-druid.glade.h:59
+msgid "SMTP"
+msgstr ""
+
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:187
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+#, fuzzy
+msgid "No authentication required"
+msgstr "Autentisering:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+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."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:297
+#: mail/mail-config-druid.glade.h:16
+msgid "CRAM-MD5"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, fuzzy, c-format
+msgid "SMTP server %s"
+msgstr "Diskusjonsgruppetenarar"
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "Cannot send message: no recipients defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, fuzzy, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, fuzzy, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, fuzzy, c-format
+msgid "RSET response error: %s"
+msgstr "Ukjend feil"
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
 #: camel/providers/vee/camel-vee-provider.c:30
@@ -3611,108 +3718,108 @@ msgid "%.1fG"
 msgstr "%1 GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 #, fuzzy
 msgid "attachment"
 msgstr "Vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: po/tmp/evolution-message-composer.xml.h:7
+#: composer/e-msg-composer-attachment-bar.c:413
+#: ui/evolution-message-composer.xml.h:7
 #, fuzzy
 msgid "Attach a file"
 msgstr "Legg ved fil"
 
-#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/filter.glade.h:14
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
 #: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Fjern"
 
-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 #, fuzzy
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern det valte programmet frå lista"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 #, fuzzy
 msgid "Add attachment..."
 msgstr "Vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:493
 #, fuzzy
 msgid "Attach a file to the message"
 msgstr "Kunne ikkje lagra melding(ar)."
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:6
 #, fuzzy
 msgid "Attachment properties"
 msgstr "Vedleggseigenskapar"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Filnamn:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 #, fuzzy
 msgid "MIME type:"
 msgstr "MIME-type"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 msgid "From:"
 msgstr "Frå:"
 
-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:247
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
 
-#: composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn på meldinga."
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 #, fuzzy
 msgid "Cc:"
 msgstr "&CC:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:319
 #, fuzzy
 msgid "Bcc:"
 msgstr "&Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:320
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 #, fuzzy
 msgid "Enter the subject of the mail"
 msgstr "Oppgi typen til medlemsvariabelen her."
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, fuzzy, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3722,45 +3829,45 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr "Lagra som ..."
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, fuzzy, c-format
 msgid "Error loading file: %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 #, fuzzy
 msgid "Saving changes to message..."
 msgstr "Lagrar alle endra filer ..."
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 #, fuzzy
 msgid "Save changes to message..."
 msgstr "Lagrar alle endra filer ..."
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 #, fuzzy
 msgid "Evolution"
 msgstr "Oppløysing"
 
-#: composer/e-msg-composer.c:745
+#: composer/e-msg-composer.c:747
 #, fuzzy
 msgid ""
 "This message has not been sent.\n"
@@ -3770,47 +3877,47 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 #, fuzzy
 msgid "That file does not exist."
 msgstr "Fila finst ikkje\n"
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 #, fuzzy
 msgid "That is not a regular file."
 msgstr "er ei vanleg fil"
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 #, fuzzy
 msgid "That file exists but is not readable."
 msgstr "%1 finst, men er inga vanleg fil"
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:945
+#: composer/e-msg-composer.c:950
 #, fuzzy
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr "Det finst ulagra endringar. Er du sikker på at du vil avslutta?"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:971
 #, fuzzy
 msgid "An error occurred while reading the file."
 msgstr "Feil ved opning av fil."
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 #, fuzzy
 msgid "Compose a message"
 msgstr "Lukk melding"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Kan ikkje laga nytt vindauge.\n"
@@ -3827,16 +3934,31 @@ msgstr "Søk"
 
 #: filter/filter-datespec.c:62
 #, fuzzy
+msgid "year"
+msgstr "År"
+
+#: filter/filter-datespec.c:62
+#, fuzzy
 msgid "years"
 msgstr "år"
 
 #: filter/filter-datespec.c:63
 #, fuzzy
+msgid "month"
+msgstr "Månad"
+
+#: filter/filter-datespec.c:63
+#, fuzzy
 msgid "months"
 msgstr "månad(er)"
 
 #: filter/filter-datespec.c:64
 #, fuzzy
+msgid "week"
+msgstr "Veke"
+
+#: filter/filter-datespec.c:64
+#, fuzzy
 msgid "weeks"
 msgstr "Veke"
 
@@ -3847,14 +3969,29 @@ msgstr " dag"
 
 #: filter/filter-datespec.c:66
 #, fuzzy
+msgid "hour"
+msgstr "time/timar"
+
+#: filter/filter-datespec.c:66
+#, fuzzy
 msgid "hours"
 msgstr "time/timar"
 
 #: filter/filter-datespec.c:67
+#, fuzzy
+msgid "minute"
+msgstr "minutt"
+
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minutt"
 
 #: filter/filter-datespec.c:68
+#, fuzzy
+msgid "second"
+msgstr "sekund"
+
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr "sekund"
 
@@ -3907,6 +4044,11 @@ msgstr "Vis hendingane for denne dagen"
 msgid "Compare against"
 msgstr "Kompilatoråtvaringar"
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#, fuzzy
+msgid "now"
+msgstr "nei"
+
 #: filter/filter-datespec.c:690
 #, fuzzy
 msgid "<click here to select a date>"
@@ -3932,7 +4074,7 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#: filter/filter-editor.c:456 filter/filter.glade.h:9
 #, fuzzy
 msgid "Edit Filters"
 msgstr "Rediger fil"
@@ -3973,7 +4115,7 @@ msgstr ""
 msgid "<click here to select a folder>"
 msgstr "Trykk for å velja ein skrifttype"
 
-#: filter/filter-input.c:184
+#: filter/filter-input.c:185
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3982,266 +4124,277 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr ""
 
-#: filter/filter-part.c:456
+#: filter/filter-part.c:467
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:520
+#: filter/filter-rule.c:530
 #, fuzzy
 msgid "Rule name: "
 msgstr "Filnamn:"
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 #, fuzzy
 msgid "Untitled"
 msgstr "Utan tittel"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 #, fuzzy
 msgid "If"
 msgstr "I"
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 #, fuzzy
 msgid "Execute actions"
 msgstr "Køyr autorun.sh"
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 #, fuzzy
 msgid "Add criterion"
 msgstr "Legg til kriterium"
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 #, fuzzy
 msgid "Remove criterion"
 msgstr "Fjern element"
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Rediger"
+#: filter/filter-system-flag.c:63
+#, fuzzy
+msgid "Replied to"
+msgstr "Svar til alle:"
+
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr ""
+
+#: filter/filter-system-flag.c:67
+#, fuzzy
+msgid "Read"
+msgstr "Tilfeldig"
 
-#: po/tmp/filter.glade.h:10
+#: filter/filter.glade.h:10
 #, fuzzy
 msgid "Edit VFolders"
 msgstr "Rediger filterreglar"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 #, fuzzy
 msgid "Filter Rules"
 msgstr "Filter-reglar"
 
-#: po/tmp/filter.glade.h:12
+#: filter/filter.glade.h:12
 msgid "Incoming"
 msgstr ""
 
-#: po/tmp/filter.glade.h:13
+#: filter/filter.glade.h:13
 #, fuzzy
 msgid "Outgoing"
 msgstr "Oversikt"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 #, fuzzy
 msgid "Virtual Folders"
 msgstr "Mapper"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 #, fuzzy
 msgid "vFolder Sources"
 msgstr "Kjelder"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "after"
+msgstr "Slutt etter"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
+msgid "before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "contains"
+msgstr "Handlingar"
+
+#: filter/libfilter-i18n.h:7
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 #, fuzzy
 msgid "Date received"
 msgstr "Motta"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Date sent"
 msgstr "Dato"
 
-#: filter/libfilter-i18n.h:8
-#, fuzzy
-msgid "Expression"
-msgstr "&Yrke:"
-
-#: filter/libfilter-i18n.h:9
-#, fuzzy
-msgid "Forward to Address"
-msgstr "Vidaresendt melding"
-
-#: filter/libfilter-i18n.h:10
-#, fuzzy
-msgid "Message Body"
-msgstr "Flytta alle meldingar til papirkorga"
-
 #: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Melding motteken"
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:12
-#, fuzzy
-msgid "Message was received"
-msgstr "Melding motteken"
+msgid "does not end with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:13
 #, fuzzy
-msgid "Message was sent"
-msgstr "Lag meldingar og slå saman"
+msgid "does not exist"
+msgstr "Fila finst ikkje\n"
 
 #: filter/libfilter-i18n.h:14
 #, fuzzy
-msgid "Move to Folder"
-msgstr "Flytt til mappe"
+msgid "does not sound like"
+msgstr "Fann ikkje fil"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 #, fuzzy
-msgid "Recipients"
-msgstr "Nyleg brukte fargar"
+msgid "does not start with"
+msgstr "Kunne ikkje starta %1."
 
-#: filter/libfilter-i18n.h:17
-msgid "Regex Match"
+#: filter/libfilter-i18n.h:16
+msgid "ends with"
 msgstr ""
 
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "exists"
+msgstr "Neste"
+
 #: filter/libfilter-i18n.h:18
 #, fuzzy
-msgid "Sender"
-msgstr "Send"
+msgid "Expression"
+msgstr "&Yrke:"
 
 #: filter/libfilter-i18n.h:19
 #, fuzzy
-msgid "Set Status"
-msgstr "Status:"
+msgid "Forward to Address"
+msgstr "Vidaresendt melding"
 
 #: filter/libfilter-i18n.h:20
 #, fuzzy
-msgid "Source"
-msgstr "Kjelder"
+msgid "is"
+msgstr "er"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-#, fuzzy
-msgid "Status"
-msgstr "Status:"
+msgid "is less than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Subject"
-msgstr "Emne"
+#, fuzzy
+msgid "Message Body"
+msgstr "Flytta alle meldingar til papirkorga"
 
 #: filter/libfilter-i18n.h:25
 #, fuzzy
-msgid "after"
-msgstr "Slutt etter"
+msgid "Message Header"
+msgstr "Melding motteken"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr ""
+#, fuzzy
+msgid "Message was received"
+msgstr "Melding motteken"
 
 #: filter/libfilter-i18n.h:27
 #, fuzzy
-msgid "contains"
-msgstr "Handlingar"
+msgid "Message was sent"
+msgstr "Lag meldingar og slå saman"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr ""
+#, fuzzy
+msgid "Move to Folder"
+msgstr "Flytt til mappe"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
 #, fuzzy
-msgid "does not exist"
-msgstr "Fila finst ikkje\n"
+msgid "on or after"
+msgstr "Slutt etter"
 
-#: filter/libfilter-i18n.h:31
-#, fuzzy
-msgid "does not sound like"
-msgstr "Fann ikkje fil"
+#: filter/libfilter-i18n.h:30
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:32
 #, fuzzy
-msgid "does not start with"
-msgstr "Kunne ikkje starta %1."
+msgid "Recipients"
+msgstr "Nyleg brukte fargar"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
 #, fuzzy
-msgid "exists"
-msgstr "Neste"
+msgid "Sender"
+msgstr "Send"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr ""
+#, fuzzy
+msgid "Set Status"
+msgstr "Status:"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr ""
+#, fuzzy
+msgid "Source"
+msgstr "Kjelder"
 
 #: filter/libfilter-i18n.h:38
-#, fuzzy
-msgid "is"
-msgstr "er"
+msgid "Specific header"
+msgstr ""
 
 #: filter/libfilter-i18n.h:39
-#, fuzzy
-msgid "on or after"
-msgstr "Slutt etter"
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
+#, fuzzy
+msgid "Status"
+msgstr "Status:"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
+msgid "Stop Processing"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
+msgid "Subject"
+msgstr "Emne"
 
 #: filter/libfilter-i18n.h:43
 #, fuzzy
@@ -4276,153 +4429,234 @@ msgstr "Rediger filterreglar"
 msgid "Edit VFolder Rule"
 msgstr "Rediger filterreglar"
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:266
+#: mail/component-factory.c:316
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:16
+#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Lagra"
 
-#: mail/folder-browser.c:153
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr ""
 
-#: mail/folder-browser.c:154
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr ""
 
-#: mail/folder-browser.c:155
+#: mail/folder-browser.c:238
 #, fuzzy
 msgid "Subject contains"
 msgstr "Emne"
 
-#: mail/folder-browser.c:156
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:157
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:643
 #, fuzzy
 msgid "VFolder on Subject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 #, fuzzy
 msgid "VFolder on Sender"
 msgstr "Mappenamn:"
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 #, fuzzy
 msgid "VFolder on Recipients"
 msgstr "Mappa finst: "
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 #, fuzzy
 msgid "Filter on Subject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 #, fuzzy
 msgid "Filter on Sender"
 msgstr "Fil under:"
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 #, fuzzy
 msgid "Filter on Recipients"
 msgstr "Skriv ut filer"
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 #, fuzzy
 msgid "Filter on Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+msgid "Show all hidden"
+msgstr ""
+
+#: mail/folder-browser.c:657
+msgid "Hide selected"
+msgstr ""
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+#, fuzzy
+msgid "Hide read"
+msgstr "Skjul"
+
+#: mail/folder-browser.c:661
+#, fuzzy
+msgid "Hide deleted"
+msgstr "Slett"
+
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+#, fuzzy
+msgid "Hide Subject"
+msgstr "Emne"
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+#, fuzzy
+msgid "Hide from Sender"
+msgstr "Fil under:"
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 #, fuzzy
 msgid "Open"
 msgstr "Opna ..."
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Save As..."
 msgstr "Lagra som ..."
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: mail/folder-browser.c:673 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:32
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:675
 #, fuzzy
 msgid "Reply to Sender"
 msgstr "Svar til avsendar:"
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
 #, fuzzy
 msgid "Reply to All"
 msgstr "Svar til alle:"
 
-#: mail/folder-browser.c:471 mail/mail-view.c:159
-#: po/tmp/evolution-mail.xml.h:17
+#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Fram"
 
-#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 #, fuzzy
 msgid "Forward inline"
 msgstr "Fram"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 #, fuzzy
 msgid "Mark as Read"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:681
 #, fuzzy
 msgid "Mark as Unread"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Flytt til mappe"
 
-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Flytt til mappe"
 
-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:686
 #, fuzzy
 msgid "Undelete"
 msgstr "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:484
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:546
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide Messages"
+msgstr "Lagra melding"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.c:787
+#, fuzzy, c-format
+msgid "Hide Subject \"%s\""
+msgstr "Emne"
+
+#: mail/folder-browser.c:793
+#, c-format
+msgid "Hide from Sender <%s>"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: mail/local-config.glade.h:6
+#, fuzzy
+msgid "Current store format:"
+msgstr "Kunne ikkje starta %1."
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "Format"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "&Ny type"
+
+#: mail/local-config.glade.h:9
+msgid ""
+"Note: When converting between mailbox formats, a failure (such as lack of "
+"disk space) may not be automatically recoverable.  Please use this feature "
+"with care."
+msgstr ""
+
+#: mail/local-config.glade.h:10
+msgid "maildir"
+msgstr ""
+
+#: mail/local-config.glade.h:11
+msgid "mbox"
+msgstr ""
+
+#: mail/local-config.glade.h:12
+#, fuzzy
+msgid "mh"
+msgstr "ms"
+
 #: mail/mail-autofilter.c:71
 #, fuzzy, c-format
 msgid "Mail to %s"
@@ -4475,106 +4709,340 @@ msgstr ""
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:246
+#: mail/mail-callbacks.c:244
 #, fuzzy
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr "Meldinga har ingen sendar"
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:312
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:552
+#: mail/mail-callbacks.c:530
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "Vidaresendt melding frå %1"
+
+#: mail/mail-callbacks.c:611
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 #, fuzzy
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Overskriv filer"
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 #, fuzzy
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr "Ei fil med det namnet finst alt. Vil du skriva over den?"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 #, fuzzy
 msgid "Print Message"
 msgstr "Private meldingar"
 
-#: mail/mail-callbacks.c:969
+#: mail/mail-callbacks.c:1008
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "Feil ved skriving av band-ID."
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/mail-config-druid.glade.h:6
+#: mail/mail-config-druid.glade.h:6
+msgid "Account"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:7
+#, fuzzy
+msgid "Account Information"
+msgstr "Informasjon"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "Vedleggseigenskapar"
+
+#: mail/mail-config-druid.glade.h:11
+#, fuzzy
+msgid "Advanced"
+msgstr "Legg til ..."
+
+#: mail/mail-config-druid.glade.h:12
+#, fuzzy
+msgid "Authentication"
+msgstr "Autentisering:"
+
+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "Autentisering:"
+
+#: mail/mail-config-druid.glade.h:15
+msgid "Automatically check mail every "
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:17
+msgid "Congratulations, your mail configuration is complete.\n"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:23
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:24
+#, fuzzy
+msgid "Default"
+msgstr "Standard"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "Slett e-post frå tenaren"
+
+#: mail/mail-config-druid.glade.h:27
+#, fuzzy
+msgid "Done"
+msgstr "Ingen"
+
+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "E-post-adresse:"
+
+#: mail/mail-config-druid.glade.h:30
+#, fuzzy
+msgid "Email Address:"
+msgstr "E-post-adresse:"
+
+#: mail/mail-config-druid.glade.h:31
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "Oppsett"
+
+#: mail/mail-config-druid.glade.h:32
+#, fuzzy
+msgid "Full Name:"
+msgstr "Fullt namn"
+
+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "Brukarnamn:"
+
+#: mail/mail-config-druid.glade.h:36
+msgid "IMAP"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr "Identitet"
 
-#: po/tmp/mail-config-druid.glade.h:7
+#: mail/mail-config-druid.glade.h:38
+msgid "Incoming Mail Server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:39
+msgid "Kerberos"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:40
+#, fuzzy
+msgid "Mail"
+msgstr "Send"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "Små ikon"
+
+#: mail/mail-config-druid.glade.h:42
 #, fuzzy
 msgid "Mail Configuration"
 msgstr "Oppsett"
 
-#: po/tmp/mail-config-druid.glade.h:8
+#: mail/mail-config-druid.glade.h:43
 #, fuzzy
-msgid "Mail Source"
-msgstr "E-posttenar"
+msgid "Mail Configuration Druid"
+msgstr "Oppsett"
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+#: mail/mail-config-druid.glade.h:44
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:46
 #, fuzzy
-msgid "Mail Transport"
-msgstr "&E-post-transport"
+msgid "News"
+msgstr "Ny ..."
+
+#: mail/mail-config-druid.glade.h:48
+#, fuzzy
+msgid "Optional"
+msgstr "Val"
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "Organisasjon:"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
+msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
+#: mail/mail-config-druid.glade.h:51
+msgid "Password:"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:55
+msgid "Remember my password"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Svar"
+
+#: mail/mail-config-druid.glade.h:57
+#, fuzzy
+msgid "Reply-to:"
+msgstr "Svar"
+
+#: mail/mail-config-druid.glade.h:58
+msgid "Required"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "Lagra som"
+
+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "Signaturfil:"
+
+#: mail/mail-config-druid.glade.h:62
+#, fuzzy
+msgid "Sending Email"
+msgstr "Send"
+
+#: mail/mail-config-druid.glade.h:64
+#, fuzzy
+msgid "Server Configuration"
+msgstr "Oppsett"
+
+#: mail/mail-config-druid.glade.h:65
+msgid "Server Timeouts"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:66
+#, fuzzy
+msgid "Server Type: "
+msgstr "Tenar:"
+
+#: mail/mail-config-druid.glade.h:67
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Tenar:"
+
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+#, fuzzy
+msgid "Signature file:"
+msgstr "Signaturfil:"
+
+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "Signaturfil:"
+
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Kjelder"
+
+#: mail/mail-config-druid.glade.h:72
+msgid "This server requires a secure connection (SSL)"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:73
+#, fuzzy
+msgid "Type"
+msgstr "Type:"
+
+#: mail/mail-config-druid.glade.h:74
 msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
+"Type the name by which you would like to refer to these servers. For "
+"example: \"Work\" or \"Home\"."
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:76
+#, fuzzy
+msgid "User Information"
+msgstr "Informasjon"
+
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "Brukarnamn:"
+
+#: mail/mail-config-druid.glade.h:78
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
 msgstr ""
 
+#: mail/mail-config-druid.glade.h:81
+#, fuzzy
+msgid "minute(s)"
+msgstr "minutt"
+
 #: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
@@ -4591,16 +5059,7 @@ msgstr "Fullt namn"
 msgid "Email address:"
 msgstr "E-post-adresse:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organisasjon:"
-
-#: mail/mail-config-gui.c:496
-#, fuzzy
-msgid "Signature file:"
-msgstr "Signaturfil:"
-
-#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
+#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Signature File"
 msgstr "Signaturfil:"
@@ -4609,27 +5068,11 @@ msgstr "Signaturfil:"
 msgid "Server:"
 msgstr "Tenar:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Brukarnamn:"
-
-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "Sti:"
-
-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "Autentisering:"
-
 #: mail/mail-config-gui.c:956
 #, fuzzy
 msgid "Detect supported types..."
 msgstr "Vel modemtype ..."
 
-#: mail/mail-config-gui.c:968
-msgid "Remember this password"
-msgstr ""
-
 #: mail/mail-config-gui.c:991
 #, fuzzy
 msgid "Don't delete messages from server"
@@ -4645,7 +5088,7 @@ msgstr "Skriftinnstillingar"
 msgid "Mail source type:"
 msgstr "E-post-&transport:"
 
-#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
+#: mail/mail-config-gui.c:1135
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4673,6 +5116,14 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "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."
+msgstr ""
+
 #: mail/mail-config-gui.c:1233
 #, fuzzy
 msgid "Add Identity"
@@ -4728,70 +5179,79 @@ msgstr ""
 msgid "Query authorization at \"%s\""
 msgstr ""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "Adresse"
 
-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Identities"
 msgstr "Identifikator"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Mail Sources"
 msgstr "Kjelder"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Mail Transport"
+msgstr "&E-post-transport"
+
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Mark message as seen [ms]: "
 msgstr "Lag meldingar og slå saman"
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "News Servers"
 msgstr "Diskusjonsgruppetenarar"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "News Sources"
 msgstr "Kjelder"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Organization"
 msgstr "Organisasjon:"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Send messages in HTML format"
 msgstr "Send meldingar:"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Kjelder"
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
+#: mail/mail-crypto.c:781
 #, fuzzy
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 #, fuzzy
 msgid "No password provided."
 msgstr "Ingen passord oppgitt."
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: 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
 #, fuzzy, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 #, fuzzy
 msgid "No GPG/PGP program available."
 msgstr "Ingen bilete tilgjengeleg."
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Kunne ikkje laga katalog\n"
+
+#: mail/mail-display.c:98
 #, fuzzy, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4801,17 +5261,17 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, fuzzy, c-format
 msgid "Could not write data: %s"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 #, fuzzy
 msgid "Save Attachment"
 msgstr "Smarte vedlegg"
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, fuzzy, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -4819,444 +5279,350 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 #, fuzzy
 msgid "Save to Disk..."
 msgstr "Lagra til disk"
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "Opnar URL ..."
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 #, fuzzy
 msgid "View Inline"
 msgstr "Vinkel"
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 #, fuzzy
 msgid "External Viewer"
 msgstr "Hendingsvisar"
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-format.c:623
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Svar"
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr ""
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Endra tidsvising"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Lagra melding"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+msgid "Reconfiguring folder"
+msgstr ""
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr ""
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 #, fuzzy
 msgid "Creating new folder"
 msgstr "Lagar ei ny mappe"
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 #, fuzzy
 msgid "Copying messages"
 msgstr "Melding"
 
-#: mail/mail-local.c:341
+#: mail/mail-local.c:348
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:372
+#: mail/mail-local.c:379
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:781
+#: mail/mail-local.c:787
 msgid "Registering local folder"
 msgstr ""
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-ops.c:79
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: mail/mail-mt.c:85
+#, fuzzy, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Feil ved laging av fil '%1':\n"
+"%2"
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Feil ved lesing av fil:\n"
+"%s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "Flyttar"
+
+#: mail/mail-ops.c:88
 #, fuzzy, c-format
 msgid "Fetching email from %s"
 msgstr "Hentar data frå %1"
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, fuzzy, c-format
 msgid "Fetch email from %s"
 msgstr "Slett e-post frå tenaren"
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, fuzzy, c-format
 msgid "There is no new mail at %s."
 msgstr "Det er ikkje band i stasjonen."
 
-#: mail/mail-ops.c:401
+#: mail/mail-ops.c:405
 #, fuzzy
 msgid "Filtering email on demand"
 msgstr "Ring ved førespurnad"
 
-#: mail/mail-ops.c:403
+#: mail/mail-ops.c:407
 #, fuzzy
 msgid "Filter email on demand"
 msgstr "Ring ved førespurnad"
 
-#: mail/mail-ops.c:538
+#: mail/mail-ops.c:551
 #, fuzzy, c-format
 msgid "Sending \"%s\""
 msgstr "Sender %1"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:553
 #, fuzzy
-msgid "Sending a message without a subject"
-msgstr "Sender meldingar til %1"
-
-#: mail/mail-ops.c:546
-#, fuzzy, c-format
-msgid "Send \"%s\""
-msgstr "Lagra: %s"
-
-#: mail/mail-ops.c:549
-#, fuzzy
-msgid "Send a message without a subject"
-msgstr "Sender ei melding til ein nettverksspelar"
+msgid "Sending message"
+msgstr "Sen melding"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 #, fuzzy
 msgid "Sending queue"
 msgstr "&Send meldingane i køen"
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 #, fuzzy
 msgid "Send queue"
 msgstr "&Send meldingane i køen"
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, fuzzy, c-format
 msgid "Appending \"%s\""
 msgstr "Sender %1"
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 #, fuzzy
 msgid "Appending a message without a subject"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-ops.c:940
-#, fuzzy, c-format
-msgid "Expunging \"%s\""
-msgstr "Forventar %1"
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, fuzzy, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, fuzzy, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1141
-#, fuzzy, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "Markerer meldingar"
-
-#: mail/mail-ops.c:1144
-#, fuzzy, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "Lag meldingar og slå saman"
-
-#: mail/mail-ops.c:1175
-#, fuzzy, c-format
-msgid "Marking message %d of %d"
-msgstr "Markerer meldingar"
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1297
-#, fuzzy, c-format
-msgid "Scan folders in \"%s\""
-msgstr "Lag ny mappe i %1"
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 #, fuzzy
 msgid "(No description)"
 msgstr "Inga skildring"
 
-#: mail/mail-ops.c:1432
-#, fuzzy, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr "Mottek meldingar frå %1"
-
-#: mail/mail-ops.c:1435
-#, fuzzy, c-format
-msgid "Attach messages from \"%s\""
-msgstr "Melding frå %s"
-
-#: mail/mail-ops.c:1535
-#, fuzzy, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "Markerer meldingar"
-
-#: mail/mail-ops.c:1539
-#, fuzzy
-msgid "Forwarding a message without a subject"
-msgstr "advarsel: denne meldinga er ikkje brukt"
-
-#: mail/mail-ops.c:1542
-#, fuzzy, c-format
-msgid "Forward message \"%s\""
-msgstr "Vidaresendt melding"
-
-#: mail/mail-ops.c:1546
-#, fuzzy
-msgid "Forward a message without a subject"
-msgstr "Vidaresendt melding frå %1"
-
-#: mail/mail-ops.c:1593
-#, fuzzy, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Mottek meldingar frå %1"
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-ops.c:1679
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "Vidaresendt melding frå %1"
-
-#: mail/mail-ops.c:1748
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
 #, fuzzy, c-format
-msgid "Loading \"%s\""
-msgstr "Lastar meldingar"
-
-#: mail/mail-ops.c:1750
-#, fuzzy, c-format
-msgid "Load \"%s\""
-msgstr "Last inn"
-
-#: mail/mail-ops.c:1853
-#, fuzzy, c-format
-msgid "Creating \"%s\""
-msgstr "Lagar"
-
-#: mail/mail-ops.c:1855
-#, fuzzy, c-format
-msgid "Create \"%s\""
-msgstr "Laga"
-
-#: mail/mail-ops.c:1903
-msgid "Exception while reporting result to shell component listener."
-msgstr ""
-
-#: mail/mail-ops.c:1949
-#, fuzzy, c-format
-msgid "Synchronizing \"%s\""
-msgstr "Synkroniser"
+msgid "Opening folder %s"
+msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1951
-#, fuzzy, c-format
-msgid "Synchronize \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
 msgstr "Synkroniser"
 
-#: mail/mail-ops.c:2015
-#, fuzzy, c-format
-msgid "Displaying message UID \"%s\""
-msgstr "Vis meldingstorleik"
-
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:1386
 #, fuzzy
-msgid "Clearing message display"
-msgstr "Markerer meldingar"
+msgid "Expunging folder"
+msgstr "Forventar %1"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1434
 #, fuzzy, c-format
-msgid "Display message UID \"%s\""
-msgstr "Vis meldingstorleik"
+msgid "Retrieving message %s"
+msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1497
 #, fuzzy
-msgid "Clear message display"
-msgstr "Endra tidsvising"
-
-#: mail/mail-ops.c:2137
-#, fuzzy, c-format
-msgid "Opening messages from folder \"%s\""
+msgid "Retrieving messages"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:1507
 #, fuzzy, c-format
-msgid "Open messages from \"%s\""
-msgstr "Melding frå %s"
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:1655
 #, fuzzy, c-format
-msgid "Loading %s Folder"
+msgid "Loading %s Folder for %s"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:2246
+#: mail/mail-ops.c:1657
 #, fuzzy, c-format
-msgid "Load %s Folder"
+msgid "Load %s Folder for %s"
 msgstr "Endra mappe"
 
-#: mail/mail-ops.c:2310
-#, fuzzy, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr "Mottek meldingar frå %1"
-
-#: mail/mail-ops.c:2313
-#, fuzzy, c-format
-msgid "View messages from \"%s\""
-msgstr "Melding frå %s"
-
-#: mail/mail-ops.c:2339
-#, fuzzy, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr "Mottek meldingar frå %1"
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "Melding"
 
-#: mail/mail-ops.c:2428
+#: mail/mail-ops.c:1902
 #, fuzzy, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Mottek meldingar frå %1"
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:2431
+#: mail/mail-ops.c:1915
 #, fuzzy, c-format
-msgid "Save messages from folder \"%s\""
+msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:1929
 #, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Mottek meldingar frå %1"
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr ""
+"Feil ved lesing a fil:\n"
+"%1"
 
 #: mail/mail-search-dialogue.c:104
 #, fuzzy
 msgid "Cancel"
 msgstr "Avbroten."
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 #, fuzzy
 msgid "Incomplete message written on pipe!"
 msgstr "<ferdig melding>"
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, fuzzy, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -5265,7 +5631,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, fuzzy, c-format
 msgid ""
 "Error while `%s':\n"
@@ -5274,20 +5640,20 @@ msgstr ""
 "Feil ved laging av fil '%1':\n"
 "%2"
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 #, fuzzy
 msgid "Could not create dialog box."
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 #, fuzzy
 msgid "User cancelled query."
 msgstr ""
@@ -5303,54 +5669,53 @@ msgstr ""
 "%2"
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, fuzzy, c-format
 msgid "Examining %s"
 msgstr "Forventar %1"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, fuzzy, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Mottek meldingar frå %1"
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, fuzzy, c-format
 msgid "Writing message %d of %d"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, fuzzy, c-format
 msgid "Saving changes to %s"
 msgstr "Lagrar alle endra filer ..."
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, fuzzy, c-format
 msgid "[%s] (forwarded message)"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (ingen emne)"
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 #, fuzzy
 msgid "Forwarded message (no subject)"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, fuzzy, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5360,86 +5725,104 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 #, fuzzy
 msgid "VFolders"
 msgstr "Mapper"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 #, fuzzy
 msgid "New VFolder"
 msgstr "Ny mappe"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 #, fuzzy
 msgid "Reply to the sender of this message"
 msgstr "Fann ikkje sendaren av denne meldinga"
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 #, fuzzy
 msgid "Reply to all recipients of this message"
 msgstr "Fann ikkje sendaren av denne meldinga"
 
-#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 #, fuzzy
 msgid "Forward this message"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 #, fuzzy
 msgid "Print the selected message"
 msgstr "Sentrer dei valte elementa"
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 #, fuzzy
 msgid "Delete this message"
 msgstr "Slett denne adressa"
 
-#: mail/message-list.c:572
+#: mail/message-list.c:590
 #, fuzzy
 msgid "Unseen"
 msgstr "partalssider"
 
-#: mail/message-list.c:575
+#: mail/message-list.c:593
 #, fuzzy
 msgid "Seen"
 msgstr "Send"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 #, fuzzy
 msgid "<unknown>"
 msgstr "Ukjend"
 
-#: mail/message-list.c:2068
+#: mail/message-list.c:965
+msgid "?"
+msgstr ""
+
+#: mail/message-list.c:972
 #, fuzzy
-msgid "Rebuilding message view"
-msgstr "Feil ved skriving av band-ID."
+msgid "Today %l:%M %p"
+msgstr "%H:%M"
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
+msgstr ""
 
-#: mail/message-list.c:2070
+#: mail/message-list.c:993
 #, fuzzy
-msgid "Rebuild message view"
-msgstr "Sen melding"
+msgid "%a %l:%M %p"
+msgstr "%H:%M"
+
+#: mail/message-list.c:1001
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%H:%M"
+
+#: mail/message-list.c:1003
+#, fuzzy
+msgid "%b %d %Y"
+msgstr "%1 bit %2 %3"
 
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
@@ -5455,27 +5838,27 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Mottek meldingar frå %1"
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, fuzzy, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Lag ny mappe i %1"
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, fuzzy, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Mottek meldingar frå %1"
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 #, fuzzy
 msgid "Evolution installation"
 msgstr "KDeelop-installering"
@@ -5490,28 +5873,28 @@ msgstr ""
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 #, fuzzy
 msgid "Could not update files correctly"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 #, fuzzy
 msgid "Evolution files successfully installed."
 msgstr "Alle filer vart sletta."
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 #, fuzzy
 msgid "This seems to be the first time you run Evolution."
 msgstr ""
 "Dette er første nivå\n"
 "i denne samlinga."
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, fuzzy, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5521,14 +5904,14 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, fuzzy, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr "kan ikkje opna fila %1"
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5536,7 +5919,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5569,7 +5952,7 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr "Ny ..."
 
@@ -5578,32 +5961,28 @@ msgstr "Ny ..."
 msgid "(Untitled)"
 msgstr "Utan tittel"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 #, fuzzy
 msgid "Bug buddy could not be run."
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 #, fuzzy
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Opphavsrett (c), %1 1997-2000"
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 #, fuzzy
 msgid "Go to folder..."
 msgstr "Flytt til mappe"
@@ -5710,9 +6089,8 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av innstillingar."
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
+#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
 #, fuzzy
 msgid "_View"
 msgstr "Vis"
@@ -5786,8 +6164,8 @@ msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5824,1268 +6202,1287 @@ msgstr "Deaktivert"
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-#, fuzzy
-msgid "N_ew Directory Server"
-msgstr "Diskusjonsgruppetenarar"
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-#, fuzzy
-msgid "_Actions"
-msgstr "Handlingar"
-
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Lagar eit nytt dokument"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 #, fuzzy
 msgid "Delete a contact"
 msgstr "Slett kolonne"
 
-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-event-editor.xml.h:67
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
 #, fuzzy
 msgid "Find"
 msgstr "Finn ..."
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New"
 msgstr "Ny ..."
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:16
 #, fuzzy
 msgid "Stop Loading"
 msgstr "Lagring"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 #, fuzzy
 msgid "View All"
 msgstr "Vinkel"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Addressbook Configuration..."
+msgstr "Oppsett"
+
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "_Print Contacts..."
 msgstr "&Innhald ..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 #, fuzzy
 msgid "_Tools"
 msgstr "Verktøy"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "5 Days"
 msgstr " dag"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Alter preferences"
 msgstr "Innstillingar"
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Ca_lendar"
 msgstr "Skriv ut alle"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Calendar Preferences..."
 msgstr "Innstillingar"
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "&Slett avtale"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Feil ved opning"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dag"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:15
 #, fuzzy
 msgid "Go to"
 msgstr "Gå til side"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "Go to a specific date"
 msgstr "Gå til side"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to present time"
 msgstr "Ikkje vis den overskytande teksten"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Månad"
 
-#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
+#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
 #, fuzzy
 msgid "Next"
 msgstr "Neste"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Open a calendar"
 msgstr "Feil ved opning"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
 msgid "Prev"
 msgstr "Førehandsvising:"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Print this calendar"
 msgstr "Skriv ut alle"
 
-#: po/tmp/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Show 1 day"
 msgstr "Vis dato"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show 1 month"
 msgstr "Vis metodar"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "Show 1 week"
 msgstr "Vis %1"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
 msgid "Show the working week"
 msgstr "Vis hovudvindauget"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 #, fuzzy
 msgid "Today"
 msgstr "i dag"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Veke"
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
 #, fuzzy
 msgid "_New"
 msgstr "Vis"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "_Open Calendar"
 msgstr "Feil ved opning"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 #, fuzzy
 msgid "_Print this calendar"
 msgstr "Skriv ut alle"
 
-#: po/tmp/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
-msgid "_Save Calendar As"
-msgstr "Ny kalender"
+msgid "_Save As..."
+msgstr "Lagra som ..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 #, fuzzy
 msgid "Delete this item"
 msgstr "Slett denne adressa"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 #, fuzzy
 msgid "Delete..."
 msgstr "Slett"
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:11
-#: po/tmp/evolution-event-editor.xml.h:81
+#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
 #, fuzzy
 msgid "Print this item"
 msgstr "Skriv til fil"
 
-#: po/tmp/evolution-contact-editor.xml.h:12
-#: po/tmp/evolution-event-editor.xml.h:82
+#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
 #, fuzzy
 msgid "Print..."
 msgstr "Skriv ut"
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "Lagra som ..."
 
-#: po/tmp/evolution-contact-editor.xml.h:14
-#: po/tmp/evolution-event-editor.xml.h:90
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
 #, fuzzy
 msgid "Save and Close"
 msgstr "Lagra ei fil"
 
-#: po/tmp/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-editor.xml.h:16
 msgid "Se_nd contact to other..."
 msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:17
-#: po/tmp/evolution-event-editor.xml.h:98
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
 #, fuzzy
 msgid "See online help"
 msgstr "Me er tilkopla!"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:18
 #, fuzzy
 msgid "Send _message to contact..."
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:38
-#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
+#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
+#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
+#: ui/evolution.xml.h:25
 #, fuzzy
 msgid "_File"
 msgstr "Fil"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 #, fuzzy
 msgid "_Print..."
 msgstr "Skriv ut"
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
+#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
+#: ui/evolution-message-composer.xml.h:46
 #, fuzzy
 msgid "_Save"
 msgstr "Lagra"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:6
 msgid "About this application"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:7
 #, fuzzy
 msgid "About..."
 msgstr "Skrifttype ..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Actio_ns"
 msgstr "Handlingar"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 #, fuzzy
 msgid "C_lear"
 msgstr "Teikn"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 #, fuzzy
 msgid "C_ut"
 msgstr "Klipp ut"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 #, fuzzy
 msgid "Clear"
 msgstr "Teikn"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:12
 #, fuzzy
 msgid "Clear the selection"
 msgstr "Slettar den valte fila"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:14
 #, fuzzy
 msgid "Close this appointment"
 msgstr "&Slett avtale"
 
-#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
 msgid "Copy"
 msgstr "Kopier"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:17
+#: ui/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: po/tmp/evolution-event-editor.xml.h:18
+#: ui/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:21
+#: ui/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:23
+#: ui/evolution-event-editor.xml.h:23
 #, fuzzy
 msgid "FIXME: Address _Book..."
 msgstr "Adresse&bok ..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:26
 #, fuzzy
 msgid "FIXME: Cop_y to Folder..."
 msgstr "Kopier til mappe"
 
-#: po/tmp/evolution-event-editor.xml.h:27
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:28
 #, fuzzy
 msgid "FIXME: Define Print _Styles"
 msgstr "&Førehandsvising ..."
 
-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:31
 #, fuzzy
 msgid "FIXME: For_ward"
 msgstr "Fort framover"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:33
 #, fuzzy
 msgid "FIXME: Help"
 msgstr "&KDE-hjelp"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:35
 #, fuzzy
 msgid "FIXME: Insert File"
 msgstr "Sett inn fil ..."
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:37
 #, fuzzy
 msgid "FIXME: Paste _Special... "
 msgstr "Lim inn spesiell ..."
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:38
 #, fuzzy
 msgid "FIXME: Print Pre_view"
 msgstr "&Førehandsvising ..."
 
-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:41
 #, fuzzy
 msgid "FIXME: Rec_urrence..."
 msgstr "Repetering"
 
-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:43
 #, fuzzy
 msgid "FIXME: Save Attac_hments..."
 msgstr "Smarte vedlegg"
 
-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:47
 #, fuzzy
 msgid "FIXME: _Customize..."
 msgstr "Tilpass ..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 #, fuzzy
 msgid "FIXME: _File..."
 msgstr "Sett inn fil ..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 #, fuzzy
 msgid "FIXME: _Font..."
 msgstr "Skrifttype ..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 #, fuzzy
 msgid "FIXME: _Formatting"
 msgstr "Tekstformatering"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:55
 #, fuzzy
 msgid "FIXME: _Memo Style"
 msgstr "Elementstil"
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:56
 #, fuzzy
 msgid "FIXME: _Move to Folder..."
 msgstr "Flytt til mappe"
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 #, fuzzy
 msgid "FIXME: _New Appointment"
 msgstr "Se&nd avtale"
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:59
 #, fuzzy
 msgid "FIXME: _Object..."
 msgstr "&Objekt ..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 #, fuzzy
 msgid "FIXME: _Paragraph..."
 msgstr "&Avsnitt ..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 #, fuzzy
 msgid "FIXME: _Spelling..."
 msgstr "&Stavekontroll ..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 #, fuzzy
 msgid "FIXME: _Standard"
 msgstr "Standard"
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:65
+#: ui/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:10
+#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 #, fuzzy
 msgid "F_ormat"
 msgstr "Format"
 
-#: po/tmp/evolution-event-editor.xml.h:68
+#: ui/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:70
+#: ui/evolution-event-editor.xml.h:70
 #, fuzzy
 msgid "Go to the next item"
 msgstr "Ikkje vis den overskytande teksten"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 #, fuzzy
 msgid "Go to the previous item"
 msgstr "Gå til neste som treng ettersyn"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 #, fuzzy
 msgid "Modify the file's properties"
 msgstr "Linjeeigenskapar"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 #, fuzzy
 msgid "N_ext"
 msgstr "Neste"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Lim inn"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Limer inn ..."
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 #, fuzzy
 msgid "Pre_vious"
 msgstr "Førre"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 #, fuzzy
 msgid "Previous"
 msgstr "Førre"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 #, fuzzy
 msgid "Print Setup"
 msgstr "Speloppsett"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 #, fuzzy
 msgid "Properties"
 msgstr "Eigenskapar ..."
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 #, fuzzy
 msgid "Redo"
 msgstr "Tilfeldig"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:85
 #, fuzzy
 msgid "Redo the undone action"
 msgstr "Fjern ein kolonne"
 
-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:86
 #, fuzzy
 msgid "Replace"
 msgstr "Svar"
 
-#: po/tmp/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:91
+#: ui/evolution-event-editor.xml.h:91
 msgid "Save the appointment and close the dialog box"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:21
+#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 #, fuzzy
 msgid "Save the current file"
 msgstr "tid no"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:93
 #, fuzzy
 msgid "Schedule Meeting"
 msgstr "Køyreplan ..."
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:94
 #, fuzzy
 msgid "Schedule _Meeting"
 msgstr "Køyreplan ..."
 
-#: po/tmp/evolution-event-editor.xml.h:95
+#: ui/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:96
+#: ui/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:97
+#: ui/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:99
+#: ui/evolution-event-editor.xml.h:99
 #, fuzzy
 msgid "Select All"
 msgstr "Vel mappe"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 #, fuzzy
 msgid "Select everything"
 msgstr "Vel mappe"
 
-#: po/tmp/evolution-event-editor.xml.h:101
+#: ui/evolution-event-editor.xml.h:101
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:102
+#: ui/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 #, fuzzy
 msgid "_About..."
 msgstr "Skrifttype ..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 #, fuzzy
 msgid "_Close"
 msgstr "Lukk"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 #, fuzzy
 msgid "_Copy"
 msgstr "Kopier"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
 msgid "_Debug"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:37
-#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
+#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
 #, fuzzy
 msgid "_Edit"
 msgstr "Rediger"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 #, fuzzy
 msgid "_Find..."
 msgstr "Finn ..."
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 #, fuzzy
 msgid "_Forms"
 msgstr "Forum"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "_Help"
 msgstr "Heim"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 #, fuzzy
 msgid "_Insert"
 msgstr "Set inn"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 #, fuzzy
 msgid "_Object"
 msgstr "Objekt"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 #, fuzzy
 msgid "_Paste"
 msgstr "Lim inn"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 #, fuzzy
 msgid "_Print"
 msgstr "Skriv ut"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 #, fuzzy
 msgid "_Properties..."
 msgstr "Eigenskapar ..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 #, fuzzy
 msgid "_Redo"
 msgstr "Tilfeldig"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 #, fuzzy
 msgid "_Replace..."
 msgstr "Opna ..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:122
 #, fuzzy
 msgid "_Toolbars"
 msgstr "Verktøylinjer"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:6
 #, fuzzy
 msgid "Compose"
 msgstr "Lukk"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 #, fuzzy
 msgid "Compose a new message"
 msgstr "Lukk melding"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 #, fuzzy
 msgid "Copy message to a new folder"
 msgstr "&Kopier bileteplassering"
 
-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
+#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
 #, fuzzy
 msgid "F_older"
 msgstr "Mapper"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:14
 #, fuzzy
 msgid "Fi_lter on Sender"
 msgstr "Fil under:"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:15
 #, fuzzy
 msgid "Filter on Rec_ipients"
 msgstr "Skriv ut filer"
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 #, fuzzy
 msgid "Get Mail"
 msgstr "Detaljar"
 
-#: po/tmp/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Hide _Deleted messages"
+msgstr "Neste melding"
+
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "Vidaresendt melding frå %1"
+
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Selected messages"
+msgstr "Sentrer dei valte elementa"
+
+#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters"
+msgid "Mail _Filters..."
 msgstr "E-post:"
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions"
+msgid "Manage Subscriptions..."
 msgstr "Skildring:"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 #, fuzzy
 msgid "Mark As U_nread"
 msgstr "Mar&ker som ulesen"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 #, fuzzy
 msgid "Move"
 msgstr "Mån"
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 #, fuzzy
 msgid "Move message to a new folder"
 msgstr "Lagra side til ascii-fil"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 #, fuzzy
 msgid "Previews the message to be printed"
 msgstr "Sen melding"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 #, fuzzy
 msgid "Print Preview of message..."
 msgstr "&Førehandsvising ..."
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 #, fuzzy
 msgid "Print message..."
 msgstr "Private meldingar"
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Svar til alle:"
 
-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 #, fuzzy
 msgid "Reply to _Sender"
 msgstr "Svar til avsendar:"
 
-#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 #, fuzzy
 msgid "Select _All"
 msgstr "Vel mappe"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Show _All messages"
+msgstr "Vidaresendt melding frå %1"
+
+#: ui/evolution-mail.xml.h:46
 #, fuzzy
 msgid "Threaded Message list"
 msgstr "Vidaresendt melding frå %1"
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Mappenamn:"
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Mappa finst: "
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Kopier til mappe"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 #, fuzzy
 msgid "_Edit Message"
 msgstr "Legg til melding"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 #, fuzzy
 msgid "_Filter on Subject"
 msgstr "Ingen emne"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 #, fuzzy
 msgid "_Forward"
 msgstr "Fram"
 
-#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:59
 #, fuzzy
-msgid "_Mail Configuration"
+msgid "_Mail Configuration..."
 msgstr "Oppsett"
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 #, fuzzy
 msgid "_Message"
 msgstr "Legg til melding"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "Flytt til mappe"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 #, fuzzy
 msgid "_Open in New Window"
 msgstr "&Opna i eige vindauge"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 #, fuzzy
 msgid "_Print Message"
 msgstr "Private meldingar"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 #, fuzzy
 msgid "_Save Message As..."
 msgstr "Lagra melding"
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 #, fuzzy
 msgid "_Source"
 msgstr "Kjelder"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 #, fuzzy
 msgid "_Undelete"
 msgstr "Slett"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 #, fuzzy
 msgid "_VFolder on Subject"
 msgstr "Ingen emne"
 
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor"
-msgstr ""
+#: ui/evolution-mail.xml.h:69
+#, fuzzy
+msgid "_Virtual Folder Editor..."
+msgstr "Mapper"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:6
 #, fuzzy
 msgid "Attach"
 msgstr "&Legg ved"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
 msgid "Close the current file"
 msgstr "tid no"
 
-#: po/tmp/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "Lagra melding"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 #, fuzzy
 msgid "Insert a file as text into the message"
 msgstr "Oppgi eit nytt namn på meldinga."
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
 msgid "Insert text file..."
 msgstr "Sett inn fil ..."
 
-#: po/tmp/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
 msgid "Open a file"
 msgstr "Opna fil"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save As"
 msgstr "Lagra"
 
-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
 msgid "Save in _folder... (FIXME)"
 msgstr "Lagrar fil ..."
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "Lagrar fil ..."
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
 msgid "Save the current file with a different name"
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
 msgid "Save the message in a specified folder"
 msgstr "Lagra side til ascii-fil"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Send"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "Send &seinare"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "Send &seinare"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Sen melding"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send the message now"
 msgstr "Sen melding"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Send this message now"
 msgstr "Sen melding"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "Vedlegg som ikon"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show _attachments"
 msgstr "Vedlegg"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Show attachments"
 msgstr "Vedlegg"
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "Sender meldingar til %1"
+
+#: ui/evolution-message-composer.xml.h:44
 #, fuzzy
 msgid "_Insert text file... (FIXME)"
 msgstr "Sett inn fil ..."
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
 msgid "_Open..."
 msgstr "Opna ..."
 
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Security"
+msgstr ""
+
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: po/tmp/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr ""
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr ""
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: po/tmp/evolution-subscribe.xml.h:13
+#: ui/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr ""
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution.xml.h:6
+#: ui/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:7
 #, fuzzy
 msgid "E_xit"
 msgstr "Avslutt"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 #, fuzzy
 msgid "Evolution bar _shortcut"
 msgstr "Evalueringsfeil"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Getting _Started"
 msgstr "Starta"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:15
 msgid "Submit bug report using Bug Buddy."
 msgstr ""
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:19
 #, fuzzy
 msgid "Using the _Calendar"
 msgstr "Skriv ut alle"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "_About Evolution..."
 msgstr "Oppløysing"
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 #, fuzzy
 msgid "_Appointment (FIXME)"
 msgstr "Avtale"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 #, fuzzy
 msgid "_Contact (FIXME)"
 msgstr "Comment=X-redigering"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "_Folder"
 msgstr "Mapper"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "Flytt til mappe"
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "_Index"
 msgstr "Set inn"
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "_Settings"
 msgstr "Skriftinnstillingar"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr ""
 
@@ -7177,31 +7574,37 @@ msgstr ""
 msgid "All Attendees"
 msgstr "Kontaktar"
 
+#. 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 ""
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 #, fuzzy
 msgid "%B %Y"
 msgstr "%1 %2"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr " ..."
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 #, fuzzy
 msgid "Now"
 msgstr "&No"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 #, fuzzy
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 #, fuzzy
 msgid "%I:%M %p"
 msgstr "%H:%M"
@@ -7211,6 +7614,323 @@ msgstr "%H:%M"
 msgid "Group %i"
 msgstr "Gruppe %1"
 
+#, fuzzy
+#~ msgid "categories"
+#~ msgstr "Kategoriar"
+
+#, fuzzy
+#~ msgid "Available Categories:"
+#~ msgstr "Tilgjengelege kategoriar"
+
+#, fuzzy
+#~ msgid "External Directories"
+#~ msgstr "Separate katalogar"
+
+#~ msgid "Port Number:"
+#~ msgstr "Portnummer:"
+
+#, fuzzy
+#~ msgid "Outline:"
+#~ msgstr "Oversikt"
+
+#, fuzzy
+#~ msgid "Headings:"
+#~ msgstr "Overskrift:"
+
+#, fuzzy
+#~ msgid "Empty days:"
+#~ msgstr " dag"
+
+#, fuzzy
+#~ msgid "Appointments:"
+#~ msgstr "Avtale"
+
+#, fuzzy
+#~ msgid "Highlighted day:"
+#~ msgstr "Opplysing:"
+
+#, fuzzy
+#~ msgid "Day numbers:"
+#~ msgstr "Høgste tal"
+
+#, fuzzy
+#~ msgid "Current day's number:"
+#~ msgstr "Noverande namn:"
+
+#, fuzzy
+#~ msgid "To-Do item that is overdue:"
+#~ msgstr "Element i hugselista:"
+
+#, fuzzy
+#~ msgid "may"
+#~ msgstr "Mai"
+
+#, fuzzy
+#~ msgid "sept"
+#~ msgstr "Nullstill"
+
+#, fuzzy
+#~ msgid "sunday"
+#~ msgstr "Sundag"
+
+#, fuzzy
+#~ msgid "monday"
+#~ msgstr "Måndag"
+
+#, fuzzy
+#~ msgid "tuesday"
+#~ msgstr "Tysdag"
+
+#, fuzzy
+#~ msgid "tues"
+#~ msgstr "sann"
+
+#, fuzzy
+#~ msgid "wednesday"
+#~ msgstr "Onsdag"
+
+#, fuzzy
+#~ msgid "wednes"
+#~ msgstr "Sverige"
+
+#, fuzzy
+#~ msgid "thursday"
+#~ msgstr "Torsdag"
+
+#, fuzzy
+#~ msgid "thur"
+#~ msgstr "Anna"
+
+#, fuzzy
+#~ msgid "thurs"
+#~ msgstr "Andre"
+
+#, fuzzy
+#~ msgid "friday"
+#~ msgstr "Fredag"
+
+#, fuzzy
+#~ msgid "saturday"
+#~ msgstr "Laurdag"
+
+#, fuzzy
+#~ msgid "fortnight"
+#~ msgstr "høgre"
+
+#, fuzzy
+#~ msgid "min"
+#~ msgstr " min"
+
+#, fuzzy
+#~ msgid "sec"
+#~ msgstr " sek"
+
+#, fuzzy
+#~ msgid "tomorrow"
+#~ msgstr "Comoros"
+
+#, fuzzy
+#~ msgid "yesterday"
+#~ msgstr "kvar dag"
+
+#~ msgid "today"
+#~ msgstr "i dag"
+
+#, fuzzy
+#~ msgid "last"
+#~ msgstr "Etternamn"
+
+#, fuzzy
+#~ msgid "this"
+#~ msgstr "er"
+
+#, fuzzy
+#~ msgid "next"
+#~ msgstr "Neste"
+
+#, fuzzy
+#~ msgid "first"
+#~ msgstr "Førenamn"
+
+#, fuzzy
+#~ msgid "third"
+#~ msgstr "Anna"
+
+#, fuzzy
+#~ msgid "fourth"
+#~ msgstr "Munnar"
+
+#, fuzzy
+#~ msgid "fifth"
+#~ msgstr "Shift"
+
+#, fuzzy
+#~ msgid "sixth"
+#~ msgstr "Høgre"
+
+#, fuzzy
+#~ msgid "seventh"
+#~ msgstr "partalssider"
+
+#, fuzzy
+#~ msgid "eighth"
+#~ msgstr "høgd"
+
+#, fuzzy
+#~ msgid "ninth"
+#~ msgstr "int"
+
+#, fuzzy
+#~ msgid "tenth"
+#~ msgstr "1 tidel"
+
+#, fuzzy
+#~ msgid "eleventh"
+#~ msgstr "partalssider"
+
+#, fuzzy
+#~ msgid "ago"
+#~ msgstr "Tag"
+
+#~ msgid "Year:"
+#~ msgstr "År:"
+
+#, fuzzy
+#~ msgid "Mail Source"
+#~ msgstr "E-posttenar"
+
+#, fuzzy
+#~ msgid "Send \"%s\""
+#~ msgstr "Lagra: %s"
+
+#, fuzzy
+#~ msgid "Send a message without a subject"
+#~ msgstr "Sender ei melding til ein nettverksspelar"
+
+#, fuzzy
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "Markerer meldingar"
+
+#, fuzzy
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "Lag meldingar og slå saman"
+
+#, fuzzy
+#~ msgid "Marking message %d of %d"
+#~ msgstr "Markerer meldingar"
+
+#, fuzzy
+#~ msgid "Scan folders in \"%s\""
+#~ msgstr "Lag ny mappe i %1"
+
+#, fuzzy
+#~ msgid "Attaching messages from folder \"%s\""
+#~ msgstr "Mottek meldingar frå %1"
+
+#, fuzzy
+#~ msgid "Attach messages from \"%s\""
+#~ msgstr "Melding frå %s"
+
+#, fuzzy
+#~ msgid "Forwarding messages \"%s\""
+#~ msgstr "Markerer meldingar"
+
+#, fuzzy
+#~ msgid "Forwarding a message without a subject"
+#~ msgstr "advarsel: denne meldinga er ikkje brukt"
+
+#, fuzzy
+#~ msgid "Forward message \"%s\""
+#~ msgstr "Vidaresendt melding"
+
+#, fuzzy
+#~ msgid "Forward a message without a subject"
+#~ msgstr "Vidaresendt melding frå %1"
+
+#, fuzzy
+#~ msgid "Loading \"%s\""
+#~ msgstr "Lastar meldingar"
+
+#, fuzzy
+#~ msgid "Load \"%s\""
+#~ msgstr "Last inn"
+
+#, fuzzy
+#~ msgid "Creating \"%s\""
+#~ msgstr "Lagar"
+
+#, fuzzy
+#~ msgid "Create \"%s\""
+#~ msgstr "Laga"
+
+#, fuzzy
+#~ msgid "Synchronize \"%s\""
+#~ msgstr "Synkroniser"
+
+#, fuzzy
+#~ msgid "Displaying message UID \"%s\""
+#~ msgstr "Vis meldingstorleik"
+
+#, fuzzy
+#~ msgid "Clearing message display"
+#~ msgstr "Markerer meldingar"
+
+#, fuzzy
+#~ msgid "Display message UID \"%s\""
+#~ msgstr "Vis meldingstorleik"
+
+#, fuzzy
+#~ msgid "Clear message display"
+#~ msgstr "Endra tidsvising"
+
+#, fuzzy
+#~ msgid "Opening messages from folder \"%s\""
+#~ msgstr "Mottek meldingar frå %1"
+
+#, fuzzy
+#~ msgid "Open messages from \"%s\""
+#~ msgstr "Melding frå %s"
+
+#, fuzzy
+#~ msgid "Viewing messages from folder \"%s\""
+#~ msgstr "Mottek meldingar frå %1"
+
+#, fuzzy
+#~ msgid "View messages from \"%s\""
+#~ msgstr "Melding frå %s"
+
+#, fuzzy
+#~ msgid "Retrieving message %d of %d (uid \"%s\")"
+#~ msgstr "Mottek meldingar frå %1"
+
+#, fuzzy
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "Mottek meldingar frå %1"
+
+#, fuzzy
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Mottek meldingar frå %1"
+
+#, fuzzy
+#~ msgid "Rebuilding message view"
+#~ msgstr "Feil ved skriving av band-ID."
+
+#, fuzzy
+#~ msgid "Rebuild message view"
+#~ msgstr "Sen melding"
+
+#, fuzzy
+#~ msgid "N_ew Directory Server"
+#~ msgstr "Diskusjonsgruppetenarar"
+
+#, fuzzy
+#~ msgid "_Actions"
+#~ msgstr "Handlingar"
+
+#, fuzzy
+#~ msgid "_Save Calendar As"
+#~ msgstr "Ny kalender"
+
 #~ msgid "(C) 1998 the Free Software Foundation"
 #~ msgstr "(C) 1998 the Free Software Foundation"
 
@@ -7225,12 +7945,6 @@ msgstr "Gruppe %1"
 #~ msgstr "Feil ved tilkopling til tenar."
 
 #, fuzzy
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr "Er du sikker på at du vil sletta denne klassen?"
-
-#, fuzzy
 #~ msgid "_Street Address:"
 #~ msgstr "Gateadresse"
 
@@ -7319,9 +8033,6 @@ msgstr "Gruppe %1"
 #~ msgid "Transparency"
 #~ msgstr "Gjennomsiktig "
 
-#~ msgid "URL"
-#~ msgstr "URL"
-
 #, fuzzy
 #~ msgid "FIXME: Ca_lendar..."
 #~ msgstr "&Slå saman kalender ..."
@@ -7387,9 +8098,6 @@ msgstr "Gruppe %1"
 #~ msgid "Due Date:"
 #~ msgstr "Forfallsdato:"
 
-#~ msgid "Priority:"
-#~ msgstr "Prioritet:"
-
 #, fuzzy
 #~ msgid "Time display"
 #~ msgstr "Endra tidsvising"
@@ -7449,9 +8157,6 @@ msgstr "Gruppe %1"
 #~ msgid "Search..."
 #~ msgstr "Søk ..."
 
-#~ msgid "Name"
-#~ msgstr "Namn"
-
 #, fuzzy
 #~ msgid "To: >>"
 #~ msgstr "Til:"
@@ -7497,14 +8202,6 @@ msgstr "Gruppe %1"
 #~ msgstr "Comment=E-postredigering"
 
 #, fuzzy
-#~ msgid "Send this message"
-#~ msgstr "Sen melding"
-
-#, fuzzy
-#~ msgid "Cannot initialize Evolution's mail summary component."
-#~ msgstr "Kan ikkje initialisera lokale variablar"
-
-#, fuzzy
 #~ msgid "Run filter \"%s\""
 #~ msgstr "Inga slik fil \"%s\"!"
 
@@ -7520,11 +8217,3 @@ msgstr "Gruppe %1"
 #, fuzzy
 #~ msgid "Forward Message"
 #~ msgstr "Vidaresendt melding"
-
-#, fuzzy
-#~ msgid "Delete Message"
-#~ msgstr "Neste melding"
-
-#, fuzzy
-#~ msgid "Move Message"
-#~ msgstr "Lagra melding"
author	Kjartan Maraas <kmaraas@gnome.org>	2001-01-09 20:42:06 +0800
committer	Kjartan Maraas <kmaraas@src.gnome.org>	2001-01-09 20:42:06 +0800
commit	af5d7854bb8392904e09bfd7fa208f1426bc6b81 (patch)
tree	cea1da1c4826dd9dcd520a0d1e8870c405a17873 /po/nn.po
parent	0cf53e3e5840295efe3462ad0b341d1f45640103 (diff)
download	gsoc2013-evolution-af5d7854bb8392904e09bfd7fa208f1426bc6b81.tar gsoc2013-evolution-af5d7854bb8392904e09bfd7fa208f1426bc6b81.tar.gz gsoc2013-evolution-af5d7854bb8392904e09bfd7fa208f1426bc6b81.tar.bz2 gsoc2013-evolution-af5d7854bb8392904e09bfd7fa208f1426bc6b81.tar.lz gsoc2013-evolution-af5d7854bb8392904e09bfd7fa208f1426bc6b81.tar.xz gsoc2013-evolution-af5d7854bb8392904e09bfd7fa208f1426bc6b81.tar.zst gsoc2013-evolution-af5d7854bb8392904e09bfd7fa208f1426bc6b81.zip