Sync for the release.

svn path=/trunk/; revision=11530

1 files changed, 1776 insertions, 1433 deletions

diff --git a/po/nn.po b/po/nn.po
index 7229692951..3a0077cfa9 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.11\n"
-"POT-Creation-Date: 2001-07-13 15:51+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-09-07 20:17+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian (Nynorsk)\n"
@@ -22,209 +22,209 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr "mellombels feil i namneoppslag"
 
-#: addressbook/backend/ebook/e-card.c:3606
+#: addressbook/backend/ebook/e-card.c:3605
 #, fuzzy
 msgid "Card: "
 msgstr "Teikn"
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3607
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3613
+#: addressbook/backend/ebook/e-card.c:3612
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "Etterstaving"
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3626
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "Start-dato:"
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3637
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "Adresse"
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3644
 #, fuzzy
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr "ZIP/Postnummer"
 
-#: addressbook/backend/ebook/e-card.c:3646
+#: addressbook/backend/ebook/e-card.c:3645
 #, fuzzy
 msgid ""
 "\n"
 "  Country:     "
 msgstr "Land:"
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3671
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3674
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3698
+#: addressbook/backend/ebook/e-card.c:3697
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card.c:3701
+#: addressbook/backend/ebook/e-card.c:3700
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3726
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3738
+#: addressbook/backend/ebook/e-card.c:3737
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3758
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "Kategoriar"
 
-#: addressbook/backend/ebook/e-card.c:3760
+#: addressbook/backend/ebook/e-card.c:3759
 #, fuzzy
 msgid ""
 "\n"
@@ -241,25 +241,25 @@ msgstr "Kommentar:"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3773
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3776
+#: addressbook/backend/ebook/e-card.c:3775
 #, fuzzy
 msgid ""
 "\n"
 "Public Key: "
 msgstr "Praksis"
 
-#: addressbook/backend/ebook/e-card.c:4038
+#: addressbook/backend/ebook/e-card.c:4037
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "&Fleire spelarar"
 
-#: addressbook/backend/ebook/e-card.c:4046
+#: addressbook/backend/ebook/e-card.c:4045
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "Kort 1:"
@@ -269,9 +269,9 @@ msgstr "Kort 1:"
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikkje initiere Bonobo"
@@ -285,15 +285,15 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 #, fuzzy
 msgid "Could not start wombat server"
 msgstr "Kunne ikkje starta underprosess."
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "Kunne ikkje starta %1."
@@ -375,7 +375,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-config.c:165
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:63
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
 msgid "Password"
 msgstr ""
 
@@ -410,13 +410,14 @@ msgstr ""
 msgid "FIXME Bind DN Help text here"
 msgstr ""
 
+#. Remember the password?
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Host:"
 msgstr "time/timar"
@@ -458,7 +459,7 @@ msgid "Advanced LDAP Options"
 msgstr "Avanserte kISDN-val"
 
 #: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:69
 msgid "Path:"
 msgstr "Sti:"
 
@@ -471,38 +472,38 @@ msgstr ""
 msgid "Create path if it doesn't exist."
 msgstr "Fila finst ikkje\n"
 
-#: addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.c:663
 #, fuzzy
 msgid "Edit Addressbook"
 msgstr "KDE adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:664
+#: addressbook/gui/component/addressbook-config.c:665
 #, fuzzy
 msgid "Add Addressbook"
 msgstr "KDE adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:682
+#: addressbook/gui/component/addressbook-config.c:683
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:53 my-evolution/e-summary-preferences.c:886
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Navn:"
 
-#: addressbook/gui/component/addressbook-config.c:689
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:691
+#: addressbook/gui/component/addressbook-config.c:694
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Skildring:"
 
-#: addressbook/gui/component/addressbook-config.c:692
+#: addressbook/gui/component/addressbook-config.c:695
 msgid "FIXME Description help text here"
 msgstr ""
 
@@ -526,26 +527,25 @@ msgid "URI"
 msgstr "URL"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:11
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Add"
 msgstr "Legg til"
 
 #: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:104 ui/evolution-comp-editor.xml.h:20
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:47
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Edit"
 msgstr "Rediger"
 
-#: addressbook/gui/component/addressbook-storage.c:99
+#: addressbook/gui/component/addressbook-storage.c:118
 #, fuzzy
 msgid "Other Contacts"
 msgstr "Slett kolonne"
@@ -585,7 +585,7 @@ msgstr ""
 "Sjekk at eininga finst og at du har\n"
 "skrivetilgang til ho."
 
-#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
+#: addressbook/gui/component/addressbook.c:554
 msgid "Any field contains"
 msgstr ""
 
@@ -607,31 +607,22 @@ msgstr "Spørjinga inneheld"
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(ingen)"
-
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#: addressbook/gui/contact-editor/e-contact-editor.c:1476
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
 msgid "Primary Email"
 msgstr "Primær e-post"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1477
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 #, fuzzy
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1478
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 #, fuzzy
 msgid "Email 3"
 msgstr "E-post 3"
@@ -664,7 +655,7 @@ msgstr ""
 
 #: addressbook/gui/component/e-address-popup.c:946
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:339
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "Slett kolonne"
@@ -694,10 +685,13 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:618
+#: addressbook/gui/component/select-names/e-select-names.c:630
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:272 shell/e-shortcuts-view.c:475
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
 msgid "Remove"
 msgstr "Fjern"
 
@@ -711,6 +705,15 @@ msgstr "Fjern"
 msgid "Send HTML Mail?"
 msgstr "&Send e-post"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Endra skrift"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #, fuzzy
 msgid "Message Recipients"
@@ -738,163 +741,158 @@ msgid "_Search"
 msgstr "Søk"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Legg til"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "Anni_versary:"
 msgstr "Merkedag"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "B_usiness"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 #, fuzzy
 msgid "Business _Fax"
 msgstr "Firma-fax"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Ca_tegories..."
 msgstr "Kategoriar ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
 msgid "Contact Editor"
 msgstr "Comment=X-redigering"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
 #: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detaljar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 #, fuzzy
 msgid "File As:"
 msgstr "Arkiver som"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Generelt"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Ny telefontype"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "No_tater:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "Organisasjon:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Telefontypar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Web page address:"
 msgstr "&WINS-adresse:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "_Address..."
 msgstr "Adresse"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "_Assistant's name:"
 msgstr "&Namn på assistent:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #, fuzzy
 msgid "_Birthday:"
 msgstr "Fødselsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 #, fuzzy
 msgid "_Business"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:20
 #, fuzzy
 msgid "_Contacts..."
 msgstr "&Innhald ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1196
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1290
-#: mail/mail-config.glade.h:103 ui/evolution-mail-message.xml.h:78
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Delete"
 msgstr "Slett"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "_Department:"
 msgstr "Avdeling:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #, fuzzy
 msgid "_Full Name..."
 msgstr "Fullt namn"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #, fuzzy
 msgid "_Home"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "_Job title:"
 msgstr "Jobb-tittel"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Na_mn på sjef:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Mobil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "Kalle_namn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "_Office:"
 msgstr "K&ontor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "_Profession:"
 msgstr "&Yrke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "_Spouse:"
 msgstr "Ektefelle"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "_This is the mailing address"
 msgstr "Rediger e-post-adresser"
@@ -904,102 +902,102 @@ msgstr "Rediger e-post-adresser"
 msgid "Delete Contact?"
 msgstr "Slett kolonne"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1434
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #, fuzzy
 msgid "Assistant"
 msgstr "Namn på assistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1435
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1436
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 #, fuzzy
 msgid "Business 2"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1437
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Firma-fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1438
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Ring tilbake"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1439
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 #, fuzzy
 msgid "Car"
 msgstr "Teikn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1440
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1441
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 #, fuzzy
 msgid "Home 2"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1443
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Heime-faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1444
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1445
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 #, fuzzy
 msgid "Mobile"
 msgstr "Mobil:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1446
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: mail/mail-config.glade.h:59
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Anna"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1447
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Alternativ faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1448
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Personsøkjar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1449
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 #, fuzzy
 msgid "Primary"
 msgstr "Privat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1450
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 #, fuzzy
 msgid "Radio"
 msgstr "Tilfeldig"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1451
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1452
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 #, fuzzy
 msgid "TTY/TDD"
 msgstr "TTY/TDD-telefon"
@@ -1014,7 +1012,7 @@ msgid "Edit Full"
 msgstr "Rediger fil"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 #, fuzzy
 msgid "Full Name"
 msgstr "Fullt namn"
@@ -1193,7 +1191,7 @@ msgid "Add Anyway"
 msgstr "Legg til &ny"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 #, fuzzy
 msgid "Duplicate Contact Detected"
 msgstr "Lag kopi av side"
@@ -1216,27 +1214,27 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Change Anyway"
-msgstr "Endra vinkel"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
-#, fuzzy
 msgid "Changed Contact:"
 msgstr "Endra skrift"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 #, fuzzy
 msgid "Conflicting Contact:"
 msgstr "Koplar til: "
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "Endra vinkel"
+
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Søk"
 
@@ -1388,9 +1386,9 @@ msgstr "Sender ei melding til ein nettverksspelar"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:53
-#: ui/evolution-tasks.xml.h:9 ui/my-evolution.xml.h:2
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Skriv ut"
 
@@ -1402,9 +1400,10 @@ msgstr "Private meldingar"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
 #: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:5
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slett"
 
@@ -1420,7 +1419,7 @@ msgid "Success"
 msgstr "Vellukka"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -1429,7 +1428,7 @@ msgstr "Ukjend feil"
 msgid "Repository offline"
 msgstr "depot i vcs"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:475
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
@@ -1485,147 +1484,147 @@ msgid "Error removing list"
 msgstr "Feil ved fjerning av oppsett"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
 #, fuzzy
 msgid "Error removing card"
 msgstr "Feil ved fjerning av oppsett"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "Trykk her for å leggja til ein ny virtuell vert."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Arkiver som"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 #, fuzzy
 msgid "Email"
 msgstr "E-post 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Telefon til assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Firma-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Ring tilbake"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 #, fuzzy
 msgid "Company Phone"
 msgstr "Hovudtelefon til firmaet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Heime-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 #, fuzzy
 msgid "Organization"
 msgstr "Organisasjon:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Firma-adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Heime-adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Bil-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Firma-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Heime-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Alternativ telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Alternativ adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 #, fuzzy
 msgid "Department"
 msgstr "Avdeling:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 #, fuzzy
 msgid "Office"
 msgstr "K&ontor:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 #, fuzzy
 msgid "Title"
 msgstr "Tittel:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #, fuzzy
 msgid "Profession"
 msgstr "&Yrke:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Manager"
 msgstr "Personsøkjar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 #, fuzzy
 msgid "Nickname"
 msgstr "Kallenamn:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 #, fuzzy
 msgid "Note"
 msgstr "Ingen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 msgid "Done."
 msgstr "Ferdig."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 #, fuzzy
 msgid "Removing cards..."
 msgstr "&Suspender ..."
@@ -1675,7 +1674,8 @@ msgid "Dimensions:"
 msgstr "Dimensjonar"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Skrifttype ..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1827,20 +1827,25 @@ msgstr "Type:"
 msgid "Width:"
 msgstr "Breidd:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Skrifttype ..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 #, fuzzy
 msgid "Error while communicating with calendar server"
 msgstr "Feil ved tilkopling til tenar."
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -1882,6 +1887,11 @@ msgstr "Øydelagd oppsettfil."
 msgid "Factory for the sample Calendar control"
 msgstr "Øydelagd oppsettfil."
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Øydelagd oppsettfil."
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr ""
@@ -2001,138 +2011,160 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: calendar/gui/calendar-commands.c:278
-msgid "File not found"
-msgstr "Fann ikkje fil"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%1 bit %2 %3"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:302
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
 #, fuzzy
-msgid "Open calendar"
-msgstr "Feil ved opning"
+msgid "%a %d %b %Y"
+msgstr "%1 bit %2 %3"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:344
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
 #, fuzzy
-msgid "Save calendar"
-msgstr "Ny kalender"
+msgid "%B %Y"
+msgstr "%1 %2"
 
-#: calendar/gui/calendar-commands.c:596
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:989
-#: calendar/gui/e-calendar-table.c:346
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 #, fuzzy
 msgid "Public"
 msgstr "Praksis"
 
-#: calendar/gui/calendar-model.c:386 calendar/gui/calendar-model.c:991
-#: calendar/gui/e-calendar-table.c:347
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:389 calendar/gui/calendar-model.c:993
-#: calendar/gui/e-calendar-table.c:348
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 #, fuzzy
 msgid "Confidential"
 msgstr "Eksponentiell"
 
-#: calendar/gui/calendar-model.c:392 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
 #: calendar/gui/dialogs/alarm-page.c:385
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: calendar/gui/calendar-model.c:489
+#: calendar/gui/calendar-model.c:497
 #, fuzzy
 msgid "N"
 msgstr "Nr"
 
-#: calendar/gui/calendar-model.c:489
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:491
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:491
+#: calendar/gui/calendar-model.c:499
 #, fuzzy
 msgid "W"
 msgstr "RW"
 
-#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1174
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:368 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 #, fuzzy
 msgid "High"
 msgstr "Høgd"
 
-#: calendar/gui/calendar-model.c:531 calendar/gui/calendar-model.c:1176
-#: calendar/gui/calendar-model.c:1699
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:369 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:533 calendar/gui/calendar-model.c:1178
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:370 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 #, fuzzy
 msgid "Low"
 msgstr "Senk"
 
-#: calendar/gui/calendar-model.c:569 calendar/gui/calendar-model.c:1230
-#: calendar/gui/e-calendar-table.c:422
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 #, fuzzy
 msgid "Transparent"
 msgstr "Gjennomsiktig "
 
-#: calendar/gui/calendar-model.c:572 calendar/gui/calendar-model.c:1232
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 #, fuzzy
 msgid "Opaque"
 msgstr "Opna"
 
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1284
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:403
 #, fuzzy
 msgid "Not Started"
 msgstr "Starta"
 
-#: calendar/gui/calendar-model.c:729 calendar/gui/calendar-model.c:1286
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:404
 #, fuzzy
 msgid "In Progress"
 msgstr "Framgong:"
 
-#: calendar/gui/calendar-model.c:732 calendar/gui/calendar-model.c:1288
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Ferdig"
 
-#: calendar/gui/calendar-model.c:735 calendar/gui/calendar-model.c:1290
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:445 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Avbroten"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:885 e-util/e-time-utils.c:267
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:888 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:893
+#: calendar/gui/calendar-model.c:901
 #, fuzzy, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2140,65 +2172,70 @@ msgid ""
 "%s"
 msgstr "Ein bandindeks må vera valt i treet."
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:987 calendar/gui/calendar-model.c:1228
-#: calendar/gui/calendar-model.c:1282
-#: calendar/gui/dialogs/e-timezone-dialog.c:197
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
 #: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:345 calendar/gui/e-calendar-table.c:420
-#: mail/mail-account-gui.c:1360 mail/mail-accounts.c:129
-#: mail/mail-accounts.c:380 mail/mail-config.glade.h:56
-#: shell/e-shell-view.c:1406 widgets/misc/e-cell-date-edit.c:240
-#: widgets/misc/e-dateedit.c:439 widgets/misc/e-dateedit.c:1369
-#: widgets/misc/e-dateedit.c:1484
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1078
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1118
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1159
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1172
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:371
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1213
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/calendar-model.c:1710
 #, fuzzy
 msgid "Recurring"
 msgstr "Repetering"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 #, fuzzy
 msgid "No"
 msgstr "&No"
@@ -2287,7 +2324,7 @@ msgstr "Terminalprogram:"
 msgid "With these arguments:"
 msgstr "Køyr %s med desse arguenta:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:81
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
 #, fuzzy
 msgid "days"
 msgstr " dag"
@@ -2297,12 +2334,12 @@ msgstr " dag"
 msgid "extra times every"
 msgstr "Oppdater kvart"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:82
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
 #, fuzzy
 msgid "hours"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 msgid "minutes"
 msgstr "minutt"
 
@@ -2408,7 +2445,7 @@ msgstr "KBasic"
 #: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-itip-control.c:297
+#: calendar/gui/e-itip-control.c:298
 #, fuzzy
 msgid "Date/Time:"
 msgstr "Dato/tid"
@@ -2422,7 +2459,7 @@ msgstr "Påminning:"
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:10
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-itip-control.c:286 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
 msgstr "Samandrag:"
@@ -2457,7 +2494,7 @@ msgstr "&Slett avtale"
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:105
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 #, fuzzy
 msgid "minute(s)"
 msgstr "minutt"
@@ -2506,8 +2543,7 @@ msgid "Beep when alarm windows appear."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: my-evolution/my-evolution.glade.h:6 shell/e-shortcuts.c:1014
-#: ui/evolution-calendar.xml.h:4
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 #, fuzzy
 msgid "Calendar"
 msgstr "Skriv ut alle"
@@ -2546,7 +2582,7 @@ msgid "Defaults"
 msgstr "Standard"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Display"
 msgstr "Vis"
@@ -2565,7 +2601,7 @@ msgid "Fri"
 msgstr "Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:978
+#: calendar/gui/dialogs/recurrence-page.c:969
 #, fuzzy
 msgid "Friday"
 msgstr "Fredag"
@@ -2575,7 +2611,7 @@ msgid "Mon"
 msgstr "Mån"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:974
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Måndag"
 
@@ -2599,7 +2635,7 @@ msgid "Sat"
 msgstr "Lau"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:970
 #, fuzzy
 msgid "Saturday"
 msgstr "Laurdag"
@@ -2624,7 +2660,7 @@ msgid "Sun"
 msgstr "Sun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Sundag"
 
@@ -2643,7 +2679,7 @@ msgid "Thu"
 msgstr "Tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:977
+#: calendar/gui/dialogs/recurrence-page.c:968
 #, fuzzy
 msgid "Thursday"
 msgstr "Torsdag"
@@ -2672,7 +2708,7 @@ msgid "Tue"
 msgstr "Tys"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:975
+#: calendar/gui/dialogs/recurrence-page.c:966
 #, fuzzy
 msgid "Tuesday"
 msgstr "Tysdag"
@@ -2682,7 +2718,7 @@ msgid "Wed"
 msgstr "Ons"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:976
+#: calendar/gui/dialogs/recurrence-page.c:967
 #, fuzzy
 msgid "Wednesday"
 msgstr "Onsdag"
@@ -2766,31 +2802,31 @@ msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
 #: calendar/gui/dialogs/comp-editor-util.c:154
-#: calendar/gui/e-itip-control.c:582 calendar/gui/print.c:2115
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
 #, fuzzy
 msgid " to "
 msgstr " til:"
 
 #: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:586 calendar/gui/print.c:2119
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 #, fuzzy
 msgid " (Completed "
 msgstr "Ferdig"
 
 #: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:588 calendar/gui/print.c:2121
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
 #, fuzzy
 msgid "Completed "
 msgstr "Ferdig"
 
 #: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:593 calendar/gui/print.c:2126
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
 #, fuzzy
 msgid " (Due "
 msgstr " Slett "
 
 #: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:595 calendar/gui/print.c:2128
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "Forfall"
@@ -2820,13 +2856,13 @@ msgstr ""
 msgid "No summary"
 msgstr "oppsummering"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1462
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
 #: mail/mail-display.c:98
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Overskriv filer"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1466
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
 #: mail/mail-display.c:102
 #, fuzzy
 msgid ""
@@ -2835,7 +2871,7 @@ msgid ""
 msgstr "Ei fil med det namnet finst alt. Vil du skriva over den?"
 
 #: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:101
 #, fuzzy
 msgid "Save As..."
 msgstr "Lagra som ..."
@@ -2981,12 +3017,136 @@ msgstr "Slutt-tid:"
 msgid "_Start time:"
 msgstr "Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:614
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Gruppenamn:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Kjelder"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Teikn"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "Tenarinformasjon"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+#, fuzzy
+msgid "Optional Participant"
+msgstr "Personleg informasjon"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Vel ikon"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Slett"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Mellombels"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Slett"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Framgong:"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Bil-telefon"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Tenarinformasjon"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Personleg informasjon"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:891
 #, fuzzy
 msgid "Sent By:"
 msgstr "Sende byte"
 
-#: calendar/gui/dialogs/meeting-page.c:1191
+#: calendar/gui/dialogs/meeting-page.c:1442
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "F&jern rad ..."
@@ -3029,14 +3189,14 @@ msgid "Role"
 msgstr "Mobil:"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:50
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Status"
 msgstr "Status:"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:96
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
 #: shell/glade/e-active-connection-dialog.glade.h:5
 #, fuzzy
 msgid "Type"
@@ -3064,36 +3224,36 @@ msgstr "Andre ..."
 msgid "_Other Organizer"
 msgstr "Planleggjar"
 
-#: calendar/gui/dialogs/recurrence-page.c:434 calendar/gui/print.c:1839
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
 #: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 #, fuzzy
 msgid "%a %b %d %Y"
 msgstr "%1 bit %2 %3"
 
-#: calendar/gui/dialogs/recurrence-page.c:582
+#: calendar/gui/dialogs/recurrence-page.c:584
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:947
+#: calendar/gui/dialogs/recurrence-page.c:938
 #, fuzzy
 msgid "on"
 msgstr "Mån"
 
-#: calendar/gui/dialogs/recurrence-page.c:973 filter/filter-datespec.c:81
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dagen"
 
-#: calendar/gui/dialogs/recurrence-page.c:1103
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "on the"
 msgstr "Månad"
 
-#: calendar/gui/dialogs/recurrence-page.c:1111
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "th"
 msgstr "4."
 
-#: calendar/gui/dialogs/recurrence-page.c:1281
+#: calendar/gui/dialogs/recurrence-page.c:1274
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
@@ -3201,7 +3361,7 @@ msgid "No one"
 msgstr "Ingen"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:894
+#: my-evolution/e-summary-preferences.c:889
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
@@ -3240,109 +3400,110 @@ msgstr "Prioritet:"
 msgid "_Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-calendar-table.c:390
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:391
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:393
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:394
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:395
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:396
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:886
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
 #, fuzzy
-msgid "Edit this task"
-msgstr "&Endra avtale ..."
+msgid "_Open"
+msgstr "Opna ..."
 
-#: calendar/gui/e-calendar-table.c:887 calendar/gui/e-calendar-table.c:897
-#: calendar/gui/e-day-view.c:3332 calendar/gui/e-week-view.c:3170
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
-#: ui/evolution-mail-list.xml.h:4
-msgid "Cut"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#, fuzzy
+msgid "C_ut"
 msgstr "Klipp ut"
 
-#: calendar/gui/e-calendar-table.c:888 calendar/gui/e-calendar-table.c:898
-#: calendar/gui/e-day-view.c:3334 calendar/gui/e-week-view.c:3172
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
-msgid "Copy"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+#, fuzzy
+msgid "_Copy"
 msgstr "Kopier"
 
-#: calendar/gui/e-calendar-table.c:889 calendar/gui/e-calendar-table.c:899
-#: calendar/gui/e-day-view.c:3307 calendar/gui/e-day-view.c:3336
-#: calendar/gui/e-week-view.c:3146 calendar/gui/e-week-view.c:3174
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
-#: ui/evolution-mail-list.xml.h:12
-msgid "Paste"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+#, fuzzy
+msgid "_Paste"
 msgstr "Lim inn"
 
-#: calendar/gui/e-calendar-table.c:891
+#: calendar/gui/e-calendar-table.c:861
 #, fuzzy
-msgid "Mark as complete"
+msgid "_Mark as Complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:892
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
-msgid "Delete this task"
+msgid "_Delete this Task"
 msgstr "Slett denne adressa"
 
-#: calendar/gui/e-calendar-table.c:901
+#: calendar/gui/e-calendar-table.c:866
 #, fuzzy
-msgid "Mark tasks as complete"
+msgid "_Mark Tasks as Complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:902 ui/evolution-tasks.xml.h:6
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
-msgid "Delete selected tasks"
+msgid "_Delete Selected Tasks"
 msgstr "Slett den valte oppgåva"
 
-#: calendar/gui/e-calendar-table.c:1259
+#: calendar/gui/e-calendar-table.c:1137
 #, fuzzy
 msgid "Click here to add a task"
 msgstr "Trykk her for å leggja til ein ny virtuell vert."
@@ -3362,8 +3523,8 @@ msgstr "Alarm"
 msgid "Categories"
 msgstr "Kategoriar"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:696
-#: camel/camel-filter-driver.c:808
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
 #, fuzzy
 msgid "Complete"
 msgstr "Ferdig"
@@ -3427,13 +3588,6 @@ msgstr ""
 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:289 calendar/gui/e-day-view.c:1344
-#: 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:293 calendar/gui/e-day-view.c:1357
@@ -3454,152 +3608,146 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3312 ui/evolution-calendar.xml.h:21
+#: calendar/gui/e-day-view.c:3306
 #, fuzzy
-msgid "New Appointment"
+msgid "New _Appointment"
 msgstr "&Vis avtale ..."
 
-#: calendar/gui/e-day-view.c:3314 calendar/gui/e-week-view.c:3153
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
 #, fuzzy
-msgid "New All Day Event"
+msgid "New All Day _Event"
 msgstr "Ny &hending ..."
 
-#: calendar/gui/e-day-view.c:3319 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
-msgid "Go to Today"
+msgid "Go to _Today"
 msgstr "Gå til &i dag"
 
-#: calendar/gui/e-day-view.c:3321 calendar/gui/e-week-view.c:3160
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
 #, fuzzy
-msgid "Go to Date..."
+msgid "_Go to Date..."
 msgstr "&Gå til side ..."
 
-#: calendar/gui/e-day-view.c:3328 calendar/gui/e-week-view.c:3166
-#: shell/e-shortcuts-view.c:468 ui/evolution-calendar.xml.h:24
-#: ui/evolution-message-composer.xml.h:12
-#, fuzzy
-msgid "Open"
-msgstr "Opna ..."
-
-#: calendar/gui/e-day-view.c:3330 calendar/gui/e-week-view.c:3168
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
 #, fuzzy
-msgid "Delete this Appointment"
+msgid "_Delete this Appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/e-day-view.c:3345 calendar/gui/e-week-view.c:3188
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
 #, fuzzy
-msgid "Make this Occurrence Movable"
+msgid "Make this Occurrence _Movable"
 msgstr "Se&nd avtale"
 
-#: calendar/gui/e-day-view.c:3347 calendar/gui/e-week-view.c:3190
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
 #, fuzzy
-msgid "Delete this Occurrence"
+msgid "Delete this _Occurrence"
 msgstr "Erstatt denne førekomsten?"
 
-#: calendar/gui/e-day-view.c:3349
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
 #, fuzzy
-msgid "Delete all Occurrences"
+msgid "Delete _All Occurrences"
 msgstr "Slettar klassen"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:694
 #, fuzzy
 msgid "This is an event that can be added to your calendar."
 msgstr "Dette er ei topptekstramme - ho kan ikkje slettast."
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:697
 #, fuzzy
 msgid "This is a meeting request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:655
+#: calendar/gui/e-itip-control.c:700
 #, fuzzy
 msgid "This is one or more additions to a current meeting."
 msgstr ""
 "Dette er første nivå\n"
 "i denne samlinga."
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:703
 #, fuzzy
 msgid "This is a request for the latest event information."
 msgstr "Dette er ei førehandsvising av det valte bakgrunnsbiletet."
 
-#: calendar/gui/e-itip-control.c:661
+#: calendar/gui/e-itip-control.c:706
 #, fuzzy
 msgid "This is a reply to a meeting request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:709
 #, fuzzy
 msgid "This is an event cancellation."
 msgstr ""
 "Dette er det siste nivået\n"
 "i denne samlinga."
 
-#: calendar/gui/e-itip-control.c:667 calendar/gui/e-itip-control.c:707
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
 msgid "The message is not understandable."
 msgstr "Meldinga har ingen sendar"
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:740
 #, fuzzy
 msgid "This is a task request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:743
 #, fuzzy
 msgid "This is a request for the latest task information."
 msgstr "Dette er ei førehandsvising av det valte bakgrunnsbiletet."
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:746
 #, fuzzy
 msgid "This is a reply to a task request."
 msgstr ""
 "Dette er ein katalog og inga fil:\n"
 "%s"
 
-#: calendar/gui/e-itip-control.c:704
+#: calendar/gui/e-itip-control.c:749
 #, fuzzy
 msgid "This is an task cancellation."
 msgstr "Dette er inga lokal fil.\n"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:771
 #, fuzzy
 msgid "This is freebusy information."
 msgstr "Skriv avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:774
 #, fuzzy
 msgid "This is a request for freebusy information."
 msgstr "Prøv «%s --help» for meir informasjon\n"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:755
+#: calendar/gui/e-itip-control.c:834
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:853
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Meldinga har ingen sendar"
 
-#: calendar/gui/e-itip-control.c:792
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
+#: calendar/gui/e-itip-control.c:989
 #, fuzzy
 msgid "I couldn't update your calendar file!\n"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-itip-control.c:908
+#: calendar/gui/e-itip-control.c:1015
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -3647,22 +3795,22 @@ msgstr ""
 msgid "date-start"
 msgstr " start"
 
-#: calendar/gui/e-tasks.c:184 calendar/gui/e-tasks.c:521
-#: calendar/gui/e-tasks.c:554
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:190
+#: calendar/gui/e-tasks.c:252
 #, fuzzy
 msgid "Category:"
 msgstr "Kategoriar"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:403
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-tasks.c:341
+#: calendar/gui/e-tasks.c:415
 #, fuzzy, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden %1 er ikkje støtta."
@@ -3676,37 +3824,12 @@ msgstr "Metoden %1 er ikkje støtta."
 msgid "%d %B"
 msgstr "%1 %2"
 
-#: calendar/gui/e-week-view.c:3151 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
 #, fuzzy
-msgid "New Appointment..."
+msgid "New _Appointment..."
 msgstr "&Vis avtale ..."
 
-#: calendar/gui/e-week-view.c:3192
-#, fuzzy
-msgid "Delete All Occurrences"
-msgstr "Slettar klassen"
-
-#: calendar/gui/gnome-cal.c:219
-#, fuzzy
-msgid "Summary contains"
-msgstr "Spørjinga inneheld"
-
-#: calendar/gui/gnome-cal.c:220
-#, fuzzy
-msgid "Description contains"
-msgstr "Skildringar"
-
-#: calendar/gui/gnome-cal.c:221
-#, fuzzy
-msgid "Comment contains"
-msgstr "ikkje inneheld"
-
-#: calendar/gui/gnome-cal.c:222
-#, fuzzy
-msgid "Has category"
-msgstr "Kategori"
-
-#: calendar/gui/gnome-cal.c:1058
+#: calendar/gui/gnome-cal.c:999
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
@@ -3714,7 +3837,7 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/gnome-cal.c:1069
+#: calendar/gui/gnome-cal.c:1010
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden %1 er ikkje støtta."
@@ -3789,7 +3912,7 @@ msgstr "September"
 msgid "_Go To Today"
 msgstr "Gå til &i dag"
 
-#: calendar/gui/itip-utils.c:223
+#: calendar/gui/itip-utils.c:224
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3952,15 +4075,15 @@ msgstr "Fre"
 msgid "Sa"
 msgstr "Lau"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:156
-#: my-evolution/e-summary-tasks.c:172 shell/e-shortcuts.c:1015
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Oppgåver"
 
 #. Day
 #: calendar/gui/print.c:1815
-msgid "Current day (%a %b %d %Y)"
+msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
 #: calendar/gui/print.c:1834 calendar/gui/print.c:1838
@@ -3973,45 +4096,45 @@ msgstr ""
 
 #: calendar/gui/print.c:1846
 #, c-format
-msgid "Current week (%s - %s)"
+msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
 #: calendar/gui/print.c:1854
 #, fuzzy
-msgid "Current month (%b %Y)"
+msgid "Selected month (%b %Y)"
 msgstr "Denne månaden"
 
 #. Year
 #: calendar/gui/print.c:1861
 #, fuzzy
-msgid "Current year (%Y)"
+msgid "Selected year (%Y)"
 msgstr "Gjeldande: %1"
 
-#: calendar/gui/print.c:2199
+#: calendar/gui/print.c:2200
 #, fuzzy
 msgid "Print Calendar"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/print.c:2287 calendar/gui/print.c:2379
-#: mail/mail-callbacks.c:1820 my-evolution/e-summary.c:498
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:10
 #, fuzzy
 msgid "Print Preview"
 msgstr "&Førehandsvising ..."
 
-#: calendar/gui/print.c:2316
+#: calendar/gui/print.c:2317
 #, fuzzy
 msgid "Print Item"
 msgstr "Utskriftssystem"
 
-#: calendar/gui/print.c:2397
+#: calendar/gui/print.c:2398
 #, fuzzy
 msgid "Print Setup"
 msgstr "Speloppsett"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "Viser korleis datoverdiar vert viste."
@@ -4099,59 +4222,59 @@ msgstr "Registrerer hjå tenaren ..."
 msgid "You must be working online to complete this operation"
 msgstr "Kan ikkje gjera LIST-operasjon ferdig"
 
-#: camel/camel-filter-driver.c:530 camel/camel-filter-driver.c:539
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synkroniser"
 
-#: camel/camel-filter-driver.c:641
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Kan ikkje 'chown' 'spool'-katalogen"
 
-#: camel/camel-filter-driver.c:650
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Kan ikkje laga 'spool'-katalog"
 
-#: camel/camel-filter-driver.c:664
-#, fuzzy, c-format
+#: camel/camel-filter-driver.c:667
+#, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/camel-filter-driver.c:668 camel/camel-filter-driver.c:681
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-filter-driver.c:669
+#: camel/camel-filter-driver.c:672
 #, fuzzy
 msgid "Cannot open message"
 msgstr "Kan ikkje dekryptera melding:"
 
-#: camel/camel-filter-driver.c:692 camel/camel-filter-driver.c:803
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synkroniser"
 
-#: camel/camel-filter-driver.c:762
+#: camel/camel-filter-driver.c:766
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/camel-filter-driver.c:767 camel/camel-filter-driver.c:785
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/camel-filter-driver.c:885
+#: camel/camel-filter-driver.c:892
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:891
+#: camel/camel-filter-driver.c:898
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
@@ -4388,7 +4511,7 @@ msgid "Connection cancelled"
 msgstr "Avbroten."
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -4397,14 +4520,14 @@ msgstr ""
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Feil ved opning"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
@@ -4502,7 +4625,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:438
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -4573,7 +4696,7 @@ msgstr ""
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4621,13 +4744,6 @@ msgstr "Kunne ikkje leggja til melding:\n"
 msgid "Failed to verify certificates."
 msgstr "Åtvaring ved &tilbaketrekte sertifikat"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:987 mail/mail-ops.c:994
-#: mail/mail-ops.c:1012 mail/mail-ops.c:1013
-#, fuzzy
-msgid "Trash"
-msgstr "Oppgåve"
-
 #: camel/camel-tcp-stream-openssl.c:415
 #, fuzzy, c-format
 msgid ""
@@ -4681,26 +4797,26 @@ msgstr "Vidaresendt melding"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, fuzzy, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Slett e-post frå tenaren"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:493
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:530
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
@@ -4721,18 +4837,29 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:430
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
 #, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "Leitar etter tilleggsmodular"
+msgid "Scanning for changed messages"
+msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:1483
-#: camel/providers/imap/camel-imap-folder.c:1819
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 #, fuzzy
 msgid "This message is not currently available"
 msgstr "%1 er ikkje tilgjengeleg."
 
-#: camel/providers/imap/camel-imap-folder.c:1852
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Melding"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -4743,7 +4870,7 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Berre sjekk for ny e-post."
@@ -4753,7 +4880,7 @@ msgstr "Berre sjekk for ny e-post."
 msgid "Check for new messages in all folders"
 msgstr "Berre sjekk for ny e-post."
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:646
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Mapper"
 
@@ -4787,28 +4914,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:471
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:510
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:536
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4816,11 +4943,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:325
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Vidaresendt melding"
 
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
 #: camel/providers/local/camel-local-provider.c:40
 #, fuzzy
 msgid "MH-format mail directories"
@@ -5103,7 +5234,7 @@ msgstr ""
 #: camel/providers/local/camel-mbox-summary.c:502
 #: camel/providers/local/camel-mbox-summary.c:703
 #: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1468
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Synkroniser"
@@ -5165,7 +5296,7 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
 #: camel/providers/local/camel-spool-summary.c:545
 #: camel/providers/local/camel-spool-summary.c:1106
 #, fuzzy, c-format
@@ -5364,7 +5495,7 @@ msgstr "&La e-posten liggja på tenaren."
 msgid "Delete after %s day(s)"
 msgstr "Slett denne adressa"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:62
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr ""
 
@@ -5444,7 +5575,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Sendmail"
 msgstr "Send"
@@ -5498,7 +5629,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:76
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
@@ -5506,127 +5637,127 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 #, fuzzy
 msgid "Help message"
 msgstr "Lagra melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 #, fuzzy
 msgid "Service ready"
 msgstr "Skjul"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Ingen passord oppgitt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:396
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/providers/smtp/camel-smtp-transport.c:419
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5634,114 +5765,129 @@ msgid ""
 "\n"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/smtp/camel-smtp-transport.c:535
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Diskusjonsgruppetenarar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:537
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:562
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:569
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#, fuzzy
+msgid "Sending message"
+msgstr "Sen melding"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:677
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy
+msgid "SMTP Greeting"
+msgstr "Møte"
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:729
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-#: camel/providers/smtp/camel-smtp-transport.c:756
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Autentisering:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:782
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:810
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:836
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:855
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, 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:899
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:930
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, 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:949
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:966
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1003
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1027
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1046
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Ukjend feil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -5772,7 +5918,7 @@ msgid "%.1fG"
 msgstr "%1 GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 #, fuzzy
 msgid "attachment"
 msgstr "Vedlegg"
@@ -5811,7 +5957,7 @@ msgstr "MIME-type"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:325
+#: composer/e-msg-composer-hdrs.c:328
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
@@ -5819,14 +5965,14 @@ msgstr "Legg adresse til adresseboka"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "Frå:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:365
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Svar"
@@ -5834,34 +5980,34 @@ msgstr "Svar"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:391
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn på meldinga."
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:394
 #, fuzzy
 msgid "Cc:"
 msgstr "&CC:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:398
 #, fuzzy
 msgid "Bcc:"
 msgstr "&Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5892,67 +6038,67 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: composer/e-msg-composer.c:869
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Lagra som ..."
 
-#: composer/e-msg-composer.c:878
+#: composer/e-msg-composer.c:882
 #, fuzzy
 msgid "Warning!"
 msgstr "Flyttar"
 
-#: composer/e-msg-composer.c:880
+#: composer/e-msg-composer.c:884
 #, fuzzy
 msgid "File exists, overwrite?"
 msgstr "Loggfil eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:902
+#: composer/e-msg-composer.c:906
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:922
+#: composer/e-msg-composer.c:926
 #, fuzzy, c-format
 msgid "Error loading file: %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1047
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1055
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: composer/e-msg-composer.c:1057
+#: composer/e-msg-composer.c:1061
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1067
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1076
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5961,18 +6107,13 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1173
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
 "Would you like to attempt recovery?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1318 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1321
 #, fuzzy
 msgid ""
 "This message has not been sent.\n"
@@ -5982,20 +6123,25 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:1349
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:1498
+#: composer/e-msg-composer.c:1500
 msgid "Insert File"
 msgstr "Set inn fil"
 
-#: composer/e-msg-composer.c:1854 composer/e-msg-composer.c:2242
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 #, fuzzy
 msgid "Compose a message"
 msgstr "Lukk melding"
 
-#: composer/e-msg-composer.c:2336
+#: composer/e-msg-composer.c:2351
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Kan ikkje laga nytt vindauge.\n"
@@ -6026,75 +6172,59 @@ msgstr "Adresse"
 msgid "calendar information"
 msgstr "Informasjon"
 
-#: default_user/searches.xml.h:1
-#, fuzzy
-msgid "Body contains"
-msgstr "Handlingar"
-
-#: default_user/searches.xml.h:2
-#, fuzzy
-msgid "Body does not contain"
-msgstr "ikkje inneheld"
-
-#: default_user/searches.xml.h:3
-#, fuzzy
-msgid "Body or subject contains"
-msgstr "Emne"
-
-#: default_user/searches.xml.h:4
-#, fuzzy
-msgid "Sender contains"
-msgstr "Spørjinga inneheld"
-
-#: default_user/searches.xml.h:5
-#, fuzzy
-msgid "Subject contains"
-msgstr "Emne"
-
-#: default_user/searches.xml.h:6
-#, fuzzy
-msgid "Subject does not contain"
-msgstr "Emne"
-
 #. strptime format for a date.
-#: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1312 widgets/misc/e-dateedit.c:1493
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:77 e-util/e-time-utils.c:187
-#: e-util/e-time-utils.c:312
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 #, fuzzy
 msgid "%I:%M:%S %p"
 msgstr "%H:%M"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:80 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:304
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 #, fuzzy
 msgid "%H:%M:%S"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
-#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1290
-#: widgets/misc/e-dateedit.c:1349 widgets/misc/e-dateedit.c:1528
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 #, fuzzy
 msgid "%I:%M %p"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
-#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1287
-#: widgets/misc/e-dateedit.c:1346 widgets/misc/e-dateedit.c:1525
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 #, fuzzy
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+msgid "%d/%m/%Y"
+msgstr ""
+
+#: e-util/e-time-utils.c:241
+msgid "%Y/%m/%d"
+msgstr ""
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "Tx"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:258
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -6102,88 +6232,88 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:263
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:312
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%H:%M"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 #, fuzzy
 msgid "year"
 msgstr "år"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 #, fuzzy
 msgid "years"
 msgstr "år"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "month"
 msgstr "Månad"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "months"
 msgstr "månad(er)"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 #, fuzzy
 msgid "week"
 msgstr "Veke"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 #, fuzzy
 msgid "weeks"
 msgstr "Veke"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 #, fuzzy
 msgid "hour"
 msgstr "time/timar"
 
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 #, fuzzy
 msgid "minute"
 msgstr "minutt"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 #, fuzzy
 msgid "second"
 msgstr "sekund"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "sekund"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -6191,37 +6321,42 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 #, fuzzy
 msgid "the current time"
 msgstr "tid no"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 #, fuzzy
 msgid "a time relative to the current time"
 msgstr "Vis hendingane for denne dagen"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 #, fuzzy
 msgid "Compare against"
 msgstr "Kompilatoråtvaringar"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 #, fuzzy
 msgid "now"
 msgstr "nei"
 
-#: filter/filter-datespec.c:579
+#: filter/filter-datespec.c:575
 #, fuzzy
 msgid " ago"
 msgstr "Tag"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:621
+#, fuzzy
+msgid "ago"
+msgstr "Tag"
+
+#: filter/filter-datespec.c:709
 #, fuzzy
 msgid "<click here to select a date>"
 msgstr "Trykk for å velja ein skrifttype"
@@ -6248,8 +6383,8 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
-#: mail/mail-account-gui.c:766
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 #, fuzzy
 msgid "Select Folder"
 msgstr "Vel mappe"
@@ -6319,7 +6454,14 @@ msgstr "Koding"
 msgid "outgoing"
 msgstr "Oversikt"
 
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Legg til"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
 msgid "Edit"
 msgstr "Rediger"
 
@@ -6461,141 +6603,136 @@ msgid "Expression"
 msgstr "&Yrke:"
 
 #: filter/libfilter-i18n.h:24
-#, fuzzy
-msgid "Forward to Address"
-msgstr "Vidaresendt melding"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 #, fuzzy
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Mailing list"
 msgstr "E-post&liste for språket:"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "Message Body"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "Message Header"
 msgstr "Melding motteken"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 #, fuzzy
 msgid "Message was received"
 msgstr "Melding motteken"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Message was sent"
 msgstr "Lag meldingar og slå saman"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "on or after"
 msgstr "Slutt etter"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 #, fuzzy
 msgid "Read"
 msgstr "Tilfeldig"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 #, fuzzy
 msgid "Recipients"
 msgstr "Nyleg brukte fargar"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Replied to"
 msgstr "Svar til alle:"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Poengsum"
 
-#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1062
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 #, fuzzy
 msgid "Sender"
 msgstr "Send"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 #, fuzzy
 msgid "Set Status"
 msgstr "Status:"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:44
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Storleik (KB)"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:46
 #, fuzzy
 msgid "Source Account"
 msgstr "Set opp konto"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52 mail/mail-format.c:861
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "was after"
 msgstr "Slutt etter"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr ""
 
@@ -6618,15 +6755,19 @@ msgstr "Rediger fil"
 msgid "Score Rules"
 msgstr "Rediger filterreglar"
 
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
 #: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:764 importers/pine-importer.c:627
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
 #: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr ""
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:769
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:12
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 #, fuzzy
 msgid "Mail"
 msgstr "Send"
@@ -6652,11 +6793,11 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:774
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: importers/netscape-importer.c:799
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6717,26 +6858,40 @@ msgstr "Øydelagd oppsettfil."
 msgid "Mail configuration interface"
 msgstr "Oppsett"
 
-#: mail/component-factory.c:679
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "Eigenskapar ..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Endra namnet på spelarane"
+
+#: mail/component-factory.c:757
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:813
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:253
+#: mail/folder-browser-ui.c:254
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenskapar ..."
 
-#: mail/folder-browser-ui.c:255
+#: mail/folder-browser-ui.c:256
 #, fuzzy
 msgid "Properties"
 msgstr "Eigenskapar ..."
 
-#: mail/folder-browser.c:227 mail/mail-display.c:277
+#: mail/folder-browser.c:231 mail/mail-display.c:278
 #, fuzzy, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -6744,152 +6899,152 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: mail/folder-browser.c:884
+#: mail/folder-browser.c:893
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "Vel mappe"
 
-#: mail/folder-browser.c:1224
+#: mail/folder-browser.c:1238
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:1227
+#: mail/folder-browser.c:1241
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Mappenamn:"
 
-#: mail/folder-browser.c:1230
+#: mail/folder-browser.c:1244
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Mappa finst: "
 
-#: mail/folder-browser.c:1233
+#: mail/folder-browser.c:1247
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1239
+#: mail/folder-browser.c:1253
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:1242
+#: mail/folder-browser.c:1256
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Fil under:"
 
-#: mail/folder-browser.c:1245
+#: mail/folder-browser.c:1259
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Skriv ut filer"
 
-#: mail/folder-browser.c:1248
+#: mail/folder-browser.c:1262
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1257
-#, fuzzy
-msgid "_Open"
-msgstr "Opna ..."
-
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1273
 #, fuzzy
 msgid "Resend"
 msgstr "Svar"
 
-#: mail/folder-browser.c:1261 ui/evolution-calendar.xml.h:54
-#: ui/evolution-mail-message.xml.h:86 ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 #, fuzzy
 msgid "_Save As..."
 msgstr "Lagra som ..."
 
-#: mail/folder-browser.c:1263 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:1268 ui/evolution-mail-message.xml.h:85
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Svar til avsendar:"
 
-#: mail/folder-browser.c:1270 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Svar til:"
 
-#: mail/folder-browser.c:1272 ui/evolution-mail-message.xml.h:60
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Svar til alle:"
 
-#: mail/folder-browser.c:1274
+#: mail/folder-browser.c:1288
 #, fuzzy
 msgid "_Forward"
 msgstr "Fram"
 
-#: mail/folder-browser.c:1277
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:1279
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:1281
+#: mail/folder-browser.c:1295
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marker som lesen"
 
-#: mail/folder-browser.c:1286
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Marker som lesen"
+
+#: mail/folder-browser.c:1302
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "Flytt til mappe"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Kopier til mappe"
 
-#: mail/folder-browser.c:1292 ui/evolution-mail-message.xml.h:87
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Undelete"
 msgstr "Slett"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Legg til i adresseboka"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1322
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Mapper"
 
-#: mail/folder-browser.c:1445
+#: mail/folder-browser.c:1479
 #, fuzzy
 msgid "Filter on Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1480
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1483
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Fil alt i liste"
@@ -6964,12 +7119,12 @@ msgstr "KDeelop-installering"
 msgid "Evolution Account Editor"
 msgstr "KDeelop-installering"
 
-#: mail/mail-account-gui.c:956
+#: mail/mail-account-gui.c:971
 #, fuzzy
 msgid "Save signature"
 msgstr "Vis sig&natur"
 
-#: mail/mail-account-gui.c:962
+#: mail/mail-account-gui.c:977
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -6979,31 +7134,40 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: mail/mail-accounts.c:130
+#: mail/mail-accounts.c:135
 #, fuzzy
 msgid " (default)"
 msgstr "Standard"
 
-#: mail/mail-accounts.c:169
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Skru av"
 
-#: mail/mail-accounts.c:171 mail/mail-config.glade.h:37
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "på"
 
-#: mail/mail-accounts.c:259 mail/mail-accounts.c:263
+#: mail/mail-accounts.c:264
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
-#: mail/mail-accounts.c:504 mail/mail-accounts.c:508
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Slett"
+
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
+msgstr ""
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:716
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr ""
 
@@ -7079,87 +7243,87 @@ msgstr ""
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:656
+#: mail/mail-callbacks.c:653
 #, fuzzy, c-format
 msgid "On %s, %s wrote:"
 msgstr "%D, skreiv %F:"
 
-#: mail/mail-callbacks.c:888
+#: mail/mail-callbacks.c:914
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-callbacks.c:982
+#: mail/mail-callbacks.c:1011
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:984
+#: mail/mail-callbacks.c:1013
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: mail/mail-callbacks.c:1339
+#: mail/mail-callbacks.c:1374
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker på at du vil sletta %1?"
 
-#: mail/mail-callbacks.c:1361
+#: mail/mail-callbacks.c:1396
 #, 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:1395
+#: mail/mail-callbacks.c:1430
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-callbacks.c:1407
+#: mail/mail-callbacks.c:1442
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker på at du vil fjerna %1?"
 
-#: mail/mail-callbacks.c:1428
+#: mail/mail-callbacks.c:1463
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Ingen rektangel valt!"
 
-#: mail/mail-callbacks.c:1510
+#: mail/mail-callbacks.c:1545
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:1512
+#: mail/mail-callbacks.c:1547
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:1722
+#: mail/mail-callbacks.c:1766
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:1732
+#: mail/mail-callbacks.c:1776
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:1780
+#: mail/mail-callbacks.c:1823
 #, fuzzy
 msgid "Print Message"
 msgstr "Private meldingar"
 
-#: mail/mail-callbacks.c:1827
+#: mail/mail-callbacks.c:1871
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "Feil ved skriving av band-ID."
 
-#: mail/mail-callbacks.c:1922
+#: mail/mail-callbacks.c:1966
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker på at du vil sletta denne overføringa?"
@@ -7195,11 +7359,11 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:463
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-config.c:1583 mail/mail-config.c:1586
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 #, fuzzy
 msgid "Connecting to server..."
 msgstr " Koplar til tenar ..."
@@ -7216,64 +7380,69 @@ msgstr "farge"
 
 #: mail/mail-config.glade.h:3
 #, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Den oppgitte fila finst ikkje"
+
+#: mail/mail-config.glade.h:4
+#, fuzzy
 msgid "Account"
 msgstr "Små ikon"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account Information"
 msgstr "Informasjon"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Kontoar"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Authentication"
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Automatically check for new mail every"
 msgstr "enkle innlegg"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Certificate ID:"
 msgstr "Dine SSL-sertifikat"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Ny melding"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7283,304 +7452,326 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "De_fault"
 msgstr "Standard"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:26
 #, fuzzy
-msgid "Default \"Forward\" style is: "
+msgid "Default Forward style is: "
 msgstr "Fjern ramme"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Default character set: "
 msgstr "Standardteiknsett"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Digital IDs..."
 msgstr "Detaljar ..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Done"
 msgstr "Ingen"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Kladd"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "Lagra i &kladdemappe"
 
-#: mail/mail-config.glade.h:34 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Endra ..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "Email Address:"
 msgstr "E-post-adresse:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 #, fuzzy
 msgid "Empty trash folders on exit"
 msgstr "Tøm papirkorg ved avslutting"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "på"
+
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Full Name:"
 msgstr "Fullt namn"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Get Digital ID..."
 msgstr "Les band-ID ..."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "HTML Signature:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Highlight citations with"
 msgstr "Merkingsvilkår"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "&IMAP 4"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Inline"
 msgstr "Vinkel"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Kerberos "
 msgstr "Tenar:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Load images if sender is in addressbook"
 msgstr "Last alle bileta i ein katalog"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Mail Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Format"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Mark messages as \"Read\" after"
+msgid "Mark messages as Read after"
 msgstr "Lag meldingar og slå saman"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "NNTP-tenar:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "News"
 msgstr "Ny ..."
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Optional Information"
 msgstr "Personleg informasjon"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organisasjon:"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:70
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Prompt when sending messages with an empty subject"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Sender meldingar til %1"
+
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "E-post 2"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Quoted"
 msgstr "Ingen"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Mottek e-post"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Val for oppkopling på nytt"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:79
 msgid "Remember PGP Passphrase until exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Required Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Secure MIME"
 msgstr "Er sikker"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "Tryggleik"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Send mail in HTML format by default."
 msgstr "Send meldingar:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Server Type: "
 msgstr "Tenar:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Source"
 msgstr "Kjelder"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Source Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Kjelder"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Special Folders"
 msgstr "Mapper"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Standard Unix mbox"
 msgstr "Standardfil"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Brukarnamn:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "newswindow1"
 msgstr "Nytt vindauge"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "placeholder"
 msgstr "Bruk &plasshaldarar"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "seconds."
 msgstr "sekund"
@@ -7630,41 +7821,41 @@ msgstr "Kunne ikkje laga kio-jobb.\n"
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-display.c:220
+#: mail/mail-display.c:221
 #, fuzzy
 msgid "Save Attachment"
 msgstr "Smarte vedlegg"
 
-#: mail/mail-display.c:337
+#: mail/mail-display.c:338
 #, fuzzy
 msgid "Save to Disk..."
 msgstr "Lagra til disk"
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:340
 #, fuzzy
 msgid "View Inline"
 msgstr "Vinkel"
 
-#: mail/mail-display.c:341
+#: mail/mail-display.c:342
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "Opnar URL ..."
 
-#: mail/mail-display.c:398
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:402
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:423
+#: mail/mail-display.c:424
 #, fuzzy
 msgid "External Viewer"
 msgstr "Hendingsvisar"
 
-#: mail/mail-display.c:1047
+#: mail/mail-display.c:1048
 #, fuzzy
 msgid "Loading message content"
 msgstr "Markerer meldingar"
@@ -7685,168 +7876,160 @@ msgstr "Lagrar fil ..."
 
 #: mail/mail-display.c:1410
 #, fuzzy
-msgid "Save Image as"
+msgid "Save Image as..."
 msgstr "Lagra bilete som"
 
-#: mail/mail-folder-cache.c:164
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d new"
 msgstr "Legg til &ny"
 
-#: mail/mail-folder-cache.c:170 mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:171
+#: mail/mail-folder-cache.c:177
 #, fuzzy, c-format
 msgid "%d hidden"
 msgstr "gøymt"
 
-#: mail/mail-folder-cache.c:178
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "Legg til &ny"
+
+#: mail/mail-folder-cache.c:188
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "(%1 totalt)"
 
-#: mail/mail-format.c:603
+#: mail/mail-format.c:609
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-format.c:652
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:734 mail/message-list.etspec.h:2
+#: mail/mail-format.c:746
 #, fuzzy
 msgid "Date"
 msgstr "Forfallsdato"
 
-#: mail/mail-format.c:850 mail/message-list.etspec.h:4
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "E-post-adresse:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Frå"
 
-#: mail/mail-format.c:853
+#: mail/mail-format.c:867
 #, fuzzy
 msgid "Reply-To"
 msgstr "Svar"
 
-#: mail/mail-format.c:856 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:859
+#: mail/mail-format.c:873
 #, fuzzy
 msgid "Cc"
 msgstr "&CC:"
 
-#: mail/mail-format.c:1182
+#: mail/mail-format.c:1291
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "Ingen bilete tilgjengeleg."
 
-#: mail/mail-format.c:1197
+#: mail/mail-format.c:1307
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Endra tidsvising"
 
-#: mail/mail-format.c:1203
+#: mail/mail-format.c:1318
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Lagra melding"
 
-#: mail/mail-format.c:1204
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1260
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1268
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1920
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1932
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1936
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1970
+#: mail/mail-format.c:2094
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1975
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:455
+#: mail/mail-local.c:458
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "Opnar URL ..."
 
-#: mail/mail-local.c:755
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:759
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:782
-msgid "Reconfiguring folder"
-msgstr ""
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:811
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:838
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:856
-#, fuzzy
-msgid "Creating new folder"
-msgstr "Lagar ei ny mappe"
-
-#: mail/mail-local.c:870
-#, fuzzy
-msgid "Copying messages"
-msgstr "Melding"
-
-#: mail/mail-local.c:887
+#: mail/mail-local.c:868
 #, 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:926
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1012
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
+
+#: mail/mail-local.c:1011
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "Set opp %1"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:187
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -7855,7 +8038,7 @@ msgstr ""
 "Feil ved laging av fil '%1':\n"
 "%2"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -7864,132 +8047,118 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:885
+#: mail/mail-mt.c:794
 #, fuzzy
 msgid "Working"
 msgstr "Flyttar"
 
-#: mail/mail-mt.c:867
-#, fuzzy
-msgid "Evolution progress"
-msgstr "Oppløysing"
-
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:578
 #, fuzzy, c-format
 msgid "Sending \"%s\""
 msgstr "Sender %1"
 
-#: mail/mail-ops.c:560
-#, fuzzy
-msgid "Sending message"
-msgstr "Sen melding"
-
-#: mail/mail-ops.c:676
+#: mail/mail-ops.c:698
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Markerer meldingar"
 
-#: mail/mail-ops.c:697 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 #, fuzzy
 msgid "Complete."
 msgstr "Ferdig"
 
-#: mail/mail-ops.c:783
+#: mail/mail-ops.c:805
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Melding"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:882
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:972
+#: mail/mail-ops.c:1016
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1141
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#, fuzzy
+msgid "Trash"
+msgstr "Oppgåve"
+
+#: mail/mail-ops.c:1189
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-ops.c:1182 mail/mail-ops.c:1320
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1249
+#: mail/mail-ops.c:1297
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1388
+#: mail/mail-ops.c:1436
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1520
+#: mail/mail-ops.c:1568
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:1556
+#: mail/mail-ops.c:1604
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Forventar %1"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1653
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:1672
-#, fuzzy
-msgid "Retrieving messages"
-msgstr "Mottek meldingar frå %1"
-
-#: mail/mail-ops.c:1682
+#: mail/mail-ops.c:1722
 #, fuzzy, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgid "Retrieving %d message(s)"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:1756
-#, fuzzy
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Melding"
 
-#: mail/mail-ops.c:1835
+#: mail/mail-ops.c:1887
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1848
-#, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Mottek meldingar frå %1"
-
-#: mail/mail-ops.c:1862
+#: mail/mail-ops.c:1913
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7998,24 +8167,24 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: mail/mail-ops.c:1936
+#: mail/mail-ops.c:1987
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Smarte vedlegg"
 
-#: mail/mail-ops.c:1951
+#: mail/mail-ops.c:2003
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1979
+#: mail/mail-ops.c:2032
 #, fuzzy, c-format
 msgid "Could not write data: %s"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2101
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar frå ..."
@@ -8025,25 +8194,35 @@ msgstr "Koplar frå ..."
 msgid "(Untitled Message)"
 msgstr "Ulest melding"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Ulest melding"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Legg til melding"
+
+#: mail/mail-search.c:284
 #, fuzzy
 msgid "Find in Message"
 msgstr "&Finn i melding ..."
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "Skil mellom store og små bokstavar"
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 #, fuzzy
 msgid "Search Forward"
 msgstr "30 sekund framover"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Finn:"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 #, fuzzy
 msgid "Matches:"
 msgstr "Treff:"
@@ -8083,14 +8262,14 @@ msgstr "Sender %1"
 msgid "Cancelled."
 msgstr "Avbroten."
 
-#: mail/mail-session.c:170
+#: mail/mail-session.c:171
 #, fuzzy
 msgid "User canceled operation."
 msgstr ""
 "Brukaren avbraut handling\n"
 "%1"
 
-#: mail/mail-tools.c:159
+#: mail/mail-tools.c:173
 #, fuzzy, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
@@ -8098,38 +8277,27 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: mail/mail-tools.c:207
-#, fuzzy, c-format
-msgid "[%s] (forwarded message)"
-msgstr "Vidaresendt melding"
-
-#: mail/mail-tools.c:217
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (ingen emne)"
-
-#: mail/mail-tools.c:234
+#: mail/mail-tools.c:241
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-tools.c:236
+#: mail/mail-tools.c:245
 #, fuzzy
-msgid "Forwarded message (no subject)"
+msgid "Forwarded message"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-tools.c:457
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-vfolder.c:250
+#: mail/mail-vfolder.c:270
 #, fuzzy
 msgid "VFolders"
 msgstr "Mapper"
 
-#: mail/mail-vfolder.c:442
+#: mail/mail-vfolder.c:463
 #, fuzzy
 msgid "New VFolder"
 msgstr "Ny mappe"
@@ -8205,11 +8373,16 @@ msgstr "%H:%M"
 msgid "%b %d %Y"
 msgstr "%1 bit %2 %3"
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Melding"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Received"
 msgstr "Motta"
@@ -8288,70 +8461,76 @@ msgstr "%H:%M"
 msgid "%a %l:%M%p"
 msgstr "%H:%M"
 
-#: my-evolution/e-summary-mail.c:103
+#: my-evolution/e-summary-mail.c:104
 #, fuzzy
 msgid "Mail summary"
 msgstr "oppsummering"
 
-#: my-evolution/e-summary-preferences.c:424
+#: my-evolution/e-summary-preferences.c:420
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:446
+#: my-evolution/e-summary-preferences.c:442
 #, fuzzy
 msgid "Quotes of the Day"
 msgstr "Tips for dagen"
 
-#: my-evolution/e-summary-preferences.c:874
+#: my-evolution/e-summary-preferences.c:869
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Legg til ei ny oppføring"
 
-#: my-evolution/e-summary-preferences.c:882
+#: my-evolution/e-summary-preferences.c:877
 #, fuzzy
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Oppgi namnet på gruppa du vil leggja til."
 
-#: my-evolution/e-summary-rdf.c:387 my-evolution/e-summary-rdf.c:413
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Skriftinnstillingar"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 #, fuzzy
 msgid "<b>Error downloading RDF</b>"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: my-evolution/e-summary-tasks.c:157
+#: my-evolution/e-summary-tasks.c:206
 #, fuzzy
 msgid "No tasks"
 msgstr "Ingen oppgåver ..."
 
-#: my-evolution/e-summary-weather.c:56
+#: my-evolution/e-summary-weather.c:57
 #, fuzzy
 msgid "My Weather"
 msgstr "Vatn"
 
-#: my-evolution/e-summary-weather.c:304
-#, fuzzy
-msgid "<b>Error downloading Metar</b>"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
-"Feil ved nedlasting av fil:\n"
-"%1"
 
-#: my-evolution/e-summary-weather.c:628
+#: my-evolution/e-summary-weather.c:643
 #, fuzzy
 msgid "Regions"
 msgstr "Start om att"
 
-#: my-evolution/e-summary.c:144
+#: my-evolution/e-summary.c:145
 #, fuzzy
 msgid "%A, %d %B %Y"
 msgstr "%1 bit %2 %3"
 
-#: my-evolution/e-summary.c:459 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print My Evolution"
 msgstr "Evolution"
 
-#: my-evolution/e-summary.c:505
+#: my-evolution/e-summary.c:518
 #, fuzzy
 msgid "Printing of My Evolution failed"
 msgstr "Feil ved skriving av band-ID."
@@ -8361,44 +8540,6 @@ msgstr "Feil ved skriving av band-ID."
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Kunne ikkje initiere Bonobo"
 
-#: my-evolution/metar.c:29
-#, fuzzy
-msgid "°F"
-msgstr "°"
-
-#: my-evolution/metar.c:29
-#, fuzzy
-msgid "°C"
-msgstr "°"
-
-#: my-evolution/metar.c:33
-#, fuzzy
-msgid "knots"
-msgstr "Knop"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr ""
-
-#: my-evolution/metar.c:38
-#, fuzzy
-msgid "inHg"
-msgstr "&Linje"
-
-#: my-evolution/metar.c:38
-#, fuzzy
-msgid "mmHg"
-msgstr "mm"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "miles"
-
-#: my-evolution/metar.c:41
-#, fuzzy
-msgid "kilometers"
-msgstr "meter"
-
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9716,144 +9857,129 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add ->"
-msgstr "&Legg til >>"
-
-#: my-evolution/my-evolution.glade.h:2
-#, fuzzy
 msgid "Add new feed"
 msgstr "Legg til nytt bilete"
 
-#: my-evolution/my-evolution.glade.h:3
+#: my-evolution/my-evolution.glade.h:2
 #, fuzzy
 msgid "All folders:"
 msgstr "Alle kantar"
 
-#: my-evolution/my-evolution.glade.h:4
+#: my-evolution/my-evolution.glade.h:3
 #, fuzzy
 msgid "All news feeds:"
 msgstr "&Alle felt"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:4
 #, fuzzy
 msgid "All stations:"
 msgstr "&Tilgjengelege handlingar:"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:6
 #, fuzzy
 msgid "Display folders:"
 msgstr "Skjermkontrollerarar"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:7
 #, fuzzy
 msgid "Display stations:"
 msgstr "Visingsval:"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:8
 #, fuzzy
 msgid "Displayed feeds:"
 msgstr "Vist namn:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:9
 #, fuzzy
 msgid "Five days"
 msgstr " dagar"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:10
 msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "Max number of items shown:"
 msgstr "&Høgste tal på hopp:"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "News Feed Settings"
 msgstr "Nettverksinnstillingar"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:14
 #, fuzzy
 msgid "News Feeds"
 msgstr "Diskusjonsgruppetenarar"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:15
 #, fuzzy
 msgid "One day"
 msgstr " dag"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:16
 #, fuzzy
 msgid "One month"
 msgstr "Neste månad"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:17
 #, fuzzy
 msgid "One week"
 msgstr "Veke"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:18
 #, fuzzy
 msgid "Refresh time (seconds):"
 msgstr "&Oppfriskingsrate:"
 
-#: my-evolution/my-evolution.glade.h:20
-#, fuzzy
-msgid "Remove <-"
-msgstr "Fjern"
-
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "Schedule"
 msgstr "&Plan"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:20
 #, fuzzy
 msgid "Show all tasks"
 msgstr "Vedlegg"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:21
 #, fuzzy
 msgid "Show full path for folders"
 msgstr "Vis sidekantar"
 
-#: my-evolution/my-evolution.glade.h:24
+#: my-evolution/my-evolution.glade.h:22
 #, fuzzy
 msgid "Show today's tasks"
 msgstr "Vedlegg"
 
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:23
 #, fuzzy
 msgid "Tasks "
 msgstr "Oppgåver"
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:24
 #, fuzzy
 msgid "Units: "
 msgstr "Einingar"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:25
 #, fuzzy
 msgid "Weather"
 msgstr "Vatn"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:26
 #, fuzzy
 msgid "Weather settings"
 msgstr "Toppinnstillingar"
 
-#: my-evolution/my-evolution.glade.h:29
-#, fuzzy
-msgid "Wipe trackers"
-msgstr "Trådmodell"
-
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:27
 #, fuzzy
 msgid "imperial"
 msgstr "seriell"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:28
 #, fuzzy
 msgid "metric"
 msgstr "Geometrisk"
@@ -9873,6 +9999,11 @@ msgstr "Vis detaljar"
 msgid "Cancel Operation"
 msgstr "&Avbryt operasjon"
 
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Mapper"
+
 #: shell/e-setup.c:125 shell/e-setup.c:196
 #, fuzzy
 msgid "Evolution installation"
@@ -9996,7 +10127,7 @@ msgstr "Er du sikker på at du vil sletta denne mappa?"
 msgid "Rename folder '%s'"
 msgstr "Endra namn på profil '%1'"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, fuzzy, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -10005,12 +10136,12 @@ msgstr ""
 "Kan ikkje laga fila\n"
 "\""
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 #, fuzzy
 msgid "The specified folder name is not valid."
 msgstr "Arkivfilnamnet er ikkje gyldig.\n"
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 #, fuzzy
 msgid "Evolution - Create new folder"
 msgstr "Lagar ei ny mappe"
@@ -10021,11 +10152,11 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:332
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Ny ..."
 
-#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Utan tittel"
@@ -10172,43 +10303,44 @@ msgstr "Vel katalogen som inneheld tenestene"
 
 #: shell/e-shell-view-menu.c:689
 #, fuzzy
-msgid "Work online"
+msgid "Work Online"
 msgstr "Flyttar"
 
 #: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
 #, fuzzy
-msgid "Work offline"
+msgid "Work Offline"
 msgstr "Flyttar"
 
-#: shell/e-shell-view.c:177
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr ""
 
 #. Special case for My Evolution
-#: shell/e-shell-view.c:1395 shell/e-storage-set-view.c:1441
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
 #, fuzzy
 msgid "My Evolution"
 msgstr "Evolution"
 
-#: shell/e-shell-view.c:1412
+#: shell/e-shell-view.c:1411
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evalueringsfeil"
 
-#: shell/e-shell-view.c:1414
+#: shell/e-shell-view.c:1413
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evalueringsfeil"
 
-#: shell/e-shell-view.c:1452
+#: shell/e-shell-view.c:1451
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1459
+#: shell/e-shell-view.c:1458
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1465
+#: shell/e-shell-view.c:1464
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
@@ -10217,7 +10349,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: shell/e-shell.c:1310
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -10245,190 +10377,195 @@ msgstr "Vil du verkeleg leggja '%1' i papirkorga?"
 msgid "Don't remove"
 msgstr "fjern"
 
-#: shell/e-shortcuts-view.c:297
+#: shell/e-shortcuts-view.c:300
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Fjern denne oppføringa"
 
-#: shell/e-shortcuts-view.c:298
+#: shell/e-shortcuts-view.c:301
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Fjern denne oppføringa"
 
-#: shell/e-shortcuts-view.c:308
+#: shell/e-shortcuts-view.c:314
 #, fuzzy
 msgid "_Small Icons"
 msgstr "Små ikon"
 
-#: shell/e-shortcuts-view.c:309
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:311
+#: shell/e-shortcuts-view.c:317
 #, fuzzy
 msgid "_Large Icons"
 msgstr "Ordna ikon"
 
-#: shell/e-shortcuts-view.c:312
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:323
+#: shell/e-shortcuts-view.c:329
 #, fuzzy
 msgid "_New Group..."
 msgstr "Ny gruppe ..."
 
-#: shell/e-shortcuts-view.c:324
+#: shell/e-shortcuts-view.c:330
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shortcuts-view.c:326
+#: shell/e-shortcuts-view.c:332
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:327
+#: shell/e-shortcuts-view.c:333
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Fjern denne oppføringa"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:335
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:336
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Fjern denne oppføringa"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:342
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "&Programsnøggtastar"
 
-#: shell/e-shortcuts-view.c:455
+#: shell/e-shortcuts-view.c:461
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Endra portnamn"
 
-#: shell/e-shortcuts-view.c:456
+#: shell/e-shortcuts-view.c:462
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "&Merka tekst"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "Opna ..."
+
+#: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:470 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
 #, fuzzy
 msgid "Open in New Window"
 msgstr "&Opna i eige vindauge"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:476
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Opna dokumentet i eit nytt vindauge"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename"
 msgstr "Omdøyp"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Fjern denne oppføringa"
 
-#: shell/e-shortcuts-view.c:475
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:614
+#: shell/e-shortcuts.c:585
 #, fuzzy
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av innstillingar."
 
-#: shell/e-shortcuts.c:1011
+#: shell/e-shortcuts.c:982
 msgid "Shortcuts"
 msgstr "Snarvegar"
 
-#: shell/e-shortcuts.c:1013
+#: shell/e-shortcuts.c:984
 msgid "Inbox"
 msgstr "Innboks"
 
-#: shell/e-shortcuts.c:1016
+#: shell/e-shortcuts.c:987
 #, fuzzy
 msgid "Contacts"
 msgstr "&Innhald ..."
 
-#: shell/e-storage.c:178
+#: shell/e-storage.c:178 shell/e-storage.c:184
 #, fuzzy
 msgid "(No name)"
 msgstr "Ingen namn"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 #, fuzzy
 msgid "No error"
 msgstr "Ingen feil."
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 #, fuzzy
 msgid "Generic error"
 msgstr "Generell feil"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 #, fuzzy
 msgid "A folder with the same name already exists"
 msgstr "Ein tabell med det namnet finst alt."
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 #, fuzzy
 msgid "The specified folder type is not valid"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 #, fuzzy
 msgid "I/O error"
 msgstr "IU-feil"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 #, fuzzy
 msgid "Not enough space to create the folder"
 msgstr "Ikkje nok skip å senda."
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 #, fuzzy
 msgid "The specified folder was not found"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 #, fuzzy
 msgid "Function not implemented in this storage"
 msgstr "Kommando ikkje støtta på tenar"
 
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 #, fuzzy
 msgid "Operation not supported"
 msgstr "Operasjonen vart stoppa"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 #, fuzzy
 msgid "The specified type is not supported in this storage"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-task-widget.c:167
+#: shell/e-task-widget.c:168
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:172
-#, fuzzy, c-format
+#: shell/e-task-widget.c:173
+#, fuzzy
 msgid "%s (%d%% complete)"
 msgstr "%1 av %2 ferdig"
 
@@ -10506,7 +10643,7 @@ msgstr "Ikkje spør igjen"
 msgid "Evolution has found the following data sources:"
 msgstr "Bruk på følgjande delar:"
 
-#: shell/main.c:89
+#: shell/main.c:96
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10523,38 +10660,37 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:110
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:148
+#: shell/main.c:155
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:208
+#: shell/main.c:215
 #, fuzzy
 msgid "Disable splash screen"
 msgstr "KDE-oppstartsskjermen."
 
-#: shell/main.c:209
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:244
+#: shell/main.c:255
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
-#: ui/evolution-tasks.xml.h:1
-#, fuzzy
-msgid "C_ut"
-msgstr "Klipp ut"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopier"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 #, fuzzy
 msgid "Copy the selection"
 msgstr "Slettar den valte fila"
@@ -10569,7 +10705,11 @@ msgstr "Lagar eit nytt dokument"
 msgid "Create new contact list"
 msgstr "Lagar eit nytt dokument"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Klipp ut"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Cut the selection"
 msgstr "Slettar den valte fila"
@@ -10589,7 +10729,11 @@ msgstr "Se&nd avtale"
 msgid "New list"
 msgstr "Ny liste"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Lim inn"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Limer inn ..."
@@ -10639,19 +10783,7 @@ msgstr "&Innhald ..."
 msgid "_Contact Group"
 msgstr "&Innhald ..."
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:47
-#: ui/evolution-tasks.xml.h:14
-#, fuzzy
-msgid "_Copy"
-msgstr "Kopier"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:52
-#: ui/evolution-tasks.xml.h:16
-#, fuzzy
-msgid "_Paste"
-msgstr "Lim inn"
-
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
 #: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 #, fuzzy
 msgid "_Print..."
@@ -10666,199 +10798,140 @@ msgstr ""
 msgid "_Select All"
 msgstr "Vel mappe"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
 #: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Tools"
 msgstr "Verktøy"
 
-#: ui/evolution-calendar.xml.h:1
-#, fuzzy
-msgid "5 Days"
-msgstr " dag"
-
 #: ui/evolution-calendar.xml.h:2
-#, fuzzy
-msgid "Alter preferences"
-msgstr "Innstillingar"
+msgid "Configure the calendar's settings"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr "Feil ved opning"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr "&Slett avtale"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
-msgid "Create a new calendar"
-msgstr "Feil ved opning"
+msgid "Create a new appointment"
+msgstr "&Slett avtale"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "Dag"
+#: ui/evolution-calendar.xml.h:7
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "Gå til side"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Go back in time"
 msgstr "Ikkje vis den overskytande teksten"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 #, fuzzy
 msgid "Go forward in time"
 msgstr "Fram"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go to _Date"
 msgstr "Gå til side"
 
-#: ui/evolution-calendar.xml.h:17
-#, fuzzy
-msgid "Go to _Today"
-msgstr "Gå til &i dag"
-
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:14
 #, fuzzy
 msgid "Go to a specific date"
 msgstr "Gå til side"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 #, fuzzy
 msgid "Go to present time"
 msgstr "Ikkje vis den overskytande teksten"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Month"
-msgstr "Månad"
-
-#: ui/evolution-calendar.xml.h:22
-#, fuzzy
-msgid "New _Event"
-msgstr "Ny &hending ..."
-
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:48
-#, fuzzy
-msgid "Next"
-msgstr "Neste"
-
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
-msgid "Open Calendar"
-msgstr "Feil ved opning"
-
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "Prev"
-msgstr "Førehandsvising:"
+msgid "New Appointment"
+msgstr "&Vis avtale ..."
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:18
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Sen melding"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Print calendar"
 msgstr "Skriv ut alle"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Print this Calendar"
 msgstr "Skriv ut alle"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
 msgid "Publish Free/Busy Information"
 msgstr "Informasjon"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:23
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-message-composer.xml.h:19
-#, fuzzy
-msgid "Save As"
-msgstr "Lagra"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "Save calendar as something else"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:38
-#, fuzzy
-msgid "Settings..."
-msgstr "Skriftinnstillingar"
-
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Show 1 day"
 msgstr "Vis dato"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:25
 #, fuzzy
 msgid "Show 1 month"
 msgstr "Vis metodar"
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Show 1 week"
 msgstr "Vis %1"
 
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show the working week"
 msgstr "Vis hovudvindauget"
 
-#: ui/evolution-calendar.xml.h:43 widgets/misc/e-cell-date-edit.c:232
-#: widgets/misc/e-dateedit.c:431
-#, fuzzy
-msgid "Today"
-msgstr "i dag"
-
-#: ui/evolution-calendar.xml.h:44
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "W_ork Week"
 msgstr "&Arbeidsveke"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "Week"
-msgstr "Veke"
-
-#: ui/evolution-calendar.xml.h:46
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
-msgid "_Appointment"
+msgid "_Appointment..."
 msgstr "Avtale"
 
-#: ui/evolution-calendar.xml.h:48
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Skriftinnstillingar"
+
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
 msgid "_Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:49
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "_Month"
 msgstr "Månad"
 
-#: ui/evolution-calendar.xml.h:50 ui/evolution.xml.h:56
-#, fuzzy
-msgid "_New"
-msgstr "Vis"
-
-#: ui/evolution-calendar.xml.h:51
-#, fuzzy
-msgid "_Open Calendar"
-msgstr "Feil ved opning"
-
-#: ui/evolution-calendar.xml.h:56
+#: ui/evolution-calendar.xml.h:37
 #, fuzzy
 msgid "_Week"
 msgstr "Veke"
@@ -10892,7 +10965,7 @@ msgstr ""
 msgid "Preview the printed item"
 msgstr "Sen melding"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 #, fuzzy
 msgid "Print Pre_view"
 msgstr "&Førehandsvising ..."
@@ -10936,22 +11009,16 @@ msgstr ""
 msgid "_Action"
 msgstr "Handlingar"
 
-#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-contact-list-editor.xml.h:9
 #: ui/evolution-mail-messagedisplay.xml.h:10
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_File"
 msgstr "Fil"
 
-#: ui/evolution-comp-editor.xml.h:22 ui/evolution-signature-editor.xml.h:9
-#: ui/evolution.xml.h:51
-#, fuzzy
-msgid "_Help"
-msgstr "Heim"
-
 #: ui/evolution-contact-editor.xml.h:2
 #, fuzzy
 msgid "Delete this item"
@@ -10975,7 +11042,7 @@ msgstr "Private meldingar"
 
 #: ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:4
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "Lagra som ..."
@@ -11091,88 +11158,93 @@ msgid "Compose"
 msgstr "Lukk"
 
 #: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Lukk melding"
+
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:7
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:8
 #, fuzzy
 msgid "Empty _Trash"
 msgstr " dag"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:9
 #, fuzzy
 msgid "Forget _Passwords"
 msgstr "Lagra som"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:10
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:11
 #, fuzzy
 msgid "Manage _Subscriptions..."
 msgstr "Skildring:"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:12
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:14
 #, fuzzy
 msgid "Send / Receive"
 msgstr "Mottakar"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 #, fuzzy
 msgid "Show message preview window"
 msgstr "Vis &meldingar kvar gong"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Mapper"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_Filters..."
 msgstr "E-post:"
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:20
 #, fuzzy
 msgid "_Mail Message"
 msgstr "Legg til melding"
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:21
 #, fuzzy
 msgid "_Mail Settings..."
 msgstr "Skriftinnstillingar"
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:22
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "Førehandsvis i"
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:23
 #, fuzzy
 msgid "_Send / Receive"
 msgstr "Mottakar"
@@ -11204,7 +11276,7 @@ msgstr "Neste melding"
 
 #: ui/evolution-mail-list.xml.h:8
 #, fuzzy
-msgid "Hide _Read messages"
+msgid "Hide _Read Messages"
 msgstr "Vidaresendt melding frå %1"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -11406,22 +11478,22 @@ msgstr "Vis det førre dokumentet"
 
 #: ui/evolution-mail-message.xml.h:24
 #, fuzzy
-msgid "Filter on Mailing _List"
+msgid "Filter on Mailing _List..."
 msgstr "Fil alt i liste"
 
 #: ui/evolution-mail-message.xml.h:25
 #, fuzzy
-msgid "Filter on Se_nder"
+msgid "Filter on Se_nder..."
 msgstr "Fil under:"
 
 #: ui/evolution-mail-message.xml.h:26
 #, fuzzy
-msgid "Filter on _Recipients"
+msgid "Filter on _Recipients..."
 msgstr "Skriv ut filer"
 
 #: ui/evolution-mail-message.xml.h:27
 #, fuzzy
-msgid "Filter on _Subject"
+msgid "Filter on _Subject..."
 msgstr "Ingen emne"
 
 #: ui/evolution-mail-message.xml.h:28
@@ -11472,208 +11544,244 @@ msgstr "Sentrer dei valte elementa"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Load _Images"
 msgstr "Endra &biletestorleik"
 
-#: ui/evolution-mail-message.xml.h:39
-#, fuzzy
-msgid "Mar_k As Read"
-msgstr "Mar&ker som ulesen"
-
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
-msgid "Mark As I_mportant"
-msgstr "Mar&ker som ulesen"
+msgid "Mark as I_mportant"
+msgstr "Marker som lesen"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 #, fuzzy
-msgid "Mark As U_nread"
-msgstr "Mar&ker som ulesen"
+msgid "Mark as Unimp_ortant"
+msgstr "Marker som lesen"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark the selected messages as having been read"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
 msgid "Mark the selected messages as important"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Mark the selected messages as not having been read"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Sentrer dei valte elementa"
+
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Move"
 msgstr "Mån"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
+#, fuzzy
+msgid "Next"
+msgstr "Neste"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Vis informasjonsmelding"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Legg til melding"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Vel mappe"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Ulest melding"
+
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "Opna dokumentet i eit nytt vindauge"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Kopierer det merkte området til utklippstavla"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Previews the message to be printed"
 msgstr "Sen melding"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "Førre"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Vis det førre dokumentet"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Private meldingar"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Vis det førre dokumentet"
+
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Print Message..."
 msgstr "Private meldingar"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Print Preview..."
 msgstr "&Førehandsvising ..."
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
-msgid "Print message to the printer"
-msgstr "Sen melding"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Redirect (FIXME: implement me)"
-msgstr ""
+msgid "Print this message"
+msgstr "Private meldingar"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Svar"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Reply to All"
 msgstr "Svar til alle:"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "S_earch Message"
 msgstr "Søk i &meldingar ..."
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Search for text in the body of the displayed message"
 msgstr "Skriv tittelen på ruta her."
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Show Email _Source"
 msgstr "E-posttenar"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "Vis &heile meldingshovudet"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Vis &meldingar kvar gong"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Lag meldingar og slå saman"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:78
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "Kunne ikkje lagra melding(ar)."
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "Fil alt i liste"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "Mappenamn:"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "Mappa finst: "
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "Ingen emne"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "_Apply Filters"
 msgstr "Rediger fil"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Vidaresendt melding"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Message Display"
 msgstr "Endra tidsvising"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Vis"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Open Message"
 msgstr "Send melding"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Re-send Message"
 msgstr "Send melding"
@@ -11697,7 +11805,7 @@ msgid "Customize toolbars"
 msgstr ""
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:42
 #, fuzzy
@@ -11745,174 +11853,179 @@ msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
 #, fuzzy
+msgid "Inline Text _File..."
+msgstr "Sett inn fil ..."
+
+#: ui/evolution-message-composer.xml.h:11
+#, fuzzy
 msgid "Insert a file as text into the message"
 msgstr "Oppgi eit nytt namn på meldinga."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 #, fuzzy
 msgid "Insert text file..."
 msgstr "Sett inn fil ..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
 msgid "Open a file"
 msgstr "Opna fil"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 #, fuzzy
 msgid "S/MIME Encrypt"
 msgstr "&Krypter"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:18
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 msgid "Save"
 msgstr "Lagra"
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save As"
+msgstr "Lagra"
+
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "Lagrar fil ..."
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:24
 #: ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "Save the current file"
 msgstr "tid no"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
 msgid "Save the current file with a different name"
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
 msgid "Save the message in a specified folder"
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Send"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "Send &seinare"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "Send &seinare"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "Send meldingar:"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Sen melding"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send this message now"
 msgstr "Sen melding"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "Vedlegg som ikon"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show _attachments"
 msgstr "Vedlegg"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show attachments"
 msgstr "Vedlegg"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Sign this message with your PGP key"
 msgstr "Sender meldingar til %1"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sender meldingar til %1"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:42
 #, fuzzy
-msgid "_Attachment"
+msgid "_Attachment..."
 msgstr "Vedlegg"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
 #: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 #, fuzzy
 msgid "_Delete all"
 msgstr "Slett alt"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-signature-editor.xml.h:10
 #, fuzzy
 msgid "_Insert"
 msgstr "Set inn"
 
-#: ui/evolution-message-composer.xml.h:51
-#, fuzzy
-msgid "_Insert text file..."
-msgstr "Sett inn fil ..."
-
 #: ui/evolution-message-composer.xml.h:52
 #, fuzzy
 msgid "_Open..."
@@ -11927,6 +12040,11 @@ msgstr "Svar"
 msgid "_Security"
 msgstr ""
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#, fuzzy
+msgid "_Help"
+msgstr "Heim"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
@@ -11973,48 +12091,47 @@ msgid "Re_fresh Task"
 msgstr "Frisk opp lerret"
 
 #: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
 msgid "Copy selected task"
 msgstr "Slett den valte oppgåva"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Create a new task"
 msgstr "Lagar eit nytt dokument"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Slett den valte oppgåva"
 
 #: ui/evolution-tasks.xml.h:7
 #, fuzzy
+msgid "Delete selected tasks"
+msgstr "Slett den valte oppgåva"
+
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
 msgid "New Task"
 msgstr "Oppgåve"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
 msgid "Paste task from the clipboard"
 msgstr "Lim inn oppgåve eller variabel frå utklippstavla."
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:11
-#, fuzzy
-msgid "Set task view preferences"
-msgstr "kView-innstillingar"
-
-#: ui/evolution-tasks.xml.h:12
-#, fuzzy
-msgid "Tasks Preferences..."
-msgstr "Innstillingar"
-
 #: ui/evolution-tasks.xml.h:13
 #, fuzzy
-msgid "TasksPreferences"
-msgstr "Innstillingar"
+msgid "Tasks Settings"
+msgstr "Skriftinnstillingar"
 
 #: ui/evolution-tasks.xml.h:19
 #, fuzzy
@@ -12161,11 +12278,6 @@ msgstr "Skriv ut alle"
 msgid "View the selected folder"
 msgstr "Slettar den valte fila"
 
-#: ui/evolution.xml.h:38
-#, fuzzy
-msgid "Work Offline"
-msgstr "Flyttar"
-
 #: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_About Evolution..."
@@ -12216,6 +12328,11 @@ msgstr "Legg til melding"
 msgid "_Move..."
 msgstr "&Flytt ..."
 
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_New"
+msgstr "Vis"
+
 #: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_New Folder"
@@ -12301,10 +12418,6 @@ msgstr "Kategori"
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Mellombels"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Oppteke"
@@ -12401,21 +12514,20 @@ msgstr "Detaljert oversikt"
 
 #. 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:427
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
-#, fuzzy
-msgid "%B %Y"
-msgstr "%1 %2"
-
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:425
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 #, fuzzy
 msgid "Now"
 msgstr "&No"
 
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#, fuzzy
+msgid "Today"
+msgstr "i dag"
+
 #: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
@@ -12509,21 +12621,26 @@ msgstr "Datakoding"
 msgid "..."
 msgstr " ..."
 
-#: widgets/misc/e-filter-bar.c:167
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Comment=X-redigering"
+
+#: widgets/misc/e-filter-bar.c:173
 #, fuzzy
 msgid "Save Search"
 msgstr "Søk"
 
-#: widgets/misc/e-filter-bar.c:238
+#: widgets/misc/e-filter-bar.c:241
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Legg til ..."
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 #, fuzzy
 msgid "Advanced..."
 msgstr "Legg til ..."
@@ -12590,3 +12707,229 @@ msgstr "Kunne ikkje initiere Bonobo"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Kunne ikkje initiere Bonobo"
 
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "kView-innstillingar"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Innstillingar"
+
+#~ msgid "(none)"
+#~ msgstr "(ingen)"
+
+#~ msgid "File not found"
+#~ msgstr "Fann ikkje fil"
+
+#, fuzzy
+#~ msgid "Open calendar"
+#~ msgstr "Feil ved opning"
+
+#, fuzzy
+#~ msgid "Save calendar"
+#~ msgstr "Ny kalender"
+
+#, fuzzy
+#~ msgid "Edit this task"
+#~ msgstr "&Endra avtale ..."
+
+#, fuzzy
+#~ msgid "Go to Today"
+#~ msgstr "Gå til &i dag"
+
+#, fuzzy
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Slettar klassen"
+
+#, fuzzy
+#~ msgid "Summary contains"
+#~ msgstr "Spørjinga inneheld"
+
+#, fuzzy
+#~ msgid "Description contains"
+#~ msgstr "Skildringar"
+
+#, fuzzy
+#~ msgid "Comment contains"
+#~ msgstr "ikkje inneheld"
+
+#, fuzzy
+#~ msgid "Has category"
+#~ msgstr "Kategori"
+
+#, fuzzy
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Leitar etter tilleggsmodular"
+
+#, fuzzy
+#~ msgid "Body contains"
+#~ msgstr "Handlingar"
+
+#, fuzzy
+#~ msgid "Body does not contain"
+#~ msgstr "ikkje inneheld"
+
+#, fuzzy
+#~ msgid "Body or subject contains"
+#~ msgstr "Emne"
+
+#, fuzzy
+#~ msgid "Sender contains"
+#~ msgstr "Spørjinga inneheld"
+
+#, fuzzy
+#~ msgid "Subject contains"
+#~ msgstr "Emne"
+
+#, fuzzy
+#~ msgid "Subject does not contain"
+#~ msgstr "Emne"
+
+#, fuzzy
+#~ msgid "Forward to Address"
+#~ msgstr "Vidaresendt melding"
+
+#, fuzzy
+#~ msgid "Creating new folder"
+#~ msgstr "Lagar ei ny mappe"
+
+#, fuzzy
+#~ msgid "Copying messages"
+#~ msgstr "Melding"
+
+#, fuzzy
+#~ msgid "Evolution progress"
+#~ msgstr "Oppløysing"
+
+#, fuzzy
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Mottek meldingar frå %1"
+
+#, fuzzy
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Mottek meldingar frå %1"
+
+#, fuzzy
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "Vidaresendt melding"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (ingen emne)"
+
+#, fuzzy
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Vidaresendt melding frå %1"
+
+#, fuzzy
+#~ msgid "<b>Error downloading Metar</b>"
+#~ msgstr ""
+#~ "Feil ved nedlasting av fil:\n"
+#~ "%1"
+
+#, fuzzy
+#~ msgid "°F"
+#~ msgstr "°"
+
+#, fuzzy
+#~ msgid "°C"
+#~ msgstr "°"
+
+#, fuzzy
+#~ msgid "knots"
+#~ msgstr "Knop"
+
+#, fuzzy
+#~ msgid "inHg"
+#~ msgstr "&Linje"
+
+#, fuzzy
+#~ msgid "mmHg"
+#~ msgstr "mm"
+
+#~ msgid "miles"
+#~ msgstr "miles"
+
+#, fuzzy
+#~ msgid "kilometers"
+#~ msgstr "meter"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "&Legg til >>"
+
+#, fuzzy
+#~ msgid "Remove <-"
+#~ msgstr "Fjern"
+
+#, fuzzy
+#~ msgid "Wipe trackers"
+#~ msgstr "Trådmodell"
+
+#, fuzzy
+#~ msgid "Work offline"
+#~ msgstr "Flyttar"
+
+#, fuzzy
+#~ msgid "5 Days"
+#~ msgstr " dag"
+
+#, fuzzy
+#~ msgid "Alter preferences"
+#~ msgstr "Innstillingar"
+
+#, fuzzy
+#~ msgid "Create a new calendar"
+#~ msgstr "Feil ved opning"
+
+#~ msgid "Day"
+#~ msgstr "Dag"
+
+#~ msgid "Month"
+#~ msgstr "Månad"
+
+#, fuzzy
+#~ msgid "New _Event"
+#~ msgstr "Ny &hending ..."
+
+#, fuzzy
+#~ msgid "Open Calendar"
+#~ msgstr "Feil ved opning"
+
+#, fuzzy
+#~ msgid "Prev"
+#~ msgstr "Førehandsvising:"
+
+#, fuzzy
+#~ msgid "Settings..."
+#~ msgstr "Skriftinnstillingar"
+
+#~ msgid "Week"
+#~ msgstr "Veke"
+
+#, fuzzy
+#~ msgid "_Open Calendar"
+#~ msgstr "Feil ved opning"
+
+#, fuzzy
+#~ msgid "Mar_k As Read"
+#~ msgstr "Mar&ker som ulesen"
+
+#, fuzzy
+#~ msgid "Mark As I_mportant"
+#~ msgstr "Mar&ker som ulesen"
+
+#, fuzzy
+#~ msgid "Mark As U_nread"
+#~ msgstr "Mar&ker som ulesen"
+
+#, fuzzy
+#~ msgid "Print message to the printer"
+#~ msgstr "Sen melding"
+
+#, fuzzy
+#~ msgid "_Insert text file..."
+#~ msgstr "Sett inn fil ..."
+
+#, fuzzy
+#~ msgid "Tasks Preferences..."
+#~ msgstr "Innstillingar"